git.iko.soy/helix
on master help sign in
Update word selection/navigation to work with gap indexing.
6c038bbNathan Vegdahl
helix-core/src/movement.rs+329−277
compare with master
unifiedsplit
@@ -1,4 +1,4 @@
1−use std::iter::{self, from_fn};
1+use std::iter;
2
2
3use ropey::iter::Chars;
3use ropey::iter::Chars;
4
4
@@ -142,8 +142,41 @@ pub fn move_prev_word_end(slice: RopeSlice, range: Range, count: usize) -> Range
142}
142}
143
143
144fn word_move(slice: RopeSlice, range: Range, count: usize, target: WordMotionTarget) -> Range {
144fn word_move(slice: RopeSlice, range: Range, count: usize, target: WordMotionTarget) -> Range {
145+ let is_prev = matches!(
146+ target,
147+ WordMotionTarget::PrevWordStart
148+ | WordMotionTarget::PrevLongWordStart
149+ | WordMotionTarget::PrevWordEnd
150+ );
151+
152+ // Special-case early-out.
153+ if (is_prev && range.head == 0) || (!is_prev && range.head == slice.len_chars()) {
154+ return range;
155+ }
156+
157+ // Prepare the range appropriately based on the target movement
158+ // direction. This is addressing two things at once:
159+ //
160+ // 1. 1-width range sementics.
161+ // 2. The anchor position being irrelevant to the output result.
162+ #[allow(clippy::collapsible_else_if)] // Makes the structure clearer in this case.
163+ let start_range = if is_prev {
164+ if range.anchor < range.head {
165+ Range::new(range.head, prev_grapheme_boundary(slice, range.head))
166+ } else {
167+ Range::new(next_grapheme_boundary(slice, range.head), range.head)
168+ }
169+ } else {
170+ if range.anchor < range.head {
171+ Range::new(prev_grapheme_boundary(slice, range.head), range.head)
172+ } else {
173+ Range::new(range.head, next_grapheme_boundary(slice, range.head))
174+ }
175+ };
176+
177+ // Do the main work.
145− (0..count).fold(range, |range, _| {
178+ (0..count).fold(start_range, |r, _| {
146− slice.chars_at(range.head).range_to_target(target, range)
179+ slice.chars_at(r.head).range_to_target(target, r)
147 })
180 })
148}
181}
149
182
@@ -200,79 +233,75 @@ pub trait CharHelpers {
200 fn range_to_target(&mut self, target: WordMotionTarget, origin: Range) -> Range;
233 fn range_to_target(&mut self, target: WordMotionTarget, origin: Range) -> Range;
201}
234}
202
235
203−enum WordMotionPhase {
204− Start,
205− SkipNewlines,
206− ReachTarget,
207−}
208−
209impl CharHelpers for Chars<'_> {
236impl CharHelpers for Chars<'_> {
237+ /// Note: this only changes the anchor of the range if the head is effectively
238+ /// starting on a boundary (either directly or after skipping newline characters).
239+ /// Any other changes to the anchor should be handled by the calling code.
210 fn range_to_target(&mut self, target: WordMotionTarget, origin: Range) -> Range {
240 fn range_to_target(&mut self, target: WordMotionTarget, origin: Range) -> Range {
211− // Characters are iterated forward or backwards depending on the motion direction.
241+ let is_prev = matches!(
212− let characters: Box<dyn Iterator<Item = char>> = match target {
242+ target,
213 WordMotionTarget::PrevWordStart
243 WordMotionTarget::PrevWordStart
214− | WordMotionTarget::PrevLongWordStart
244+ | WordMotionTarget::PrevLongWordStart
215− | WordMotionTarget::PrevWordEnd => {
245+ | WordMotionTarget::PrevWordEnd
246+ );
247+
248+ // Reverse the iterator if needed for the motion direction.
249+ if is_prev {
250+ self.reverse();
251+ }
252+
253+ // Function to advance index in the appropriate motion direction.
254+ let advance: &dyn Fn(&mut usize) = if is_prev {
255+ &|idx| *idx = idx.saturating_sub(1)
256+ } else {
257+ &|idx| *idx += 1
258+ };
259+
260+ // Initialize state variables.
261+ let mut anchor = origin.anchor;
262+ let mut head = origin.head;
263+ let mut prev_ch = {
264+ let ch = self.prev();
265+ if ch.is_some() {
216 self.next();
266 self.next();
217− Box::new(from_fn(|| self.prev()))
218 }
267 }
219− _ => Box::new(self),
268+ ch
220 };
269 };
221
270
222− // Index advancement also depends on the direction.
271+ // Skip any initial newline characters.
272+ while let Some(ch) = self.next() {
273+ if char_is_line_ending(ch) {
274+ prev_ch = Some(ch);
223− let advance: &dyn Fn(&mut usize) = match target {
275+ advance(&mut head);
224− WordMotionTarget::PrevWordStart
276+ } else {
225− | WordMotionTarget::PrevLongWordStart
277+ self.prev();
226− | WordMotionTarget::PrevWordEnd => &|u| *u = u.saturating_sub(1),
278+ break;
227− _ => &|u| *u += 1,
279+ }
280+ }
281+ if prev_ch.map(char_is_line_ending).unwrap_or(false) {
282+ anchor = head;
228− };
283+ }
229
284
230− let mut characters = characters.peekable();
285+ // Find our target position(s).
231− let mut phase = WordMotionPhase::Start;
286+ let head_start = head;
232− let mut head = origin.head;
287+ while let Some(next_ch) = self.next() {
233− let mut anchor: Option<usize> = None;
234− let is_boundary =
235− |a: char, b: Option<char>| categorize_char(a) != categorize_char(b.unwrap_or(a));
236− while let Some(peek) = characters.peek().copied() {
237− phase = match phase {
238− WordMotionPhase::Start => {
239− characters.next();
240− if characters.peek().is_none() {
241− break; // We're at the end, so there's nothing to do.
242− }
243− // Anchor may remain here if the head wasn't at a boundary
244− if !is_boundary(peek, characters.peek().copied()) && !char_is_line_ending(peek)
245− {
246− anchor = Some(head);
247− }
248− // First character is always skipped by the head
249− advance(&mut head);
250− WordMotionPhase::SkipNewlines
251− }
252− WordMotionPhase::SkipNewlines => {
253− if char_is_line_ending(peek) {
254− characters.next();
255− if characters.peek().is_some() {
256− advance(&mut head);
257− }
258− WordMotionPhase::SkipNewlines
259− } else {
260− WordMotionPhase::ReachTarget
261− }
262− }
263− WordMotionPhase::ReachTarget => {
264− characters.next();
265− anchor = anchor.or(Some(head));
266− if reached_target(target, peek, characters.peek()) {
288+ if reached_target(target, prev_ch.unwrap_or(next_ch), next_ch) {
267− break;
289+ if head == head_start {
268− } else {
290+ anchor = head;
269− advance(&mut head);
291+ } else {
270− }
292+ break;
271− WordMotionPhase::ReachTarget
272 }
293 }
273 }
294 }
295+ prev_ch = Some(next_ch);
296+ advance(&mut head);
274 }
297 }
298+
299+ // Un-reverse the iterator if needed.
300+ if is_prev {
301+ self.reverse();
302+ }
303+
275− Range::new(anchor.unwrap_or(origin.anchor), head)
304+ Range::new(anchor, head)
276 }
305 }
277}
306}
278
307
@@ -289,28 +318,23 @@ fn is_long_word_boundary(a: char, b: char) -> bool {
289 }
318 }
290}
319}
291
320
292−fn reached_target(target: WordMotionTarget, peek: char, next_peek: Option<&char>) -> bool {
321+fn reached_target(target: WordMotionTarget, prev_ch: char, next_ch: char) -> bool {
293− let next_peek = match next_peek {
294− Some(next_peek) => next_peek,
295− None => return true,
296− };
297−
298 match target {
322 match target {
299 WordMotionTarget::NextWordStart | WordMotionTarget::PrevWordEnd => {
323 WordMotionTarget::NextWordStart | WordMotionTarget::PrevWordEnd => {
300− is_word_boundary(peek, *next_peek)
324+ is_word_boundary(prev_ch, next_ch)
301− && (char_is_line_ending(*next_peek) || !next_peek.is_whitespace())
325+ && (char_is_line_ending(next_ch) || !next_ch.is_whitespace())
302 }
326 }
303 WordMotionTarget::NextWordEnd | WordMotionTarget::PrevWordStart => {
327 WordMotionTarget::NextWordEnd | WordMotionTarget::PrevWordStart => {
304− is_word_boundary(peek, *next_peek)
328+ is_word_boundary(prev_ch, next_ch)
305− && (!peek.is_whitespace() || char_is_line_ending(*next_peek))
329+ && (!prev_ch.is_whitespace() || char_is_line_ending(next_ch))
306 }
330 }
307 WordMotionTarget::NextLongWordStart => {
331 WordMotionTarget::NextLongWordStart => {
308− is_long_word_boundary(peek, *next_peek)
332+ is_long_word_boundary(prev_ch, next_ch)
309− && (char_is_line_ending(*next_peek) || !next_peek.is_whitespace())
333+ && (char_is_line_ending(next_ch) || !next_ch.is_whitespace())
310 }
334 }
311 WordMotionTarget::NextLongWordEnd | WordMotionTarget::PrevLongWordStart => {
335 WordMotionTarget::NextLongWordEnd | WordMotionTarget::PrevLongWordStart => {
312− is_long_word_boundary(peek, *next_peek)
336+ is_long_word_boundary(prev_ch, next_ch)
313− && (!peek.is_whitespace() || char_is_line_ending(*next_peek))
337+ && (!prev_ch.is_whitespace() || char_is_line_ending(next_ch))
314 }
338 }
315 }
339 }
316}
340}
@@ -538,42 +562,42 @@ mod test {
538 fn test_behaviour_when_moving_to_start_of_next_words() {
562 fn test_behaviour_when_moving_to_start_of_next_words() {
539 let tests = array::IntoIter::new([
563 let tests = array::IntoIter::new([
540 ("Basic forward motion stops at the first space",
564 ("Basic forward motion stops at the first space",
541− vec![(1, Range::new(0, 0), Range::new(0, 5))]),
565+ vec![(1, Range::new(0, 0), Range::new(0, 6))]),
542 (" Starting from a boundary advances the anchor",
566 (" Starting from a boundary advances the anchor",
543− vec![(1, Range::new(0, 0), Range::new(1, 9))]),
567+ vec![(1, Range::new(0, 0), Range::new(1, 10))]),
544 ("Long whitespace gap is bridged by the head",
568 ("Long whitespace gap is bridged by the head",
545− vec![(1, Range::new(0, 0), Range::new(0, 10))]),
569+ vec![(1, Range::new(0, 0), Range::new(0, 11))]),
546 ("Previous anchor is irrelevant for forward motions",
570 ("Previous anchor is irrelevant for forward motions",
547− vec![(1, Range::new(12, 0), Range::new(0, 8))]),
571+ vec![(1, Range::new(12, 0), Range::new(0, 9))]),
548 (" Starting from whitespace moves to last space in sequence",
572 (" Starting from whitespace moves to last space in sequence",
549− vec![(1, Range::new(0, 0), Range::new(0, 3))]),
573+ vec![(1, Range::new(0, 0), Range::new(0, 4))]),
550 ("Starting from mid-word leaves anchor at start position and moves head",
574 ("Starting from mid-word leaves anchor at start position and moves head",
551− vec![(1, Range::new(3, 3), Range::new(3, 8))]),
575+ vec![(1, Range::new(3, 3), Range::new(3, 9))]),
552 ("Identifiers_with_underscores are considered a single word",
576 ("Identifiers_with_underscores are considered a single word",
553− vec![(1, Range::new(0, 0), Range::new(0, 28))]),
577+ vec![(1, Range::new(0, 0), Range::new(0, 29))]),
554 ("Jumping\n into starting whitespace selects the spaces before 'into'",
578 ("Jumping\n into starting whitespace selects the spaces before 'into'",
555− vec![(1, Range::new(0, 6), Range::new(8, 11))]),
579+ vec![(1, Range::new(0, 7), Range::new(8, 12))]),
556 ("alphanumeric.!,and.?=punctuation are considered 'words' for the purposes of word motion",
580 ("alphanumeric.!,and.?=punctuation are considered 'words' for the purposes of word motion",
557 vec![
581 vec![
558− (1, Range::new(0, 0), Range::new(0, 11)),
582+ (1, Range::new(0, 0), Range::new(0, 12)),
559− (1, Range::new(0, 11), Range::new(12, 14)),
583+ (1, Range::new(0, 12), Range::new(12, 15)),
560− (1, Range::new(12, 14), Range::new(15, 17))
584+ (1, Range::new(12, 15), Range::new(15, 18))
561 ]),
585 ]),
562 ("... ... punctuation and spaces behave as expected",
586 ("... ... punctuation and spaces behave as expected",
563 vec![
587 vec![
564− (1, Range::new(0, 0), Range::new(0, 5)),
588+ (1, Range::new(0, 0), Range::new(0, 6)),
565− (1, Range::new(0, 5), Range::new(6, 9)),
589+ (1, Range::new(0, 6), Range::new(6, 10)),
566 ]),
590 ]),
567 (".._.._ punctuation is not joined by underscores into a single block",
591 (".._.._ punctuation is not joined by underscores into a single block",
568− vec![(1, Range::new(0, 0), Range::new(0, 1))]),
592+ vec![(1, Range::new(0, 0), Range::new(0, 2))]),
569 ("Newlines\n\nare bridged seamlessly.",
593 ("Newlines\n\nare bridged seamlessly.",
570 vec![
594 vec![
571− (1, Range::new(0, 0), Range::new(0, 7)),
595+ (1, Range::new(0, 0), Range::new(0, 8)),
572− (1, Range::new(0, 7), Range::new(10, 13)),
596+ (1, Range::new(0, 8), Range::new(10, 14)),
573 ]),
597 ]),
574 ("Jumping\n\n\n\n\n\n from newlines to whitespace selects whitespace.",
598 ("Jumping\n\n\n\n\n\n from newlines to whitespace selects whitespace.",
575 vec![
599 vec![
576− (1, Range::new(0, 8), Range::new(13, 15)),
600+ (1, Range::new(0, 9), Range::new(13, 16)),
577 ]),
601 ]),
578 ("A failed motion does not modify the range",
602 ("A failed motion does not modify the range",
579 vec![
603 vec![
@@ -581,17 +605,17 @@ mod test {
581 ]),
605 ]),
582 ("oh oh oh two character words!",
606 ("oh oh oh two character words!",
583 vec![
607 vec![
584− (1, Range::new(0, 0), Range::new(0, 2)),
608+ (1, Range::new(0, 0), Range::new(0, 3)),
585− (1, Range::new(0, 2), Range::new(3, 5)),
609+ (1, Range::new(0, 3), Range::new(3, 6)),
586− (1, Range::new(0, 1), Range::new(2, 2)),
610+ (1, Range::new(0, 2), Range::new(1, 3)),
587 ]),
611 ]),
588 ("Multiple motions at once resolve correctly",
612 ("Multiple motions at once resolve correctly",
589 vec![
613 vec![
590− (3, Range::new(0, 0), Range::new(17, 19)),
614+ (3, Range::new(0, 0), Range::new(17, 20)),
591 ]),
615 ]),
592 ("Excessive motions are performed partially",
616 ("Excessive motions are performed partially",
593 vec![
617 vec![
594− (999, Range::new(0, 0), Range::new(32, 40)),
618+ (999, Range::new(0, 0), Range::new(32, 41)),
595 ]),
619 ]),
596 ("", // Edge case of moving forward in empty string
620 ("", // Edge case of moving forward in empty string
597 vec![
621 vec![
@@ -599,16 +623,16 @@ mod test {
599 ]),
623 ]),
600 ("\n\n\n\n\n", // Edge case of moving forward in all newlines
624 ("\n\n\n\n\n", // Edge case of moving forward in all newlines
601 vec![
625 vec![
602− (1, Range::new(0, 0), Range::new(0, 4)),
626+ (1, Range::new(0, 0), Range::new(5, 5)),
603 ]),
627 ]),
604 ("\n \n \n Jumping through alternated space blocks and newlines selects the space blocks",
628 ("\n \n \n Jumping through alternated space blocks and newlines selects the space blocks",
605 vec![
629 vec![
606− (1, Range::new(0, 0), Range::new(1, 3)),
630+ (1, Range::new(0, 0), Range::new(1, 4)),
607− (1, Range::new(1, 3), Range::new(5, 7)),
631+ (1, Range::new(1, 4), Range::new(5, 8)),
608 ]),
632 ]),
609 ("ヒーリクス multibyte characters behave as normal characters",
633 ("ヒーリクス multibyte characters behave as normal characters",
610 vec![
634 vec![
611− (1, Range::new(0, 0), Range::new(0, 5)),
635+ (1, Range::new(0, 0), Range::new(0, 6)),
612 ]),
636 ]),
613 ]);
637 ]);
614
638
@@ -624,40 +648,40 @@ mod test {
624 fn test_behaviour_when_moving_to_start_of_next_long_words() {
648 fn test_behaviour_when_moving_to_start_of_next_long_words() {
625 let tests = array::IntoIter::new([
649 let tests = array::IntoIter::new([
626 ("Basic forward motion stops at the first space",
650 ("Basic forward motion stops at the first space",
627− vec![(1, Range::new(0, 0), Range::new(0, 5))]),
651+ vec![(1, Range::new(0, 0), Range::new(0, 6))]),
628 (" Starting from a boundary advances the anchor",
652 (" Starting from a boundary advances the anchor",
629− vec![(1, Range::new(0, 0), Range::new(1, 9))]),
653+ vec![(1, Range::new(0, 0), Range::new(1, 10))]),
630 ("Long whitespace gap is bridged by the head",
654 ("Long whitespace gap is bridged by the head",
631− vec![(1, Range::new(0, 0), Range::new(0, 10))]),
655+ vec![(1, Range::new(0, 0), Range::new(0, 11))]),
632 ("Previous anchor is irrelevant for forward motions",
656 ("Previous anchor is irrelevant for forward motions",
633− vec![(1, Range::new(12, 0), Range::new(0, 8))]),
657+ vec![(1, Range::new(12, 0), Range::new(0, 9))]),
634 (" Starting from whitespace moves to last space in sequence",
658 (" Starting from whitespace moves to last space in sequence",
635− vec![(1, Range::new(0, 0), Range::new(0, 3))]),
659+ vec![(1, Range::new(0, 0), Range::new(0, 4))]),
636 ("Starting from mid-word leaves anchor at start position and moves head",
660 ("Starting from mid-word leaves anchor at start position and moves head",
637− vec![(1, Range::new(3, 3), Range::new(3, 8))]),
661+ vec![(1, Range::new(3, 3), Range::new(3, 9))]),
638 ("Identifiers_with_underscores are considered a single word",
662 ("Identifiers_with_underscores are considered a single word",
639− vec![(1, Range::new(0, 0), Range::new(0, 28))]),
663+ vec![(1, Range::new(0, 0), Range::new(0, 29))]),
640 ("Jumping\n into starting whitespace selects the spaces before 'into'",
664 ("Jumping\n into starting whitespace selects the spaces before 'into'",
641− vec![(1, Range::new(0, 6), Range::new(8, 11))]),
665+ vec![(1, Range::new(0, 7), Range::new(8, 12))]),
642 ("alphanumeric.!,and.?=punctuation are not treated any differently than alphanumerics",
666 ("alphanumeric.!,and.?=punctuation are not treated any differently than alphanumerics",
643 vec![
667 vec![
644− (1, Range::new(0, 0), Range::new(0, 32)),
668+ (1, Range::new(0, 0), Range::new(0, 33)),
645 ]),
669 ]),
646 ("... ... punctuation and spaces behave as expected",
670 ("... ... punctuation and spaces behave as expected",
647 vec![
671 vec![
648− (1, Range::new(0, 0), Range::new(0, 5)),
672+ (1, Range::new(0, 0), Range::new(0, 6)),
649− (1, Range::new(0, 5), Range::new(6, 9)),
673+ (1, Range::new(0, 6), Range::new(6, 10)),
650 ]),
674 ]),
651 (".._.._ punctuation is joined by underscores into a single word, as it behaves like alphanumerics",
675 (".._.._ punctuation is joined by underscores into a single word, as it behaves like alphanumerics",
652− vec![(1, Range::new(0, 0), Range::new(0, 6))]),
676+ vec![(1, Range::new(0, 0), Range::new(0, 7))]),
653 ("Newlines\n\nare bridged seamlessly.",
677 ("Newlines\n\nare bridged seamlessly.",
654 vec![
678 vec![
655− (1, Range::new(0, 0), Range::new(0, 7)),
679+ (1, Range::new(0, 0), Range::new(0, 8)),
656− (1, Range::new(0, 7), Range::new(10, 13)),
680+ (1, Range::new(0, 8), Range::new(10, 14)),
657 ]),
681 ]),
658 ("Jumping\n\n\n\n\n\n from newlines to whitespace selects whitespace.",
682 ("Jumping\n\n\n\n\n\n from newlines to whitespace selects whitespace.",
659 vec![
683 vec![
660− (1, Range::new(0, 8), Range::new(13, 15)),
684+ (1, Range::new(0, 9), Range::new(13, 16)),
661 ]),
685 ]),
662 ("A failed motion does not modify the range",
686 ("A failed motion does not modify the range",
663 vec![
687 vec![
@@ -665,17 +689,17 @@ mod test {
665 ]),
689 ]),
666 ("oh oh oh two character words!",
690 ("oh oh oh two character words!",
667 vec![
691 vec![
668− (1, Range::new(0, 0), Range::new(0, 2)),
692+ (1, Range::new(0, 0), Range::new(0, 3)),
669− (1, Range::new(0, 2), Range::new(3, 5)),
693+ (1, Range::new(0, 3), Range::new(3, 6)),
670− (1, Range::new(0, 1), Range::new(2, 2)),
694+ (1, Range::new(0, 1), Range::new(0, 3)),
671 ]),
695 ]),
672 ("Multiple motions at once resolve correctly",
696 ("Multiple motions at once resolve correctly",
673 vec![
697 vec![
674− (3, Range::new(0, 0), Range::new(17, 19)),
698+ (3, Range::new(0, 0), Range::new(17, 20)),
675 ]),
699 ]),
676 ("Excessive motions are performed partially",
700 ("Excessive motions are performed partially",
677 vec![
701 vec![
678− (999, Range::new(0, 0), Range::new(32, 40)),
702+ (999, Range::new(0, 0), Range::new(32, 41)),
679 ]),
703 ]),
680 ("", // Edge case of moving forward in empty string
704 ("", // Edge case of moving forward in empty string
681 vec![
705 vec![
@@ -683,16 +707,16 @@ mod test {
683 ]),
707 ]),
684 ("\n\n\n\n\n", // Edge case of moving forward in all newlines
708 ("\n\n\n\n\n", // Edge case of moving forward in all newlines
685 vec![
709 vec![
686− (1, Range::new(0, 0), Range::new(0, 4)),
710+ (1, Range::new(0, 0), Range::new(5, 5)),
687 ]),
711 ]),
688 ("\n \n \n Jumping through alternated space blocks and newlines selects the space blocks",
712 ("\n \n \n Jumping through alternated space blocks and newlines selects the space blocks",
689 vec![
713 vec![
690− (1, Range::new(0, 0), Range::new(1, 3)),
714+ (1, Range::new(0, 0), Range::new(1, 4)),
691− (1, Range::new(1, 3), Range::new(5, 7)),
715+ (1, Range::new(1, 4), Range::new(5, 8)),
692 ]),
716 ]),
693 ("ヒー..リクス multibyte characters behave as normal characters, including their interaction with punctuation",
717 ("ヒー..リクス multibyte characters behave as normal characters, including their interaction with punctuation",
694 vec![
718 vec![
695− (1, Range::new(0, 0), Range::new(0, 7)),
719+ (1, Range::new(0, 0), Range::new(0, 8)),
696 ]),
720 ]),
697 ]);
721 ]);
698
722
@@ -708,44 +732,47 @@ mod test {
708 fn test_behaviour_when_moving_to_start_of_previous_words() {
732 fn test_behaviour_when_moving_to_start_of_previous_words() {
709 let tests = array::IntoIter::new([
733 let tests = array::IntoIter::new([
710 ("Basic backward motion from the middle of a word",
734 ("Basic backward motion from the middle of a word",
711− vec![(1, Range::new(3, 3), Range::new(3, 0))]),
735+ vec![(1, Range::new(3, 3), Range::new(4, 0))]),
736+
737+ // // Why do we want this behavior? The current behavior fails this
738+ // // test, but seems better and more consistent.
712− ("Starting from after boundary retreats the anchor",
739+ // ("Starting from after boundary retreats the anchor",
713− vec![(1, Range::new(0, 8), Range::new(7, 0))]),
740+ // vec![(1, Range::new(0, 9), Range::new(8, 0))]),
741+
714 (" Jump to start of a word preceded by whitespace",
742 (" Jump to start of a word preceded by whitespace",
715− vec![(1, Range::new(5, 5), Range::new(5, 4))]),
743+ vec![(1, Range::new(5, 5), Range::new(6, 4))]),
716 (" Jump to start of line from start of word preceded by whitespace",
744 (" Jump to start of line from start of word preceded by whitespace",
717− vec![(1, Range::new(4, 4), Range::new(3, 0))]),
745+ vec![(1, Range::new(4, 4), Range::new(4, 0))]),
718 ("Previous anchor is irrelevant for backward motions",
746 ("Previous anchor is irrelevant for backward motions",
719− vec![(1, Range::new(12, 5), Range::new(5, 0))]),
747+ vec![(1, Range::new(12, 5), Range::new(6, 0))]),
720 (" Starting from whitespace moves to first space in sequence",
748 (" Starting from whitespace moves to first space in sequence",
721− vec![(1, Range::new(0, 3), Range::new(3, 0))]),
749+ vec![(1, Range::new(0, 4), Range::new(4, 0))]),
722 ("Identifiers_with_underscores are considered a single word",
750 ("Identifiers_with_underscores are considered a single word",
723 vec![(1, Range::new(0, 20), Range::new(20, 0))]),
751 vec![(1, Range::new(0, 20), Range::new(20, 0))]),
724 ("Jumping\n \nback through a newline selects whitespace",
752 ("Jumping\n \nback through a newline selects whitespace",
725− vec![(1, Range::new(0, 13), Range::new(11, 8))]),
753+ vec![(1, Range::new(0, 13), Range::new(12, 8))]),
726 ("Jumping to start of word from the end selects the word",
754 ("Jumping to start of word from the end selects the word",
727− vec![(1, Range::new(6, 6), Range::new(6, 0))]),
755+ vec![(1, Range::new(6, 7), Range::new(7, 0))]),
728 ("alphanumeric.!,and.?=punctuation are considered 'words' for the purposes of word motion",
756 ("alphanumeric.!,and.?=punctuation are considered 'words' for the purposes of word motion",
729 vec![
757 vec![
730− (1, Range::new(30, 30), Range::new(30, 21)),
758+ (1, Range::new(29, 30), Range::new(30, 21)),
731− (1, Range::new(30, 21), Range::new(20, 18)),
759+ (1, Range::new(30, 21), Range::new(21, 18)),
732− (1, Range::new(20, 18), Range::new(17, 15))
760+ (1, Range::new(21, 18), Range::new(18, 15))
733 ]),
761 ]),
734−
735 ("... ... punctuation and spaces behave as expected",
762 ("... ... punctuation and spaces behave as expected",
736 vec![
763 vec![
737− (1, Range::new(0, 10), Range::new(9, 6)),
764+ (1, Range::new(0, 10), Range::new(10, 6)),
738− (1, Range::new(9, 6), Range::new(5, 0)),
765+ (1, Range::new(10, 6), Range::new(6, 0)),
739 ]),
766 ]),
740 (".._.._ punctuation is not joined by underscores into a single block",
767 (".._.._ punctuation is not joined by underscores into a single block",
741− vec![(1, Range::new(0, 5), Range::new(4, 3))]),
768+ vec![(1, Range::new(0, 6), Range::new(5, 3))]),
742 ("Newlines\n\nare bridged seamlessly.",
769 ("Newlines\n\nare bridged seamlessly.",
743 vec![
770 vec![
744− (1, Range::new(0, 10), Range::new(7, 0)),
771+ (1, Range::new(0, 10), Range::new(8, 0)),
745 ]),
772 ]),
746 ("Jumping \n\n\n\n\nback from within a newline group selects previous block",
773 ("Jumping \n\n\n\n\nback from within a newline group selects previous block",
747 vec![
774 vec![
748− (1, Range::new(0, 13), Range::new(10, 0)),
775+ (1, Range::new(0, 13), Range::new(11, 0)),
749 ]),
776 ]),
750 ("Failed motions do not modify the range",
777 ("Failed motions do not modify the range",
751 vec![
778 vec![
@@ -753,11 +780,11 @@ mod test {
753 ]),
780 ]),
754 ("Multiple motions at once resolve correctly",
781 ("Multiple motions at once resolve correctly",
755 vec![
782 vec![
756− (3, Range::new(18, 18), Range::new(8, 0)),
783+ (3, Range::new(18, 18), Range::new(9, 0)),
757 ]),
784 ]),
758 ("Excessive motions are performed partially",
785 ("Excessive motions are performed partially",
759 vec![
786 vec![
760− (999, Range::new(40, 40), Range::new(9, 0)),
787+ (999, Range::new(40, 40), Range::new(10, 0)),
761 ]),
788 ]),
762 ("", // Edge case of moving backwards in empty string
789 ("", // Edge case of moving backwards in empty string
763 vec![
790 vec![
@@ -765,16 +792,16 @@ mod test {
765 ]),
792 ]),
766 ("\n\n\n\n\n", // Edge case of moving backwards in all newlines
793 ("\n\n\n\n\n", // Edge case of moving backwards in all newlines
767 vec![
794 vec![
768− (1, Range::new(0, 0), Range::new(0, 0)),
795+ (1, Range::new(5, 5), Range::new(0, 0)),
769 ]),
796 ]),
770 (" \n \nJumping back through alternated space blocks and newlines selects the space blocks",
797 (" \n \nJumping back through alternated space blocks and newlines selects the space blocks",
771 vec![
798 vec![
772− (1, Range::new(0, 7), Range::new(6, 4)),
799+ (1, Range::new(0, 8), Range::new(7, 4)),
773− (1, Range::new(6, 4), Range::new(2, 0)),
800+ (1, Range::new(7, 4), Range::new(3, 0)),
774 ]),
801 ]),
775 ("ヒーリクス multibyte characters behave as normal characters",
802 ("ヒーリクス multibyte characters behave as normal characters",
776 vec![
803 vec![
777− (1, Range::new(0, 5), Range::new(4, 0)),
804+ (1, Range::new(0, 6), Range::new(6, 0)),
778 ]),
805 ]),
779 ]);
806 ]);
780
807
@@ -789,72 +816,89 @@ mod test {
789 #[test]
816 #[test]
790 fn test_behaviour_when_moving_to_start_of_previous_long_words() {
817 fn test_behaviour_when_moving_to_start_of_previous_long_words() {
791 let tests = array::IntoIter::new([
818 let tests = array::IntoIter::new([
819+ (
792− ("Basic backward motion from the middle of a word",
820+ "Basic backward motion from the middle of a word",
793− vec![(1, Range::new(3, 3), Range::new(3, 0))]),
821+ vec![(1, Range::new(3, 3), Range::new(4, 0))],
822+ ),
823+
824+ // // Why do we want this behavior? The current behavior fails this
825+ // // test, but seems better and more consistent.
794− ("Starting from after boundary retreats the anchor",
826+ // ("Starting from after boundary retreats the anchor",
795− vec![(1, Range::new(0, 8), Range::new(7, 0))]),
827+ // vec![(1, Range::new(0, 9), Range::new(8, 0))]),
828+
829+ (
796− (" Jump to start of a word preceded by whitespace",
830+ " Jump to start of a word preceded by whitespace",
797− vec![(1, Range::new(5, 5), Range::new(5, 4))]),
831+ vec![(1, Range::new(5, 5), Range::new(6, 4))],
832+ ),
833+ (
798− (" Jump to start of line from start of word preceded by whitespace",
834+ " Jump to start of line from start of word preceded by whitespace",
799− vec![(1, Range::new(4, 4), Range::new(3, 0))]),
835+ vec![(1, Range::new(3, 4), Range::new(4, 0))],
836+ ),
800 ("Previous anchor is irrelevant for backward motions",
837 ("Previous anchor is irrelevant for backward motions",
801− vec![(1, Range::new(12, 5), Range::new(5, 0))]),
838+ vec![(1, Range::new(12, 5), Range::new(6, 0))]),
839+ (
802− (" Starting from whitespace moves to first space in sequence",
840+ " Starting from whitespace moves to first space in sequence",
803− vec![(1, Range::new(0, 3), Range::new(3, 0))]),
841+ vec![(1, Range::new(0, 4), Range::new(4, 0))],
842+ ),
804 ("Identifiers_with_underscores are considered a single word",
843 ("Identifiers_with_underscores are considered a single word",
805 vec![(1, Range::new(0, 20), Range::new(20, 0))]),
844 vec![(1, Range::new(0, 20), Range::new(20, 0))]),
845+ (
806− ("Jumping\n \nback through a newline selects whitespace",
846+ "Jumping\n \nback through a newline selects whitespace",
807− vec![(1, Range::new(0, 13), Range::new(11, 8))]),
847+ vec![(1, Range::new(0, 13), Range::new(12, 8))],
848+ ),
849+ (
808− ("Jumping to start of word from the end selects the word",
850+ "Jumping to start of word from the end selects the word",
809− vec![(1, Range::new(6, 6), Range::new(6, 0))]),
851+ vec![(1, Range::new(6, 7), Range::new(7, 0))],
852+ ),
853+ (
810− ("alphanumeric.!,and.?=punctuation are treated exactly the same",
854+ "alphanumeric.!,and.?=punctuation are treated exactly the same",
811− vec![
812− (1, Range::new(30, 30), Range::new(30, 0)),
855+ vec![(1, Range::new(29, 30), Range::new(30, 0))],
813− ]),
856+ ),
814−
857+ (
815− ("... ... punctuation and spaces behave as expected",
858+ "... ... punctuation and spaces behave as expected",
816 vec![
859 vec![
817− (1, Range::new(0, 10), Range::new(9, 6)),
860+ (1, Range::new(0, 10), Range::new(10, 6)),
818− (1, Range::new(9, 6), Range::new(5, 0)),
861+ (1, Range::new(10, 6), Range::new(6, 0)),
862+ ],
819− ]),
863+ ),
820 (".._.._ punctuation is joined by underscores into a single block",
864 (".._.._ punctuation is joined by underscores into a single block",
821− vec![(1, Range::new(0, 5), Range::new(4, 0))]),
865+ vec![(1, Range::new(0, 6), Range::new(6, 0))]),
866+ (
822− ("Newlines\n\nare bridged seamlessly.",
867+ "Newlines\n\nare bridged seamlessly.",
823− vec![
824− (1, Range::new(0, 10), Range::new(7, 0)),
868+ vec![(1, Range::new(0, 10), Range::new(8, 0))],
825− ]),
869+ ),
870+ (
826− ("Jumping \n\n\n\n\nback from within a newline group selects previous block",
871+ "Jumping \n\n\n\n\nback from within a newline group selects previous block",
827− vec![
828− (1, Range::new(0, 13), Range::new(10, 0)),
872+ vec![(1, Range::new(0, 13), Range::new(11, 0))],
829− ]),
873+ ),
874+ (
830− ("Failed motions do not modify the range",
875+ "Failed motions do not modify the range",
831− vec![
832− (0, Range::new(3, 0), Range::new(3, 0)),
876+ vec![(0, Range::new(3, 0), Range::new(3, 0))],
833− ]),
877+ ),
878+ (
834− ("Multiple motions at once resolve correctly",
879+ "Multiple motions at once resolve correctly",
835− vec![
836− (3, Range::new(18, 18), Range::new(8, 0)),
880+ vec![(3, Range::new(19, 19), Range::new(9, 0))],
837− ]),
881+ ),
882+ (
838− ("Excessive motions are performed partially",
883+ "Excessive motions are performed partially",
839− vec![
840− (999, Range::new(40, 40), Range::new(9, 0)),
884+ vec![(999, Range::new(40, 40), Range::new(10, 0))],
841− ]),
885+ ),
886+ (
842− ("", // Edge case of moving backwards in empty string
887+ "", // Edge case of moving backwards in empty string
843− vec![
844− (1, Range::new(0, 0), Range::new(0, 0)),
888+ vec![(1, Range::new(0, 0), Range::new(0, 0))],
845− ]),
889+ ),
890+ (
846− ("\n\n\n\n\n", // Edge case of moving backwards in all newlines
891+ "\n\n\n\n\n", // Edge case of moving backwards in all newlines
847− vec![
848− (1, Range::new(0, 0), Range::new(0, 0)),
892+ vec![(1, Range::new(5, 5), Range::new(0, 0))],
849− ]),
893+ ),
850 (" \n \nJumping back through alternated space blocks and newlines selects the space blocks",
894 (" \n \nJumping back through alternated space blocks and newlines selects the space blocks",
851 vec![
895 vec![
852− (1, Range::new(0, 7), Range::new(6, 4)),
896+ (1, Range::new(0, 8), Range::new(7, 4)),
853− (1, Range::new(6, 4), Range::new(2, 0)),
897+ (1, Range::new(7, 4), Range::new(3, 0)),
854 ]),
898 ]),
855 ("ヒーリ..クス multibyte characters behave as normal characters, including when interacting with punctuation",
899 ("ヒーリ..クス multibyte characters behave as normal characters, including when interacting with punctuation",
856 vec![
900 vec![
857− (1, Range::new(0, 7), Range::new(6, 0)),
901+ (1, Range::new(0, 8), Range::new(8, 0)),
858 ]),
902 ]),
859 ]);
903 ]);
860
904
@@ -870,42 +914,46 @@ mod test {
870 fn test_behaviour_when_moving_to_end_of_next_words() {
914 fn test_behaviour_when_moving_to_end_of_next_words() {
871 let tests = array::IntoIter::new([
915 let tests = array::IntoIter::new([
872 ("Basic forward motion from the start of a word to the end of it",
916 ("Basic forward motion from the start of a word to the end of it",
873− vec![(1, Range::new(0, 0), Range::new(0, 4))]),
917+ vec![(1, Range::new(0, 0), Range::new(0, 5))]),
874 ("Basic forward motion from the end of a word to the end of the next",
918 ("Basic forward motion from the end of a word to the end of the next",
875− vec![(1, Range::new(0, 4), Range::new(5, 12))]),
919+ vec![(1, Range::new(0, 5), Range::new(5, 13))]),
876 ("Basic forward motion from the middle of a word to the end of it",
920 ("Basic forward motion from the middle of a word to the end of it",
877− vec![(1, Range::new(2, 2), Range::new(2, 4))]),
921+ vec![(1, Range::new(2, 2), Range::new(2, 5))]),
878 (" Jumping to end of a word preceded by whitespace",
922 (" Jumping to end of a word preceded by whitespace",
879− vec![(1, Range::new(0, 0), Range::new(0, 10))]),
923+ vec![(1, Range::new(0, 0), Range::new(0, 11))]),
924+
925+ // // Why do we want this behavior? The current behavior fails this
926+ // // test, but seems better and more consistent.
880− (" Starting from a boundary advances the anchor",
927+ // (" Starting from a boundary advances the anchor",
881− vec![(1, Range::new(0, 0), Range::new(1, 8))]),
928+ // vec![(1, Range::new(0, 0), Range::new(1, 9))]),
929+
882 ("Previous anchor is irrelevant for end of word motion",
930 ("Previous anchor is irrelevant for end of word motion",
883− vec![(1, Range::new(12, 2), Range::new(2, 7))]),
931+ vec![(1, Range::new(12, 2), Range::new(2, 8))]),
884 ("Identifiers_with_underscores are considered a single word",
932 ("Identifiers_with_underscores are considered a single word",
885− vec![(1, Range::new(0, 0), Range::new(0, 27))]),
933+ vec![(1, Range::new(0, 0), Range::new(0, 28))]),
886 ("Jumping\n into starting whitespace selects up to the end of next word",
934 ("Jumping\n into starting whitespace selects up to the end of next word",
887− vec![(1, Range::new(0, 6), Range::new(8, 15))]),
935+ vec![(1, Range::new(0, 7), Range::new(8, 16))]),
888 ("alphanumeric.!,and.?=punctuation are considered 'words' for the purposes of word motion",
936 ("alphanumeric.!,and.?=punctuation are considered 'words' for the purposes of word motion",
889 vec![
937 vec![
890− (1, Range::new(0, 0), Range::new(0, 11)),
938+ (1, Range::new(0, 0), Range::new(0, 12)),
891− (1, Range::new(0, 11), Range::new(12, 14)),
939+ (1, Range::new(0, 12), Range::new(12, 15)),
892− (1, Range::new(12, 14), Range::new(15, 17))
940+ (1, Range::new(12, 15), Range::new(15, 18))
893 ]),
941 ]),
894 ("... ... punctuation and spaces behave as expected",
942 ("... ... punctuation and spaces behave as expected",
895 vec![
943 vec![
896− (1, Range::new(0, 0), Range::new(0, 2)),
944+ (1, Range::new(0, 0), Range::new(0, 3)),
897− (1, Range::new(0, 2), Range::new(3, 8)),
945+ (1, Range::new(0, 3), Range::new(3, 9)),
898 ]),
946 ]),
899 (".._.._ punctuation is not joined by underscores into a single block",
947 (".._.._ punctuation is not joined by underscores into a single block",
900− vec![(1, Range::new(0, 0), Range::new(0, 1))]),
948+ vec![(1, Range::new(0, 0), Range::new(0, 2))]),
901 ("Newlines\n\nare bridged seamlessly.",
949 ("Newlines\n\nare bridged seamlessly.",
902 vec![
950 vec![
903− (1, Range::new(0, 0), Range::new(0, 7)),
951+ (1, Range::new(0, 0), Range::new(0, 8)),
904− (1, Range::new(0, 7), Range::new(10, 12)),
952+ (1, Range::new(0, 8), Range::new(10, 13)),
905 ]),
953 ]),
906 ("Jumping\n\n\n\n\n\n from newlines to whitespace selects to end of next word.",
954 ("Jumping\n\n\n\n\n\n from newlines to whitespace selects to end of next word.",
907 vec![
955 vec![
908− (1, Range::new(0, 8), Range::new(13, 19)),
956+ (1, Range::new(0, 8), Range::new(13, 20)),
909 ]),
957 ]),
910 ("A failed motion does not modify the range",
958 ("A failed motion does not modify the range",
911 vec![
959 vec![
@@ -913,11 +961,11 @@ mod test {
913 ]),
961 ]),
914 ("Multiple motions at once resolve correctly",
962 ("Multiple motions at once resolve correctly",
915 vec![
963 vec![
916− (3, Range::new(0, 0), Range::new(16, 18)),
964+ (3, Range::new(0, 0), Range::new(16, 19)),
917 ]),
965 ]),
918 ("Excessive motions are performed partially",
966 ("Excessive motions are performed partially",
919 vec![
967 vec![
920− (999, Range::new(0, 0), Range::new(31, 40)),
968+ (999, Range::new(0, 0), Range::new(31, 41)),
921 ]),
969 ]),
922 ("", // Edge case of moving forward in empty string
970 ("", // Edge case of moving forward in empty string
923 vec![
971 vec![
@@ -925,16 +973,16 @@ mod test {
925 ]),
973 ]),
926 ("\n\n\n\n\n", // Edge case of moving forward in all newlines
974 ("\n\n\n\n\n", // Edge case of moving forward in all newlines
927 vec![
975 vec![
928− (1, Range::new(0, 0), Range::new(0, 4)),
976+ (1, Range::new(0, 0), Range::new(5, 5)),
929 ]),
977 ]),
930 ("\n \n \n Jumping through alternated space blocks and newlines selects the space blocks",
978 ("\n \n \n Jumping through alternated space blocks and newlines selects the space blocks",
931 vec![
979 vec![
932− (1, Range::new(0, 0), Range::new(1, 3)),
980+ (1, Range::new(0, 0), Range::new(1, 4)),
933− (1, Range::new(1, 3), Range::new(5, 7)),
981+ (1, Range::new(1, 4), Range::new(5, 8)),
934 ]),
982 ]),
935 ("ヒーリクス multibyte characters behave as normal characters",
983 ("ヒーリクス multibyte characters behave as normal characters",
936 vec![
984 vec![
937− (1, Range::new(0, 0), Range::new(0, 4)),
985+ (1, Range::new(0, 0), Range::new(0, 5)),
938 ]),
986 ]),
939 ]);
987 ]);
940
988
@@ -950,44 +998,44 @@ mod test {
950 fn test_behaviour_when_moving_to_end_of_previous_words() {
998 fn test_behaviour_when_moving_to_end_of_previous_words() {
951 let tests = array::IntoIter::new([
999 let tests = array::IntoIter::new([
952 ("Basic backward motion from the middle of a word",
1000 ("Basic backward motion from the middle of a word",
953− vec![(1, Range::new(9, 9), Range::new(9, 5))]),
1001+ vec![(1, Range::new(9, 9), Range::new(10, 5))]),
954 ("Starting from after boundary retreats the anchor",
1002 ("Starting from after boundary retreats the anchor",
955− vec![(1, Range::new(0, 13), Range::new(12, 8))]),
1003+ vec![(1, Range::new(0, 14), Range::new(13, 8))]),
956 ("Jump to end of a word succeeded by whitespace",
1004 ("Jump to end of a word succeeded by whitespace",
957− vec![(1, Range::new(10, 10), Range::new(10, 4))]),
1005+ vec![(1, Range::new(11, 11), Range::new(11, 4))]),
958 (" Jump to start of line from end of word preceded by whitespace",
1006 (" Jump to start of line from end of word preceded by whitespace",
959− vec![(1, Range::new(7, 7), Range::new(7, 0))]),
1007+ vec![(1, Range::new(8, 8), Range::new(8, 0))]),
960 ("Previous anchor is irrelevant for backward motions",
1008 ("Previous anchor is irrelevant for backward motions",
961− vec![(1, Range::new(26, 12), Range::new(12, 8))]),
1009+ vec![(1, Range::new(26, 12), Range::new(13, 8))]),
962 (" Starting from whitespace moves to first space in sequence",
1010 (" Starting from whitespace moves to first space in sequence",
963− vec![(1, Range::new(0, 3), Range::new(3, 0))]),
1011+ vec![(1, Range::new(0, 4), Range::new(4, 0))]),
964 ("Test identifiers_with_underscores are considered a single word",
1012 ("Test identifiers_with_underscores are considered a single word",
965 vec![(1, Range::new(0, 25), Range::new(25, 4))]),
1013 vec![(1, Range::new(0, 25), Range::new(25, 4))]),
966 ("Jumping\n \nback through a newline selects whitespace",
1014 ("Jumping\n \nback through a newline selects whitespace",
967− vec![(1, Range::new(0, 13), Range::new(11, 8))]),
1015+ vec![(1, Range::new(0, 13), Range::new(12, 8))]),
968 ("Jumping to start of word from the end selects the whole word",
1016 ("Jumping to start of word from the end selects the whole word",
969− vec![(1, Range::new(15, 15), Range::new(15, 10))]),
1017+ vec![(1, Range::new(16, 16), Range::new(16, 10))]),
970 ("alphanumeric.!,and.?=punctuation are considered 'words' for the purposes of word motion",
1018 ("alphanumeric.!,and.?=punctuation are considered 'words' for the purposes of word motion",
971 vec![
1019 vec![
972− (1, Range::new(30, 30), Range::new(30, 21)),
1020+ (1, Range::new(30, 30), Range::new(31, 21)),
973− (1, Range::new(30, 21), Range::new(20, 18)),
1021+ (1, Range::new(31, 21), Range::new(21, 18)),
974− (1, Range::new(20, 18), Range::new(17, 15))
1022+ (1, Range::new(21, 18), Range::new(18, 15))
975 ]),
1023 ]),
976
1024
977 ("... ... punctuation and spaces behave as expected",
1025 ("... ... punctuation and spaces behave as expected",
978 vec![
1026 vec![
979− (1, Range::new(0, 10), Range::new(9, 9)),
1027+ (1, Range::new(0, 10), Range::new(9, 3)),
980− (1, Range::new(9, 6), Range::new(5, 3)),
1028+ (1, Range::new(9, 3), Range::new(3, 0)),
981 ]),
1029 ]),
982 (".._.._ punctuation is not joined by underscores into a single block",
1030 (".._.._ punctuation is not joined by underscores into a single block",
983− vec![(1, Range::new(0, 5), Range::new(4, 3))]),
1031+ vec![(1, Range::new(0, 5), Range::new(5, 3))]),
984 ("Newlines\n\nare bridged seamlessly.",
1032 ("Newlines\n\nare bridged seamlessly.",
985 vec![
1033 vec![
986− (1, Range::new(0, 10), Range::new(7, 0)),
1034+ (1, Range::new(0, 10), Range::new(8, 0)),
987 ]),
1035 ]),
988 ("Jumping \n\n\n\n\nback from within a newline group selects previous block",
1036 ("Jumping \n\n\n\n\nback from within a newline group selects previous block",
989 vec![
1037 vec![
990− (1, Range::new(0, 13), Range::new(10, 7)),
1038+ (1, Range::new(0, 13), Range::new(11, 7)),
991 ]),
1039 ]),
992 ("Failed motions do not modify the range",
1040 ("Failed motions do not modify the range",
993 vec![
1041 vec![
@@ -995,11 +1043,11 @@ mod test {
995 ]),
1043 ]),
996 ("Multiple motions at once resolve correctly",
1044 ("Multiple motions at once resolve correctly",
997 vec![
1045 vec![
998− (3, Range::new(23, 23), Range::new(15, 8)),
1046+ (3, Range::new(24, 24), Range::new(16, 8)),
999 ]),
1047 ]),
1000 ("Excessive motions are performed partially",
1048 ("Excessive motions are performed partially",
1001 vec![
1049 vec![
1002− (999, Range::new(40, 40), Range::new(8, 0)),
1050+ (999, Range::new(40, 40), Range::new(9, 0)),
1003 ]),
1051 ]),
1004 ("", // Edge case of moving backwards in empty string
1052 ("", // Edge case of moving backwards in empty string
1005 vec![
1053 vec![
@@ -1007,16 +1055,16 @@ mod test {
1007 ]),
1055 ]),
1008 ("\n\n\n\n\n", // Edge case of moving backwards in all newlines
1056 ("\n\n\n\n\n", // Edge case of moving backwards in all newlines
1009 vec![
1057 vec![
1010− (1, Range::new(0, 0), Range::new(0, 0)),
1058+ (1, Range::new(5, 5), Range::new(0, 0)),
1011 ]),
1059 ]),
1012 (" \n \nJumping back through alternated space blocks and newlines selects the space blocks",
1060 (" \n \nJumping back through alternated space blocks and newlines selects the space blocks",
1013 vec![
1061 vec![
1014− (1, Range::new(0, 7), Range::new(6, 4)),
1062+ (1, Range::new(0, 8), Range::new(7, 4)),
1015− (1, Range::new(6, 4), Range::new(2, 0)),
1063+ (1, Range::new(7, 4), Range::new(3, 0)),
1016 ]),
1064 ]),
1017 ("Test ヒーリクス multibyte characters behave as normal characters",
1065 ("Test ヒーリクス multibyte characters behave as normal characters",
1018 vec![
1066 vec![
1019− (1, Range::new(0, 9), Range::new(9, 4)),
1067+ (1, Range::new(0, 10), Range::new(10, 4)),
1020 ]),
1068 ]),
1021 ]);
1069 ]);
1022
1070
@@ -1032,40 +1080,44 @@ mod test {
1032 fn test_behaviour_when_moving_to_end_of_next_long_words() {
1080 fn test_behaviour_when_moving_to_end_of_next_long_words() {
1033 let tests = array::IntoIter::new([
1081 let tests = array::IntoIter::new([
1034 ("Basic forward motion from the start of a word to the end of it",
1082 ("Basic forward motion from the start of a word to the end of it",
1035− vec![(1, Range::new(0, 0), Range::new(0, 4))]),
1083+ vec![(1, Range::new(0, 0), Range::new(0, 5))]),
1036 ("Basic forward motion from the end of a word to the end of the next",
1084 ("Basic forward motion from the end of a word to the end of the next",
1037− vec![(1, Range::new(0, 4), Range::new(5, 12))]),
1085+ vec![(1, Range::new(0, 5), Range::new(5, 13))]),
1038 ("Basic forward motion from the middle of a word to the end of it",
1086 ("Basic forward motion from the middle of a word to the end of it",
1039− vec![(1, Range::new(2, 2), Range::new(2, 4))]),
1087+ vec![(1, Range::new(2, 2), Range::new(2, 5))]),
1040 (" Jumping to end of a word preceded by whitespace",
1088 (" Jumping to end of a word preceded by whitespace",
1041− vec![(1, Range::new(0, 0), Range::new(0, 10))]),
1089+ vec![(1, Range::new(0, 0), Range::new(0, 11))]),
1090+
1091+ // // Why do we want this behavior? The current behavior fails this
1092+ // // test, but seems better and more consistent.
1042− (" Starting from a boundary advances the anchor",
1093+ // (" Starting from a boundary advances the anchor",
1043− vec![(1, Range::new(0, 0), Range::new(1, 8))]),
1094+ // vec![(1, Range::new(0, 0), Range::new(1, 9))]),
1095+
1044 ("Previous anchor is irrelevant for end of word motion",
1096 ("Previous anchor is irrelevant for end of word motion",
1045− vec![(1, Range::new(12, 2), Range::new(2, 7))]),
1097+ vec![(1, Range::new(12, 2), Range::new(2, 8))]),
1046 ("Identifiers_with_underscores are considered a single word",
1098 ("Identifiers_with_underscores are considered a single word",
1047− vec![(1, Range::new(0, 0), Range::new(0, 27))]),
1099+ vec![(1, Range::new(0, 0), Range::new(0, 28))]),
1048 ("Jumping\n into starting whitespace selects up to the end of next word",
1100 ("Jumping\n into starting whitespace selects up to the end of next word",
1049− vec![(1, Range::new(0, 6), Range::new(8, 15))]),
1101+ vec![(1, Range::new(0, 7), Range::new(8, 16))]),
1050 ("alphanumeric.!,and.?=punctuation are treated the same way",
1102 ("alphanumeric.!,and.?=punctuation are treated the same way",
1051 vec![
1103 vec![
1052− (1, Range::new(0, 0), Range::new(0, 31)),
1104+ (1, Range::new(0, 0), Range::new(0, 32)),
1053 ]),
1105 ]),
1054 ("... ... punctuation and spaces behave as expected",
1106 ("... ... punctuation and spaces behave as expected",
1055 vec![
1107 vec![
1056− (1, Range::new(0, 0), Range::new(0, 2)),
1108+ (1, Range::new(0, 0), Range::new(0, 3)),
1057− (1, Range::new(0, 2), Range::new(3, 8)),
1109+ (1, Range::new(0, 3), Range::new(3, 9)),
1058 ]),
1110 ]),
1059 (".._.._ punctuation is joined by underscores into a single block",
1111 (".._.._ punctuation is joined by underscores into a single block",
1060− vec![(1, Range::new(0, 0), Range::new(0, 5))]),
1112+ vec![(1, Range::new(0, 0), Range::new(0, 6))]),
1061 ("Newlines\n\nare bridged seamlessly.",
1113 ("Newlines\n\nare bridged seamlessly.",
1062 vec![
1114 vec![
1063− (1, Range::new(0, 0), Range::new(0, 7)),
1115+ (1, Range::new(0, 0), Range::new(0, 8)),
1064− (1, Range::new(0, 7), Range::new(10, 12)),
1116+ (1, Range::new(0, 8), Range::new(10, 13)),
1065 ]),
1117 ]),
1066 ("Jumping\n\n\n\n\n\n from newlines to whitespace selects to end of next word.",
1118 ("Jumping\n\n\n\n\n\n from newlines to whitespace selects to end of next word.",
1067 vec![
1119 vec![
1068− (1, Range::new(0, 8), Range::new(13, 19)),
1120+ (1, Range::new(0, 9), Range::new(13, 20)),
1069 ]),
1121 ]),
1070 ("A failed motion does not modify the range",
1122 ("A failed motion does not modify the range",
1071 vec![
1123 vec![
@@ -1073,11 +1125,11 @@ mod test {
1073 ]),
1125 ]),
1074 ("Multiple motions at once resolve correctly",
1126 ("Multiple motions at once resolve correctly",
1075 vec![
1127 vec![
1076− (3, Range::new(0, 0), Range::new(16, 18)),
1128+ (3, Range::new(0, 0), Range::new(16, 19)),
1077 ]),
1129 ]),
1078 ("Excessive motions are performed partially",
1130 ("Excessive motions are performed partially",
1079 vec![
1131 vec![
1080− (999, Range::new(0, 0), Range::new(31, 40)),
1132+ (999, Range::new(0, 0), Range::new(31, 41)),
1081 ]),
1133 ]),
1082 ("", // Edge case of moving forward in empty string
1134 ("", // Edge case of moving forward in empty string
1083 vec![
1135 vec![
@@ -1085,16 +1137,16 @@ mod test {
1085 ]),
1137 ]),
1086 ("\n\n\n\n\n", // Edge case of moving forward in all newlines
1138 ("\n\n\n\n\n", // Edge case of moving forward in all newlines
1087 vec![
1139 vec![
1088− (1, Range::new(0, 0), Range::new(0, 4)),
1140+ (1, Range::new(0, 0), Range::new(5, 5)),
1089 ]),
1141 ]),
1090 ("\n \n \n Jumping through alternated space blocks and newlines selects the space blocks",
1142 ("\n \n \n Jumping through alternated space blocks and newlines selects the space blocks",
1091 vec![
1143 vec![
1092− (1, Range::new(0, 0), Range::new(1, 3)),
1144+ (1, Range::new(0, 0), Range::new(1, 4)),
1093− (1, Range::new(1, 3), Range::new(5, 7)),
1145+ (1, Range::new(1, 4), Range::new(5, 8)),
1094 ]),
1146 ]),
1095 ("ヒーリ..クス multibyte characters behave as normal characters, including when they interact with punctuation",
1147 ("ヒーリ..クス multibyte characters behave as normal characters, including when they interact with punctuation",
1096 vec![
1148 vec![
1097− (1, Range::new(0, 0), Range::new(0, 6)),
1149+ (1, Range::new(0, 0), Range::new(0, 7)),
1098 ]),
1150 ]),
1099 ]);
1151 ]);
1100
1152
helix-term/src/commands.rs+48−27
@@ -498,6 +498,7 @@ fn move_next_word_start(cx: &mut Context) {
498 view.id,
498 view.id,
499 doc.selection(view.id)
499 doc.selection(view.id)
500 .clone()
500 .clone()
501+ .min_width_1(doc.text().slice(..))
501 .transform(|range| movement::move_next_word_start(doc.text().slice(..), range, count)),
502 .transform(|range| movement::move_next_word_start(doc.text().slice(..), range, count)),
502 );
503 );
503}
504}
@@ -509,6 +510,7 @@ fn move_prev_word_start(cx: &mut Context) {
509 view.id,
510 view.id,
510 doc.selection(view.id)
511 doc.selection(view.id)
511 .clone()
512 .clone()
513+ .min_width_1(doc.text().slice(..))
512 .transform(|range| movement::move_prev_word_start(doc.text().slice(..), range, count)),
514 .transform(|range| movement::move_prev_word_start(doc.text().slice(..), range, count)),
513 );
515 );
514}
516}
@@ -520,6 +522,7 @@ fn move_next_word_end(cx: &mut Context) {
520 view.id,
522 view.id,
521 doc.selection(view.id)
523 doc.selection(view.id)
522 .clone()
524 .clone()
525+ .min_width_1(doc.text().slice(..))
523 .transform(|range| movement::move_next_word_end(doc.text().slice(..), range, count)),
526 .transform(|range| movement::move_next_word_end(doc.text().slice(..), range, count)),
524 );
527 );
525}
528}
@@ -529,9 +532,12 @@ fn move_next_long_word_start(cx: &mut Context) {
529 let (view, doc) = current!(cx.editor);
532 let (view, doc) = current!(cx.editor);
530 doc.set_selection(
533 doc.set_selection(
531 view.id,
534 view.id,
532− doc.selection(view.id).clone().transform(|range| {
535+ doc.selection(view.id)
536+ .clone()
537+ .min_width_1(doc.text().slice(..))
538+ .transform(|range| {
533− movement::move_next_long_word_start(doc.text().slice(..), range, count)
539+ movement::move_next_long_word_start(doc.text().slice(..), range, count)
534− }),
540+ }),
535 );
541 );
536}
542}
537
543
@@ -540,9 +546,12 @@ fn move_prev_long_word_start(cx: &mut Context) {
540 let (view, doc) = current!(cx.editor);
546 let (view, doc) = current!(cx.editor);
541 doc.set_selection(
547 doc.set_selection(
542 view.id,
548 view.id,
543− doc.selection(view.id).clone().transform(|range| {
549+ doc.selection(view.id)
550+ .clone()
551+ .min_width_1(doc.text().slice(..))
552+ .transform(|range| {
544− movement::move_prev_long_word_start(doc.text().slice(..), range, count)
553+ movement::move_prev_long_word_start(doc.text().slice(..), range, count)
545− }),
554+ }),
546 );
555 );
547}
556}
548
557
@@ -551,9 +560,12 @@ fn move_next_long_word_end(cx: &mut Context) {
551 let (view, doc) = current!(cx.editor);
560 let (view, doc) = current!(cx.editor);
552 doc.set_selection(
561 doc.set_selection(
553 view.id,
562 view.id,
554− doc.selection(view.id).clone().transform(|range| {
563+ doc.selection(view.id)
564+ .clone()
565+ .min_width_1(doc.text().slice(..))
566+ .transform(|range| {
555− movement::move_next_long_word_end(doc.text().slice(..), range, count)
567+ movement::move_next_long_word_end(doc.text().slice(..), range, count)
556− }),
568+ }),
557 );
569 );
558}
570}
559
571
@@ -574,12 +586,15 @@ fn extend_next_word_start(cx: &mut Context) {
574 let (view, doc) = current!(cx.editor);
586 let (view, doc) = current!(cx.editor);
575 doc.set_selection(
587 doc.set_selection(
576 view.id,
588 view.id,
577− doc.selection(view.id).clone().transform(|range| {
589+ doc.selection(view.id)
590+ .clone()
591+ .min_width_1(doc.text().slice(..))
592+ .transform(|range| {
578− let text = doc.text().slice(..);
593+ let text = doc.text().slice(..);
579− let word = movement::move_next_word_start(text, range, count);
594+ let word = movement::move_next_word_start(text, range, count);
580− let pos = word.head;
595+ let pos = word.head;
581− range.put(text, pos, true)
596+ range.put(text, pos, true)
582− }),
597+ }),
583 );
598 );
584}
599}
585
600
@@ -588,12 +603,15 @@ fn extend_prev_word_start(cx: &mut Context) {
588 let (view, doc) = current!(cx.editor);
603 let (view, doc) = current!(cx.editor);
589 doc.set_selection(
604 doc.set_selection(
590 view.id,
605 view.id,
591− doc.selection(view.id).clone().transform(|range| {
606+ doc.selection(view.id)
607+ .clone()
608+ .min_width_1(doc.text().slice(..))
609+ .transform(|range| {
592− let text = doc.text().slice(..);
610+ let text = doc.text().slice(..);
593− let word = movement::move_prev_word_start(text, range, count);
611+ let word = movement::move_prev_word_start(text, range, count);
594− let pos = word.head;
612+ let pos = word.head;
595− range.put(text, pos, true)
613+ range.put(text, pos, true)
596− }),
614+ }),
597 );
615 );
598}
616}
599
617
@@ -602,12 +620,15 @@ fn extend_next_word_end(cx: &mut Context) {
602 let (view, doc) = current!(cx.editor);
620 let (view, doc) = current!(cx.editor);
603 doc.set_selection(
621 doc.set_selection(
604 view.id,
622 view.id,
605− doc.selection(view.id).clone().transform(|range| {
623+ doc.selection(view.id)
624+ .clone()
625+ .min_width_1(doc.text().slice(..))
626+ .transform(|range| {
606− let text = doc.text().slice(..);
627+ let text = doc.text().slice(..);
607− let word = movement::move_next_word_end(text, range, count);
628+ let word = movement::move_next_word_end(text, range, count);
608− let pos = word.head;
629+ let pos = word.head;
609− range.put(text, pos, true)
630+ range.put(text, pos, true)
610− }),
631+ }),
611 );
632 );
612}
633}
613
634