Merge pull request #1392 from zed-industries/mouse-vim-mode-clipping

Fixup Clipping at Line Ends when Selecting with the Mouse in Vim Mode
2022-07-20 13:39:24 -07:00
parent d76cdb01be a77cf914ec
commit d34d6ea184
9 changed files with 39 additions and 45 deletions
@@ -1643,12 +1643,12 @@ impl PaintState {
        } else {
            0
        };
-        let column_overshoot = (0f32.max(x - line.width()) / layout.em_advance) as u32;

-        (
-            DisplayPoint::new(row, column),
-            DisplayPoint::new(row_overshoot, column_overshoot),
-        )
+        let point = snapshot.clip_point(DisplayPoint::new(row, column), Bias::Left);
+        let mut column_overshoot = (0f32.max(x - line.width()) / layout.em_advance) as u32;
+        column_overshoot = column_overshoot + column - point.column();
+
+        (point, DisplayPoint::new(row_overshoot, column_overshoot))
    }
 }