Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vim change for wrapped lines

Browse source
This commit is contained in:
Conrad Irwin 2023-08-24 12:53:20 -06:00
parent 104f5ae9cd
commit 0280d5d010
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/vim/src/motion.rs
View file

@ -1,4 +1,4 @@
use std::sync::Arc; use std::{cmp, sync::Arc};
use editor::{ use editor::{
char_kind, char_kind,
@ -404,9 +404,13 @@ fn down(
mut goal: SelectionGoal, mut goal: SelectionGoal,
times: usize, times: usize,
) -> (DisplayPoint, SelectionGoal) { ) -> (DisplayPoint, SelectionGoal) {
for _ in 0..times { let start_row = point.to_point(map).row;
let target = cmp::min(map.max_buffer_row(), start_row + times as u32);
while point.to_point(map).row < target {
(point, goal) = movement::down(map, point, goal, true); (point, goal) = movement::down(map, point, goal, true);
} }
(point, goal) (point, goal)
} }
@ -416,7 +420,10 @@ fn up(
mut goal: SelectionGoal, mut goal: SelectionGoal,
times: usize, times: usize,
) -> (DisplayPoint, SelectionGoal) { ) -> (DisplayPoint, SelectionGoal) {
for _ in 0..times { let start_row = point.to_point(map).row;
let target = start_row.saturating_sub(times as u32);
while point.to_point(map).row > target {
(point, goal) = movement::up(map, point, goal, true); (point, goal) = movement::up(map, point, goal, true);
} }
(point, goal) (point, goal)