mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-04 01:34:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25329 from neovim/backport-25328-to-release-0.9

Browse Source 
[Backport release-0.9] fix(float): fix some other crashes with :unhide or :all
This commit is contained in:
zeertzjq
2023-09-23 22:45:44 +08:00
committed by GitHub
parent b49cb1826a fd0ff7665c
commit 5bf0873d86
3 changed files with 178 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/nvim/arglist.c
View File

@@ -855,12 +855,17 @@ static void arg_all_close_unused_windows(arg_all_state_T *aall)
for (;;) {
win_T *wpnext = NULL;
tabpage_T *tpnext = curtab->tp_next;
for (win_T *wp = firstwin; wp != NULL; wp = wpnext) {
// Try to close floating windows first
for (win_T *wp = lastwin->w_floating ? lastwin : firstwin; wp != NULL; wp = wpnext) {
int i;
wpnext = wp->w_next;
wpnext = wp->w_floating
? wp->w_prev->w_floating ? wp->w_prev : firstwin
: (wp->w_next == NULL || wp->w_next->w_floating) ? NULL : wp->w_next;
buf_T *buf = wp->w_buffer;
if (buf->b_ffname == NULL
|| (!aall->keep_tabs && (buf->b_nwindows > 1 || wp->w_width != Columns))) {
|| (!aall->keep_tabs
&& (buf->b_nwindows > 1 || wp->w_width != Columns
|| (wp->w_floating && !is_aucmd_win(wp))))) {
i = aall->opened_len;
} else {
// check if the buffer in this window is in the arglist
@@ -915,7 +920,7 @@ static void arg_all_close_unused_windows(arg_all_state_T *aall)
(void)autowrite(buf, false);
// Check if autocommands removed the window.
if (!win_valid(wp) || !bufref_valid(&bufref)) {
wpnext = firstwin; // Start all over...
wpnext = lastwin->w_floating ? lastwin : firstwin; // Start all over...
continue;
}
}
@@ -928,7 +933,7 @@ static void arg_all_close_unused_windows(arg_all_state_T *aall)
// check if autocommands removed the next window
if (!win_valid(wpnext)) {
// start all over...
wpnext = firstwin;
wpnext = lastwin->w_floating ? lastwin : firstwin;
}
}
}
@@ -975,6 +980,8 @@ static void arg_all_open_windows(arg_all_state_T *aall, int count)
if (aall->keep_tabs) {
aall->new_curwin = wp;
aall->new_curtab = curtab;
} else if (wp->w_floating) {
break;
} else if (wp->w_frame->fr_parent != curwin->w_frame->fr_parent) {
emsg(_("E249: window layout changed unexpectedly"));
i = count;
@@ -1089,7 +1096,8 @@ static void do_arg_all(int count, int forceit, int keep_tabs)
autocmd_no_leave++;
last_curwin = curwin;
last_curtab = curtab;
win_enter(lastwin, false);
// lastwin may be aucmd_win
win_enter(lastwin_nofloating(), false);
// Open up to "count" windows.
arg_all_open_windows(&aall, count);

4
src/nvim/buffer.c
View File

@@ -3616,6 +3616,7 @@ void ex_buffer_all(exarg_T *eap)
? wp->w_prev->w_floating ? wp->w_prev : firstwin
: (wp->w_next == NULL || wp->w_next->w_floating) ? NULL : wp->w_next;
if ((wp->w_buffer->b_nwindows > 1
|| wp->w_floating
|| ((cmdmod.cmod_split & WSP_VERT)
? wp->w_height + wp->w_hsep_height + wp->w_status_height < Rows - p_ch
- tabline_height() - global_stl_height()
@@ -3650,6 +3651,7 @@ void ex_buffer_all(exarg_T *eap)
//
// Don't execute Win/Buf Enter/Leave autocommands here.
autocmd_no_enter++;
// lastwin may be aucmd_win
win_enter(lastwin_nofloating(), false);
autocmd_no_leave++;
for (buf = firstbuf; buf != NULL && open_wins < count; buf = buf->b_next) {
@@ -3668,7 +3670,7 @@ void ex_buffer_all(exarg_T *eap)
} else {
// Check if this buffer already has a window
for (wp = firstwin; wp != NULL; wp = wp->w_next) {
if (wp->w_buffer == buf) {
if (!wp->w_floating && wp->w_buffer == buf) {
break;
}
}

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

@@ -440,8 +440,8 @@ describe('float window', function()
eq(5, meths.win_get_option(float_win, 'scroll'))
end)
it(':unhide works when there are floating windows #17797', function()
local float_opts = {relative = 'editor', row = 1, col = 1, width = 10, height = 10}
it(':unhide works when there are floating windows', function()
local float_opts = {relative = 'editor', row = 1, col = 1, width = 5, height = 5}
local w0 = curwin()
meths.open_win(0, false, float_opts)
meths.open_win(0, false, float_opts)
@@ -450,6 +450,17 @@ describe('float window', function()
eq({ w0 }, meths.list_wins())
end)
it(':all works when there are floating windows', function()
command('args Xa.txt')
local float_opts = {relative = 'editor', row = 1, col = 1, width = 5, height = 5}
local w0 = curwin()
meths.open_win(0, false, float_opts)
meths.open_win(0, false, float_opts)
eq(3, #meths.list_wins())
command('all')
eq({ w0 }, meths.list_wins())
end)
describe('with only one tabpage,', function()
local float_opts = {relative = 'editor', row = 1, col = 1, width = 1, height = 1}
local old_buf, old_win
@@ -2675,6 +2686,154 @@ describe('float window', function()
end
end)
describe('no crash when rearranging windows', function()
local function test_rearrange_windows(cmd)
command('set laststatus=2')
screen:try_resize(40, 13)
command('args X1 X2 X3 X4 X5 X6')
command('sargument 2')
command('sargument 3')
local w3 = curwin()
command('sargument 4')
local w4 = curwin()
command('sargument 5')
command('sargument 6')
local float_opts = { relative = 'editor', row = 6, col = 0, width = 40, height = 1 }
meths.win_set_config(w3, float_opts)
meths.win_set_config(w4, float_opts)
command('wincmd =')
if multigrid then
screen:expect{grid=[[
## grid 1
[8:----------------------------------------]|
[8:----------------------------------------]|
{4:X6 }|
[7:----------------------------------------]|
[7:----------------------------------------]|
{5:X5 }|
[4:----------------------------------------]|
[4:----------------------------------------]|
{5:X2 }|
[2:----------------------------------------]|
[2:----------------------------------------]|
{5:X1 }|
[3:----------------------------------------]|
## grid 2
|
{0:~ }|
## grid 3
|
## grid 4
|
{0:~ }|
## grid 5
{1: }|
## grid 6
{1: }|
## grid 7
|
{0:~ }|
## grid 8
^ |
{0:~ }|
]], float_pos={
[5] = {{id = 1002}, "NW", 1, 6, 0, true, 50};
[6] = {{id = 1003}, "NW", 1, 6, 0, true, 50};
}, win_viewport={
[2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1, sum_scroll_delta = 0};
[4] = {win = {id = 1001}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1, sum_scroll_delta = 0};
[5] = {win = {id = 1002}, topline = 0, botline = 1, curline = 0, curcol = 0, linecount = 1, sum_scroll_delta = 0};
[6] = {win = {id = 1003}, topline = 0, botline = 1, curline = 0, curcol = 0, linecount = 1, sum_scroll_delta = 0};
[7] = {win = {id = 1004}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1, sum_scroll_delta = 0};
[8] = {win = {id = 1005}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1, sum_scroll_delta = 0};
}}
else
screen:expect{grid=[[
^ |
{0:~ }|
{4:X6 }|
|
{0:~ }|
{5:X5 }|
{1: }|
{0:~ }|
{5:X2 }|
|
{0:~ }|
{5:X1 }|
|
]]}
end
command(cmd)
if multigrid then
screen:expect{grid=[[
## grid 1
[2:----------------------------------------]|
{4:X1 }|
[4:----------------------------------------]|
{5:X2 }|
[9:----------------------------------------]|
{5:X3 }|
[10:----------------------------------------]|
{5:X4 }|
[7:----------------------------------------]|
{5:X5 }|
[8:----------------------------------------]|
{5:X6 }|
[3:----------------------------------------]|
## grid 2
^ |
## grid 3
|
## grid 4
|
## grid 7
|
## grid 8
|
## grid 9
|
## grid 10
|
]], win_viewport={
[2] = {win = {id = 1000}, topline = 0, botline = 1, curline = 0, curcol = 0, linecount = 1, sum_scroll_delta = 0};
[4] = {win = {id = 1001}, topline = 0, botline = 1, curline = 0, curcol = 0, linecount = 1, sum_scroll_delta = 0};
[7] = {win = {id = 1004}, topline = 0, botline = 1, curline = 0, curcol = 0, linecount = 1, sum_scroll_delta = 0};
[8] = {win = {id = 1005}, topline = 0, botline = 1, curline = 0, curcol = 0, linecount = 1, sum_scroll_delta = 0};
[9] = {win = {id = 1006}, topline = 0, botline = 1, curline = 0, curcol = 0, linecount = 1, sum_scroll_delta = 0};
[10] = {win = {id = 1007}, topline = 0, botline = 1, curline = 0, curcol = 0, linecount = 1, sum_scroll_delta = 0};
}}
else
screen:expect{grid=[[
^ |
{4:X1 }|
|
{5:X2 }|
|
{5:X3 }|
|
{5:X4 }|
|
{5:X5 }|
|
{5:X6 }|
|
]]}
end
end
it('using :unhide', function()
test_rearrange_windows('unhide')
end)
it('using :all', function()
test_rearrange_windows('all')
end)
end)
it('API has proper error messages', function()
local buf = meths.create_buf(false,false)
eq("Invalid key: 'bork'",