mirror/ helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix synced 2024-06-01 07:46:05 +02:00
Code Issues

Implement selection rotation with `(` and `)`

This commit is contained in:
Blaž Hrastnik 2021-08-06 11:22:01 +09:00
parent 953125d3f3
commit 66a90130a5
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
book/src/keymap.md
View File

@ -76,6 +76,8 @@ ### Selection manipulation
| `Alt-;` | Flip selection cursor and anchor |
| `C` | Copy selection onto the next line |
| `Alt-C` | Copy selection onto the previous line |
| `(` | Rotate main selection forward |
| `)` | Rotate main selection backward |
| `%` | Select entire file |
| `x` | Select current line, if already selected, extend to next line |
| `X` | Extend selection to line bounds (line-wise selection) |

21
helix-term/src/commands.rs
View File

@ -275,6 +275,8 @@ pub fn doc(&self) -> &'static str {
completion, "Invoke completion popup",
hover, "Show docs for item under cursor",
toggle_comments, "Comment/uncomment selections",
rotate_selections_forward, "Rotate selections forward",
rotate_selections_backward, "Rotate selections backward",
expand_selection, "Expand selection to parent syntax node",
jump_forward, "Jump forward on jumplist",
jump_backward, "Jump backward on jumplist",
@ -3747,6 +3749,25 @@ fn toggle_comments(cx: &mut Context) {
doc.append_changes_to_history(view.id);
}
fn rotate_selections(cx: &mut Context, direction: Direction) {
let count = cx.count();
let (view, doc) = current!(cx.editor);
let mut selection = doc.selection(view.id).clone();
let index = selection.primary_index();
let len = selection.len();
selection.set_primary_index(match direction {
Direction::Forward => (index + count) % len,
Direction::Backward => (index + (len.saturating_sub(count) % len)) % len,
});
doc.set_selection(view.id, selection);
}
fn rotate_selections_forward(cx: &mut Context) {
rotate_selections(cx, Direction::Forward)
}
fn rotate_selections_backward(cx: &mut Context) {
rotate_selections(cx, Direction::Backward)
}
// tree sitter node selection
fn expand_selection(cx: &mut Context) {

6
helix-term/src/keymap.rs
View File

@ -451,7 +451,8 @@ fn default() -> Keymaps {
// & align selections
// _ trim selections
// C / altC = copy (repeat) selections on prev/next lines
"(" => rotate_selections_backward,
")" => rotate_selections_forward,
"esc" => normal_mode,
"C-b" | "pageup" => page_up,
@ -508,9 +509,6 @@ fn default() -> Keymaps {
"\"" => select_register,
"C-z" => suspend,
});
// TODO: decide whether we want normal mode to also be select mode (kakoune-like), or whether
// we keep this separate select mode. More keys can fit into normal mode then, but it's weird
// because some selection operations can now be done from normal mode, some from select mode.
let mut select = normal.clone();
select.merge_nodes(keymap!({ "Select mode"
"h" | "left" => extend_char_left,