git.iko.soy/helix
on master help sign in
Add documentation for surround
753ed4cGokul Soumya
book/src/keymap.md+14−2
compare with master
unifiedsplit
@@ -21,7 +21,6 @@
21| `F` | Find previous char |
21| `F` | Find previous char |
22| `Home` | Move to the start of the line |
22| `Home` | Move to the start of the line |
23| `End` | Move to the end of the line |
23| `End` | Move to the end of the line |
24−| `m` | Jump to matching bracket |
25| `PageUp` | Move page up |
24| `PageUp` | Move page up |
26| `PageDown` | Move page down |
25| `PageDown` | Move page down |
27| `Ctrl-u` | Move half page up |
26| `Ctrl-u` | Move half page up |
@@ -30,6 +29,7 @@
30| `Ctrl-o` | Jump backward on the jumplist |
29| `Ctrl-o` | Jump backward on the jumplist |
31| `v` | Enter [select (extend) mode](#select--extend-mode) |
30| `v` | Enter [select (extend) mode](#select--extend-mode) |
32| `g` | Enter [goto mode](#goto-mode) |
31| `g` | Enter [goto mode](#goto-mode) |
32+| `m` | Enter [match mode](#match-mode)
33| `:` | Enter command mode |
33| `:` | Enter command mode |
34| `z` | Enter [view mode](#view-mode) |
34| `z` | Enter [view mode](#view-mode) |
35| `Ctrl-w` | Enter [window mode](#window-mode) (maybe will be remove for spc w w later) |
35| `Ctrl-w` | Enter [window mode](#window-mode) (maybe will be remove for spc w w later) |
@@ -70,7 +70,7 @@
70| `Alt-;` | Flip selection cursor and anchor |
70| `Alt-;` | Flip selection cursor and anchor |
71| `%` | Select entire file |
71| `%` | Select entire file |
72| `x` | Select current line, if already selected, extend to next line |
72| `x` | Select current line, if already selected, extend to next line |
73−| `` | Expand selection to parent syntax node TODO: pick a key |
73+| | Expand selection to parent syntax node TODO: pick a key |
74| `J` | join lines inside selection |
74| `J` | join lines inside selection |
75| `K` | keep selections matching the regex TODO: overlapped by hover help |
75| `K` | keep selections matching the regex TODO: overlapped by hover help |
76| `Space` | keep only the primary selection TODO: overlapped by space mode |
76| `Space` | keep only the primary selection TODO: overlapped by space mode |
@@ -144,6 +144,18 @@ Jumps to various locations.
144| `i` | Go to implementation |
144| `i` | Go to implementation |
145| `a` | Go to the last accessed/alternate file |
145| `a` | Go to the last accessed/alternate file |
146
146
147+## Match mode
148+
149+Enter this mode using `m` from normal mode. See the relavant section
150+in [Usage](./usage.md#surround) for an explanation about surround usage.
151+
152+| Key | Description |
153+| ----- | ----------- |
154+| `m` | Goto matching bracket |
155+| `s` `<char>` | Surround current selection with `<char>` |
156+| `r` `<from><to>` | Replace surround character `<from>` with `<to>` |
157+| `d` `<char>` | Delete surround character `<char>` |
158+
147## Object mode
159## Object mode
148
160
149TODO: Mappings for selecting syntax nodes (a superset of `[`).
161TODO: Mappings for selecting syntax nodes (a superset of `[`).
book/src/usage.md+25
@@ -1 +1,26 @@
1# Usage
1# Usage
2+
3+(Currently not fully documented, see the [keymappings](./keymap.md) list for more.)
4+
5+## Surround
6+
7+Functionality similar to [vim-surround](https://github.com/tpope/vim-surround) is built into
8+helix. The keymappings have been inspired from [vim-sandwich](https://github.com/machakann/vim-sandwich):
9+
10+![surround demo](https://user-images.githubusercontent.com/23398472/122865801-97073180-d344-11eb-8142-8f43809982c6.gif)
11+
12+- `ms` - Add surround characters
13+- `mr` - Replace surround characters
14+- `md` - Delete surround characters
15+
16+`ms` acts on a selection, so select the text first and use `ms<char>`. `mr` and `md` work
17+on the closest pairs found and selections are not required; use counts to act in outer pairs.
18+
19+It can also act on multiple seletions (yay!). For example, to change every occurance of `(use)` to `[use]`:
20+
21+- `%` to select the whole file
22+- `s` to split the selections on a search term
23+- Input `use` and hit Enter
24+- `mr([` to replace the parens with square brackets
25+
26+Multiple characters are currently not supported, but planned.
helix-term/src/commands.rs+1−1
@@ -3324,7 +3324,7 @@ fn surround(cx: &mut Context) {
3324 cx.count = count;
3324 cx.count = count;
3325 match ch {
3325 match ch {
3326 'm' => match_brackets(cx),
3326 'm' => match_brackets(cx),
3327− 'a' => surround_add(cx),
3327+ 's' => surround_add(cx),
3328 'r' => surround_replace(cx),
3328 'r' => surround_replace(cx),
3329 'd' => {
3329 'd' => {
3330 surround_delete(cx);
3330 surround_delete(cx);