From 2601e0873ff50ed804487dff00bd27e233709beb Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 6 Mar 2022 06:56:24 +0800
Subject: fix(paste): don't move cursor past the end of pasted text in Normal
 mode

---
 test/functional/api/vim_spec.lua | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

(limited to 'test/functional/api/vim_spec.lua')

diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua
index 384e8d11f2..3d57953a11 100644
--- a/test/functional/api/vim_spec.lua
+++ b/test/functional/api/vim_spec.lua
@@ -665,6 +665,43 @@ describe('API', function()
       feed('u')  -- Undo.
       expect(expected1)
     end)
+    it('stream: Insert mode', function()
+      feed('i')
+      nvim('paste', 'aaaaaa', false, 1)
+      nvim('paste', 'bbbbbb', false, 2)
+      nvim('paste', 'cccccc', false, 2)
+      nvim('paste', 'dddddd', false, 3)
+      expect('aaaaaabbbbbbccccccdddddd')
+    end)
+    it('stream: Normal mode on empty line', function()
+      nvim('paste', 'aaaaaa', false, 1)
+      nvim('paste', 'bbbbbb', false, 2)
+      nvim('paste', 'cccccc', false, 2)
+      nvim('paste', 'dddddd', false, 3)
+      expect('aaaaaabbbbbbccccccdddddd')
+      feed('u')
+      expect('')
+    end)
+    it('stream: Normal mode not at the end of a line', function()
+      feed('i||<Esc>0')
+      nvim('paste', 'aaaaaa', false, 1)
+      nvim('paste', 'bbbbbb', false, 2)
+      nvim('paste', 'cccccc', false, 2)
+      nvim('paste', 'dddddd', false, 3)
+      expect('|aaaaaabbbbbbccccccdddddd|')
+      feed('u')
+      expect('||')
+    end)
+    it('stream: Normal mode at the end of a line', function()
+      feed('i||<Esc>')
+      nvim('paste', 'aaaaaa', false, 1)
+      nvim('paste', 'bbbbbb', false, 2)
+      nvim('paste', 'cccccc', false, 2)
+      nvim('paste', 'dddddd', false, 3)
+      expect('||aaaaaabbbbbbccccccdddddd')
+      feed('u')
+      expect('||')
+    end)
     it('non-streaming', function()
       -- With final "\n".
       nvim('paste', 'line 1\nline 2\nline 3\n', true, -1)
-- 
cgit