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

vim: Fix visual object expands (#28301)

Browse source 
Closes #28198

Release Notes:

- Fixed visual object expands
This commit is contained in:
0x2CA 2025-04-08 22:51:41 +08:00 • committed by GitHub
parent 61b7a05792
commit b04f7a4c7c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 80 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

68
crates/vim/src/visual.rs
View file

@ -386,8 +386,20 @@ impl Vim {
|| movement::right(map, selection.start) == selection.end; || movement::right(map, selection.start) == selection.end;
if expand_both_ways { if expand_both_ways {
if selection.start == range.start
&& selection.end == range.end
&& object.always_expands_both_ways()
{
if let Some(range) =
object.range(map, selection.clone(), around)
{
selection.start = range.start; selection.start = range.start;
selection.end = range.end; selection.end = range.end;
}
} else {
selection.start = range.start;
selection.end = range.end;
}
} else if selection.reversed { } else if selection.reversed {
selection.start = range.start; selection.start = range.start;
} else { } else {
@ -1419,6 +1431,62 @@ mod test {
.assert_eq("«ˇhello in a word» again."); .assert_eq("«ˇhello in a word» again.");
} }
#[gpui::test]
async fn test_visual_object_expands(cx: &mut gpui::TestAppContext) {
let mut cx = NeovimBackedTestContext::new(cx).await;
cx.set_shared_state(indoc! {
"{
{
ˇ }
}
{
}
"
})
.await;
cx.simulate_shared_keystrokes("v l").await;
cx.shared_state().await.assert_eq(indoc! {
"{
{
« }ˇ»
}
{
}
"
});
cx.simulate_shared_keystrokes("a {").await;
cx.shared_state().await.assert_eq(indoc! {
"{
«{
}ˇ»
}
{
}
"
});
cx.simulate_shared_keystrokes("a {").await;
cx.shared_state().await.assert_eq(indoc! {
"«{
{
}
}ˇ»
{
}
"
});
// cx.simulate_shared_keystrokes("a {").await;
// cx.shared_state().await.assert_eq(indoc! {
// "{
// «{
// }ˇ»
// }
// {
// }
// "
// });
}
#[gpui::test] #[gpui::test]
async fn test_mode_across_command(cx: &mut gpui::TestAppContext) { async fn test_mode_across_command(cx: &mut gpui::TestAppContext) {
let mut cx = VimTestContext::new(cx, true).await; let mut cx = VimTestContext::new(cx, true).await;

10
crates/vim/test_data/test_visual_object_expands.json Normal file
View file

@ -0,0 +1,10 @@
{"Put":{"state":"{\n {\n ˇ }\n}\n{\n}\n"}}
{"Key":"v"}
{"Key":"l"}
{"Get":{"state":"{\n {\n « }ˇ»\n}\n{\n}\n","mode":"Visual"}}
{"Key":"a"}
{"Key":"{"}
{"Get":{"state":"{\n «{\n }ˇ»\n}\n{\n}\n","mode":"Visual"}}
{"Key":"a"}
{"Key":"{"}
{"Get":{"state":"«{\n {\n }\n}ˇ»\n{\n}\n","mode":"Visual"}}