vim-patch:9.1.0176: Cursor column wrong with 'virtualedit' and conceal

Problem:  Cursor column wrong with 'virtualedit' and conceal.
Solution: Correct cursor column at end of line if never reached.
          (zeertzjq)

closes: vim/vim#14190

https://github.com/vim/vim/commit/253ff4dece4e6cc4a9ff3ed935bc78f832b6fb7c

2 files changed, 142 insertions, 0 deletions

diff --git a/test/functional/legacy/conceal_spec.lua b/test/functional/legacy/conceal_spec.lua
index a7badf6910..63ec644a10 100644
--- a/test/functional/legacy/conceal_spec.lua
+++ b/test/functional/legacy/conceal_spec.lua
@@ -632,4 +632,92 @@ describe('Conceal', function()
     feed('$')
     expect_pos(9, 26)
   end)
+
+  -- oldtest: Test_conceal_virtualedit_after_eol()
+  it('cursor drawn at correct column with virtualedit', function()
+    local screen = Screen.new(75, 3)
+    screen:set_default_attr_ids({
+      [0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText
+    })
+    screen:attach()
+    exec([[
+      call setline(1, 'abcdefgh|hidden|ijklmnpop')
+      syntax match test /|hidden|/ conceal
+      set conceallevel=2 concealcursor=n virtualedit=all
+      normal! $
+    ]])
+    screen:expect([[
+      abcdefghijklmnpo^p                                                          |
+      {0:~                                                                          }|
+                                                                                 |
+    ]])
+    feed('l')
+    screen:expect([[
+      abcdefghijklmnpop^                                                          |
+      {0:~                                                                          }|
+                                                                                 |
+    ]])
+    feed('l')
+    screen:expect([[
+      abcdefghijklmnpop ^                                                         |
+      {0:~                                                                          }|
+                                                                                 |
+    ]])
+    feed('l')
+    screen:expect([[
+      abcdefghijklmnpop  ^                                                        |
+      {0:~                                                                          }|
+                                                                                 |
+    ]])
+    feed('rr')
+    screen:expect([[
+      abcdefghijklmnpop  ^r                                                       |
+      {0:~                                                                          }|
+                                                                                 |
+    ]])
+  end)
+
+  -- oldtest: Test_conceal_virtualedit_after_eol_rightleft()
+  it('cursor drawn correctly with virtualedit and rightleft', function()
+    local screen = Screen.new(75, 3)
+    screen:set_default_attr_ids({
+      [0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText
+    })
+    screen:attach()
+    exec([[
+      call setline(1, 'abcdefgh|hidden|ijklmnpop')
+      syntax match test /|hidden|/ conceal
+      set conceallevel=2 concealcursor=n virtualedit=all rightleft
+      normal! $
+    ]])
+    screen:expect([[
+                                                                ^popnmlkjihgfedcba|
+      {0:                                                                          ~}|
+                                                                                 |
+    ]])
+    feed('h')
+    screen:expect([[
+                                                               ^ popnmlkjihgfedcba|
+      {0:                                                                          ~}|
+                                                                                 |
+    ]])
+    feed('h')
+    screen:expect([[
+                                                              ^  popnmlkjihgfedcba|
+      {0:                                                                          ~}|
+                                                                                 |
+    ]])
+    feed('h')
+    screen:expect([[
+                                                             ^   popnmlkjihgfedcba|
+      {0:                                                                          ~}|
+                                                                                 |
+    ]])
+    feed('rr')
+    screen:expect([[
+                                                             ^r  popnmlkjihgfedcba|
+      {0:                                                                          ~}|
+                                                                                 |
+    ]])
+  end)
 end)
diff --git a/test/old/testdir/test_conceal.vim b/test/old/testdir/test_conceal.vim
index d5a2bcce46..94d5d1d470 100644
--- a/test/old/testdir/test_conceal.vim
+++ b/test/old/testdir/test_conceal.vim
@@ -460,4 +460,58 @@ func Test_conceal_mouse_click()
   set mouse& virtualedit&
 endfunc
 
+" Test that cursor is drawn at the correct column when it is after end of the
+" line with 'virtualedit' and concealing.
+func Test_conceal_virtualedit_after_eol()
+  CheckScreendump
+
+  let code =<< trim [CODE]
+    call setline(1, 'abcdefgh|hidden|ijklmnpop')
+    syntax match test /|hidden|/ conceal
+    set conceallevel=2 concealcursor=n virtualedit=all
+    normal! $
+  [CODE]
+  call writefile(code, 'XTest_conceal_ve_after_eol', 'D')
+  let buf = RunVimInTerminal('-S XTest_conceal_ve_after_eol', {'rows': 3})
+  call VerifyScreenDump(buf, 'Test_conceal_ve_after_eol_1', {})
+  call term_sendkeys(buf, "l")
+  call VerifyScreenDump(buf, 'Test_conceal_ve_after_eol_2', {})
+  call term_sendkeys(buf, "l")
+  call VerifyScreenDump(buf, 'Test_conceal_ve_after_eol_3', {})
+  call term_sendkeys(buf, "l")
+  call VerifyScreenDump(buf, 'Test_conceal_ve_after_eol_4', {})
+  call term_sendkeys(buf, "rr")
+  call VerifyScreenDump(buf, 'Test_conceal_ve_after_eol_5', {})
+
+  " clean up
+  call StopVimInTerminal(buf)
+endfunc
+
+" Same as Test_conceal_virtualedit_after_eol(), but with 'rightleft' set.
+func Test_conceal_virtualedit_after_eol_rightleft()
+  CheckFeature rightleft
+  CheckScreendump
+
+  let code =<< trim [CODE]
+    call setline(1, 'abcdefgh|hidden|ijklmnpop')
+    syntax match test /|hidden|/ conceal
+    set conceallevel=2 concealcursor=n virtualedit=all rightleft
+    normal! $
+  [CODE]
+  call writefile(code, 'XTest_conceal_ve_after_eol_rl', 'D')
+  let buf = RunVimInTerminal('-S XTest_conceal_ve_after_eol_rl', {'rows': 3})
+  call VerifyScreenDump(buf, 'Test_conceal_ve_after_eol_rl_1', {})
+  call term_sendkeys(buf, "h")
+  call VerifyScreenDump(buf, 'Test_conceal_ve_after_eol_rl_2', {})
+  call term_sendkeys(buf, "h")
+  call VerifyScreenDump(buf, 'Test_conceal_ve_after_eol_rl_3', {})
+  call term_sendkeys(buf, "h")
+  call VerifyScreenDump(buf, 'Test_conceal_ve_after_eol_rl_4', {})
+  call term_sendkeys(buf, "rr")
+  call VerifyScreenDump(buf, 'Test_conceal_ve_after_eol_rl_5', {})
+
+  " clean up
+  call StopVimInTerminal(buf)
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab