IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(api): error properly with invalid field in nvim_open_win (#30078)

Browse Source
This commit is contained in:
zeertzjq 2024-08-18 07:10:27 +08:00 committed by GitHub
parent b0a042e877
commit cce1eb0806
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1038,7 +1038,7 @@ static void parse_border_style(Object style, WinConfig *fconfig, Error *err)
static void generate_api_error(win_T *wp, const char *attribute, Error *err) static void generate_api_error(win_T *wp, const char *attribute, Error *err)
{ {
if (wp->w_floating) { if (wp != NULL && wp->w_floating) {
api_set_error(err, kErrorTypeValidation, api_set_error(err, kErrorTypeValidation,
"Missing 'relative' field when reconfiguring floating window %d", "Missing 'relative' field when reconfiguring floating window %d",
wp->handle); wp->handle);

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

@ -327,6 +327,35 @@ describe('float window', function()
eq(12, pos[2]) eq(12, pos[2])
end) end)
it('error message when invalid field specified for split', function()
local bufnr = api.nvim_create_buf(false, true)
eq(
"non-float cannot have 'row'",
pcall_err(api.nvim_open_win, bufnr, true, { split = 'right', row = 10 })
)
eq(
"non-float cannot have 'col'",
pcall_err(api.nvim_open_win, bufnr, true, { split = 'right', col = 10 })
)
eq(
"non-float cannot have 'bufpos'",
pcall_err(api.nvim_open_win, bufnr, true, { split = 'right', bufpos = { 0, 0 } })
)
local winid = api.nvim_open_win(bufnr, true, { split = 'right' })
eq(
"non-float cannot have 'row'",
pcall_err(api.nvim_win_set_config, winid, { split = 'right', row = 10 })
)
eq(
"non-float cannot have 'col'",
pcall_err(api.nvim_win_set_config, winid, { split = 'right', col = 10 })
)
eq(
"non-float cannot have 'bufpos'",
pcall_err(api.nvim_win_set_config, winid, { split = 'right', bufpos = { 0, 0 } })
)
end)
it('error message when reconfig missing relative field', function() it('error message when reconfig missing relative field', function()
local bufnr = api.nvim_create_buf(false, true) local bufnr = api.nvim_create_buf(false, true)
local opts = { local opts = {
@ -337,15 +366,16 @@ describe('float window', function()
relative = 'editor', relative = 'editor',
style = 'minimal', style = 'minimal',
} }
local win_id = api.nvim_open_win(bufnr, true, opts) local winid = api.nvim_open_win(bufnr, true, opts)
eq( eq(
"Missing 'relative' field when reconfiguring floating window 1001", "Missing 'relative' field when reconfiguring floating window 1001",
pcall_err(api.nvim_win_set_config, win_id, { pcall_err(api.nvim_win_set_config, winid, {
width = 3, width = 3,
height = 3, height = 3,
row = 10, row = 10,
col = 10, col = 10,
})) })
)
end) end)
it('is not operated on by windo when non-focusable #15374', function() it('is not operated on by windo when non-focusable #15374', function()