aboutsummaryrefslogtreecommitdiff
path: root/helix-term
diff options
context:
space:
mode:
Diffstat (limited to 'helix-term')
-rw-r--r--helix-term/src/ui/editor.rs18
1 files changed, 16 insertions, 2 deletions
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index f47d6c26..8ce9cdc8 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -261,7 +261,16 @@ impl EditorView {
Rect::new(
viewport.x + start.col as u16,
viewport.y + start.row as u16,
- ((end.col - start.col) as u16 + 1).min(viewport.width),
+ // .min is important, because set_style does a
+ // for i in area.left()..area.right() and
+ // area.right = x + width !!! which shouldn't be > then surface.area.right()
+ // This is checked by a debug_assert! in Buffer::index_of
+ ((end.col - start.col) as u16 + 1).min(
+ surface
+ .area
+ .width
+ .saturating_sub(viewport.x + start.col as u16),
+ ),
1,
),
selection_style,
@@ -290,7 +299,12 @@ impl EditorView {
);
}
surface.set_style(
- Rect::new(viewport.x, viewport.y + end.row as u16, end.col as u16, 1),
+ Rect::new(
+ viewport.x,
+ viewport.y + end.row as u16,
+ (end.col as u16).min(viewport.width),
+ 1,
+ ),
selection_style,
);
}