feedback: address clippy complaints, and extract variables.

helix-editor · Oct 15, 2022 · 538f3f8 · 538f3f8
1 parent 7bbce6a
commit 538f3f8
Showing 1 changed file with 10 additions and 12 deletions.
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
@@ -4083,21 +4083,19 @@ fn match_brackets(cx: &mut Context) {
     let (view, doc) = current!(cx.editor);
 
     if let Some(syntax) = doc.syntax() {
-        let text = doc.text().slice(..);
+        let text = doc.text();
+        let text_slice = text.slice(..);
+        let is_select = cx.editor.mode == Mode::Select;
         let selection = doc.selection(view.id).clone().transform(|range| {
-            if let Some(pos) =
-                match_brackets::find_matching_bracket_fuzzy(syntax, doc.text(), range.cursor(text))
+            let pos = range.cursor(text_slice);
+            if let Some(pos) = match_brackets::find_matching_bracket_fuzzy(syntax, text, pos) {
+                range.put_cursor(text_slice, pos, is_select)
+            } else if let Some(pos) =
+                match_brackets::find_matching_bracket_current_line_plaintext(text, pos)
             {
-                range.put_cursor(text, pos, cx.editor.mode == Mode::Select)
+                range.put_cursor(text_slice, pos, is_select)
             } else {
-                if let Some(pos) = match_brackets::find_matching_bracket_current_line_plaintext(
-                    doc.text(),
-                    range.cursor(text),
-                ) {
-                    range.put_cursor(text, pos, cx.editor.mode == Mode::Select)
-                } else {
-                    range
-                }
+                range
             }
         });
         doc.set_selection(view.id, selection);