TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix panic paint mysterious matching pair

Browse source 
When the matching pair is out of bounds it still paints it causing an
out of bound panic. A dirty fix since it still have some issue, at least
it does not panic now.
This commit is contained in:
Ivan Tham 2021-06-04 01:46:32 +08:00 committed by Blaž Hrastnik
parent fdb5bfafae
commit 29b9eed33c
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
helix-term/src/ui/editor.rs
View file

@ -306,6 +306,7 @@ pub fn render_buffer(
),
cursor_style,
);
// TODO: set cursor position for IME
if let Some(syntax) = doc.syntax() {
use helix_core::match_brackets;
let pos = doc.selection(view.id).cursor();
@ -313,10 +314,15 @@ pub fn render_buffer(
if let Some(pos) = pos {
let pos = view.screen_coords_at_pos(doc, text, pos);
if let Some(pos) = pos {
let style = Style::default().add_modifier(Modifier::REVERSED);
surface
.get_mut(pos.col as u16 + OFFSET, pos.row as u16)
.set_style(style);
// this only prevents panic due to painting selection too far
// TODO: prevent painting when scroll past x or in gutter
// TODO: use a more correct width check
if (pos.col as u16) < viewport.width {
let style = Style::default().add_modifier(Modifier::REVERSED);
surface
.get_mut(pos.col as u16 + OFFSET, pos.row as u16)
.set_style(style);
}
}
}
}