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

fix(grid): double grid_line_start() with ext_messages #31292

Browse Source 
Problem:  Hit double grid_line_start() assert when redrawing from
          ext_messages msg_ruler event.
Solution: Do not start() batched grid calls when win_redr_ruler() will not
          puts() anything.
This commit is contained in:
luukvbaal
2024-11-25 14:54:43 +01:00
committed by GitHub
parent beec377e90
commit b47b0b3f75
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/drawscreen.c
View File

@ -1092,9 +1092,13 @@ int showmode(void)
win_T *ruler_win = curwin->w_status_height == 0 ? curwin : lastwin_nofloating();
if (redrawing() && ruler_win->w_status_height == 0 && global_stl_height() == 0
&& !(p_ch == 0 && !ui_has(kUIMessages))) {
grid_line_start(&msg_grid_adj, Rows - 1);
if (!ui_has(kUIMessages)) {
grid_line_start(&msg_grid_adj, Rows - 1);
}
win_redr_ruler(ruler_win);
grid_line_flush();
if (!ui_has(kUIMessages)) {
grid_line_flush();
}
}
redraw_cmdline = false;

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

@ -1159,6 +1159,21 @@ stack traceback:
exec_lua([[vim.print({ foo = "bar" })]])
screen:expect_unchanged()
end)
it('ruler redraw does not crash due to double grid_line_start()', function()
exec_lua([[
local ns = vim.api.nvim_create_namespace('')
vim.ui_attach(ns, { ext_messages = true }, function(event, ...)
if event == 'msg_ruler' then
vim.api.nvim__redraw({ flush = true })
end
end)
vim.o.ruler = true
vim.o.laststatus = 0
]])
feed('i')
n.assert_alive()
end)
end)
describe('ui/builtin messages', function()