Mirrors
/
helix
mirror of https://github.com/helix-editor/helix
1
1
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Refactor {move,extend}_word_* commands

Browse Source
pull/712/head
Gokul Soumya 3 years ago committed by Blaž Hrastnik
parent ea2b4c687d
commit 33ce8779fd
1 changed files with 28 additions and 99 deletions
Show Stats Download Patch File Download Diff File

127
helix-term/src/commands.rs
Unescape Escape View File

@ -503,7 +503,10 @@ fn goto_window_bottom(cx: &mut Context) {
goto_window(cx, Align::Bottom) goto_window(cx, Align::Bottom)
} }
fn move_next_word_start(cx: &mut Context) { fn move_word_impl<F>(cx: &mut Context, move_fn: F)
where
F: Fn(RopeSlice, Range, usize) -> Range,
{
let count = cx.count(); let count = cx.count();
let (view, doc) = current!(cx.editor); let (view, doc) = current!(cx.editor);
let text = doc.text().slice(..); let text = doc.text().slice(..);
@ -511,68 +514,32 @@ fn move_next_word_start(cx: &mut Context) {
let selection = doc let selection = doc
.selection(view.id) .selection(view.id)
.clone() .clone()
.transform(|range| movement::move_next_word_start(text, range, count)); .transform(|range| move_fn(text, range, count));
doc.set_selection(view.id, selection); doc.set_selection(view.id, selection);
} }
fn move_prev_word_start(cx: &mut Context) { fn move_next_word_start(cx: &mut Context) {
let count = cx.count(); move_word_impl(cx, movement::move_next_word_start)
let (view, doc) = current!(cx.editor); }
let text = doc.text().slice(..);
let selection = doc fn move_prev_word_start(cx: &mut Context) {
.selection(view.id) move_word_impl(cx, movement::move_prev_word_start)
.clone()
.transform(|range| movement::move_prev_word_start(text, range, count));
doc.set_selection(view.id, selection);
} }
fn move_next_word_end(cx: &mut Context) { fn move_next_word_end(cx: &mut Context) {
let count = cx.count(); move_word_impl(cx, movement::move_next_word_end)
let (view, doc) = current!(cx.editor);
let text = doc.text().slice(..);
let selection = doc
.selection(view.id)
.clone()
.transform(|range| movement::move_next_word_end(text, range, count));
doc.set_selection(view.id, selection);
} }
fn move_next_long_word_start(cx: &mut Context) { fn move_next_long_word_start(cx: &mut Context) {
let count = cx.count(); move_word_impl(cx, movement::move_next_long_word_start)
let (view, doc) = current!(cx.editor);
let text = doc.text().slice(..);
let selection = doc
.selection(view.id)
.clone()
.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) { fn move_prev_long_word_start(cx: &mut Context) {
let count = cx.count(); move_word_impl(cx, movement::move_prev_long_word_start)
let (view, doc) = current!(cx.editor);
let text = doc.text().slice(..);
let selection = doc
.selection(view.id)
.clone()
.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) { fn move_next_long_word_end(cx: &mut Context) {
let count = cx.count(); move_word_impl(cx, movement::move_next_long_word_end)
let (view, doc) = current!(cx.editor);
let text = doc.text().slice(..);
let selection = doc
.selection(view.id)
.clone()
.transform(|range| movement::move_next_long_word_end(text, range, count));
doc.set_selection(view.id, selection);
} }
fn goto_file_start(cx: &mut Context) { fn goto_file_start(cx: &mut Context) {
@ -591,82 +558,44 @@ fn goto_file_end(cx: &mut Context) {
doc.set_selection(view.id, Selection::point(doc.text().len_chars())); doc.set_selection(view.id, Selection::point(doc.text().len_chars()));
} }
fn extend_next_word_start(cx: &mut Context) { fn extend_word_impl<F>(cx: &mut Context, extend_fn: F)
where
F: Fn(RopeSlice, Range, usize) -> Range,
{
let count = cx.count(); let count = cx.count();
let (view, doc) = current!(cx.editor); let (view, doc) = current!(cx.editor);
let text = doc.text().slice(..); let text = doc.text().slice(..);
let selection = doc.selection(view.id).clone().transform(|range| { let selection = doc.selection(view.id).clone().transform(|range| {
let word = movement::move_next_word_start(text, range, count); let word = extend_fn(text, range, count);
let pos = word.cursor(text); let pos = word.cursor(text);
range.put_cursor(text, pos, true) range.put_cursor(text, pos, true)
}); });
doc.set_selection(view.id, selection); doc.set_selection(view.id, selection);
} }
fn extend_prev_word_start(cx: &mut Context) { fn extend_next_word_start(cx: &mut Context) {
let count = cx.count(); extend_word_impl(cx, movement::move_next_word_start)
let (view, doc) = current!(cx.editor); }
let text = doc.text().slice(..);
let selection = doc.selection(view.id).clone().transform(|range| { fn extend_prev_word_start(cx: &mut Context) {
let word = movement::move_prev_word_start(text, range, count); extend_word_impl(cx, movement::move_prev_word_start)
let pos = word.cursor(text);
range.put_cursor(text, pos, true)
});
doc.set_selection(view.id, selection);
} }
fn extend_next_word_end(cx: &mut Context) { fn extend_next_word_end(cx: &mut Context) {
let count = cx.count(); extend_word_impl(cx, movement::move_next_word_end)
let (view, doc) = current!(cx.editor);
let text = doc.text().slice(..);
let selection = doc.selection(view.id).clone().transform(|range| {
let word = movement::move_next_word_end(text, range, count);
let pos = word.cursor(text);
range.put_cursor(text, pos, true)
});
doc.set_selection(view.id, selection);
} }
fn extend_next_long_word_start(cx: &mut Context) { fn extend_next_long_word_start(cx: &mut Context) {
let count = cx.count(); extend_word_impl(cx, movement::move_next_long_word_start)
let (view, doc) = current!(cx.editor);
let text = doc.text().slice(..);
let selection = doc.selection(view.id).clone().transform(|range| {
let word = movement::move_next_long_word_start(text, range, count);
let pos = word.cursor(text);
range.put_cursor(text, pos, true)
});
doc.set_selection(view.id, selection);
} }
fn extend_prev_long_word_start(cx: &mut Context) { fn extend_prev_long_word_start(cx: &mut Context) {
let count = cx.count(); extend_word_impl(cx, movement::move_prev_long_word_start)
let (view, doc) = current!(cx.editor);
let text = doc.text().slice(..);
let selection = doc.selection(view.id).clone().transform(|range| {
let word = movement::move_prev_long_word_start(text, range, count);
let pos = word.cursor(text);
range.put_cursor(text, pos, true)
});
doc.set_selection(view.id, selection);
} }
fn extend_next_long_word_end(cx: &mut Context) { fn extend_next_long_word_end(cx: &mut Context) {
let count = cx.count(); extend_word_impl(cx, movement::move_next_long_word_end)
let (view, doc) = current!(cx.editor);
let text = doc.text().slice(..);
let selection = doc.selection(view.id).clone().transform(|range| {
let word = movement::move_next_long_word_end(text, range, count);
let pos = word.cursor(text);
range.put_cursor(text, pos, true)
});
doc.set_selection(view.id, selection);
} }
#[inline] #[inline]

Write Preview
Loading…
Cancel
Save