TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Minor cleanup of the vertical movement code.

Browse source
This commit is contained in:
Nathan Vegdahl 2021-07-26 23:20:58 -07:00
parent 84f8167fd1
commit aead4e69a6
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
helix-core/src/movement.rs
View file

@ -57,17 +57,12 @@ pub fn move_vertically(
let horiz = range.horiz.unwrap_or(col as u32);
// Compute the new position.
let (new_pos, new_row) = {
let new_row = match dir {
Direction::Forward => (row + count).min(slice.len_lines().saturating_sub(1)),
Direction::Backward => row.saturating_sub(count),
};
let new_col = col.max(horiz as usize);
(
pos_at_coords(slice, Position::new(new_row, new_col), true),
new_row,
)
let new_row = match dir {
Direction::Forward => (row + count).min(slice.len_lines().saturating_sub(1)),
Direction::Backward => row.saturating_sub(count),
};
let new_col = col.max(horiz as usize);
let new_pos = pos_at_coords(slice, Position::new(new_row, new_col), true);
// Special-case to avoid moving to the end of the last non-empty line.
if behaviour == Movement::Extend && slice.line(new_row).len_chars() == 0 {