From c2c521015a0655ce46542b572b341e8e31e2a4b8 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 11 Sep 2023 18:48:24 -0600
Subject: [PATCH] Fix bug where cursors became invisible if replaying was
 interrupted

---
 crates/vim/src/editor_events.rs |  2 ++
 crates/vim/src/normal/repeat.rs | 34 ++++++++++++++++++++++-----------
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/crates/vim/src/editor_events.rs b/crates/vim/src/editor_events.rs
index da5c7d46ed..ae6a2808cf 100644
--- a/crates/vim/src/editor_events.rs
+++ b/crates/vim/src/editor_events.rs
@@ -34,7 +34,9 @@ fn focused(EditorFocused(editor): &EditorFocused, cx: &mut AppContext) {
 fn blurred(EditorBlurred(editor): &EditorBlurred, cx: &mut AppContext) {
     editor.window().update(cx, |cx| {
         Vim::update(cx, |vim, cx| {
+            vim.clear_operator(cx);
             vim.workspace_state.recording = false;
+            vim.workspace_state.recorded_actions.clear();
             if let Some(previous_editor) = vim.active_editor.clone() {
                 if previous_editor == editor.clone() {
                     vim.active_editor = None;
diff --git a/crates/vim/src/normal/repeat.rs b/crates/vim/src/normal/repeat.rs
index 6954ace71f..d7d8c30773 100644
--- a/crates/vim/src/normal/repeat.rs
+++ b/crates/vim/src/normal/repeat.rs
@@ -43,9 +43,6 @@ pub(crate) fn init(cx: &mut AppContext) {
     cx.add_action(|_: &mut Workspace, _: &EndRepeat, cx| {
         Vim::update(cx, |vim, cx| {
             vim.workspace_state.replaying = false;
-            vim.update_active_editor(cx, |editor, _| {
-                editor.show_local_selections = true;
-            });
             vim.switch_mode(Mode::Normal, false, cx)
         });
     });
@@ -56,6 +53,10 @@ pub(crate) fn init(cx: &mut AppContext) {
 pub(crate) fn repeat(cx: &mut WindowContext, from_insert_mode: bool) {
     let Some((mut actions, editor, selection)) = Vim::update(cx, |vim, cx| {
         let actions = vim.workspace_state.recorded_actions.clone();
+        if actions.is_empty() {
+            return None;
+        }
+
         let Some(editor) = vim.active_editor.clone() else {
             return None;
         };
@@ -82,14 +83,6 @@ pub(crate) fn repeat(cx: &mut WindowContext, from_insert_mode: bool) {
             }
         }
 
-        if let Some(editor) = editor.upgrade(cx) {
-            editor.update(cx, |editor, _| {
-                editor.show_local_selections = false;
-            })
-        } else {
-            return None;
-        }
-
         Some((actions, editor, selection))
     }) else {
         return;
@@ -176,6 +169,9 @@ pub(crate) fn repeat(cx: &mut WindowContext, from_insert_mode: bool) {
     let window = cx.window();
     cx.app_context()
         .spawn(move |mut cx| async move {
+            editor.update(&mut cx, |editor, _| {
+                editor.show_local_selections = false;
+            })?;
             for action in actions {
                 match action {
                     ReplayableAction::Action(action) => {
@@ -195,6 +191,9 @@ pub(crate) fn repeat(cx: &mut WindowContext, from_insert_mode: bool) {
                     }),
                 }?
             }
+            editor.update(&mut cx, |editor, _| {
+                editor.show_local_selections = true;
+            })?;
             window
                 .dispatch_action(editor.id(), &EndRepeat, &mut cx)
                 .ok_or_else(|| anyhow::anyhow!("window was closed"))
@@ -513,4 +512,17 @@ mod test {
         })
         .await;
     }
+
+    #[gpui::test]
+    async fn test_record_interrupted(
+        deterministic: Arc<Deterministic>,
+        cx: &mut gpui::TestAppContext,
+    ) {
+        let mut cx = VimTestContext::new(cx, true).await;
+
+        cx.set_state("ˇhello\n", Mode::Normal);
+        cx.simulate_keystrokes(["4", "i", "j", "cmd-shift-p", "escape", "escape"]);
+        deterministic.run_until_parked();
+        cx.assert_state("ˇjhello\n", Mode::Normal);
+    }
 }