Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

expand_selection_around #6198

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
+929 −104
Open

expand_selection_around #6198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bc8ee85
backfill expand/shrink tests
dead10ck Mar 1, 2023
5e1b730
Add TreeRecursiveWalker
dead10ck Apr 7, 2024
b43a808
shrink_selection without history selects first contained child
dead10ck Feb 26, 2023
f44b51e
Add Selection::{overlaps,without} and fix contains
dead10ck Feb 24, 2023
9e47397
Generalize View::object_selections into map
dead10ck Oct 9, 2022
c76d4a4
feat(command): expand_selection_around
dead10ck Oct 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 39 additions & 65 deletions helix-core/src/object.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,31 +25,49 @@ pub fn expand_selection(syntax: &Syntax, text: RopeSlice, selection: Selection)
}

pub fn shrink_selection(syntax: &Syntax, text: RopeSlice, selection: Selection) -> Selection {
select_node_impl(
syntax,
text,
selection,
|cursor| {
cursor.goto_first_child();
},
None,
)
selection.transform(move |range| {
let (from, to) = range.into_byte_range(text);
let mut cursor = syntax.walk();
cursor.reset_to_byte_range(from, to);

if let Some(node) = cursor.first_contained_child(&range, text) {
return Range::from_node(node, text, range.direction());
}

range
})
}

pub fn select_next_sibling(syntax: &Syntax, text: RopeSlice, selection: Selection) -> Selection {
select_node_impl(
syntax,
text,
selection,
|cursor| {
while !cursor.goto_next_sibling() {
if !cursor.goto_parent() {
break;
}
selection.transform(move |range| {
let (from, to) = range.into_byte_range(text);
let mut cursor = syntax.walk();
cursor.reset_to_byte_range(from, to);

while !cursor.goto_next_sibling() {
if !cursor.goto_parent() {
return range;
}
}

Range::from_node(cursor.node(), text, Direction::Forward)
})
}

pub fn select_prev_sibling(syntax: &Syntax, text: RopeSlice, selection: Selection) -> Selection {
selection.transform(move |range| {
let (from, to) = range.into_byte_range(text);
let mut cursor = syntax.walk();
cursor.reset_to_byte_range(from, to);

while !cursor.goto_prev_sibling() {
if !cursor.goto_parent() {
return range;
}
},
Some(Direction::Forward),
)
}

Range::from_node(cursor.node(), text, Direction::Backward)
})
}

pub fn select_all_siblings(syntax: &Syntax, text: RopeSlice, selection: Selection) -> Selection {
Expand Down Expand Up @@ -91,47 +109,3 @@ fn select_children<'n>(
vec![range]
}
}

pub fn select_prev_sibling(syntax: &Syntax, text: RopeSlice, selection: Selection) -> Selection {
select_node_impl(
syntax,
text,
selection,
|cursor| {
while !cursor.goto_prev_sibling() {
if !cursor.goto_parent() {
break;
}
}
},
Some(Direction::Backward),
)
}

fn select_node_impl<F>(
syntax: &Syntax,
text: RopeSlice,
selection: Selection,
motion: F,
direction: Option<Direction>,
) -> Selection
where
F: Fn(&mut TreeCursor),
{
let cursor = &mut syntax.walk();

selection.transform(|range| {
let from = text.char_to_byte(range.from());
let to = text.char_to_byte(range.to());

cursor.reset_to_byte_range(from, to);

motion(cursor);

let node = cursor.node();
let from = text.byte_to_char(node.start_byte());
let to = text.byte_to_char(node.end_byte());

Range::new(from, to).with_direction(direction.unwrap_or_else(|| range.direction()))
})
}
Loading
Loading