kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-19 10:45:16 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(window): :close crash if WinClosed from float closes window (#27794)

Browse Source 
Problem:  :close crash if WinClosed from float closes window.
Solution: Check if window has already been closed.
This commit is contained in:
zeertzjq 2024-03-10 08:37:16 +08:00 committed by GitHub
parent 731e7f51ee
commit 9bd4a28079
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/window.c
View File

@ -2560,6 +2560,7 @@ static bool close_last_window_tabpage(win_T *win, bool free_buf, bool force, tab
emsg(_("E814: Cannot close window, only autocmd window would remain")); emsg(_("E814: Cannot close window, only autocmd window would remain"));
return true; return true;
} }
if (force || can_close_floating_windows()) { if (force || can_close_floating_windows()) {
// close the last window until the there are no floating windows // close the last window until the there are no floating windows
while (lastwin->w_floating) { while (lastwin->w_floating) {
@ -2573,6 +2574,10 @@ static bool close_last_window_tabpage(win_T *win, bool free_buf, bool force, tab
emsg(e_floatonly); emsg(e_floatonly);
return true; return true;
} }
if (!win_valid_any_tab(win)) {
return true; // window already closed by autocommands
}
} }
buf_T *old_curbuf = curbuf; buf_T *old_curbuf = curbuf;
@ -2591,10 +2596,6 @@ static bool close_last_window_tabpage(win_T *win, bool free_buf, bool force, tab
// that below. // that below.
goto_tabpage_tp(alt_tabpage(), false, true); goto_tabpage_tp(alt_tabpage(), false, true);
// save index for tabclosed event
char prev_idx[NUMBUFLEN];
snprintf(prev_idx, NUMBUFLEN, "%i", tabpage_index(prev_curtab));
// Safety check: Autocommands may have closed the window when jumping // Safety check: Autocommands may have closed the window when jumping
// to the other tab page. // to the other tab page.
if (valid_tabpage(prev_curtab) && prev_curtab->tp_firstwin == win) { if (valid_tabpage(prev_curtab) && prev_curtab->tp_firstwin == win) {

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

@ -908,6 +908,21 @@ describe('float window', function()
command('close') command('close')
assert_alive() assert_alive()
end) end)
it('does not crash if WinClosed from floating windows closes it', function()
exec([[
tabnew
let g:buf = bufnr()
new
let s:win = win_getid()
call nvim_win_set_config(s:win,
\ #{relative: 'editor', row: 5, col: 5, width: 5, height: 5})
wincmd t
exe $"autocmd WinClosed {s:win} 1close"
]])
command('close')
assert_alive()
end)
end) end)
local function with_ext_multigrid(multigrid) local function with_ext_multigrid(multigrid)