TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Support extend for multiple goto (#909)

Browse source 
gg, ge, [n]gg
This commit is contained in:
Ivan Tham 2021-10-29 09:07:07 +08:00 • committed by GitHub
parent befecc8a9a
commit 21d535565b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
helix-term/src/commands.rs
View file

@ -622,14 +622,25 @@ fn goto_file_start(cx: &mut Context) {
} else { } else {
push_jump(cx.editor); push_jump(cx.editor);
let (view, doc) = current!(cx.editor); let (view, doc) = current!(cx.editor);
doc.set_selection(view.id, Selection::point(0)); let text = doc.text().slice(..);
let selection = doc
.selection(view.id)
.clone()
.transform(|range| range.put_cursor(text, 0, doc.mode == Mode::Select));
doc.set_selection(view.id, selection);
} }
} }
fn goto_file_end(cx: &mut Context) { fn goto_file_end(cx: &mut Context) {
push_jump(cx.editor); push_jump(cx.editor);
let (view, doc) = current!(cx.editor); let (view, doc) = current!(cx.editor);
doc.set_selection(view.id, Selection::point(doc.text().len_chars())); let text = doc.text().slice(..);
let pos = doc.text().len_chars();
let selection = doc
.selection(view.id)
.clone()
.transform(|range| range.put_cursor(text, pos, doc.mode == Mode::Select));
doc.set_selection(view.id, selection);
} }
fn extend_word_impl<F>(cx: &mut Context, extend_fn: F) fn extend_word_impl<F>(cx: &mut Context, extend_fn: F)
@ -2905,8 +2916,13 @@ fn goto_line(cx: &mut Context) {
doc.text().len_lines() - 1 doc.text().len_lines() - 1
}; };
let line_idx = std::cmp::min(count.get() - 1, max_line); let line_idx = std::cmp::min(count.get() - 1, max_line);
let text = doc.text().slice(..);
let pos = doc.text().line_to_char(line_idx); let pos = doc.text().line_to_char(line_idx);
doc.set_selection(view.id, Selection::point(pos)); let selection = doc
.selection(view.id)
.clone()
.transform(|range| range.put_cursor(text, pos, doc.mode == Mode::Select));
doc.set_selection(view.id, selection);
} }
} }
@ -2920,8 +2936,13 @@ fn goto_last_line(cx: &mut Context) {
} else { } else {
doc.text().len_lines() - 1 doc.text().len_lines() - 1
}; };
let text = doc.text().slice(..);
let pos = doc.text().line_to_char(line_idx); let pos = doc.text().line_to_char(line_idx);
doc.set_selection(view.id, Selection::point(pos)); let selection = doc
.selection(view.id)
.clone()
.transform(|range| range.put_cursor(text, pos, doc.mode == Mode::Select));
doc.set_selection(view.id, selection);
} }
fn goto_last_accessed_file(cx: &mut Context) { fn goto_last_accessed_file(cx: &mut Context) {