@@ -177,6 +177,10 @@ pub fn move_prev_word_start(slice: RopeSlice, range: Range, count: usize) -> Ran
177177 word_move(slice, range, count, WordMotionTarget::PrevWordStart)
178178}
179179
180+pub fn move_prev_word_end(slice: RopeSlice, range: Range, count: usize) -> Range {
181+ word_move(slice, range, count, WordMotionTarget::PrevWordEnd)
182+}
183+
180184pub fn move_next_long_word_start(slice: RopeSlice, range: Range, count: usize) -> Range {
181185 word_move(slice, range, count, WordMotionTarget::NextLongWordStart)
182186}
@@ -189,8 +193,8 @@ pub fn move_prev_long_word_start(slice: RopeSlice, range: Range, count: usize) -
189193 word_move(slice, range, count, WordMotionTarget::PrevLongWordStart)
190194}
191195
192−pub fn move_prev_word_end(slice: RopeSlice, range: Range, count: usize) -> Range {
193− word_move(slice, range, count, WordMotionTarget::PrevWordEnd)
196+pub fn move_prev_long_word_end(slice: RopeSlice, range: Range, count: usize) -> Range {
197+ word_move(slice, range, count, WordMotionTarget::PrevLongWordEnd)
194198}
195199
196200fn word_move(slice: RopeSlice, range: Range, count: usize, target: WordMotionTarget) -> Range {
@@ -199,6 +203,7 @@ fn word_move(slice: RopeSlice, range: Range, count: usize, target: WordMotionTar
199203 WordMotionTarget::PrevWordStart
200204 | WordMotionTarget::PrevLongWordStart
201205 | WordMotionTarget::PrevWordEnd
206+ | WordMotionTarget::PrevLongWordEnd
202207 );
203208
204209 // Special-case early-out.
@@ -377,6 +382,7 @@ pub enum WordMotionTarget {
377382 NextLongWordStart,
378383 NextLongWordEnd,
379384 PrevLongWordStart,
385+ PrevLongWordEnd,
380386}
381387
382388pub trait CharHelpers {
@@ -393,6 +399,7 @@ impl CharHelpers for Chars<'_> {
393399 WordMotionTarget::PrevWordStart
394400 | WordMotionTarget::PrevLongWordStart
395401 | WordMotionTarget::PrevWordEnd
402+ | WordMotionTarget::PrevLongWordEnd
396403 );
397404
398405 // Reverse the iterator if needed for the motion direction.
@@ -479,7 +486,7 @@ fn reached_target(target: WordMotionTarget, prev_ch: char, next_ch: char) -> boo
479486 is_word_boundary(prev_ch, next_ch)
480487 && (!prev_ch.is_whitespace() || char_is_line_ending(next_ch))
481488 }
482− WordMotionTarget::NextLongWordStart => {
489+ WordMotionTarget::NextLongWordStart | WordMotionTarget::PrevLongWordEnd => {
483490 is_long_word_boundary(prev_ch, next_ch)
484491 && (char_is_line_ending(next_ch) || !next_ch.is_whitespace())
485492 }
@@ -1445,6 +1452,100 @@ mod test {
14451452 }
14461453 }
14471454
1455+ #[test]
1456+ fn test_behaviour_when_moving_to_end_of_prev_long_words() {
1457+ let tests = [
1458+ (
1459+ "Basic backward motion from the middle of a word",
1460+ vec![(1, Range::new(3, 3), Range::new(4, 0))],
1461+ ),
1462+ ("Starting from after boundary retreats the anchor",
1463+ vec![(1, Range::new(0, 9), Range::new(8, 0))],
1464+ ),
1465+ (
1466+ "Jump to end of a word succeeded by whitespace",
1467+ vec![(1, Range::new(10, 10), Range::new(10, 4))],
1468+ ),
1469+ (
1470+ " Jump to start of line from end of word preceded by whitespace",
1471+ vec![(1, Range::new(3, 4), Range::new(4, 0))],
1472+ ),
1473+ ("Previous anchor is irrelevant for backward motions",
1474+ vec![(1, Range::new(12, 5), Range::new(6, 0))]),
1475+ (
1476+ " Starting from whitespace moves to first space in sequence",
1477+ vec![(1, Range::new(0, 4), Range::new(4, 0))],
1478+ ),
1479+ ("Identifiers_with_underscores are considered a single word",
1480+ vec![(1, Range::new(0, 20), Range::new(20, 0))]),
1481+ (
1482+ "Jumping\n \nback through a newline selects whitespace",
1483+ vec![(1, Range::new(0, 13), Range::new(12, 8))],
1484+ ),
1485+ (
1486+ "Jumping to start of word from the end selects the word",
1487+ vec![(1, Range::new(6, 7), Range::new(7, 0))],
1488+ ),
1489+ (
1490+ "alphanumeric.!,and.?=punctuation are treated exactly the same",
1491+ vec![(1, Range::new(29, 30), Range::new(30, 0))],
1492+ ),
1493+ (
1494+ "... ... punctuation and spaces behave as expected",
1495+ vec![
1496+ (1, Range::new(0, 10), Range::new(9, 3)),
1497+ (1, Range::new(10, 6), Range::new(7, 3)),
1498+ ],
1499+ ),
1500+ (".._.._ punctuation is joined by underscores into a single block",
1501+ vec![(1, Range::new(0, 6), Range::new(6, 0))]),
1502+ (
1503+ "Newlines\n\nare bridged seamlessly.",
1504+ vec![(1, Range::new(0, 10), Range::new(8, 0))],
1505+ ),
1506+ (
1507+ "Jumping \n\n\n\n\nback from within a newline group selects previous block",
1508+ vec![(1, Range::new(0, 13), Range::new(11, 7))],
1509+ ),
1510+ (
1511+ "Failed motions do not modify the range",
1512+ vec![(0, Range::new(3, 0), Range::new(3, 0))],
1513+ ),
1514+ (
1515+ "Multiple motions at once resolve correctly",
1516+ vec![(3, Range::new(19, 19), Range::new(8, 0))],
1517+ ),
1518+ (
1519+ "Excessive motions are performed partially",
1520+ vec![(999, Range::new(40, 40), Range::new(9, 0))],
1521+ ),
1522+ (
1523+ "", // Edge case of moving backwards in empty string
1524+ vec![(1, Range::new(0, 0), Range::new(0, 0))],
1525+ ),
1526+ (
1527+ "\n\n\n\n\n", // Edge case of moving backwards in all newlines
1528+ vec![(1, Range::new(5, 5), Range::new(0, 0))],
1529+ ),
1530+ (" \n \nJumping back through alternated space blocks and newlines selects the space blocks",
1531+ vec![
1532+ (1, Range::new(0, 8), Range::new(7, 4)),
1533+ (1, Range::new(7, 4), Range::new(3, 0)),
1534+ ]),
1535+ ("ヒーリ..クス multibyte characters behave as normal characters, including when interacting with punctuation",
1536+ vec![
1537+ (1, Range::new(0, 8), Range::new(7, 0)),
1538+ ]),
1539+ ];
1540+
1541+ for (sample, scenario) in tests {
1542+ for (count, begin, expected_end) in scenario.into_iter() {
1543+ let range = move_prev_long_word_end(Rope::from(sample).slice(..), begin, count);
1544+ assert_eq!(range, expected_end, "Case failed: [{}]", sample);
1545+ }
1546+ }
1547+ }
1548+
14481549 #[test]
14491550 fn test_behaviour_when_moving_to_prev_paragraph_single() {
14501551 let tests = [