mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-04 19:37:54 +03:00
Code Issues Projects Releases Packages Wiki Activity

feat: allow reverse repeat for expand / shrink selection

Browse source
This commit is contained in:
Will Bush 2025-02-21 21:53:05 -06:00
parent c29f1ee1ad
commit 46465f1440
1 changed files with 49 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5311,49 +5311,65 @@ fn reverse_selection_contents(cx: &mut Context) {
// tree sitter node selection // tree sitter node selection
fn expand_selection(cx: &mut Context) { fn expand_selection(cx: &mut Context) {
let motion = |editor: &mut Editor, _mode: MotionMode, _move_override: Option<Movement>| { selection_motion(cx, Direction::Forward);
let (view, doc) = current!(editor); }
if let Some(syntax) = doc.syntax() { fn shrink_selection(cx: &mut Context) {
let text = doc.text().slice(..); selection_motion(cx, Direction::Backward);
}
let current_selection = doc.selection(view.id); fn selection_motion(cx: &mut Context, direction: Direction) {
let selection = object::expand_selection(syntax, text, current_selection.clone()); let motion = move |editor: &mut Editor, mode: MotionMode, _move_override: Option<Movement>| {
let direction = match mode {
// check if selection is different from the last one MotionMode::Normal => direction,
if *current_selection != selection { MotionMode::Reverse => direction.reverse(),
// save current selection so it can be restored using shrink_selection };
view.object_selections.push(current_selection.clone()); match direction {
Direction::Forward => expand_selection_impl(editor),
doc.set_selection(view.id, selection); Direction::Backward => shrink_selection_impl(editor),
}
} }
}; };
cx.editor.apply_motion(motion); cx.editor.apply_motion(motion);
} }
fn shrink_selection(cx: &mut Context) { fn expand_selection_impl(editor: &mut Editor) {
let motion = |editor: &mut Editor, _mode: MotionMode, _move_override: Option<Movement>| { let (view, doc) = current!(editor);
let (view, doc) = current!(editor);
if let Some(syntax) = doc.syntax() {
let text = doc.text().slice(..);
let current_selection = doc.selection(view.id); let current_selection = doc.selection(view.id);
// try to restore previous selection let selection = object::expand_selection(syntax, text, current_selection.clone());
if let Some(prev_selection) = view.object_selections.pop() {
if current_selection.contains(&prev_selection) { // check if selection is different from the last one
doc.set_selection(view.id, prev_selection); if *current_selection != selection {
return; // save current selection so it can be restored using shrink_selection
} else { view.object_selections.push(current_selection.clone());
// clear existing selection as they can't be shrunk to anyway
view.object_selections.clear();
}
}
// if not previous selection, shrink to first child
if let Some(syntax) = doc.syntax() {
let text = doc.text().slice(..);
let selection = object::shrink_selection(syntax, text, current_selection.clone());
doc.set_selection(view.id, selection); doc.set_selection(view.id, selection);
} }
}; }
cx.editor.apply_motion(motion); }
fn shrink_selection_impl(editor: &mut Editor) {
let (view, doc) = current!(editor);
let current_selection = doc.selection(view.id);
if let Some(prev_selection) = view.object_selections.pop() {
if current_selection.contains(&prev_selection) {
doc.set_selection(view.id, prev_selection);
return;
} else {
// clear existing selection as they can't be shrunk to anyway
view.object_selections.clear();
}
}
// try to restore previous selection
// if not previous selection, shrink to first child
if let Some(syntax) = doc.syntax() {
let text = doc.text().slice(..);
let selection = object::shrink_selection(syntax, text, current_selection.clone());
doc.set_selection(view.id, selection);
}
} }
fn select_sibling_impl(cx: &mut Context, direction: Direction) { fn select_sibling_impl(cx: &mut Context, direction: Direction) {