IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): don't send empty grid_line with redrawdebug=compositor (#23899)

Browse Source
This commit is contained in:
zeertzjq 2023-06-04 10:49:02 +08:00 committed by GitHub
parent 700cab0068
commit fdc8e966a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/ui_compositor.c
View File

@ -439,7 +439,7 @@ static void compose_line(Integer row, Integer startcol, Integer endcol, LineFlag
static void compose_debug(Integer startrow, Integer endrow, Integer startcol, Integer endcol, static void compose_debug(Integer startrow, Integer endrow, Integer startcol, Integer endcol,
int syn_id, bool delay) int syn_id, bool delay)
{ {
if (!(rdb_flags & RDB_COMPOSITOR)) { if (!(rdb_flags & RDB_COMPOSITOR) || startcol >= endcol) {
return; return;
} }

1
test/functional/ui/screen.lua
View File

@ -947,6 +947,7 @@ end
function Screen:_handle_grid_line(grid, row, col, items) function Screen:_handle_grid_line(grid, row, col, items)
assert(self._options.ext_linegrid) assert(self._options.ext_linegrid)
assert(#items > 0)
local line = self._grids[grid].rows[row+1] local line = self._grids[grid].rows[row+1]
local colpos = col+1 local colpos = col+1
local hl_id = 0 local hl_id = 0

15
test/functional/ui/screen_basic_spec.lua
View File

@ -1096,3 +1096,18 @@ it('CTRL-F or CTRL-B scrolls a page after UI attach/resize #20605', function()
feed('<C-F>') feed('<C-F>')
eq(953, funcs.line('w0')) eq(953, funcs.line('w0'))
end) end)
it("showcmd doesn't cause empty grid_line with redrawdebug=compositor #22593", function()
clear()
local screen = Screen.new(30, 2)
screen:set_default_attr_ids({
[0] = {bold = true, foreground = Screen.colors.Blue},
})
screen:attach()
command('set showcmd redrawdebug=compositor')
feed('d')
screen:expect{grid=[[
^ |
d |
]]}
end)