highlight spaces between bytes when selected

This commit is contained in:
alice pellerin
2026-03-16 23:26:06 -05:00
parent 7a18c6cbfe
commit ce19c3eb9c
5 changed files with 106 additions and 55 deletions
+52 -47
View File
@@ -22,22 +22,27 @@ impl Cursor {
}
}
pub const fn contains_space_before(&self, index: usize) -> bool {
(self.head < index && index <= self.tail) ||
(self.tail < index && index <= self.head)
}
pub const fn collapse(&mut self) {
self.tail = self.head;
}
pub fn to_next_word(&mut self, max: usize) {
pub fn move_to_next_word(&mut self, max: usize) {
if self.head == max { return }
if self.head % 4 == 0 { // at the beginning of a word
if self.head.is_multiple_of(4) { // at the beginning of a word
self.head = (self.head + 4).min(max);
} {
} else {
self.head = self.head.next_multiple_of(4).min(max);
}
self.collapse();
}
pub fn to_next_end(&mut self, max: usize) {
pub fn move_to_next_end(&mut self, max: usize) {
if self.head == max { return }
self.collapse();
@@ -49,11 +54,11 @@ impl Cursor {
}
}
pub const fn to_previous_beginning(&mut self) {
pub const fn move_to_previous_beginning(&mut self) {
if self.head == 0 { return }
self.collapse();
if self.head % 4 == 0 { // at the beginning of a word
if self.head.is_multiple_of(4) { // at the beginning of a word
self.tail = self.head - 1;
self.head -= 4;
} else {
@@ -76,57 +81,57 @@ mod tests {
fn next_word() {
// [a]bcd efgh -> abcd [e]fgh
let mut cursor = Cursor::at(0);
cursor.to_next_word(99);
cursor.move_to_next_word(99);
assert_eq!(cursor, Cursor::at(4));
// a[b]cd efgh -> abcd [e]fgh
let mut cursor = Cursor::at(1);
cursor.to_next_word(99);
cursor.move_to_next_word(99);
assert_eq!(cursor, Cursor::at(4));
// ab[c]d efgh -> abcd [e]fgh
let mut cursor = Cursor::at(2);
cursor.to_next_word(99);
cursor.move_to_next_word(99);
assert_eq!(cursor, Cursor::at(4));
// abc[d] efgh -> abcd [e]fgh
let mut cursor = Cursor::at(3);
cursor.to_next_word(99);
cursor.move_to_next_word(99);
assert_eq!(cursor, Cursor::at(4));
// [a]bcd -> abc[d]
let mut cursor = Cursor::at(0);
cursor.to_next_word(3);
cursor.move_to_next_word(3);
assert_eq!(cursor, Cursor::at(3));
// [a]bc -> ab[c]
let mut cursor = Cursor::at(0);
cursor.to_next_word(2);
cursor.move_to_next_word(2);
assert_eq!(cursor, Cursor::at(2));
// [a]b -> a[b]
let mut cursor = Cursor::at(0);
cursor.to_next_word(1);
cursor.move_to_next_word(1);
assert_eq!(cursor, Cursor::at(1));
// [a] -> [a]
let mut cursor = Cursor::at(0);
cursor.to_next_word(0);
cursor.move_to_next_word(0);
assert_eq!(cursor, Cursor::at(0));
// ab[c]d -> abc[d]
let mut cursor = Cursor::at(2);
cursor.to_next_word(3);
cursor.move_to_next_word(3);
assert_eq!(cursor, Cursor::at(3));
// abc[d] -> abc[d]
let mut cursor = Cursor::at(3);
cursor.to_next_word(3);
cursor.move_to_next_word(3);
assert_eq!(cursor, Cursor::at(3));
// ab[c[d] -> ab[c[d]
let mut cursor = Cursor { tail: 2, head: 3 };
cursor.to_next_word(3);
cursor.move_to_next_word(3);
assert_eq!(cursor, Cursor { tail: 2, head: 3 });
}
@@ -134,97 +139,97 @@ mod tests {
fn next_end() {
// [a]bcd -> [abcd]
let mut cursor = Cursor::at(0);
cursor.to_next_end(99);
cursor.move_to_next_end(99);
assert_eq!(cursor, Cursor { tail: 0, head: 3 });
// a[b]cd -> [abcd]
let mut cursor = Cursor::at(1);
cursor.to_next_end(99);
cursor.move_to_next_end(99);
assert_eq!(cursor, Cursor { tail: 1, head: 3 });
// ab[c]d -> [abcd]
let mut cursor = Cursor::at(2);
cursor.to_next_end(99);
cursor.move_to_next_end(99);
assert_eq!(cursor, Cursor { tail: 2, head: 3 });
// abc[d] efgh -> abcd [efgh]
let mut cursor = Cursor::at(3);
cursor.to_next_end(99);
cursor.move_to_next_end(99);
assert_eq!(cursor, Cursor { tail: 4, head: 7 });
// abcd [e]fgh -> abcd [efgh]
let mut cursor = Cursor::at(4);
cursor.to_next_end(99);
cursor.move_to_next_end(99);
assert_eq!(cursor, Cursor { tail: 4, head: 7 });
// abcd e[f]gh -> abcd e[fgh]
let mut cursor = Cursor::at(5);
cursor.to_next_end(99);
cursor.move_to_next_end(99);
assert_eq!(cursor, Cursor { tail: 5, head: 7 });
// abcd ef[g]h -> abcd ef[gh]
let mut cursor = Cursor::at(6);
cursor.to_next_end(99);
cursor.move_to_next_end(99);
assert_eq!(cursor, Cursor { tail: 6, head: 7 });
// abcd efg[h] ijkl -> abcd efgh [ijkl]
let mut cursor = Cursor::at(7);
cursor.to_next_end(99);
cursor.move_to_next_end(99);
assert_eq!(cursor, Cursor { tail: 8, head: 11 });
// abcd efg[h] -> abcd efg[h]
let mut cursor = Cursor::at(7);
cursor.to_next_end(7);
cursor.move_to_next_end(7);
assert_eq!(cursor, Cursor { tail: 7, head: 7 });
// abcd e[fgh] -> abcd e[fgh]
let mut cursor = Cursor { tail: 5, head: 7 };
cursor.to_next_end(7);
cursor.move_to_next_end(7);
assert_eq!(cursor, Cursor { tail: 5, head: 7 });
// a[b]c -> a[bc]
let mut cursor = Cursor::at(1);
cursor.to_next_end(2);
cursor.move_to_next_end(2);
assert_eq!(cursor, Cursor { tail: 1, head: 2 });
// a[bc] -> a[bc]
let mut cursor = Cursor { tail: 1, head: 2};
cursor.to_next_end(2);
cursor.move_to_next_end(2);
assert_eq!(cursor, Cursor { tail: 1, head: 2 });
// a[b] -> a[b]
let mut cursor = Cursor::at(1);
cursor.to_next_end(1);
cursor.move_to_next_end(1);
assert_eq!(cursor, Cursor::at(1));
// [a]b -> [ab]
let mut cursor = Cursor::at(0);
cursor.to_next_end(1);
cursor.move_to_next_end(1);
assert_eq!(cursor, Cursor { tail: 0, head: 1 });
// [ab] -> [ab]
let mut cursor = Cursor { tail: 0, head: 1};
cursor.to_next_end(1);
cursor.move_to_next_end(1);
assert_eq!(cursor, Cursor { tail: 0, head: 1 });
// [a] -> [a]
let mut cursor = Cursor::at(0);
cursor.to_next_end(0);
cursor.move_to_next_end(0);
assert_eq!(cursor, Cursor::at(0));
// [a]bcd] -> [abc[d]
let mut cursor = Cursor { head: 0, tail: 3 };
cursor.to_next_end(99);
cursor.move_to_next_end(99);
assert_eq!(cursor, Cursor { tail: 0, head: 3 });
// [a[b]cd -> a[bc[d]
let mut cursor = Cursor { tail: 0, head: 1 };
cursor.to_next_end(99);
cursor.move_to_next_end(99);
assert_eq!(cursor, Cursor { tail: 1, head: 3 });
// abc[d] ef -> abcd [ef]
let mut cursor = Cursor::at(3);
cursor.to_next_end(5);
cursor.move_to_next_end(5);
assert_eq!(cursor, Cursor { tail: 4, head: 5 });
}
@@ -232,57 +237,57 @@ mod tests {
fn previous_beginning() {
// abcd efgh [i]jkl -> abcd [efgh] ijkl
let mut cursor = Cursor::at(8);
cursor.to_previous_beginning();
cursor.move_to_previous_beginning();
assert_eq!(cursor, Cursor { head: 4, tail: 7 });
// abcd efg[h] -> abcd [efgh]
let mut cursor = Cursor::at(7);
cursor.to_previous_beginning();
cursor.move_to_previous_beginning();
assert_eq!(cursor, Cursor { head: 4, tail: 7 });
// abcd ef[g]h -> abcd [efg]h
let mut cursor = Cursor::at(6);
cursor.to_previous_beginning();
cursor.move_to_previous_beginning();
assert_eq!(cursor, Cursor { head: 4, tail: 6 });
// abcd e[f]gh -> abcd [ef]gh
let mut cursor = Cursor::at(5);
cursor.to_previous_beginning();
cursor.move_to_previous_beginning();
assert_eq!(cursor, Cursor { head: 4, tail: 5 });
// abcd [e]fgh -> [abcd] efgh
let mut cursor = Cursor::at(4);
cursor.to_previous_beginning();
cursor.move_to_previous_beginning();
assert_eq!(cursor, Cursor { head: 0, tail: 3 });
// abc[d] -> [abcd]
let mut cursor = Cursor::at(3);
cursor.to_previous_beginning();
cursor.move_to_previous_beginning();
assert_eq!(cursor, Cursor { head: 0, tail: 3 });
// ab[c]d -> [abc]d
let mut cursor = Cursor::at(2);
cursor.to_previous_beginning();
cursor.move_to_previous_beginning();
assert_eq!(cursor, Cursor { head: 0, tail: 2 });
// a[b]cd -> [ab]cd
let mut cursor = Cursor::at(1);
cursor.to_previous_beginning();
cursor.move_to_previous_beginning();
assert_eq!(cursor, Cursor { head: 0, tail: 1 });
// [a]bcd -> [a]bcd
let mut cursor = Cursor::at(0);
cursor.to_previous_beginning();
cursor.move_to_previous_beginning();
assert_eq!(cursor, Cursor { head: 0, tail: 0 });
// [abc[d] -> [a]bcd]
let mut cursor = Cursor { tail: 0, head: 3 };
cursor.to_previous_beginning();
cursor.move_to_previous_beginning();
assert_eq!(cursor, Cursor { head: 0, tail: 3 });
// ab[c]d] -> [a]bc]d
let mut cursor = Cursor { head: 2, tail: 3 };
cursor.to_previous_beginning();
cursor.move_to_previous_beginning();
assert_eq!(cursor, Cursor { head: 0, tail: 2 });
}
}