mirror of
https://github.com/helix-editor/helix.git
synced 2024-09-11 18:58:00 +03:00
Use requested direction for new textobject selection range
This changes the behavior of operations like `]f`/`[f` to set the direction of the new range to the direction of the action. The original behavior was to always use the head of the next function. This is inconsistent with the behavior of goto_next_paragraph and makes it impossible to create extend variants of the textobject motions. This causes a behavior change when there are nested functions. The behavior in the parent commit is that repeated uses of `]f` will select every function in the file even if nested. With this commit, functions are skipped. It's notable that it's possible to emulate the original behavior by using the `ensure_selections_forward` (A-:) command between invocations of `]f`.
This commit is contained in:
parent
f3958aa1fd
commit
274f2ea459
@ -389,6 +389,8 @@ fn reached_target(target: WordMotionTarget, prev_ch: char, next_ch: char) -> boo
|
||||
}
|
||||
}
|
||||
|
||||
/// Finds the range of the next or previous textobject in the syntax sub-tree of `node`.
|
||||
/// Returns the range in the forwards direction.
|
||||
pub fn goto_treesitter_object(
|
||||
slice: RopeSlice,
|
||||
range: Range,
|
||||
@ -419,8 +421,8 @@ pub fn goto_treesitter_object(
|
||||
.filter(|n| n.start_byte() > byte_pos)
|
||||
.min_by_key(|n| n.start_byte())?,
|
||||
Direction::Backward => nodes
|
||||
.filter(|n| n.start_byte() < byte_pos)
|
||||
.max_by_key(|n| n.start_byte())?,
|
||||
.filter(|n| n.end_byte() < byte_pos)
|
||||
.max_by_key(|n| n.end_byte())?,
|
||||
};
|
||||
|
||||
let len = slice.len_bytes();
|
||||
@ -434,7 +436,7 @@ pub fn goto_treesitter_object(
|
||||
let end_char = slice.byte_to_char(end_byte);
|
||||
|
||||
// head of range should be at beginning
|
||||
Some(Range::new(end_char, start_char))
|
||||
Some(Range::new(start_char, end_char))
|
||||
};
|
||||
(0..count).fold(range, |range, _| get_range(range).unwrap_or(range))
|
||||
}
|
||||
|
@ -122,7 +122,7 @@ pub fn direction(&self) -> Direction {
|
||||
}
|
||||
}
|
||||
|
||||
// flips the direction of the selection
|
||||
/// Flips the direction of the selection
|
||||
pub fn flip(&self) -> Self {
|
||||
Self {
|
||||
anchor: self.head,
|
||||
@ -131,6 +131,16 @@ pub fn flip(&self) -> Self {
|
||||
}
|
||||
}
|
||||
|
||||
/// Returns the selection if it goes in the direction of `direction`,
|
||||
/// flipping the selection otherwise.
|
||||
pub fn with_direction(self, direction: Direction) -> Self {
|
||||
if self.direction() == direction {
|
||||
self
|
||||
} else {
|
||||
self.flip()
|
||||
}
|
||||
}
|
||||
|
||||
/// Check two ranges for overlap.
|
||||
#[must_use]
|
||||
pub fn overlaps(&self, other: &Self) -> bool {
|
||||
|
@ -4294,6 +4294,7 @@ fn goto_ts_object_impl(cx: &mut Context, object: &'static str, direction: Direct
|
||||
lang_config,
|
||||
count,
|
||||
)
|
||||
.with_direction(direction)
|
||||
});
|
||||
|
||||
doc.set_selection(view.id, selection);
|
||||
|
Loading…
Reference in New Issue
Block a user