alex/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-02-21 09:50:19 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix(session): window sizes not stored with float windows (#37344)

Browse Source 
(cherry picked from commit 2d3dc070ce)
This commit is contained in:
zeertzjq
2026-01-10 22:28:45 +08:00
committed by github-actions[bot]
parent 1b13864d97
commit ba600c495f
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/ex_session.c
View File

@@ -787,7 +787,7 @@ static int makeopens(FILE *fd, char *dirnow)
for (win_T *wp = tab_firstwin; wp != NULL; wp = wp->w_next) {
if (ses_do_win(wp)) {
nr++;
} else {
} else if (!wp->w_floating) {
restore_size = false;
}
if (curwin == wp) {

13
test/functional/ex_cmds/mksession_spec.lua
View File

@@ -232,6 +232,11 @@ describe(':mksession', function()
local tmpfile = file_prefix .. '-tmpfile-float'
command('edit ' .. tmpfile)
eq(80, fn.winwidth(1))
command('30vsplit')
eq(2, #api.nvim_list_wins())
eq(30, fn.winwidth(1))
eq(49, fn.winwidth(2))
local buf = api.nvim_create_buf(false, true)
local config = {
relative = 'editor',
@@ -243,6 +248,7 @@ describe(':mksession', function()
style = 'minimal',
}
api.nvim_open_win(buf, false, config)
eq(3, #api.nvim_list_wins())
local cmdheight = api.nvim_get_option_value('cmdheight', {})
command('mksession ' .. session_file)
@@ -252,9 +258,12 @@ describe(':mksession', function()
command('source ' .. session_file)
eq(tmpfile, fn.expand('%'))
-- Check that there is only a single window, which indicates the floating
-- Check that there are only two windows, which indicates the floating
-- window was not restored.
eq(1, fn.winnr('$'))
-- Don't use winnr('$') as that doesn't count unfocusable floating windows.
eq(2, #api.nvim_list_wins())
eq(30, fn.winwidth(1))
eq(49, fn.winwidth(2))
-- The command-line height should remain the same as it was.
eq(cmdheight, api.nvim_get_option_value('cmdheight', {}))