From aa5113cd92492fcb816a77e5c2928417f851ccf6 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Thu, 9 May 2024 16:12:59 -0600
Subject: [PATCH] vim: Support paste with count (#11621)

Fixes: #10842



Release Notes:

- vim: Fix pasting with a count (#10842)
---
 crates/vim/src/normal/paste.rs             | 40 +++++++++++++++++++++-
 crates/vim/test_data/test_paste_count.json | 13 +++++++
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 crates/vim/test_data/test_paste_count.json

diff --git a/crates/vim/src/normal/paste.rs b/crates/vim/src/normal/paste.rs
index b56bb33b5c..803365cd43 100644
--- a/crates/vim/src/normal/paste.rs
+++ b/crates/vim/src/normal/paste.rs
@@ -39,6 +39,7 @@ fn system_clipboard_is_newer(vim: &Vim, cx: &mut AppContext) -> bool {
 fn paste(_: &mut Workspace, action: &Paste, cx: &mut ViewContext<Workspace>) {
     Vim::update(cx, |vim, cx| {
         vim.record_current_action(cx);
+        let count = vim.take_count(cx).unwrap_or(1);
         vim.update_active_editor(cx, |vim, editor, cx| {
             let text_layout_details = editor.text_layout_details(cx);
             editor.transact(cx, |editor, cx| {
@@ -178,7 +179,7 @@ fn paste(_: &mut Workspace, action: &Paste, cx: &mut ViewContext<Workspace>) {
                     if *preserve {
                         new_selections.push((anchor, line_mode, is_multiline));
                     }
-                    edits.push((point_range, to_insert));
+                    edits.push((point_range, to_insert.repeat(count)));
                     original_indent_columns.extend(original_indent_column);
                 }
 
@@ -599,4 +600,41 @@ mod test {
             Mode::Normal,
         );
     }
+
+    #[gpui::test]
+    async fn test_paste_count(cx: &mut gpui::TestAppContext) {
+        let mut cx = NeovimBackedTestContext::new(cx).await;
+
+        cx.set_shared_state(indoc! {"
+            onˇe
+            two
+            three
+        "})
+            .await;
+        cx.simulate_shared_keystrokes(["y", "y", "3", "p"]).await;
+        cx.assert_shared_state(indoc! {"
+            one
+            ˇone
+            one
+            one
+            two
+            three
+        "})
+            .await;
+
+        cx.set_shared_state(indoc! {"
+            one
+            ˇtwo
+            three
+        "})
+            .await;
+        cx.simulate_shared_keystrokes(["y", "$", "$", "3", "p"])
+            .await;
+        cx.assert_shared_state(indoc! {"
+            one
+            twotwotwotwˇo
+            three
+        "})
+            .await;
+    }
 }
diff --git a/crates/vim/test_data/test_paste_count.json b/crates/vim/test_data/test_paste_count.json
new file mode 100644
index 0000000000..7dd4dc4d91
--- /dev/null
+++ b/crates/vim/test_data/test_paste_count.json
@@ -0,0 +1,13 @@
+{"Put":{"state":"onˇe\ntwo\nthree\n"}}
+{"Key":"y"}
+{"Key":"y"}
+{"Key":"3"}
+{"Key":"p"}
+{"Get":{"state":"one\nˇone\none\none\ntwo\nthree\n","mode":"Normal"}}
+{"Put":{"state":"one\nˇtwo\nthree\n"}}
+{"Key":"y"}
+{"Key":"$"}
+{"Key":"$"}
+{"Key":"3"}
+{"Key":"p"}
+{"Get":{"state":"one\ntwotwotwotwˇo\nthree\n","mode":"Normal"}}