mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-28 20:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Add yss operation support for vim surrounds: (#11084)

Browse source 
The Motion::CurrentLine operation will contain the newline of the
current line, so we need to deal with this edge case



Release Notes:

- N/A
This commit is contained in:
Hans 2024-04-30 09:38:14 +08:00 committed by GitHub
parent ad44237467
commit 4fad96b179
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 50 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
assets/keymaps/vim.json
View file

@ -435,6 +435,12 @@
]
}
},
{
"context": "Editor && vim_operator == ys",
"bindings": {
"s": "vim::CurrentLine"
}
},
{
"context": "Editor && VimObject",
"bindings": {

52
crates/vim/src/surrounds.rs
View file

@ -1,5 +1,5 @@
use crate::{motion::Motion, object::Object, state::Mode, Vim};
use editor::{scroll::Autoscroll, Bias};
use editor::{movement, scroll::Autoscroll, Bias};
use gpui::WindowContext;
use language::BracketPair;
use serde::Deserialize;
@ -47,13 +47,32 @@ pub fn add_surrounds(text: Arc<str>, target: SurroundsType, cx: &mut WindowConte
SurroundsType::Object(object) => {
object.range(&display_map, selection.clone(), false)
}
SurroundsType::Motion(motion) => motion.range(
&display_map,
selection.clone(),
Some(1),
true,
&text_layout_details,
),
SurroundsType::Motion(motion) => {
let range = motion
.range(
&display_map,
selection.clone(),
Some(1),
true,
&text_layout_details,
)
.map(|mut range| {
// The Motion::CurrentLine operation will contain the newline of the current line,
// so we need to deal with this edge case
if let Motion::CurrentLine = motion {
let offset = range.end.to_offset(&display_map, Bias::Left);
if let Some((last_ch, _)) =
display_map.reverse_buffer_chars_at(offset).next()
{
if last_ch == '\n' {
range.end = movement::left(&display_map, range.end);
}
}
}
range
});
range
}
};
if let Some(range) = range {
@ -591,6 +610,23 @@ mod test {
the laˇ1zy dog.1"},
Mode::Normal,
);
// test add surrounds with motion current line
cx.set_state(
indoc! {"
The quˇick brown
fox jumps over
the lazy dog."},
Mode::Normal,
);
cx.simulate_keystrokes(["y", "s", "s", "{"]);
cx.assert_state(
indoc! {"
ˇ{ The quick brown }
fox jumps over
the lazy dog."},
Mode::Normal,
);
}
#[gpui::test]