diff options
| author | luukvbaal <luukvbaal@gmail.com> | 2025-02-27 13:15:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-27 13:15:47 +0100 |
| commit | f25dd7a8d54844effb44dad60e8154bc8172a67a (patch) | |
| tree | 24da445b386f2ba9edb8ecb17459c9ad4fad2b92 | |
| parent | ac1c5ccb2c04177b526e0aa2ed286760fad98a5d (diff) | |
| download | rneovim-f25dd7a8d54844effb44dad60e8154bc8172a67a.tar.gz rneovim-f25dd7a8d54844effb44dad60e8154bc8172a67a.tar.bz2 rneovim-f25dd7a8d54844effb44dad60e8154bc8172a67a.zip | |
fix(display): correctly store winline info for concealed lines (#32656)
Off-by-one error in storing last line number for a logical line.
| -rw-r--r-- | src/nvim/drawscreen.c | 2 | ||||
| -rw-r--r-- | test/functional/ui/decorations_spec.lua | 51 |
2 files changed, 51 insertions, 2 deletions
diff --git a/src/nvim/drawscreen.c b/src/nvim/drawscreen.c index bb2c41d91a..a645dced40 100644 --- a/src/nvim/drawscreen.c +++ b/src/nvim/drawscreen.c @@ -2119,7 +2119,7 @@ static void win_update(win_T *wp) conceal_cursor_used = conceal_cursor_line(curwin); } if (idx > 0) { - wp->w_lines[idx - 1].wl_lastlnum = lnum + foldinfo.fi_lines - 1; + wp->w_lines[idx - 1].wl_lastlnum = lnum + foldinfo.fi_lines - (foldinfo.fi_lines != 0); } if (lnum == mod_top && lnum < mod_bot) { mod_top += foldinfo.fi_lines ? foldinfo.fi_lines : 1; diff --git a/test/functional/ui/decorations_spec.lua b/test/functional/ui/decorations_spec.lua index 1d0021363b..0eb8391385 100644 --- a/test/functional/ui/decorations_spec.lua +++ b/test/functional/ui/decorations_spec.lua @@ -2826,7 +2826,20 @@ describe('extmark decorations', function() ]] }) feed('jj') - screen:expect_unchanged() + screen:expect({ + grid = [[ + {2: 1 }^for _,item in ipairs(items) do | + {2: 6 } for _ = 1, (count or 1) do | + {2: 7 } local cell = line[colpos] | + {2: 8 } cell.text = text | + {2: 9 } cell.hl_id = hl_id | + {2: 10 } colpos = colpos+1 | + {2: 11 } end | + {2: 12 }end | + {1:~ }|*6 + | + ]] + }) -- Below virtual line belonging to line above concealed line is drawn. api.nvim_buf_set_extmark(0, ns, 0, 0, { virt_lines = { { { 'line 1 below' } } } }) -- Above virtual line belonging to concealed line isn't. @@ -2845,6 +2858,42 @@ describe('extmark decorations', function() {1:~ }|*7 | ]]) + -- w_lines.wl_lastlnum values are valid + command('set relativenumber concealcursor=') + api.nvim_buf_clear_namespace(0, ns, 0, -1) + api.nvim_buf_set_extmark(0, ns, 1, 0, { conceal_lines = "" }) + api.nvim_buf_set_extmark(0, ns, 4, 0, { conceal_lines = "" }) + feed('zE') + screen:expect([[ + {2: 4 }for _,item in ipairs(items) do | + {2: 2 } if hl_id_cell ~= nil then | + {2: 1 } hl_id = hl_id_cell | + {2:5 }^conceal text | + {2: 1 } for _ = 1, (count or 1) do | + {2: 2 } local cell = line[colpos] | + {2: 3 } cell.text = text | + {2: 4 } cell.hl_id = hl_id | + {2: 5 } colpos = colpos+1 | + {2: 6 } end | + {2: 7 }end | + {1:~ }|*3 + | + ]]) + feed('jj') + screen:expect([[ + {2: 6 }for _,item in ipairs(items) do | + {2: 4 } if hl_id_cell ~= nil then | + {2: 3 } hl_id = hl_id_cell | + {2: 1 } for _ = 1, (count or 1) do | + {2:7 }^ local cell = line[colpos] | + {2: 1 } cell.text = text | + {2: 2 } cell.hl_id = hl_id | + {2: 3 } colpos = colpos+1 | + {2: 4 } end | + {2: 5 }end | + {1:~ }|*4 + | + ]]) end) end) |