mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-14 22:06:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(api): adjust fix for reconfiguring float "relative" (#34287)

Browse Source 
Problem:  "win" is cleared in float config after 96330843, even with
          unchanged "relative".
Solution: Don't clear "win". Avoid erroring for deleted "win" by setting
          the parent win to curwin directly when "win" is zero or not
          present in config.
This commit is contained in:
luukvbaal
2025-06-03 13:27:07 +02:00
committed by GitHub
parent ee84518b94
commit eeacd7bd71
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/nvim/api/win_config.c
View File

@@ -236,8 +236,9 @@ Window nvim_open_win(Buffer buffer, Boolean enter, Dict(win_config) *config, Err
win_T *wp = NULL; win_T *wp = NULL;
tabpage_T *tp = curtab; tabpage_T *tp = curtab;
win_T *parent = NULL; assert(curwin != NULL);
if (config->win != -1) { win_T *parent = config->win == 0 ? curwin : NULL;
if (config->win > 0) {
parent = find_window_by_handle(fconfig.window, err); parent = find_window_by_handle(fconfig.window, err);
if (!parent) { if (!parent) {
// find_window_by_handle has already set the error // find_window_by_handle has already set the error
@@ -413,8 +414,8 @@ void nvim_win_set_config(Window window, Dict(win_config) *config, Error *err)
if (!parse_win_config(win, config, &fconfig, !was_split || to_split, err)) { if (!parse_win_config(win, config, &fconfig, !was_split || to_split, err)) {
return; return;
} }
win_T *parent = NULL; win_T *parent = config->win == 0 ? curwin : NULL;
if (config->win != -1) { if (config->win > 0) {
parent = find_window_by_handle(fconfig.window, err); parent = find_window_by_handle(fconfig.window, err);
if (!parent) { if (!parent) {
return; return;
@@ -1206,8 +1207,6 @@ static bool parse_win_config(win_T *wp, Dict(win_config) *config, WinConfig *fco
"non-float with 'win' requires at least 'split' or 'vertical'"); "non-float with 'win' requires at least 'split' or 'vertical'");
goto fail; goto fail;
} }
} else {
fconfig->window = 0;
} }
if (HAS_KEY_X(config, external)) { if (HAS_KEY_X(config, external)) {

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

@@ -379,7 +379,11 @@ describe('float window', function()
row = 1, row = 1,
}) })
eq(1001, api.nvim_win_get_config(winid).win) eq(1001, api.nvim_win_get_config(winid).win)
-- But unrelated config doesn't clear parent win #34286
api.nvim_win_set_config(winid, { title = 'foo' })
eq(1001, api.nvim_win_get_config(winid).win)
command('close') command('close')
api.nvim_win_set_config(winid, { title = 'bar' })
api.nvim_win_set_config(winid, { relative = 'editor', row = 1, col = 1 }) api.nvim_win_set_config(winid, { relative = 'editor', row = 1, col = 1 })
eq(nil, api.nvim_win_get_config(winid).win) eq(nil, api.nvim_win_get_config(winid).win)
end) end)