@@ -361,27 +361,26 @@ impl EditorView {
361361 if let Some(syntax) = doc.syntax() {
362362 use helix_core::match_brackets;
363363 let pos = doc.selection(view.id).cursor();
364− let pos = match_brackets::find(syntax, doc.text(), pos);
364+ let pos = match_brackets::find(syntax, doc.text(), pos)
365+ .and_then(|pos| view.screen_coords_at_pos(doc, text, pos));
366+
365367 if let Some(pos) = pos {
366− let pos = view.screen_coords_at_pos(doc, text, pos);
367− if let Some(pos) = pos {
368− if (pos.col as u16) < viewport.width + view.first_col as u16
369− && pos.col >= view.first_col
370− {
371− let style =
372− theme.try_get("ui.cursor.match").unwrap_or_else(|| {
373− Style::default()
374− .add_modifier(Modifier::REVERSED)
375− .add_modifier(Modifier::DIM)
376− });
377−
378− surface
379− .get_mut(
380− viewport.x + pos.col as u16,
381− viewport.y + pos.row as u16,
382− )
383− .set_style(style);
384− }
368+ // ensure col is on screen
369+ if (pos.col as u16) < viewport.width + view.first_col as u16
370+ && pos.col >= view.first_col
371+ {
372+ let style = theme.try_get("ui.cursor.match").unwrap_or_else(|| {
373+ Style::default()
374+ .add_modifier(Modifier::REVERSED)
375+ .add_modifier(Modifier::DIM)
376+ });
377+
378+ surface
379+ .get_mut(
380+ viewport.x + pos.col as u16,
381+ viewport.y + pos.row as u16,
382+ )
383+ .set_style(style);
385384 }
386385 }
387386 }