Add word and line movement in vim normal mode
Add jump to start and end of the document Move vim tests to relevant vim files Rename VimTestAppContext to VimTestContext for brevity Improve VimTestContext assertions to pretty print locations when selection position assertion panics
This commit is contained in:
parent
3ae5fc74c9
commit
a7a52ef3f7
10 changed files with 766 additions and 278 deletions
82
crates/vim/src/normal/g_prefix.rs
Normal file
82
crates/vim/src/normal/g_prefix.rs
Normal file
|
@ -0,0 +1,82 @@
|
|||
use gpui::{action, keymap::Binding, MutableAppContext, ViewContext};
|
||||
use workspace::Workspace;
|
||||
|
||||
use crate::{mode::Mode, SwitchMode, VimState};
|
||||
|
||||
action!(MoveToStart);
|
||||
|
||||
pub fn init(cx: &mut MutableAppContext) {
|
||||
let context = Some("Editor && vim_mode == normal && vim_sub_mode == g");
|
||||
cx.add_bindings(vec![
|
||||
Binding::new("g", MoveToStart, context),
|
||||
Binding::new("escape", SwitchMode(Mode::normal()), context),
|
||||
]);
|
||||
|
||||
cx.add_action(move_to_start);
|
||||
}
|
||||
|
||||
fn move_to_start(_: &mut Workspace, _: &MoveToStart, cx: &mut ViewContext<Workspace>) {
|
||||
VimState::update_global(cx, |state, cx| {
|
||||
state.update_active_editor(cx, |editor, cx| {
|
||||
editor.move_to_beginning(&editor::MoveToBeginning, cx);
|
||||
});
|
||||
state.switch_mode(&SwitchMode(Mode::normal()), cx);
|
||||
})
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod test {
|
||||
use indoc::indoc;
|
||||
|
||||
use crate::{
|
||||
mode::{Mode, NormalState},
|
||||
vim_test_context::VimTestContext,
|
||||
};
|
||||
|
||||
#[gpui::test]
|
||||
async fn test_g_prefix_and_abort(cx: &mut gpui::TestAppContext) {
|
||||
let mut cx = VimTestContext::new(cx, true, "").await;
|
||||
|
||||
// Can abort with escape to get back to normal mode
|
||||
cx.simulate_keystroke("g");
|
||||
assert_eq!(cx.mode(), Mode::Normal(NormalState::GPrefix));
|
||||
cx.simulate_keystroke("escape");
|
||||
assert_eq!(cx.mode(), Mode::normal());
|
||||
}
|
||||
|
||||
#[gpui::test]
|
||||
async fn test_move_to_start(cx: &mut gpui::TestAppContext) {
|
||||
let initial_content = indoc! {"
|
||||
The quick
|
||||
|
||||
brown fox jumps
|
||||
over the lazy dog"};
|
||||
let mut cx = VimTestContext::new(cx, true, initial_content).await;
|
||||
|
||||
// Jump to the end to
|
||||
cx.simulate_keystroke("shift-G");
|
||||
cx.assert_editor_state(indoc! {"
|
||||
The quick
|
||||
|
||||
brown fox jumps
|
||||
over the lazy do|g"});
|
||||
|
||||
// Jump to the start
|
||||
cx.simulate_keystrokes(&["g", "g"]);
|
||||
cx.assert_editor_state(indoc! {"
|
||||
|The quick
|
||||
|
||||
brown fox jumps
|
||||
over the lazy dog"});
|
||||
assert_eq!(cx.mode(), Mode::normal());
|
||||
|
||||
// Repeat action doesn't change
|
||||
cx.simulate_keystrokes(&["g", "g"]);
|
||||
cx.assert_editor_state(indoc! {"
|
||||
|The quick
|
||||
|
||||
brown fox jumps
|
||||
over the lazy dog"});
|
||||
assert_eq!(cx.mode(), Mode::normal());
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue