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

Revert display-width-based vertical cursor movement.

Browse source 
Still needs to be done, but should be part of a separate PR.
This commit is contained in:
Nathan Vegdahl 2021-07-22 13:21:44 -07:00
parent 5841954f58
commit fd684ef693
2 changed files with 57 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -521,16 +521,14 @@ mod test {
V, V,
} }
let moves_and_expected_coordinates = IntoIter::new([ let moves_and_expected_coordinates = IntoIter::new([
// Places cursor at the fourth kana (each of which are double-wide, // Places cursor at the fourth kana.
// so the visual column is 8). ((Axis::H, Direction::Forward, 4), (0, 4)),
((Axis::H, Direction::Forward, 4), (0, 8)), // Descent places cursor at the 4th character.
// Descent places cursor at the 8th character. ((Axis::V, Direction::Forward, 1usize), (1, 4)),
((Axis::V, Direction::Forward, 1usize), (1, 8)), // Moving back 1 character.
// Moving back a single-width character. ((Axis::H, Direction::Backward, 1usize), (1, 3)),
((Axis::H, Direction::Backward, 1usize), (1, 7)), // Jumping back up 1 line.
// Jumping back up into the middle of a double-width character shifts ((Axis::V, Direction::Backward, 1usize), (0, 3)),
// the column to the start of that character.
((Axis::V, Direction::Backward, 1usize), (0, 6)),
]); ]);
for ((axis, direction, amount), coordinates) in moves_and_expected_coordinates { for ((axis, direction, amount), coordinates) in moves_and_expected_coordinates {

89
helix-core/src/position.rs
View file

@ -1,8 +1,6 @@
use std::borrow::Cow;
use crate::{ use crate::{
chars::char_is_line_ending, chars::char_is_line_ending,
graphemes::{ensure_grapheme_boundary_prev, grapheme_width, RopeGraphemes}, graphemes::{ensure_grapheme_boundary_prev, RopeGraphemes},
line_ending::line_end_char_index, line_ending::line_end_char_index,
RopeSlice, RopeSlice,
}; };
@ -66,12 +64,7 @@ pub fn coords_at_pos(text: RopeSlice, pos: usize) -> Position {
let line_start = text.line_to_char(line); let line_start = text.line_to_char(line);
let pos = ensure_grapheme_boundary_prev(text, pos); let pos = ensure_grapheme_boundary_prev(text, pos);
let col = RopeGraphemes::new(text.slice(line_start..pos)) let col = RopeGraphemes::new(text.slice(line_start..pos)).count();
.map(|g| {
let g: Cow<str> = g.into();
grapheme_width(&g)
})
.sum();
Position::new(line, col) Position::new(line, col)
} }
@ -83,6 +76,9 @@ pub fn coords_at_pos(text: RopeSlice, pos: usize) -> Position {
/// `false` corresponds to properly round-tripping with `coords_at_pos()`, /// `false` corresponds to properly round-tripping with `coords_at_pos()`,
/// whereas `true` will ensure that block cursors don't jump off the /// whereas `true` will ensure that block cursors don't jump off the
/// end of the line. /// end of the line.
///
/// TODO: this should be changed to work in terms of visual row/column, not
/// graphemes.
pub fn pos_at_coords(text: RopeSlice, coords: Position, is_1_width: bool) -> usize { pub fn pos_at_coords(text: RopeSlice, coords: Position, is_1_width: bool) -> usize {
let Position { row, col } = coords; let Position { row, col } = coords;
let line_start = text.line_to_char(row); let line_start = text.line_to_char(row);
@ -92,17 +88,11 @@ pub fn pos_at_coords(text: RopeSlice, coords: Position, is_1_width: bool) -> usi
text.line_to_char((row + 1).min(text.len_lines())) text.line_to_char((row + 1).min(text.len_lines()))
}; };
let mut prev_col = 0;
let mut col_char_offset = 0; let mut col_char_offset = 0;
for g in RopeGraphemes::new(text.slice(line_start..line_end)) { for (i, g) in RopeGraphemes::new(text.slice(line_start..line_end)).enumerate() {
let g: Cow<str> = g.into(); if i == col {
let next_col = prev_col + grapheme_width(&g);
if next_col > col {
break; break;
} }
prev_col = next_col;
col_char_offset += g.chars().count(); col_char_offset += g.chars().count();
} }
@ -131,17 +121,18 @@ mod test {
assert_eq!(coords_at_pos(slice, 10), (1, 4).into()); // position on d assert_eq!(coords_at_pos(slice, 10), (1, 4).into()); // position on d
// Test with wide characters. // Test with wide characters.
// TODO: account for character width.
let text = Rope::from("今日はいい\n"); let text = Rope::from("今日はいい\n");
let slice = text.slice(..); let slice = text.slice(..);
assert_eq!(coords_at_pos(slice, 0), (0, 0).into()); assert_eq!(coords_at_pos(slice, 0), (0, 0).into());
assert_eq!(coords_at_pos(slice, 1), (0, 2).into()); assert_eq!(coords_at_pos(slice, 1), (0, 1).into());
assert_eq!(coords_at_pos(slice, 2), (0, 4).into()); assert_eq!(coords_at_pos(slice, 2), (0, 2).into());
assert_eq!(coords_at_pos(slice, 3), (0, 6).into()); assert_eq!(coords_at_pos(slice, 3), (0, 3).into());
assert_eq!(coords_at_pos(slice, 4), (0, 8).into()); assert_eq!(coords_at_pos(slice, 4), (0, 4).into());
assert_eq!(coords_at_pos(slice, 5), (0, 10).into()); assert_eq!(coords_at_pos(slice, 5), (0, 5).into());
assert_eq!(coords_at_pos(slice, 6), (1, 0).into()); assert_eq!(coords_at_pos(slice, 6), (1, 0).into());
// test with grapheme clusters // Test with grapheme clusters.
let text = Rope::from("a̐éö̲\r\n"); let text = Rope::from("a̐éö̲\r\n");
let slice = text.slice(..); let slice = text.slice(..);
assert_eq!(coords_at_pos(slice, 0), (0, 0).into()); assert_eq!(coords_at_pos(slice, 0), (0, 0).into());
@ -150,13 +141,23 @@ mod test {
assert_eq!(coords_at_pos(slice, 7), (0, 3).into()); assert_eq!(coords_at_pos(slice, 7), (0, 3).into());
assert_eq!(coords_at_pos(slice, 9), (1, 0).into()); assert_eq!(coords_at_pos(slice, 9), (1, 0).into());
// Test with wide-character grapheme clusters.
// TODO: account for character width.
let text = Rope::from("किमपि\n"); let text = Rope::from("किमपि\n");
let slice = text.slice(..); let slice = text.slice(..);
assert_eq!(coords_at_pos(slice, 0), (0, 0).into()); assert_eq!(coords_at_pos(slice, 0), (0, 0).into());
assert_eq!(coords_at_pos(slice, 2), (0, 2).into()); assert_eq!(coords_at_pos(slice, 2), (0, 1).into());
assert_eq!(coords_at_pos(slice, 3), (0, 3).into()); assert_eq!(coords_at_pos(slice, 3), (0, 2).into());
assert_eq!(coords_at_pos(slice, 5), (0, 5).into()); assert_eq!(coords_at_pos(slice, 5), (0, 3).into());
assert_eq!(coords_at_pos(slice, 6), (1, 0).into()); assert_eq!(coords_at_pos(slice, 6), (1, 0).into());
// Test with tabs.
// Todo: account for tab stops.
let text = Rope::from("\tHello\n");
let slice = text.slice(..);
assert_eq!(coords_at_pos(slice, 0), (0, 0).into());
assert_eq!(coords_at_pos(slice, 1), (0, 1).into());
assert_eq!(coords_at_pos(slice, 2), (0, 2).into());
} }
#[test] #[test]
@ -172,21 +173,20 @@ mod test {
assert_eq!(pos_at_coords(slice, (1, 4).into(), false), 10); // position on d assert_eq!(pos_at_coords(slice, (1, 4).into(), false), 10); // position on d
// Test with wide characters. // Test with wide characters.
// TODO: account for character width.
let text = Rope::from("今日はいい\n"); let text = Rope::from("今日はいい\n");
let slice = text.slice(..); let slice = text.slice(..);
assert_eq!(pos_at_coords(slice, (0, 0).into(), false), 0); assert_eq!(pos_at_coords(slice, (0, 0).into(), false), 0);
assert_eq!(pos_at_coords(slice, (0, 1).into(), false), 0); assert_eq!(pos_at_coords(slice, (0, 1).into(), false), 1);
assert_eq!(pos_at_coords(slice, (0, 2).into(), false), 1); assert_eq!(pos_at_coords(slice, (0, 2).into(), false), 2);
assert_eq!(pos_at_coords(slice, (0, 3).into(), false), 1); assert_eq!(pos_at_coords(slice, (0, 3).into(), false), 3);
assert_eq!(pos_at_coords(slice, (0, 4).into(), false), 2); assert_eq!(pos_at_coords(slice, (0, 4).into(), false), 4);
assert_eq!(pos_at_coords(slice, (0, 6).into(), false), 3); assert_eq!(pos_at_coords(slice, (0, 5).into(), false), 5);
assert_eq!(pos_at_coords(slice, (0, 8).into(), false), 4); assert_eq!(pos_at_coords(slice, (0, 6).into(), false), 6);
assert_eq!(pos_at_coords(slice, (0, 10).into(), false), 5); assert_eq!(pos_at_coords(slice, (0, 6).into(), true), 5);
assert_eq!(pos_at_coords(slice, (0, 11).into(), false), 6);
assert_eq!(pos_at_coords(slice, (0, 11).into(), true), 5);
assert_eq!(pos_at_coords(slice, (1, 0).into(), false), 6); assert_eq!(pos_at_coords(slice, (1, 0).into(), false), 6);
// test with grapheme clusters // Test with grapheme clusters.
let text = Rope::from("a̐éö̲\r\n"); let text = Rope::from("a̐éö̲\r\n");
let slice = text.slice(..); let slice = text.slice(..);
assert_eq!(pos_at_coords(slice, (0, 0).into(), false), 0); assert_eq!(pos_at_coords(slice, (0, 0).into(), false), 0);
@ -197,15 +197,24 @@ mod test {
assert_eq!(pos_at_coords(slice, (0, 4).into(), true), 7); assert_eq!(pos_at_coords(slice, (0, 4).into(), true), 7);
assert_eq!(pos_at_coords(slice, (1, 0).into(), false), 9); assert_eq!(pos_at_coords(slice, (1, 0).into(), false), 9);
// Test with wide-character grapheme clusters.
// TODO: account for character width.
let text = Rope::from("किमपि"); let text = Rope::from("किमपि");
// 2 - 1 - 2 codepoints // 2 - 1 - 2 codepoints
// TODO: delete handling as per https://news.ycombinator.com/item?id=20058454 // TODO: delete handling as per https://news.ycombinator.com/item?id=20058454
let slice = text.slice(..); let slice = text.slice(..);
assert_eq!(pos_at_coords(slice, (0, 0).into(), false), 0); assert_eq!(pos_at_coords(slice, (0, 0).into(), false), 0);
assert_eq!(pos_at_coords(slice, (0, 1).into(), false), 0); assert_eq!(pos_at_coords(slice, (0, 1).into(), false), 2);
assert_eq!(pos_at_coords(slice, (0, 2).into(), false), 3);
assert_eq!(pos_at_coords(slice, (0, 3).into(), false), 5);
assert_eq!(pos_at_coords(slice, (0, 3).into(), true), 5);
// Test with tabs.
// Todo: account for tab stops.
let text = Rope::from("\tHello\n");
let slice = text.slice(..);
assert_eq!(pos_at_coords(slice, (0, 0).into(), false), 0);
assert_eq!(pos_at_coords(slice, (0, 1).into(), false), 1);
assert_eq!(pos_at_coords(slice, (0, 2).into(), false), 2); assert_eq!(pos_at_coords(slice, (0, 2).into(), false), 2);
assert_eq!(pos_at_coords(slice, (0, 3).into(), false), 3);
assert_eq!(pos_at_coords(slice, (0, 4).into(), false), 3);
assert_eq!(pos_at_coords(slice, (0, 5).into(), false), 5); // eol
} }
} }