suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor cleanup of the vertical movement code.

pull/376/head
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); let horiz = range.horiz.unwrap_or(col as u32);
// Compute the new position. // Compute the new position.
let (new_pos, new_row) = { let new_row = match dir {
let new_row = match dir { Direction::Forward => (row + count).min(slice.len_lines().saturating_sub(1)),
Direction::Forward => (row + count).min(slice.len_lines().saturating_sub(1)), Direction::Backward => row.saturating_sub(count),
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_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. // 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 { if behaviour == Movement::Extend && slice.line(new_row).len_chars() == 0 {