neovim

commit f4f1ce1d167c557e54153f74cf0f55245b8fd414
parent 958cc22836f199c90eea680847843574ec54ebfe
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Thu, 22 Jun 2023 18:15:04 +0800

fix(extmarks): hide inline virt_text properly with 'smoothscroll' (#24106)


Diffstat:
M
src/nvim/drawline.c
 | 
2
+-
M
test/functional/ui/decorations_spec.lua
 | 
32
++++++++++++++++++++++++++++++++

2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/src/nvim/drawline.c b/src/nvim/drawline.c
@@ -1525,7 +1525,7 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool number_onl
 
     // If there the text doesn't reach to the desired column, need to skip
     // "skip_cells" cells when virtual text follows.
-    if (!wp->w_p_wrap && v > wlv.vcol) {
+    if ((!wp->w_p_wrap || (lnum == wp->w_topline && wp->w_skipcol > 0)) && v > wlv.vcol) {
       wlv.skip_cells = (int)(v - wlv.vcol);
     }
 
diff --git a/test/functional/ui/decorations_spec.lua b/test/functional/ui/decorations_spec.lua
@@ -2316,6 +2316,38 @@ bbbbbbb]])
       ]]}
   end)
 
+  it('smoothscroll works correctly when virtual text wraps', function()
+    insert('foobar')
+    meths.buf_set_extmark(0, ns, 0, 3,
+      { virt_text = { { string.rep('X', 55), 'Special' } }, virt_text_pos = 'inline' })
+    command('setlocal smoothscroll')
+    screen:expect{grid=[[
+      foo{10:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX}|
+      {10:XXXXXXXX}ba^r                                       |
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+                                                        |
+    ]]}
+    feed('<C-E>')
+    screen:expect{grid=[[
+      {1:<<<}{10:XXXXX}ba^r                                       |
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+                                                        |
+    ]]}
+  end)
+
   it('in diff mode is highlighted correct', function()
     insert([[
     9000