mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-07-09 10:59:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(options): crash when setting option to empty dict #40492

Browse Source
This commit is contained in:
zeertzjq
2026-06-30 19:58:46 +08:00
committed by GitHub
parent 1b959ba485
commit f89972e13a
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/option.c
View File

@@ -3650,7 +3650,7 @@ OptVal object_as_optval_for(OptIndex opt_idx, Object o, set_op_T op, bool *error
}
// Sort maps and comma-flag lists for a deterministic result (Dict order is unstable); a bare
// flag list is concatenated in-order with no separator.
if (is_map || is_comma) {
if (ga.ga_len > 0 && (is_map || is_comma)) {
sort_strings(ga.ga_data, ga.ga_len);
}
str = ga_concat_strings(&ga, (is_flaglist && !is_comma) ? "" : ",");

8
test/functional/api/vim_spec.lua
View File

@@ -2279,9 +2279,12 @@ describe('API', function()
-- only support removing items in order. Behavior matches :set-=
api.nvim_set_option_value('wildignore', { '1', '2', '3' }, { operation = 'remove' })
eq('*.o,*.obj,*.a,*.b,*.c', api.nvim_get_option_value('wildignore', {}))
api.nvim_set_option_value('wildignore', {}, {})
eq('', api.nvim_get_option_value('wildignore', {}))
end)
it('allows setting, appending, prepending, removing tables', function()
it('allows setting, appending, prepending, removing dicts', function()
-- NOTE: order is dependent on lua's hash map implementation. I don't
-- *think* order matters for the map style options
api.nvim_set_option_value('listchars', { eol = '~', space = '-' }, {})
@@ -2307,6 +2310,9 @@ describe('API', function()
-- A bare key (string or 1-item list) removes the matching "key:value" item by key.
api.nvim_set_option_value('listchars', { 'space' }, { operation = 'remove' })
eq('eol:~,tab:>-', api.nvim_get_option_value('listchars', {}))
api.nvim_set_option_value('listchars', vim.empty_dict(), {})
eq('', api.nvim_get_option_value('listchars', {}))
end)
it('returns the new option value', function()