diff options
| -rw-r--r-- | helix-core/src/textobject.rs | 12 | ||||
| -rw-r--r-- | helix-term/src/commands.rs | 8 |
2 files changed, 11 insertions, 9 deletions
diff --git a/helix-core/src/textobject.rs b/helix-core/src/textobject.rs index ee06bf47..76c6d103 100644 --- a/helix-core/src/textobject.rs +++ b/helix-core/src/textobject.rs @@ -198,26 +198,26 @@ pub fn textobject_paragraph( Range::new(anchor, head) } -pub fn textobject_surround( +pub fn textobject_pair_surround( slice: RopeSlice, range: Range, textobject: TextObject, ch: char, count: usize, ) -> Range { - textobject_surround_impl(slice, range, textobject, Some(ch), count) + textobject_pair_surround_impl(slice, range, textobject, Some(ch), count) } -pub fn textobject_surround_closest( +pub fn textobject_pair_surround_closest( slice: RopeSlice, range: Range, textobject: TextObject, count: usize, ) -> Range { - textobject_surround_impl(slice, range, textobject, None, count) + textobject_pair_surround_impl(slice, range, textobject, None, count) } -fn textobject_surround_impl( +fn textobject_pair_surround_impl( slice: RopeSlice, range: Range, textobject: TextObject, @@ -562,7 +562,7 @@ mod test { let slice = doc.slice(..); for &case in scenario { let (pos, objtype, expected_range, ch, count) = case; - let result = textobject_surround(slice, Range::point(pos), objtype, ch, count); + let result = textobject_pair_surround(slice, Range::point(pos), objtype, ch, count); assert_eq!( result, expected_range.into(), diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs index f1cc5966..ae50ed7c 100644 --- a/helix-term/src/commands.rs +++ b/helix-term/src/commands.rs @@ -4332,10 +4332,12 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) { 'o' => textobject_treesitter("comment", range), 't' => textobject_treesitter("test", range), 'p' => textobject::textobject_paragraph(text, range, objtype, count), - 'm' => textobject::textobject_surround_closest(text, range, objtype, count), + 'm' => textobject::textobject_pair_surround_closest( + text, range, objtype, count, + ), // TODO: cancel new ranges if inconsistent surround matches across lines ch if !ch.is_ascii_alphanumeric() => { - textobject::textobject_surround(text, range, objtype, ch, count) + textobject::textobject_pair_surround(text, range, objtype, ch, count) } _ => range, } @@ -4361,7 +4363,7 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) { ("a", "Argument/parameter (tree-sitter)"), ("o", "Comment (tree-sitter)"), ("t", "Test (tree-sitter)"), - ("m", "Matching delimiter under cursor"), + ("m", "Closest surrounding pair to cursor"), (" ", "... or any character acting as a pair"), ]; |