Nathan Sobo
daf999c3be
Also: Make some structural adjustments to remove the need for defer. Instead of accessing the global in associated VimState functions, have a single method that allows us to call update instance methods.
31 lines
986 B
Rust
31 lines
986 B
Rust
use editor::Bias;
|
|
use gpui::{action, keymap::Binding, MutableAppContext, ViewContext};
|
|
use language::SelectionGoal;
|
|
use workspace::Workspace;
|
|
|
|
use crate::{mode::Mode, SwitchMode, VimState};
|
|
|
|
action!(NormalBefore);
|
|
|
|
pub fn init(cx: &mut MutableAppContext) {
|
|
let context = Some("Editor && vim_mode == insert");
|
|
cx.add_bindings(vec![
|
|
Binding::new("escape", NormalBefore, context),
|
|
Binding::new("ctrl-c", NormalBefore, context),
|
|
]);
|
|
|
|
cx.add_action(normal_before);
|
|
}
|
|
|
|
fn normal_before(_: &mut Workspace, _: &NormalBefore, cx: &mut ViewContext<Workspace>) {
|
|
VimState::update_global(cx, |state, cx| {
|
|
state.update_active_editor(cx, |editor, cx| {
|
|
editor.move_cursors(cx, |map, mut cursor, _| {
|
|
*cursor.column_mut() = cursor.column().saturating_sub(1);
|
|
(map.clip_point(cursor, Bias::Left), SelectionGoal::None)
|
|
});
|
|
});
|
|
state.switch_mode(&SwitchMode(Mode::Normal), cx);
|
|
})
|
|
}
|