mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-06 01:46:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.4718: @@@ in the last line sometimes drawn in the wrong place (#18055)

Browse Source 
Problem:    @@@ in the last line sometimes drawn in the wrong place.
Solution:   Make sure the column is valid. (closes vim/vim#10130)
cee9c844f2
This commit is contained in:
zeertzjq
2022-04-10 04:50:49 +08:00
committed by GitHub
parent 61bd5426f4
commit 2a2c4e191f
3 changed files with 83 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/nvim/screen.c
View File

@@ -1639,16 +1639,18 @@ static void win_update(win_T *wp, DecorProviders *providers)
int scr_row = wp->w_grid.Rows - 1;
// Last line isn't finished: Display "@@@" in the last screen line.
grid_puts_len(&wp->w_grid, (char_u *)"@@", 2, scr_row, 0, at_attr);
grid_puts_len(&wp->w_grid, (char_u *)"@@", MIN(wp->w_grid.Columns, 2), scr_row, 0, at_attr);
grid_fill(&wp->w_grid, scr_row, scr_row + 1, 2, wp->w_grid.Columns,
'@', ' ', at_attr);
set_empty_rows(wp, srow);
wp->w_botline = lnum;
} else if (dy_flags & DY_LASTLINE) { // 'display' has "lastline"
int start_col = wp->w_grid.Columns - 3;
// Last line isn't finished: Display "@@@" at the end.
grid_fill(&wp->w_grid, wp->w_grid.Rows - 1, wp->w_grid.Rows,
wp->w_grid.Columns - 3, wp->w_grid.Columns, '@', '@', at_attr);
MAX(start_col, 0), wp->w_grid.Columns, '@', '@', at_attr);
set_empty_rows(wp, srow);
wp->w_botline = lnum;
} else {
@@ -6001,9 +6003,9 @@ static void end_search_hl(void)
}
/// Fill the grid from 'start_row' to 'end_row', from 'start_col' to 'end_col'
/// with character 'c1' in first column followed by 'c2' in the other columns.
/// Use attributes 'attr'.
/// Fill the grid from "start_row" to "end_row" (exclusive), from "start_col"
/// to "end_col" (exclusive) with character "c1" in first column followed by
/// "c2" in the other columns. Use attributes "attr".
void grid_fill(ScreenGrid *grid, int start_row, int end_row, int start_col, int end_col, int c1,
int c2, int attr)
{

27
src/nvim/testdir/test_display.vim
View File

@@ -325,4 +325,31 @@ func Test_display_linebreak_breakat()
let &breakat=_breakat
endfunc
func Test_display_lastline()
CheckScreendump
let lines =<< trim END
call setline(1, ['aaa', 'b'->repeat(100)])
set display=truncate
vsplit
100wincmd <
END
call writefile(lines, 'XdispLastline')
let buf = RunVimInTerminal('-S XdispLastline', #{rows: 10})
call VerifyScreenDump(buf, 'Test_display_lastline_1', {})
call term_sendkeys(buf, ":set display=lastline\<CR>")
call VerifyScreenDump(buf, 'Test_display_lastline_2', {})
call term_sendkeys(buf, ":100wincmd >\<CR>")
call VerifyScreenDump(buf, 'Test_display_lastline_3', {})
call term_sendkeys(buf, ":set display=truncate\<CR>")
call VerifyScreenDump(buf, 'Test_display_lastline_4', {})
call StopVimInTerminal(buf)
call delete('XdispLastline')
endfunc
" vim: shiftwidth=2 sts=2 expandtab