From fc08ea9b0dbc0e0cfbc70125ea009d9f44de0719 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Wed, 3 Apr 2024 11:35:04 -0600
Subject: [PATCH] Fix undo in replace mode (#10086)

Fixes: #10031

Co-Authored-By: Petros <petros@amignosis.com>

Release Notes:

- vim: Fix undo grouping in Replace mode
([#10031](https://github.com/zed-industries/zed/issues/10031)).

---------

Co-authored-by: Petros <petros@amignosis.com>
---
 crates/vim/src/replace.rs | 9 +++++++++
 crates/vim/src/vim.rs     | 6 ++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/crates/vim/src/replace.rs b/crates/vim/src/replace.rs
index 859289903e..75185435b0 100644
--- a/crates/vim/src/replace.rs
+++ b/crates/vim/src/replace.rs
@@ -349,4 +349,13 @@ mod test {
         ]);
         cx.assert_state("ˇabˇcabcabc", Mode::Replace);
     }
+
+    #[gpui::test]
+    async fn test_replace_undo(cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new(cx, true).await;
+
+        cx.set_state("ˇaaaa", Mode::Normal);
+        cx.simulate_keystrokes(["0", "shift-r", "b", "b", "b", "escape", "u"]);
+        cx.assert_state("ˇaaaa", Mode::Normal);
+    }
 }
diff --git a/crates/vim/src/vim.rs b/crates/vim/src/vim.rs
index f8782b9444..ac26f02501 100644
--- a/crates/vim/src/vim.rs
+++ b/crates/vim/src/vim.rs
@@ -390,7 +390,7 @@ impl Vim {
             {
                 visual_block_motion(true, editor, cx, |_, point, goal| Some((point, goal)))
             }
-            if last_mode == Mode::Insert {
+            if last_mode == Mode::Insert || last_mode == Mode::Replace {
                 if let Some(prior_tx) = prior_tx {
                     editor.group_until_transaction(prior_tx, cx)
                 }
@@ -502,7 +502,9 @@ impl Vim {
 
     fn transaction_begun(&mut self, transaction_id: TransactionId, _: &mut WindowContext) {
         self.update_state(|state| {
-            let mode = if (state.mode == Mode::Insert || state.mode == Mode::Normal)
+            let mode = if (state.mode == Mode::Insert
+                || state.mode == Mode::Replace
+                || state.mode == Mode::Normal)
                 && state.current_tx.is_none()
             {
                 state.current_tx = Some(transaction_id);