aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGokul Soumya2022-03-07 07:46:14 +0000
committerGitHub2022-03-07 07:46:14 +0000
commitb0aaf089958f59b3d7a1eb03dbb46db8f9a2b914 (patch)
tree490163616352b31fd21876160b36b0795379e801
parent79caa7b72bef94bd820758b2ebc20887324f7416 (diff)
Change parameter object keybind from `p` to `a` (#1708)
This is largely to avoid a collision with the soon to be merged paragraph object which takes up the p key.
-rw-r--r--book/src/keymap.md4
-rw-r--r--book/src/usage.md2
-rw-r--r--helix-term/src/commands.rs4
-rw-r--r--helix-term/src/keymap.rs4
4 files changed, 7 insertions, 7 deletions
diff --git a/book/src/keymap.md b/book/src/keymap.md
index 2549fbaf..f9e0824e 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -268,8 +268,8 @@ Mappings in the style of [vim-unimpaired](https://github.com/tpope/vim-unimpaire
| `[f` | Go to previous function (**TS**) | `goto_prev_function` |
| `]c` | Go to next class (**TS**) | `goto_next_class` |
| `[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` |
+| `]a` | Go to next argument/parameter (**TS**) | `goto_next_parameter` |
+| `[a` | Go to previous argument/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` |
diff --git a/book/src/usage.md b/book/src/usage.md
index 9ae1eac5..010e30f5 100644
--- a/book/src/usage.md
+++ b/book/src/usage.md
@@ -68,7 +68,7 @@ Currently supported: `word`, `surround`, `function`, `class`, `parameter`.
| `(`, `[`, `'`, etc | Specified surround pairs |
| `f` | Function |
| `c` | Class |
-| `p` | Parameter |
+| `a` | Argument/parameter |
| `o` | Comment |
> NOTE: `f`, `c`, etc need a tree-sitter grammar active for the current
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 45ab7659..0052b43e 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3965,7 +3965,7 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {
'W' => textobject::textobject_word(text, range, objtype, count, true),
'c' => textobject_treesitter("class", range),
'f' => textobject_treesitter("function", range),
- 'p' => textobject_treesitter("parameter", range),
+ 'a' => textobject_treesitter("parameter", range),
'o' => textobject_treesitter("comment", range),
'm' => {
let ch = text.char(range.cursor(text));
@@ -3999,7 +3999,7 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {
("W", "WORD"),
("c", "Class (tree-sitter)"),
("f", "Function (tree-sitter)"),
- ("p", "Parameter (tree-sitter)"),
+ ("a", "Argument/parameter (tree-sitter)"),
("o", "Comment (tree-sitter)"),
("m", "Matching delimiter under cursor"),
(" ", "... or any character acting as a pair"),
diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index a5a615f3..a203b4e2 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -607,7 +607,7 @@ impl Default for Keymaps {
"D" => goto_first_diag,
"f" => goto_prev_function,
"c" => goto_prev_class,
- "p" => goto_prev_parameter,
+ "a" => goto_prev_parameter,
"o" => goto_prev_comment,
"space" => add_newline_above,
},
@@ -616,7 +616,7 @@ impl Default for Keymaps {
"D" => goto_last_diag,
"f" => goto_next_function,
"c" => goto_next_class,
- "p" => goto_next_parameter,
+ "a" => goto_next_parameter,
"o" => goto_next_comment,
"space" => add_newline_below,
},