kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 11:15:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(float): don't relative flaot win itself

Browse Source 
Problem: when reconfig current float win without win key in nvim_win_set_config will cause float win position changed when move.

Solution: don't relative itself.
This commit is contained in:
glepnir 2023-12-28 17:46:59 +08:00
parent 49983387ff
commit 898371fc9f
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -225,7 +225,7 @@ Window nvim_open_win(Buffer buffer, Boolean enter, Dict(win_config) *config, Err
} }
WinConfig fconfig = WIN_CONFIG_INIT; WinConfig fconfig = WIN_CONFIG_INIT;
if (!parse_float_config(config, &fconfig, false, true, err)) { if (!parse_float_config(NULL, config, &fconfig, false, err)) {
return 0; return 0;
} }
@ -396,7 +396,7 @@ void nvim_win_set_config(Window window, Dict(win_config) *config, Error *err)
&& !(HAS_KEY_X(config, external) ? config->external : fconfig.external) && !(HAS_KEY_X(config, external) ? config->external : fconfig.external)
&& (has_split || has_vertical || was_split); && (has_split || has_vertical || was_split);
if (!parse_float_config(config, &fconfig, !was_split || to_split, false, err)) { if (!parse_float_config(win, config, &fconfig, !was_split || to_split, err)) {
return; return;
} }
if (was_split && !to_split) { if (was_split && !to_split) {
@ -1023,8 +1023,8 @@ static void parse_border_style(Object style, WinConfig *fconfig, Error *err)
} }
} }
static bool parse_float_config(Dict(win_config) *config, WinConfig *fconfig, bool reconf, static bool parse_float_config(win_T *wp, Dict(win_config) *config, WinConfig *fconfig, bool reconf,
bool new_win, Error *err) Error *err)
{ {
#define HAS_KEY_X(d, key) HAS_KEY(d, win_config, key) #define HAS_KEY_X(d, key) HAS_KEY(d, win_config, key)
bool has_relative = false, relative_is_win = false, is_split = false; bool has_relative = false, relative_is_win = false, is_split = false;
@ -1049,7 +1049,7 @@ static bool parse_float_config(Dict(win_config) *config, WinConfig *fconfig, boo
} else if (!config->external) { } else if (!config->external) {
if (HAS_KEY_X(config, vertical) || HAS_KEY_X(config, split)) { if (HAS_KEY_X(config, vertical) || HAS_KEY_X(config, split)) {
is_split = true; is_split = true;
} else if (new_win) { } else if (wp == NULL) { // new win
api_set_error(err, kErrorTypeValidation, api_set_error(err, kErrorTypeValidation,
"Must specify 'relative' or 'external' when creating a float"); "Must specify 'relative' or 'external' when creating a float");
return false; return false;
@ -1141,6 +1141,17 @@ static bool parse_float_config(Dict(win_config) *config, WinConfig *fconfig, boo
} }
if (relative_is_win || is_split) { if (relative_is_win || is_split) {
if (reconf && relative_is_win) {
win_T *target_win = find_window_by_handle(config->win, err);
if (!target_win) {
return false;
}
if (target_win == wp) {
api_set_error(err, kErrorTypeException, "floating window cannot be relative to itself");
return false;
}
}
fconfig->window = curwin->handle; fconfig->window = curwin->handle;
if (HAS_KEY_X(config, win)) { if (HAS_KEY_X(config, win)) {
if (config->win > 0) { if (config->win > 0) {
@ -1266,7 +1277,7 @@ static bool parse_float_config(Dict(win_config) *config, WinConfig *fconfig, boo
} }
if (HAS_KEY_X(config, noautocmd)) { if (HAS_KEY_X(config, noautocmd)) {
if (!new_win) { if (wp) {
api_set_error(err, kErrorTypeValidation, "'noautocmd' cannot be used with existing windows"); api_set_error(err, kErrorTypeValidation, "'noautocmd' cannot be used with existing windows");
return false; return false;
} }

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

@ -9227,6 +9227,14 @@ describe('float window', function()
eq(restcmd, fn.winrestcmd()) eq(restcmd, fn.winrestcmd())
eq(config, api.nvim_win_get_config(0)) eq(config, api.nvim_win_get_config(0))
end) end)
it("error when relative to itself", function()
local buf = api.nvim_create_buf(false, true)
local config = { relative='win', width=5, height=2, row=3, col=3 }
local winid = api.nvim_open_win(buf, false, config)
api.nvim_set_current_win(winid)
eq("floating window cannot be relative to itself", pcall_err(api.nvim_win_set_config, winid, config))
end)
end end
describe('with ext_multigrid', function() describe('with ext_multigrid', function()