Merge pull request #31073 from bfredl/cmdchar

fix(cmdline): simplify and correct grapheme cluster adjustment

1 files changed, 21 insertions, 0 deletions

diff --git a/test/functional/editor/mode_cmdline_spec.lua b/test/functional/editor/mode_cmdline_spec.lua
index efd7a37c0b..bb74dfe12f 100644
--- a/test/functional/editor/mode_cmdline_spec.lua
+++ b/test/functional/editor/mode_cmdline_spec.lua
@@ -38,6 +38,27 @@ describe('cmdline', function()
       feed([[:<C-R>="foo\nbar\rbaz"<CR>]])
       eq('foo\nbar\rbaz', fn.getcmdline())
     end)
+
+    it('pasting handles composing chars properly', function()
+      local screen = Screen.new(60, 4)
+      -- 'arabicshape' cheats and always redraws everything which trivially works,
+      -- this test is for partial redraws in 'noarabicshape' mode.
+      command('set noarabicshape')
+      screen:attach()
+      fn.setreg('a', '💻')
+      feed(':test 🧑‍')
+      screen:expect([[
+                                                                    |
+        {1:~                                                           }|*2
+        :test 🧑‍^                                                    |
+      ]])
+      feed('<c-r><c-r>a')
+      screen:expect([[
+                                                                    |
+        {1:~                                                           }|*2
+        :test 🧑‍💻^                                                    |
+      ]])
+    end)
   end)
 
   it('Ctrl-Shift-V supports entering unsimplified key notations', function()