Vim mode: make motion::EndOfLine works with times. (#8591)

Release Notes:

- Fixed `$` in Vim mode not taking a numeric argument (i.e. `2$` or
`4$`) ([#8007](https://github.com/zed-industries/zed/issues/8007)).

---------

Co-authored-by: Thorsten Ball <mrnugget@gmail.com>
This commit is contained in:
Wind 2024-03-01 21:00:31 +08:00 committed by GitHub
parent aeed9d0d8b
commit 9723ca95e3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 58 additions and 7 deletions

View file

@ -492,9 +492,10 @@ impl Motion {
start_of_line(map, *display_lines, point),
SelectionGoal::None,
),
EndOfLine { display_lines } => {
(end_of_line(map, *display_lines, point), SelectionGoal::None)
}
EndOfLine { display_lines } => (
end_of_line(map, *display_lines, point, times),
SelectionGoal::None,
),
StartOfParagraph => (
movement::start_of_paragraph(map, point, times),
SelectionGoal::None,
@ -949,8 +950,12 @@ pub(crate) fn start_of_line(
pub(crate) fn end_of_line(
map: &DisplaySnapshot,
display_lines: bool,
point: DisplayPoint,
mut point: DisplayPoint,
times: usize,
) -> DisplayPoint {
if times > 1 {
point = start_of_relative_buffer_row(map, point, times as isize - 1);
}
if display_lines {
map.clip_point(
DisplayPoint::new(point.row(), map.line_len(point.row())),
@ -1119,7 +1124,7 @@ pub(crate) fn next_line_end(
if times > 1 {
point = start_of_relative_buffer_row(map, point, times as isize - 1);
}
end_of_line(map, false, point)
end_of_line(map, false, point, 1)
}
fn window_top(