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

vim: Fix t operand not working correctly when cursor is on tag (#9899)

Browse source 
Fix #8994 and #9844 

Release notes:
* Fixed the `t` object in Vim mode not working correctly when cursor was
on a tag. #9844 and #8994

This mr fixes the above two problems, for #9844, because our previous
logic is to only think that the minimum html tag containing the current
cursor is qualified, but the approach of nvim is to get the tag after
the current cursor first, followed by the tag around the current cursor,
so I modified the corresponding condition

For #8994, the situation is a bit more complicated, in our previous
implementation, we could only get the range of the object by a `cursor
position`, but there are two possible cases for the html tag:
When the current cursor length is 1, nvim will return the first tag
after the current cursor, as described above
When the current cursor length is greater than 1, nvim will return just
the smallest tag that can cover the current selection

So we may need to pass the current selection to the inside of the
method, and the point alone is not enough to support us in calculating
these conditions
This commit is contained in:
Hans 2024-03-28 17:16:54 +08:00 • committed by GitHub
parent 96a1af7b0f
commit eaec04632a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 86 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -165,9 +165,10 @@ impl Object {
pub fn range(
self,
map: &DisplaySnapshot,
relative_to: DisplayPoint,
selection: Selection<DisplayPoint>,
around: bool,
) -> Option<Range<DisplayPoint>> {
let relative_to = selection.head();
match self {
Object::Word { ignore_punctuation } => {
if around {
@ -193,7 +194,7 @@ impl Object {
Object::Parentheses => {
surrounding_markers(map, relative_to, around, self.is_multiline(), '(', ')')
}
Object::Tag => surrounding_html_tag(map, relative_to, around),
Object::Tag => surrounding_html_tag(map, selection, around),
Object::SquareBrackets => {
surrounding_markers(map, relative_to, around, self.is_multiline(), '[', ']')
}
@ -213,7 +214,7 @@ impl Object {
selection: &mut Selection<DisplayPoint>,
around: bool,
) -> bool {
if let Some(range) = self.range(map, selection.head(), around) {
if let Some(range) = self.range(map, selection.clone(), around) {
selection.start = range.start;
selection.end = range.end;
true
@ -256,8 +257,8 @@ fn in_word(
fn surrounding_html_tag(
map: &DisplaySnapshot,
relative_to: DisplayPoint,
surround: bool,
selection: Selection<DisplayPoint>,
around: bool,
) -> Option<Range<DisplayPoint>> {
fn read_tag(chars: impl Iterator<Item = char>) -> String {
chars
@ -278,7 +279,7 @@ fn surrounding_html_tag(
}
let snapshot = &map.buffer_snapshot;
let offset = relative_to.to_offset(map, Bias::Left);
let offset = selection.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);
@ -298,11 +299,18 @@ fn surrounding_html_tag(
if let (Some(first_child), Some(last_child)) = (first_child, last_child) {
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()));
if open_tag.is_some()
&& open_tag == close_tag
&& (first_child.end_byte() + 1..last_child.start_byte()).contains(&offset)
// 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)
<= 1
{
let range = if surround {
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
};
if open_tag.is_some() && open_tag == close_tag && is_valid {
let range = if around {
first_child.byte_range().start..last_child.byte_range().end
} else {
first_child.byte_range().end..last_child.byte_range().start
@ -320,6 +328,7 @@ fn surrounding_html_tag(
}
None
}
/// Returns a range that surrounds the word and following whitespace
/// relative_to is in.
///
@ -1601,5 +1610,63 @@ mod test {
"<html><head></head>«<body><b>hi!</b></body>ˇ»",
Mode::Visual,
);
// The cursor is before the tag
cx.set_state(
"<html><head></head><body> ˇ <b>hi!</b></body>",
Mode::Normal,
);
cx.simulate_keystrokes(["v", "i", "t"]);
cx.assert_state(
"<html><head></head><body> <b>«hi!ˇ»</b></body>",
Mode::Visual,
);
cx.simulate_keystrokes(["a", "t"]);
cx.assert_state(
"<html><head></head><body> «<b>hi!</b>ˇ»</body>",
Mode::Visual,
);
// The cursor is in the open tag
cx.set_state(
"<html><head></head><body><bˇ>hi!</b><b>hello!</b></body>",
Mode::Normal,
);
cx.simulate_keystrokes(["v", "a", "t"]);
cx.assert_state(
"<html><head></head><body>«<b>hi!</b>ˇ»<b>hello!</b></body>",
Mode::Visual,
);
cx.simulate_keystrokes(["i", "t"]);
cx.assert_state(
"<html><head></head><body>«<b>hi!</b><b>hello!</b>ˇ»</body>",
Mode::Visual,
);
// current selection length greater than 1
cx.set_state(
"<html><head></head><body><«b>hi!ˇ»</b></body>",
Mode::Visual,
);
cx.simulate_keystrokes(["i", "t"]);
cx.assert_state(
"<html><head></head><body><b>«hi!ˇ»</b></body>",
Mode::Visual,
);
cx.simulate_keystrokes(["a", "t"]);
cx.assert_state(
"<html><head></head><body>«<b>hi!</b>ˇ»</body>",
Mode::Visual,
);
cx.set_state(
"<html><head></head><body><«b>hi!</ˇ»b></body>",
Mode::Visual,
);
cx.simulate_keystrokes(["a", "t"]);
cx.assert_state(
"<html><head></head>«<body><b>hi!</b></body>ˇ»",
Mode::Visual,
);
}
}