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

vim: Fix cursor restoration when undoing substitute

Browse source
This commit is contained in:
Conrad Irwin 2023-06-26 20:20:47 -06:00
parent 3f4a06f576
commit 77dc22bff6
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
crates/vim/src/normal/substitute.rs
View file

@ -6,14 +6,14 @@ use crate::{motion::Motion, Mode, Vim};
pub fn substitute(vim: &mut Vim, count: Option<usize>, cx: &mut WindowContext) { pub fn substitute(vim: &mut Vim, count: Option<usize>, cx: &mut WindowContext) {
vim.update_active_editor(cx, |editor, cx| { vim.update_active_editor(cx, |editor, cx| {
editor.set_clip_at_line_ends(false, cx); editor.set_clip_at_line_ends(false, cx);
editor.change_selections(None, cx, |s| {
s.move_with(|map, selection| {
if selection.start == selection.end {
Motion::Right.expand_selection(map, selection, count, true);
}
})
});
editor.transact(cx, |editor, cx| { editor.transact(cx, |editor, cx| {
editor.change_selections(None, cx, |s| {
s.move_with(|map, selection| {
if selection.start == selection.end {
Motion::Right.expand_selection(map, selection, count, true);
}
})
});
let selections = editor.selections.all::<Point>(cx); let selections = editor.selections.all::<Point>(cx);
for selection in selections.into_iter().rev() { for selection in selections.into_iter().rev() {
editor.buffer().update(cx, |buffer, cx| { editor.buffer().update(cx, |buffer, cx| {
@ -63,7 +63,11 @@ mod test {
// it handles multibyte characters // it handles multibyte characters
cx.set_state(indoc! {"ˇcàfé\n"}, Mode::Normal); cx.set_state(indoc! {"ˇcàfé\n"}, Mode::Normal);
cx.simulate_keystrokes(["4", "s", "x"]); cx.simulate_keystrokes(["4", "s"]);
cx.assert_editor_state("xˇ\n"); cx.assert_editor_state("ˇ\n");
// should transactionally undo selection changes
cx.simulate_keystrokes(["escape", "u"]);
cx.assert_editor_state("ˇcàfé\n");
} }
} }