vim: ctrl-r while we're on a register kick (#13085)

Release Notes:

- vim: Support `ctrl-r X` to paste in insert mode (#4308)

crates/vim/src/insert.rs

@@ -16,6 +16,11 @@ pub fn register(workspace: &mut Workspace, _: &mut ViewContext<Workspace>) {
 
 fn normal_before(_: &mut Workspace, action: &NormalBefore, cx: &mut ViewContext<Workspace>) {
     let should_repeat = Vim::update(cx, |vim, cx| {
+        if vim.state().active_operator().is_some() {
+            vim.update_state(|state| state.operator_stack.clear());
+            vim.sync_vim_settings(cx);
+            return false;
+        }
         let count = vim.take_count(cx).unwrap_or(1);
         vim.stop_recording_immediately(action.boxed_clone());
         if count <= 1 || vim.workspace_state.replaying {
@@ -66,30 +71,24 @@ mod test {
 
         cx.set_shared_state("ˇhello\n").await;
         cx.simulate_shared_keystrokes("5 i - escape").await;
-        cx.run_until_parked();
         cx.shared_state().await.assert_eq("----ˇ-hello\n");
 
         cx.set_shared_state("ˇhello\n").await;
         cx.simulate_shared_keystrokes("5 a - escape").await;
-        cx.run_until_parked();
         cx.shared_state().await.assert_eq("h----ˇ-ello\n");
 
         cx.simulate_shared_keystrokes("4 shift-i - escape").await;
-        cx.run_until_parked();
         cx.shared_state().await.assert_eq("---ˇ-h-----ello\n");
 
         cx.simulate_shared_keystrokes("3 shift-a - escape").await;
-        cx.run_until_parked();
         cx.shared_state().await.assert_eq("----h-----ello--ˇ-\n");
 
         cx.set_shared_state("ˇhello\n").await;
         cx.simulate_shared_keystrokes("3 o o i escape").await;
-        cx.run_until_parked();
         cx.shared_state().await.assert_eq("hello\noi\noi\noˇi\n");
 
         cx.set_shared_state("ˇhello\n").await;
         cx.simulate_shared_keystrokes("3 shift-o o i escape").await;
-        cx.run_until_parked();
         cx.shared_state().await.assert_eq("oi\noi\noˇi\nhello\n");
     }
 
@@ -99,28 +98,31 @@ mod test {
 
         cx.set_shared_state("ˇhello\n").await;
         cx.simulate_shared_keystrokes("3 i - escape").await;
-        cx.run_until_parked();
         cx.shared_state().await.assert_eq("--ˇ-hello\n");
         cx.simulate_shared_keystrokes(".").await;
-        cx.run_until_parked();
         cx.shared_state().await.assert_eq("----ˇ--hello\n");
         cx.simulate_shared_keystrokes("2 .").await;
-        cx.run_until_parked();
         cx.shared_state().await.assert_eq("-----ˇ---hello\n");
 
         cx.set_shared_state("ˇhello\n").await;
         cx.simulate_shared_keystrokes("2 o k k escape").await;
-        cx.run_until_parked();
         cx.shared_state().await.assert_eq("hello\nkk\nkˇk\n");
         cx.simulate_shared_keystrokes(".").await;
-        cx.run_until_parked();
         cx.shared_state()
             .await
             .assert_eq("hello\nkk\nkk\nkk\nkˇk\n");
         cx.simulate_shared_keystrokes("1 .").await;
-        cx.run_until_parked();
         cx.shared_state()
             .await
             .assert_eq("hello\nkk\nkk\nkk\nkk\nkˇk\n");
     }
+
+    #[gpui::test]
+    async fn test_insert_ctrl_r(cx: &mut gpui::TestAppContext) {
+        let mut cx = NeovimBackedTestContext::new(cx).await;
+
+        cx.set_shared_state("heˇllo\n").await;
+        cx.simulate_shared_keystrokes("y y i ctrl-r \"").await;
+        cx.shared_state().await.assert_eq("hehello\nˇllo\n");
+    }
 }

crates/vim/src/state.rs

@@ -227,6 +227,7 @@ impl EditorState {
             Some(Operator::FindForward { .. })
                 | Some(Operator::FindBackward { .. })
                 | Some(Operator::Mark)
+                | Some(Operator::Register)
                 | Some(Operator::Jump { .. })
         )
     }

crates/vim/src/vim.rs

@@ -624,7 +624,7 @@ impl Vim {
         editor: Option<&mut Editor>,
         cx: &mut WindowContext,
     ) -> Option<Register> {
-        let Some(register) = register else {
+        let Some(register) = register.filter(|reg| *reg != '"') else {
             let setting = VimSettings::get_global(cx).use_system_clipboard;
             return match setting {
                 UseSystemClipboard::Always => cx.read_from_clipboard().map(|item| item.into()),
@@ -882,8 +882,24 @@ impl Vim {
             Some(Operator::Mark) => Vim::update(cx, |vim, cx| {
                 normal::mark::create_mark(vim, text, false, cx)
             }),
-            Some(Operator::Register) => Vim::update(cx, |vim, cx| {
-                vim.select_register(text, cx);
+            Some(Operator::Register) => Vim::update(cx, |vim, cx| match vim.state().mode {
+                Mode::Insert => {
+                    vim.update_active_editor(cx, |vim, editor, cx| {
+                        if let Some(register) =
+                            vim.read_register(text.chars().next(), Some(editor), cx)
+                        {
+                            editor.do_paste(
+                                &register.text.to_string(),
+                                register.clipboard_selections.clone(),
+                                false,
+                                cx,
+                            )
+                        }
+                    });
+                }
+                _ => {
+                    vim.select_register(text, cx);
+                }
             }),
             Some(Operator::Jump { line }) => normal::mark::jump(text, line, cx),
             _ => match Vim::read(cx).state().mode {

crates/vim/test_data/test_insert_ctrl_r.json

@@ -0,0 +1,7 @@
+{"Put":{"state":"heˇllo\n"}}
+{"Key":"y"}
+{"Key":"y"}
+{"Key":"i"}
+{"Key":"ctrl-r"}
+{"Key":"\""}
+{"Get":{"state":"hehello\nˇllo\n","mode":"Insert"}}