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

Allow repeat in visual mode (#33569)

Browse source 
Release Notes:

- vim: Allow `.` in visual mode.
This commit is contained in:
Conrad Irwin 2025-06-30 14:04:28 -06:00 • committed by GitHub
parent b0086b472f
commit a2e786e0f9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 93 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

4
assets/keymaps/vim.json
View file

@ -210,7 +210,8 @@
"ctrl-w space": "editor::OpenExcerptsSplit", "ctrl-w space": "editor::OpenExcerptsSplit",
"ctrl-w g space": "editor::OpenExcerptsSplit", "ctrl-w g space": "editor::OpenExcerptsSplit",
"ctrl-6": "pane::AlternateFile", "ctrl-6": "pane::AlternateFile",
"ctrl-^": "pane::AlternateFile" "ctrl-^": "pane::AlternateFile",
".": "vim::Repeat"
} }
}, },
{ {
@ -219,7 +220,6 @@
"ctrl-[": "editor::Cancel", "ctrl-[": "editor::Cancel",
"escape": "editor::Cancel", "escape": "editor::Cancel",
":": "command_palette::Toggle", ":": "command_palette::Toggle",
".": "vim::Repeat",
"c": "vim::PushChange", "c": "vim::PushChange",
"shift-c": "vim::ChangeToEndOfLine", "shift-c": "vim::ChangeToEndOfLine",
"d": "vim::PushDelete", "d": "vim::PushDelete",

102
crates/vim/src/normal/repeat.rs
View file

@ -245,61 +245,63 @@ impl Vim {
}) else { }) else {
return; return;
}; };
if let Some(mode) = mode { if mode != Some(self.mode) {
self.switch_mode(mode, false, window, cx) if let Some(mode) = mode {
} self.switch_mode(mode, false, window, cx)
}
match selection { match selection {
RecordedSelection::SingleLine { cols } => { RecordedSelection::SingleLine { cols } => {
if cols > 1 { if cols > 1 {
self.visual_motion(Motion::Right, Some(cols as usize - 1), window, cx) self.visual_motion(Motion::Right, Some(cols as usize - 1), window, cx)
}
} }
} RecordedSelection::Visual { rows, cols } => {
RecordedSelection::Visual { rows, cols } => { self.visual_motion(
self.visual_motion( Motion::Down {
Motion::Down { display_lines: false,
display_lines: false, },
}, Some(rows as usize),
Some(rows as usize), window,
window, cx,
cx, );
); self.visual_motion(
self.visual_motion( Motion::StartOfLine {
Motion::StartOfLine { display_lines: false,
display_lines: false, },
}, None,
None, window,
window, cx,
cx, );
); if cols > 1 {
if cols > 1 { self.visual_motion(Motion::Right, Some(cols as usize - 1), window, cx)
self.visual_motion(Motion::Right, Some(cols as usize - 1), window, cx) }
} }
} RecordedSelection::VisualBlock { rows, cols } => {
RecordedSelection::VisualBlock { rows, cols } => { self.visual_motion(
self.visual_motion( Motion::Down {
Motion::Down { display_lines: false,
display_lines: false, },
}, Some(rows as usize),
Some(rows as usize), window,
window, cx,
cx, );
); if cols > 1 {
if cols > 1 { self.visual_motion(Motion::Right, Some(cols as usize - 1), window, cx);
self.visual_motion(Motion::Right, Some(cols as usize - 1), window, cx); }
} }
RecordedSelection::VisualLine { rows } => {
self.visual_motion(
Motion::Down {
display_lines: false,
},
Some(rows as usize),
window,
cx,
);
}
RecordedSelection::None => {}
} }
RecordedSelection::VisualLine { rows } => {
self.visual_motion(
Motion::Down {
display_lines: false,
},
Some(rows as usize),
window,
cx,
);
}
RecordedSelection::None => {}
} }
// insert internally uses repeat to handle counts // insert internally uses repeat to handle counts

39
crates/vim/src/test.rs
View file

@ -2071,3 +2071,42 @@ async fn test_paragraph_multi_delete(cx: &mut gpui::TestAppContext) {
cx.simulate_shared_keystrokes("4 d a p").await; cx.simulate_shared_keystrokes("4 d a p").await;
cx.shared_state().await.assert_eq(indoc! {"ˇ"}); cx.shared_state().await.assert_eq(indoc! {"ˇ"});
} }
#[gpui::test]
async fn test_multi_cursor_replay(cx: &mut gpui::TestAppContext) {
let mut cx = VimTestContext::new(cx, true).await;
cx.set_state(
indoc! {
"
oˇne one one
two two two
"
},
Mode::Normal,
);
cx.simulate_keystrokes("3 g l s wow escape escape");
cx.assert_state(
indoc! {
"
woˇw wow wow
two two two
"
},
Mode::Normal,
);
cx.simulate_keystrokes("2 j 3 g l .");
cx.assert_state(
indoc! {
"
wow wow wow
woˇw woˇw woˇw
"
},
Mode::Normal,
);
}