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

Refactor goto_ts_object_impl as a motion (#3264)

Browse source 
This refactor changes the overall structure of the goto_ts_object_impl
command without removing any functionality from its behavior. The
refactored motion:

* acts on all selections instead of reducing to one selection
* may be repeated with the `repeat_last_motion` (A-.) command
* informs the user when the syntax-tree is not accessible in the current buffer
This commit is contained in:
Michael Davis 2022-08-31 03:48:33 -05:00 • committed by GitHub
parent 7547a961bb
commit 83f177d270
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4251,26 +4251,33 @@ fn scroll_down(cx: &mut Context) {
scroll(cx, cx.count(), Direction::Forward); scroll(cx, cx.count(), Direction::Forward);
} }
fn goto_ts_object_impl(cx: &mut Context, object: &str, direction: Direction) { fn goto_ts_object_impl(cx: &mut Context, object: &'static str, direction: Direction) {
let count = cx.count(); let count = cx.count();
let (view, doc) = current!(cx.editor); let motion = move |editor: &mut Editor| {
let text = doc.text().slice(..); let (view, doc) = current!(editor);
let range = doc.selection(view.id).primary(); if let Some((lang_config, syntax)) = doc.language_config().zip(doc.syntax()) {
let text = doc.text().slice(..);
let root = syntax.tree().root_node();
let new_range = match doc.language_config().zip(doc.syntax()) { let selection = doc.selection(view.id).clone().transform(|range| {
Some((lang_config, syntax)) => movement::goto_treesitter_object( movement::goto_treesitter_object(
text, text,
range, range,
object, object,
direction, direction,
syntax.tree().root_node(), root,
lang_config, lang_config,
count, count,
), )
None => range, });
doc.set_selection(view.id, selection);
} else {
editor.set_status("Syntax-tree is not available in current buffer");
}
}; };
motion(cx.editor);
doc.set_selection(view.id, Selection::single(new_range.anchor, new_range.head)); cx.editor.last_motion = Some(Motion(Box::new(motion)));
} }
fn goto_next_function(cx: &mut Context) { fn goto_next_function(cx: &mut Context) {