vim: Fix `c` when range ends in a multibyte character (#14139)

Conrad Irwin created 2 years ago

Release Notes:

- vim: Fixed `c <motion>` omitting trailing multibyte characters
([#13909](https://github.com/zed-industries/zed/issues/13909)).

Change summary

crates/vim/src/motion.rs                      |  2 +-
crates/vim/src/test.rs                        | 13 +++++++++++++
crates/vim/test_data/test_find_multibyte.json |  7 +++++++
3 files changed, 21 insertions(+), 1 deletion(-)

Detailed changes

crates/vim/src/motion.rs

@@ -890,7 +890,7 @@ impl Motion {
                 }
 
                 if inclusive && selection.end.column() < map.line_len(selection.end.row()) {
-                    *selection.end.column_mut() += 1;
+                    selection.end = movement::saturating_right(map, selection.end)
                 }
             }
             Some(selection.start..selection.end)

crates/vim/src/test.rs

@@ -1266,3 +1266,16 @@ async fn test_toggle_comments(cx: &mut gpui::TestAppContext) {
         Mode::Normal,
     );
 }
+
+#[gpui::test]
+async fn test_find_multibyte(cx: &mut gpui::TestAppContext) {
+    let mut cx = NeovimBackedTestContext::new(cx).await;
+
+    cx.set_shared_state(r#"<label for="guests">ˇPočet hostů</label>"#)
+        .await;
+
+    cx.simulate_shared_keystrokes("c t < o escape").await;
+    cx.shared_state()
+        .await
+        .assert_eq(r#"<label for="guests">ˇo</label>"#);
+}

crates/vim/test_data/test_find_multibyte.json

@@ -0,0 +1,7 @@
+{"Put":{"state":"<label for=\"guests\">ˇPočet hostů</label>"}}
+{"Key":"c"}
+{"Key":"t"}
+{"Key":"<"}
+{"Key":"o"}
+{"Key":"escape"}
+{"Get":{"state":"<label for=\"guests\">ˇo</label>","mode":"Normal"}}