kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 03:05:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(drawline): don't draw beyond end of window with 'rnu' (#29406)

Browse Source
This commit is contained in:
zeertzjq 2024-06-19 09:20:24 +08:00 committed by GitHub
parent b381b2d529
commit b1c439cef6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/drawline.c
View File

@ -1553,7 +1553,7 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, int col_rows, s
// When only updating the columns and that's done, stop here. // When only updating the columns and that's done, stop here.
if (col_rows > 0) { if (col_rows > 0) {
wlv_put_linebuf(wp, &wlv, wlv.off, false, bg_attr, 0); wlv_put_linebuf(wp, &wlv, MIN(wlv.off, grid->cols), false, bg_attr, 0);
// Need to update more screen lines if: // Need to update more screen lines if:
// - 'statuscolumn' needs to be drawn, or // - 'statuscolumn' needs to be drawn, or
// - LineNrAbove or LineNrBelow is used, or // - LineNrAbove or LineNrBelow is used, or

40
test/functional/ui/diff_spec.lua
View File

@ -1346,6 +1346,46 @@ it("diff mode doesn't restore invalid 'foldcolumn' value #21647", function()
eq('0', api.nvim_get_option_value('foldcolumn', {})) eq('0', api.nvim_get_option_value('foldcolumn', {}))
end) end)
it("'relativenumber' doesn't draw beyond end of window in diff mode #29403", function()
local screen = Screen.new(60, 12)
screen:attach()
command('set relativenumber')
feed('10aa<CR><Esc>gg')
command('vnew')
feed('ab<CR><Esc>gg')
command('windo diffthis')
command('wincmd |')
screen:expect([[
{8: }│{7: }{8: 0 }{27:^a}{4: }|
{8: }│{7: }{8: 1 }{22:a }|
{8: }│{7: }{8: 2 }{22:a }|
{8: }│{7: }{8: 3 }{22:a }|
{8: }│{7: }{8: 4 }{22:a }|
{8: }│{7: }{8: 5 }{22:a }|
{8: }│{7: }{8: 6 }{22:a }|
{8: }│{7: }{8: 7 }{22:a }|
{8: }│{7: }{8: 8 }{22:a }|
{8: }│{7: }{8: 9 }{22:a }|
{2:< }{3:[No Name] [+] }|
|
]])
feed('j')
screen:expect([[
{8: }│{7: }{8: 1 }{27:a}{4: }|
{8: }│{7: }{8: 0 }{22:^a }|
{8: }│{7: }{8: 1 }{22:a }|
{8: }│{7: }{8: 2 }{22:a }|
{8: }│{7: }{8: 3 }{22:a }|
{8: }│{7: }{8: 4 }{22:a }|
{8: }│{7: }{8: 5 }{22:a }|
{8: }│{7: }{8: 6 }{22:a }|
{8: }│{7: }{8: 7 }{22:a }|
{8: }│{7: }{8: 8 }{22:a }|
{2:< }{3:[No Name] [+] }|
|
]])
end)
-- oldtest: Test_diff_binary() -- oldtest: Test_diff_binary()
it('diff mode works properly if file contains NUL bytes vim-patch:8.2.3925', function() it('diff mode works properly if file contains NUL bytes vim-patch:8.2.3925', function()
local screen = Screen.new(40, 20) local screen = Screen.new(40, 20)