Skip to content

Commit

Permalink
Incorporate long word commands into keymap
Browse files Browse the repository at this point in the history
  • Loading branch information
PabloMansanet committed Jun 29, 2021
1 parent fcca647 commit 41a9e1b
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 0 deletions.
39 changes: 39 additions & 0 deletions helix-term/src/commands.rs
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,9 @@ impl Command {
move_next_word_start,
move_prev_word_start,
move_next_word_end,
move_next_long_word_start,
move_prev_long_word_start,
move_next_long_word_end,
move_file_start,
move_file_end,
extend_next_word_start,
Expand Down Expand Up @@ -434,6 +437,42 @@ fn move_next_word_end(cx: &mut Context) {
doc.set_selection(view.id, selection);
}

fn move_next_long_word_start(cx: &mut Context) {
let count = cx.count();
let (view, doc) = current!(cx.editor);
let text = doc.text().slice(..);

let selection = doc
.selection(view.id)
.transform(|range| movement::move_next_long_word_start(text, range, count));

doc.set_selection(view.id, selection);
}

fn move_prev_long_word_start(cx: &mut Context) {
let count = cx.count();
let (view, doc) = current!(cx.editor);
let text = doc.text().slice(..);

let selection = doc
.selection(view.id)
.transform(|range| movement::move_prev_long_word_start(text, range, count));

doc.set_selection(view.id, selection);
}

fn move_next_long_word_end(cx: &mut Context) {
let count = cx.count();
let (view, doc) = current!(cx.editor);
let text = doc.text().slice(..);

let selection = doc
.selection(view.id)
.transform(|range| movement::move_next_long_word_end(text, range, count));

doc.set_selection(view.id, selection);
}

fn move_file_start(cx: &mut Context) {
push_jump(cx.editor);
let (view, doc) = current!(cx.editor);
Expand Down
4 changes: 4 additions & 0 deletions helix-term/src/keymap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,10 @@ impl Default for Keymaps {
key!('b') => Command::move_prev_word_start,
key!('e') => Command::move_next_word_end,

key!('W') => Command::move_next_long_word_start,
key!('B') => Command::move_prev_long_word_start,
key!('E') => Command::move_next_long_word_end,

key!('v') => Command::select_mode,
key!('g') => Command::goto_mode,
key!(':') => Command::command_mode,
Expand Down

0 comments on commit 41a9e1b

Please sign in to comment.