aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 9.1.0082: Redrawing can be improved when deleting lines with 'cursorline'

Browse Source 
Problem:  Redrawing can be improved when deleting lines with 'cursorline'.
Solution: Use smarter invalidation and adjustment.  Remove unnecessary
          UPD_VALID as it is already set at the top of the loop.  Make
          the test for #4862 fail without the fix.
          (zeertzjq)

closes: #13986

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq 2024-02-08 11:34:55 +01:00 committed by Christian Brabandt
parent b8170143c8
commit 7ce34c9a94
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
3 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/change.c
View File

@ -656,22 +656,20 @@ changed_common(
set_topline(wp, wp->w_topline); set_topline(wp, wp->w_topline);
#endif #endif
// If lines have been added or removed, relative numbering always // If lines have been added or removed, relative numbering always
// requires a redraw. // requires an update even if cursor didn't move.
if (wp->w_p_rnu && xtra != 0) if (wp->w_p_rnu && xtra != 0)
{
wp->w_last_cursor_lnum_rnu = 0; wp->w_last_cursor_lnum_rnu = 0;
redraw_win_later(wp, UPD_VALID);
}
#ifdef FEAT_SYN_HL #ifdef FEAT_SYN_HL
// Cursor line highlighting probably need to be updated with if (wp->w_p_cul && wp->w_last_cursorline >= lnum)
// "UPD_VALID" if it's below the change.
// If the cursor line is inside the change we need to redraw more.
if (wp->w_p_cul)
{ {
if (xtra == 0) if (wp->w_last_cursorline < lnume)
redraw_win_later(wp, UPD_VALID); // If 'cursorline' was inside the change, it has already
else if (lnum <= wp->w_last_cursorline) // been invalidated in w_lines[] by the loop above.
redraw_win_later(wp, UPD_SOME_VALID); wp->w_last_cursorline = 0;
else
// If 'cursorline' was below the change, adjust its lnum.
wp->w_last_cursorline += xtra;
} }
#endif #endif
} }

17
src/testdir/test_highlight.vim
View File

@ -557,22 +557,23 @@ func Test_cursorline_after_yank()
call StopVimInTerminal(buf) call StopVimInTerminal(buf)
endfunc endfunc
" test for issue #4862 " Test for issue #4862: pasting above 'cursorline' redraws properly.
func Test_put_before_cursorline() func Test_put_before_cursorline()
new new
only! only!
call setline(1, 'A') call setline(1, ['A', 'B', 'C'])
call cursor(2, 1)
redraw redraw
let std_attr = screenattr(1, 1) let std_attr = screenattr(2, 1)
set cursorline set cursorline
redraw redraw
let cul_attr = screenattr(1, 1) let cul_attr = screenattr(2, 1)
normal yyP normal yyP
redraw redraw
" Line 1 has cursor so it should be highlighted with CursorLine. " Line 2 has cursor so it should be highlighted with CursorLine.
call assert_equal(cul_attr, screenattr(1, 1)) call assert_equal(cul_attr, screenattr(2, 1))
" And CursorLine highlighting from the second line should be gone. " And CursorLine highlighting from line 3 should be gone.
call assert_equal(std_attr, screenattr(2, 1)) call assert_equal(std_attr, screenattr(3, 1))
set nocursorline set nocursorline
bwipe! bwipe!
endfunc endfunc

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
82,
/**/ /**/
81, 81,
/**/ /**/