mirror/ helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix synced 2024-05-17 14:56:05 +02:00
Code Issues

Clamp character movement to line.

This commit is contained in:
Blaž Hrastnik 2020-09-29 01:11:17 +09:00
parent 36e7e2133f
commit 13d1ea542e
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
helix-core/src/state.rs
View File

@ -147,12 +147,23 @@ pub fn move_pos(
) -> usize {
let text = &self.doc;
match (dir, granularity) {
// TODO: clamp movement to line, prevent moving onto \n at the end
(Direction::Backward, Granularity::Character) => {
nth_prev_grapheme_boundary(&text.slice(..), pos, count)
// Clamp to line
let line = text.char_to_line(pos);
let start = text.line_to_char(line);
std::cmp::max(
nth_prev_grapheme_boundary(&text.slice(..), pos, count),
start,
)
}
(Direction::Forward, Granularity::Character) => {
nth_next_grapheme_boundary(&text.slice(..), pos, count)
// Clamp to line
let line = text.char_to_line(pos);
let start = text.line_to_char(line);
let len = text.line(line).len_chars();
// convert to 0-indexed, subtract another 1 because len_chars() counts \n
let end = start + len.saturating_sub(2);
std::cmp::min(nth_next_grapheme_boundary(&text.slice(..), pos, count), end)
}
(Direction::Forward, Granularity::Word) => {
Self::move_next_word_start(&text.slice(..), pos)