ui: Simplify conditional

helix-term/src/ui/editor.rs

@@ -361,15 +361,15 @@ impl EditorView {
                     if let Some(syntax) = doc.syntax() {
                         use helix_core::match_brackets;
                         let pos = doc.selection(view.id).cursor();
-                        let pos = match_brackets::find(syntax, doc.text(), pos);
+                        let pos = match_brackets::find(syntax, doc.text(), pos)
-                        if let Some(pos) = pos {
+                            .and_then(|pos| view.screen_coords_at_pos(doc, text, pos));
-                            let pos = view.screen_coords_at_pos(doc, text, pos);
+
                         if let Some(pos) = pos {
+                            // ensure col is on screen
                             if (pos.col as u16) < viewport.width + view.first_col as u16
                                 && pos.col >= view.first_col
                             {
-                                    let style =
+                                let style = theme.try_get("ui.cursor.match").unwrap_or_else(|| {
-                                        theme.try_get("ui.cursor.match").unwrap_or_else(|| {
                                     Style::default()
                                         .add_modifier(Modifier::REVERSED)
                                         .add_modifier(Modifier::DIM)
@@ -388,7 +388,6 @@ impl EditorView {
             }
         }
     }
-    }
 
     pub fn render_diagnostics(
         &self,