Add extend variant of match_brackets command.

book/src/generated/static-cmd.md

@@ -257,7 +257,8 @@
 | `align_view_bottom` | Align view bottom | normal: `` Zb ``, `` zb ``, select: `` Zb ``, `` zb `` |
 | `scroll_up` | Scroll view up | normal: `` Zk ``, `` zk ``, `` Z<up> ``, `` z<up> ``, select: `` Zk ``, `` zk ``, `` Z<up> ``, `` z<up> `` |
 | `scroll_down` | Scroll view down | normal: `` Zj ``, `` zj ``, `` Z<down> ``, `` z<down> ``, select: `` Zj ``, `` zj ``, `` Z<down> ``, `` z<down> `` |
-| `match_brackets` | Goto matching bracket | normal: `` mm ``, select: `` mm `` |
+| `match_brackets` | Goto matching bracket | normal: `` mm `` |
+| `extend_brackets` | Extend to matching bracket | select: `` mm `` |
 | `surround_add` | Surround add | normal: `` ms ``, select: `` ms `` |
 | `surround_replace` | Surround replace | normal: `` mr ``, select: `` mr `` |
 | `surround_delete` | Surround delete | normal: `` md ``, select: `` md `` |

helix-term/src/commands.rs

@@ -560,6 +560,7 @@ impl MappableCommand {
         scroll_up, "Scroll view up",
         scroll_down, "Scroll view down",
         match_brackets, "Goto matching bracket",
+        extend_brackets, "Extend to matching bracket",
         surround_add, "Surround add",
         surround_replace, "Surround replace",
         surround_delete, "Surround delete",
@@ -5592,9 +5593,9 @@ fn select_all_children(cx: &mut Context) {
     cx.editor.apply_motion(motion);
 }
 
-fn match_brackets(cx: &mut Context) {
+fn match_brackets_impl(cx: &mut Context, movement: Movement) {
     let (view, doc) = current!(cx.editor);
-    let is_select = cx.editor.mode == Mode::Select;
+    let is_select = movement == Movement::Extend;
     let text = doc.text();
     let text_slice = text.slice(..);
 
@@ -5613,7 +5614,13 @@ fn match_brackets(cx: &mut Context) {
     doc.set_selection(view.id, selection);
 }
 
-//
+fn match_brackets(cx: &mut Context) {
+    match_brackets_impl(cx, Movement::Move);
+}
+
+fn extend_brackets(cx: &mut Context) {
+    match_brackets_impl(cx, Movement::Extend);
+}
 
 fn jump_forward(cx: &mut Context) {
     let count = cx.count();

helix-term/src/keymap/default.rs

@@ -377,6 +377,9 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
             "j" => extend_line_down,
             "w" => extend_to_word,
         },
+        "m" => { "Match"
+            "m" => extend_brackets,
+        },
     }));
     let insert = keymap!({ "Insert mode"
         "esc" => normal_mode,