Add unimpaired navigation with comment textobjects after helix-editor…

…#1619 merged
EpocSquadron · Mar 4, 2022 · d1d620f · d1d620f
1 parent 4bce969
commit d1d620f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/book/src/keymap.md b/book/src/keymap.md
@@ -270,6 +270,8 @@ Mappings in the style of [vim-unimpaired](https://github.com/tpope/vim-unimpaire
 | `[c`     | Go to previous class (**TS**)                | `goto_prev_class`     |
 | `]p`     | Go to next parameter (**TS**)                | `goto_next_parameter` |
 | `[p`     | Go to previous parameter (**TS**)            | `goto_prev_parameter` |
+| `]o`     | Go to next comment (**TS**)                  | `goto_next_comment`   |
+| `[o`     | Go to previous comment (**TS**)              | `goto_prev_comment`   |
 | `[space` | Add newline above                            | `add_newline_above`   |
 | `]space` | Add newline below                            | `add_newline_below`   |
 

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
@@ -401,6 +401,8 @@ impl MappableCommand {
         goto_prev_class, "Goto previous class",
         goto_next_parameter, "Goto next parameter",
         goto_prev_parameter, "Goto previous parameter",
+        goto_next_comment, "Goto next comment",
+        goto_prev_comment, "Goto previous comment",
         dap_launch, "Launch debug target",
         dap_toggle_breakpoint, "Toggle breakpoint",
         dap_continue, "Continue program execution",
@@ -5380,6 +5382,14 @@ fn goto_prev_parameter(cx: &mut Context) {
     goto_ts_object_impl(cx, "parameter", Direction::Backward)
 }
 
+fn goto_next_comment(cx: &mut Context) {
+    goto_ts_object_impl(cx, "comment", Direction::Forward)
+}
+
+fn goto_prev_comment(cx: &mut Context) {
+    goto_ts_object_impl(cx, "comment", Direction::Backward)
+}
+
 fn select_textobject_around(cx: &mut Context) {
     select_textobject(cx, textobject::TextObject::Around);
 }

diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
@@ -608,6 +608,7 @@ impl Default for Keymaps {
                 "f" => goto_prev_function,
                 "c" => goto_prev_class,
                 "p" => goto_prev_parameter,
+                "o" => goto_prev_comment,
                 "space" => add_newline_above,
             },
             "]" => { "Right bracket"
@@ -616,6 +617,7 @@ impl Default for Keymaps {
                 "f" => goto_next_function,
                 "c" => goto_next_class,
                 "p" => goto_next_parameter,
+                "o" => goto_next_comment,
                 "space" => add_newline_below,
             },