neovim

commit 5af9c065ada5600a076e24ca899da38b299c81e6
parent 41b70a0dea4ddced39e8475e2ed61a8bec729939
Author: luukvbaal <luukvbaal@gmail.com>
Date:   Fri, 26 Jul 2024 03:04:17 +0200

fix(decor): don't draw invalidated virtual lines (#29858)


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

2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/src/nvim/decoration.c b/src/nvim/decoration.c
@@ -924,7 +924,7 @@ int decor_virt_lines(win_T *wp, linenr_T lnum, VirtLines *lines, TriState has_fo
   while (true) {
     MTKey mark = marktree_itr_current(itr);
     DecorVirtText *vt = mt_decor_virt(mark);
-    if (ns_in_win(mark.ns, wp)) {
+    if (!mt_invalid(mark) && ns_in_win(mark.ns, wp)) {
       while (vt) {
         if (vt->flags & kVTIsLines) {
           bool above = vt->flags & kVTLinesAbove;
diff --git a/test/functional/ui/decorations_spec.lua b/test/functional/ui/decorations_spec.lua
@@ -4948,6 +4948,28 @@ if (h->n_buckets < new_n_buckets) { // expand
                           |
     ]])
   end)
+
+  it('not drawn when invalid', function()
+    api.nvim_buf_set_lines(0, 0, -1, false, { 'foo', 'bar' })
+    api.nvim_buf_set_extmark(0, ns, 0, 0, { virt_lines = {{{'VIRT1'}}}, invalidate = true })
+    screen:expect({
+      grid = [[
+        ^foo                                               |
+        VIRT1                                             |
+        bar                                               |
+        {1:~                                                 }|*8
+                                                          |
+      ]]
+    })
+    feed('dd')
+    screen:expect({
+      grid = [[
+        ^bar                                               |
+        {1:~                                                 }|*10
+                                                          |
+      ]]
+    })
+  end)
 end)
 
 describe('decorations: signs', function()