GitHub/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim synced 2025-07-15 16:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(display): scroll redrawing doesn't account for virt_lines above fold #33374

Browse Source 
Problem:  Logic computing the new height of the modified area does not
          take into account virtual lines attached to a folded line.

Solution: Remove `hasFolding()` branch and let `plines_win_full()` do its job.
(cherry picked from commit 5b1561bb71)
This commit is contained in:
luukvbaal
2025-04-08 14:47:18 +02:00
committed by github-actions[bot]
parent a92155b86b
commit c4a19bff4e
2 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/nvim/drawscreen.c
View File

@ -2188,20 +2188,10 @@ static void win_update(win_T *wp)
// rows, and may insert/delete lines
int j = idx;
for (l = lnum; l < mod_bot; l++) {
linenr_T first = l;
int prev_rows = new_rows;
if (hasFolding(wp, l, NULL, &l)) {
new_rows += !decor_conceal_line(wp, first - 1, false);
} else if (l == wp->w_topline) {
int n = plines_win_nofill(wp, l, false) + wp->w_topfill
- adjust_plines_for_skipcol(wp);
n = MIN(n, wp->w_height_inner);
new_rows += n;
} else {
new_rows += plines_win(wp, l, true);
}
// Do not increment when height was 0 (for a concealed line).
j += (prev_rows != new_rows);
int n = plines_win_full(wp, l, &l, NULL, true, false);
n -= (l == wp->w_topline ? adjust_plines_for_skipcol(wp) : 0);
new_rows += MIN(n, wp->w_height_inner);
j += n > 0; // don't count concealed lines
if (new_rows > wp->w_grid.rows - row - 2) {
// it's getting too much, must redraw the rest
new_rows = 9999;

4
test/functional/ui/decorations_spec.lua
View File

@ -2905,11 +2905,13 @@ describe('extmark decorations', function()
{2: 1 }for _,item in ipairs(items) do |
{2: }line 1 below |
{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:~ }|*7
{1:~ }|*5
|
]])
-- w_lines.wl_lastlnum values are valid