aboutsummaryrefslogtreecommitdiff
path: root/helix-term/src
diff options
context:
space:
mode:
authornosa2022-12-06 01:13:41 +0000
committerGitHub2022-12-06 01:13:41 +0000
commit7210c58a51a16c0ae3c9d77211ed1a25e039bd9e (patch)
treee56f7bdd7e7a37a48e5af1bf381a7d1b7ef03727 /helix-term/src
parent5691ada822a7c6e27f8890ee25f52a9262caddd2 (diff)
Change default TS object bindings (#3782)
* Change default TS object bindings Changes 'match inside/around' bindings for: - type definition from `c` to `t` - comments from `o` to `c` - tests from `t` to `T` Also changes those for the `]` / `[` bindings. * Update docs for changed keybinds Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
Diffstat (limited to 'helix-term/src')
-rw-r--r--helix-term/src/commands.rs16
-rw-r--r--helix-term/src/keymap/default.rs12
2 files changed, 14 insertions, 14 deletions
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 4cd27119..31a2f582 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -402,8 +402,8 @@ impl MappableCommand {
select_textobject_inner, "Select inside object",
goto_next_function, "Goto next function",
goto_prev_function, "Goto previous function",
- goto_next_class, "Goto next class",
- goto_prev_class, "Goto previous class",
+ goto_next_class, "Goto next type definition",
+ goto_prev_class, "Goto previous type definition",
goto_next_parameter, "Goto next parameter",
goto_prev_parameter, "Goto previous parameter",
goto_next_comment, "Goto next comment",
@@ -4520,11 +4520,11 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {
match ch {
'w' => textobject::textobject_word(text, range, objtype, count, false),
'W' => textobject::textobject_word(text, range, objtype, count, true),
- 'c' => textobject_treesitter("class", range),
+ 't' => textobject_treesitter("class", range),
'f' => textobject_treesitter("function", range),
'a' => textobject_treesitter("parameter", range),
- 'o' => textobject_treesitter("comment", range),
- 't' => textobject_treesitter("test", range),
+ 'c' => textobject_treesitter("comment", range),
+ 'T' => textobject_treesitter("test", range),
'p' => textobject::textobject_paragraph(text, range, objtype, count),
'm' => textobject::textobject_pair_surround_closest(
text, range, objtype, count,
@@ -4552,11 +4552,11 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {
("w", "Word"),
("W", "WORD"),
("p", "Paragraph"),
- ("c", "Class (tree-sitter)"),
+ ("t", "Type definition (tree-sitter)"),
("f", "Function (tree-sitter)"),
("a", "Argument/parameter (tree-sitter)"),
- ("o", "Comment (tree-sitter)"),
- ("t", "Test (tree-sitter)"),
+ ("c", "Comment (tree-sitter)"),
+ ("T", "Test (tree-sitter)"),
("m", "Closest surrounding pair to cursor"),
(" ", "... or any character acting as a pair"),
];
diff --git a/helix-term/src/keymap/default.rs b/helix-term/src/keymap/default.rs
index c0d17a87..b6d9ea10 100644
--- a/helix-term/src/keymap/default.rs
+++ b/helix-term/src/keymap/default.rs
@@ -101,10 +101,10 @@ pub fn default() -> HashMap<Mode, Keymap> {
"d" => goto_prev_diag,
"D" => goto_first_diag,
"f" => goto_prev_function,
- "c" => goto_prev_class,
+ "t" => goto_prev_class,
"a" => goto_prev_parameter,
- "o" => goto_prev_comment,
- "t" => goto_prev_test,
+ "c" => goto_prev_comment,
+ "T" => goto_prev_test,
"p" => goto_prev_paragraph,
"space" => add_newline_above,
},
@@ -112,10 +112,10 @@ pub fn default() -> HashMap<Mode, Keymap> {
"d" => goto_next_diag,
"D" => goto_last_diag,
"f" => goto_next_function,
- "c" => goto_next_class,
+ "t" => goto_next_class,
"a" => goto_next_parameter,
- "o" => goto_next_comment,
- "t" => goto_next_test,
+ "c" => goto_next_comment,
+ "T" => goto_next_test,
"p" => goto_next_paragraph,
"space" => add_newline_below,
},