Add c and d operators to vim normal mode

Extracted motions from normal mode
Changed vim_submode to be vim_operator to enable better composition of operators

crates/vim/src/vim.rs

@@ -1,7 +1,8 @@
 mod editor_events;
 mod insert;
-mod mode;
+mod motion;
 mod normal;
+mod state;
 #[cfg(test)]
 mod vim_test_context;
 
@@ -10,41 +11,53 @@ use editor::{CursorShape, Editor};
 use gpui::{impl_actions, MutableAppContext, ViewContext, WeakViewHandle};
 use serde::Deserialize;
 
-use mode::Mode;
 use settings::Settings;
+use state::{Mode, Operator, VimState};
 use workspace::{self, Workspace};
 
 #[derive(Clone, Deserialize)]
 pub struct SwitchMode(pub Mode);
 
-impl_actions!(vim, [SwitchMode]);
+#[derive(Clone, Deserialize)]
+pub struct PushOperator(pub Operator);
+
+impl_actions!(vim, [SwitchMode, PushOperator]);
 
 pub fn init(cx: &mut MutableAppContext) {
     editor_events::init(cx);
     insert::init(cx);
-    normal::init(cx);
+    motion::init(cx);
 
-    cx.add_action(|_: &mut Workspace, action: &SwitchMode, cx| {
-        VimState::update_global(cx, |state, cx| state.switch_mode(action, cx))
+    cx.add_action(|_: &mut Workspace, &SwitchMode(mode): &SwitchMode, cx| {
+        Vim::update(cx, |vim, cx| vim.switch_mode(mode, cx))
     });
+    cx.add_action(
+        |_: &mut Workspace, &PushOperator(operator): &PushOperator, cx| {
+            Vim::update(cx, |vim, cx| vim.push_operator(operator, cx))
+        },
+    );
 
     cx.observe_global::<Settings, _>(|settings, cx| {
-        VimState::update_global(cx, |state, cx| state.set_enabled(settings.vim_mode, cx))
+        Vim::update(cx, |state, cx| state.set_enabled(settings.vim_mode, cx))
     })
     .detach();
 }
 
 #[derive(Default)]
-pub struct VimState {
+pub struct Vim {
     editors: HashMap<usize, WeakViewHandle<Editor>>,
     active_editor: Option<WeakViewHandle<Editor>>,
 
     enabled: bool,
-    mode: Mode,
+    state: VimState,
 }
 
-impl VimState {
-    fn update_global<F, S>(cx: &mut MutableAppContext, update: F) -> S
+impl Vim {
+    fn read(cx: &mut MutableAppContext) -> &Self {
+        cx.default_global()
+    }
+
+    fn update<F, S>(cx: &mut MutableAppContext, update: F) -> S
     where
         F: FnOnce(&mut Self, &mut MutableAppContext) -> S,
     {
@@ -62,33 +75,54 @@ impl VimState {
             .map(|ae| ae.update(cx, update))
     }
 
-    fn switch_mode(&mut self, SwitchMode(mode): &SwitchMode, cx: &mut MutableAppContext) {
-        self.mode = *mode;
+    fn switch_mode(&mut self, mode: Mode, cx: &mut MutableAppContext) {
+        self.state.mode = mode;
+        self.state.operator_stack.clear();
         self.sync_editor_options(cx);
     }
 
+    fn push_operator(&mut self, operator: Operator, cx: &mut MutableAppContext) {
+        self.state.operator_stack.push(operator);
+        self.sync_editor_options(cx);
+    }
+
+    fn pop_operator(&mut self, cx: &mut MutableAppContext) -> Operator {
+        let popped_operator = self.state.operator_stack.pop().expect("Operator popped when no operator was on the stack. This likely means there is an invalid keymap config");
+        self.sync_editor_options(cx);
+        popped_operator
+    }
+
+    fn clear_operator(&mut self, cx: &mut MutableAppContext) {
+        self.state.operator_stack.clear();
+        self.sync_editor_options(cx);
+    }
+
+    fn active_operator(&mut self) -> Option<Operator> {
+        self.state.operator_stack.last().copied()
+    }
+
     fn set_enabled(&mut self, enabled: bool, cx: &mut MutableAppContext) {
         if self.enabled != enabled {
             self.enabled = enabled;
-            self.mode = Default::default();
+            self.state = Default::default();
             if enabled {
-                self.mode = Mode::normal();
+                self.state.mode = Mode::Normal;
             }
             self.sync_editor_options(cx);
         }
     }
 
     fn sync_editor_options(&self, cx: &mut MutableAppContext) {
-        let mode = self.mode;
-        let cursor_shape = mode.cursor_shape();
+        let state = &self.state;
+        let cursor_shape = state.cursor_shape();
         for editor in self.editors.values() {
             if let Some(editor) = editor.upgrade(cx) {
                 editor.update(cx, |editor, cx| {
                     if self.enabled {
                         editor.set_cursor_shape(cursor_shape, cx);
                         editor.set_clip_at_line_ends(cursor_shape == CursorShape::Block, cx);
-                        editor.set_input_enabled(mode == Mode::Insert);
-                        let context_layer = mode.keymap_context_layer();
+                        editor.set_input_enabled(!state.vim_controlled());
+                        let context_layer = state.keymap_context_layer();
                         editor.set_keymap_context_layer::<Self>(context_layer);
                     } else {
                         editor.set_cursor_shape(CursorShape::Bar, cx);
@@ -104,12 +138,12 @@ impl VimState {
 
 #[cfg(test)]
 mod test {
-    use crate::{mode::Mode, vim_test_context::VimTestContext};
+    use crate::{state::Mode, vim_test_context::VimTestContext};
 
     #[gpui::test]
     async fn test_initially_disabled(cx: &mut gpui::TestAppContext) {
         let mut cx = VimTestContext::new(cx, false, "").await;
-        cx.simulate_keystrokes(&["h", "j", "k", "l"]);
+        cx.simulate_keystrokes(["h", "j", "k", "l"]);
         cx.assert_editor_state("hjkl|");
     }
 
@@ -122,22 +156,22 @@ mod test {
 
         // Editor acts as though vim is disabled
         cx.disable_vim();
-        cx.simulate_keystrokes(&["h", "j", "k", "l"]);
+        cx.simulate_keystrokes(["h", "j", "k", "l"]);
         cx.assert_editor_state("hjkl|");
 
         // Enabling dynamically sets vim mode again and restores normal mode
         cx.enable_vim();
-        assert_eq!(cx.mode(), Mode::normal());
-        cx.simulate_keystrokes(&["h", "h", "h", "l"]);
+        assert_eq!(cx.mode(), Mode::Normal);
+        cx.simulate_keystrokes(["h", "h", "h", "l"]);
         assert_eq!(cx.editor_text(), "hjkl".to_owned());
         cx.assert_editor_state("hj|kl");
-        cx.simulate_keystrokes(&["i", "T", "e", "s", "t"]);
+        cx.simulate_keystrokes(["i", "T", "e", "s", "t"]);
         cx.assert_editor_state("hjTest|kl");
 
         // Disabling and enabling resets to normal mode
         assert_eq!(cx.mode(), Mode::Insert);
         cx.disable_vim();
         cx.enable_vim();
-        assert_eq!(cx.mode(), Mode::normal());
+        assert_eq!(cx.mode(), Mode::Normal);
     }
 }