From 466c18b8185c44f4fbf67ae91a2ffe27c1919306 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 24 Aug 2023 07:19:18 +0800
Subject: vim-patch:9.0.1785: wrong cursor position with 'showbreak' and
 lcs-eol (#24852)

Problem:  wrong cursor position with 'showbreak' and lcs-eol
Solution: Add size of 'showbreak' before when 'listchars' "eol" is used.
          Also fix wrong cursor position with wrapping virtual text on
          empty line and 'showbreak'.

closes: vim/vim#12891

https://github.com/vim/vim/commit/1193951bebcff50d88403ce17dec5d3be14f131d
---
 test/functional/legacy/breakindent_spec.lua | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

(limited to 'test/functional/legacy/breakindent_spec.lua')

diff --git a/test/functional/legacy/breakindent_spec.lua b/test/functional/legacy/breakindent_spec.lua
index d7779684a4..ecd2d47f47 100644
--- a/test/functional/legacy/breakindent_spec.lua
+++ b/test/functional/legacy/breakindent_spec.lua
@@ -1,6 +1,7 @@
 local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local clear = helpers.clear
+local command = helpers.command
 local exec = helpers.exec
 local feed = helpers.feed
 
@@ -17,20 +18,15 @@ describe('breakindent', function()
     })
     screen:attach()
     exec([[
+      set listchars=eol:$
       let &signcolumn = 'yes'
-      let &showbreak = '+'
+      let &showbreak = '++'
+      let &breakindent = v:true
+      let &breakindentopt = 'shift:2'
       let leftcol = win_getid()->getwininfo()->get(0, {})->get('textoff')
       eval repeat('x', &columns - leftcol - 1)->setline(1)
       eval 'second line'->setline(2)
     ]])
-    screen:expect([[
-      {1:  }^xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx |
-      {1:  }second line                                                              |
-      {0:~                                                                          }|
-      {0:~                                                                          }|
-      {0:~                                                                          }|
-                                                                                 |
-    ]])
     feed('AX')
     screen:expect([[
       {1:  }xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxX|
@@ -40,5 +36,18 @@ describe('breakindent', function()
       {0:~                                                                          }|
       {2:-- INSERT --}                                                               |
     ]])
+    -- No line wraps, so changing 'showbreak' should lead to the same screen.
+    command('setlocal showbreak=+')
+    screen:expect_unchanged()
+    -- The first line now wraps because of "eol" in 'listchars'.
+    command('setlocal list')
+    screen:expect{grid=[[
+      {1:  }xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxX|
+      {1:  }  {0:+^$}                                                                     |
+      {1:  }second line{0:$}                                                             |
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {2:-- INSERT --}                                                               |
+    ]]}
   end)
 end)
-- 
cgit 


From 128091a256d64db2f983d70a888b379d7e63f131 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 24 Aug 2023 07:27:18 +0800
Subject: fix(ui): wrong cursor position with left gravity inline virt text at
 eol

---
 test/functional/legacy/breakindent_spec.lua | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'test/functional/legacy/breakindent_spec.lua')

diff --git a/test/functional/legacy/breakindent_spec.lua b/test/functional/legacy/breakindent_spec.lua
index ecd2d47f47..3913ba935a 100644
--- a/test/functional/legacy/breakindent_spec.lua
+++ b/test/functional/legacy/breakindent_spec.lua
@@ -21,7 +21,6 @@ describe('breakindent', function()
       set listchars=eol:$
       let &signcolumn = 'yes'
       let &showbreak = '++'
-      let &breakindent = v:true
       let &breakindentopt = 'shift:2'
       let leftcol = win_getid()->getwininfo()->get(0, {})->get('textoff')
       eval repeat('x', &columns - leftcol - 1)->setline(1)
@@ -39,6 +38,9 @@ describe('breakindent', function()
     -- No line wraps, so changing 'showbreak' should lead to the same screen.
     command('setlocal showbreak=+')
     screen:expect_unchanged()
+    -- No line wraps, so setting 'breakindent' should lead to the same screen.
+    command('setlocal breakindent')
+    screen:expect_unchanged()
     -- The first line now wraps because of "eol" in 'listchars'.
     command('setlocal list')
     screen:expect{grid=[[
@@ -49,5 +51,14 @@ describe('breakindent', function()
       {0:~                                                                          }|
       {2:-- INSERT --}                                                               |
     ]]}
+    command('setlocal nobreakindent')
+    screen:expect{grid=[[
+      {1:  }xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxX|
+      {1:  }{0:+^$}                                                                       |
+      {1:  }second line{0:$}                                                             |
+      {0:~                                                                          }|
+      {0:~                                                                          }|
+      {2:-- INSERT --}                                                               |
+    ]]}
   end)
 end)
-- 
cgit