Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vim: Enable % to jump between tags (#20536)

Browse source 
Closes #12986

Release Notes:

- Enable `%` to jump between pairs of tags

---------

Co-authored-by: Harrison <hrouillard@sfi.com.au>
This commit is contained in:
hrou0003 2024-11-15 06:41:53 +11:00 • committed by GitHub
parent 189a034e71
commit f0882f44a7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 159 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
crates/vim/src/object.rs
View file

@ -204,7 +204,11 @@ impl Object {
Object::Parentheses => {
surrounding_markers(map, relative_to, around, self.is_multiline(), '(', ')')
}
Object::Tag => surrounding_html_tag(map, selection, around),
Object::Tag => {
let head = selection.head();
let range = selection.range();
surrounding_html_tag(map, head, range, around)
}
Object::SquareBrackets => {
surrounding_markers(map, relative_to, around, self.is_multiline(), '[', ']')
}
@ -262,9 +266,10 @@ fn in_word(
Some(start..end)
}
fn surrounding_html_tag(
pub fn surrounding_html_tag(
map: &DisplaySnapshot,
selection: Selection<DisplayPoint>,
head: DisplayPoint,
range: Range<DisplayPoint>,
around: bool,
) -> Option<Range<DisplayPoint>> {
fn read_tag(chars: impl Iterator<Item = char>) -> String {
@ -286,7 +291,7 @@ fn surrounding_html_tag(
}
let snapshot = &map.buffer_snapshot;
let offset = selection.head().to_offset(map, Bias::Left);
let offset = head.to_offset(map, Bias::Left);
let excerpt = snapshot.excerpt_containing(offset..offset)?;
let buffer = excerpt.buffer();
let offset = excerpt.map_offset_to_buffer(offset);
@ -307,14 +312,14 @@ fn surrounding_html_tag(
let open_tag = open_tag(buffer.chars_for_range(first_child.byte_range()));
let close_tag = close_tag(buffer.chars_for_range(last_child.byte_range()));
// It needs to be handled differently according to the selection length
let is_valid = if selection.end.to_offset(map, Bias::Left)
- selection.start.to_offset(map, Bias::Left)
let is_valid = if range.end.to_offset(map, Bias::Left)
- range.start.to_offset(map, Bias::Left)
<= 1
{
offset <= last_child.end_byte()
} else {
selection.start.to_offset(map, Bias::Left) >= first_child.start_byte()
&& selection.end.to_offset(map, Bias::Left) <= last_child.start_byte() + 1
range.start.to_offset(map, Bias::Left) >= first_child.start_byte()
&& range.end.to_offset(map, Bias::Left) <= last_child.start_byte() + 1
};
if open_tag.is_some() && open_tag == close_tag && is_valid {
let range = if around {