vim: Fix e/E with inlay hints

Co-Authored-By: Sergey <sergey.b@hey.com> Fixes: #7046
zed-industries · May 9, 2024 · 7fd2ac2 · 7fd2ac2
1 parent ddaaaee
commit 7fd2ac2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs
@@ -721,6 +721,10 @@ impl DisplaySnapshot {
         DisplayPoint(clipped)
     }
 
+    pub fn clip_ignoring_line_ends(&self, point: DisplayPoint, bias: Bias) -> DisplayPoint {
+        DisplayPoint(self.block_snapshot.clip_point(point.0, bias))
+    }
+
     pub fn clip_at_line_end(&self, point: DisplayPoint) -> DisplayPoint {
         let mut point = point.0;
         if point.column == self.line_len(point.row) {

diff --git a/crates/vim/src/motion.rs b/crates/vim/src/motion.rs
@@ -1094,7 +1094,7 @@ pub(crate) fn next_char(
         *new_point.row_mut() += 1;
         *new_point.column_mut() = 0;
     }
-    new_point
+    map.clip_ignoring_line_ends(new_point, Bias::Right)
 }
 
 pub(crate) fn next_word_start(
@@ -1155,7 +1155,7 @@ pub(crate) fn next_word_end(
             },
         );
         let new_point = if need_next_char {
-            next_char(map, new_point, true)
+            next_char(map, point, allow_cross_newline)
         } else {
             new_point
         };