29b9eed · helix · git.iko.soy

on master help sign in

Fix panic paint mysterious matching pair

29b9eedIvan Tham5 years ago

helix-term/src/ui/editor.rs+10−4

@@ -306,6 +306,7 @@ impl EditorView {

306 ),

307 cursor_style,

308 );

309+ // TODO: set cursor position for IME

309 if let Some(syntax) = doc.syntax() {

310 if let Some(syntax) = doc.syntax() {

310 use helix_core::match_brackets;

311 use helix_core::match_brackets;

311 let pos = doc.selection(view.id).cursor();

312 let pos = doc.selection(view.id).cursor();

@@ -313,10 +314,15 @@ impl EditorView {

313 if let Some(pos) = pos {

314 if let Some(pos) = pos {

314 let pos = view.screen_coords_at_pos(doc, text, pos);

315 let pos = view.screen_coords_at_pos(doc, text, pos);

315 if let Some(pos) = pos {

316 if let Some(pos) = pos {

317+ // this only prevents panic due to painting selection too far

318+ // TODO: prevent painting when scroll past x or in gutter

319+ // TODO: use a more correct width check

320+ if (pos.col as u16) < viewport.width {

316− let style = Style::default().add_modifier(Modifier::REVERSED);

321+ let style = Style::default().add_modifier(Modifier::REVERSED);

317− surface

322+ surface

318− .get_mut(pos.col as u16 + OFFSET, pos.row as u16)

323+ .get_mut(pos.col as u16 + OFFSET, pos.row as u16)

319− .set_style(style);

324+ .set_style(style);

325+ }

320 }

326 }

321 }

327 }

322 }

328 }