aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Tham2022-04-29 06:49:15 +0000
committerGitHub2022-04-29 06:49:15 +0000
commitab6a00e196832d3a2b942641f914a0c9727129e4 (patch)
tree7ef3cf83d276e01aa36b6df71a835e9b7b90b679
parente10cf0851633bba1424b9211932a624c0f4c9a72 (diff)
Make A-hjkl tree-sitter nav A-pion (#2205)
A-hl currently is not very consistent with hl when next object is selected, since it may go up/down or left/right and this behavior is confusing such that some people think it should swap the keys with A-jk, so it is better to use A-pn since that only specifies two direction. A-jk have the same issue as in it usually moves right and is not consistent with the behavior of jk so people may think A-hl is better, maybe A-oi is better here since A-hl will be swapped to A-pn, A-oi can convey the meaning of in and out, similar to some window manager keys?
-rw-r--r--book/src/keymap.md8
-rw-r--r--helix-term/src/keymap/default.rs8
2 files changed, 8 insertions, 8 deletions
diff --git a/book/src/keymap.md b/book/src/keymap.md
index 2abe4f74..77682a38 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -111,10 +111,10 @@
| `K` | Keep selections matching the regex | `keep_selections` |
| `Alt-K` | Remove selections matching the regex | `remove_selections` |
| `Ctrl-c` | Comment/uncomment the selections | `toggle_comments` |
-| `Alt-k`, `Alt-up` | Expand selection to parent syntax node (**TS**) | `expand_selection` |
-| `Alt-j`, `Alt-down` | Shrink syntax tree object selection (**TS**) | `shrink_selection` |
-| `Alt-h`, `Alt-left` | Select previous sibling node in syntax tree (**TS**) | `select_prev_sibling` |
-| `Alt-l`, `Alt-right` | Select next sibling node in syntax tree (**TS**) | `select_next_sibling` |
+| `Alt-o`, `Alt-up` | Expand selection to parent syntax node (**TS**) | `expand_selection` |
+| `Alt-i`, `Alt-down` | Shrink syntax tree object selection (**TS**) | `shrink_selection` |
+| `Alt-p`, `Alt-left` | Select previous sibling node in syntax tree (**TS**) | `select_prev_sibling` |
+| `Alt-n`, `Alt-right` | Select next sibling node in syntax tree (**TS**) | `select_next_sibling` |
### Search
diff --git a/helix-term/src/keymap/default.rs b/helix-term/src/keymap/default.rs
index 10a43d12..da5127b2 100644
--- a/helix-term/src/keymap/default.rs
+++ b/helix-term/src/keymap/default.rs
@@ -79,10 +79,10 @@ pub fn default() -> HashMap<Mode, Keymap> {
"S" => split_selection,
";" => collapse_selection,
"A-;" => flip_selections,
- "A-k" | "A-up" => expand_selection,
- "A-j" | "A-down" => shrink_selection,
- "A-h" | "A-left" => select_prev_sibling,
- "A-l" | "A-right" => select_next_sibling,
+ "A-o" | "A-up" => expand_selection,
+ "A-i" | "A-down" => shrink_selection,
+ "A-p" | "A-left" => select_prev_sibling,
+ "A-n" | "A-right" => select_next_sibling,
"%" => select_all,
"x" => extend_line,