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

vim-patch:8.2.3064: Vim9: in script cannot set item in uninitialized list (#25605)

Browse Source 
Problem:    Vim9: in script cannot set item in uninitialized list.
Solution:   When a list is NULL allocate an empty one. (closes vim/vim#8461)

e65081d1b5

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq 2023-10-12 07:38:56 +08:00 committed by GitHub
parent f4c85b9ad1
commit 3cbb02ce77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/nvim/eval.c
View File

@ -1467,14 +1467,22 @@ char *get_lval(char *const name, typval_T *const rettv, lval_T *const lp, const
} }
return NULL; return NULL;
} }
if (!(lp->ll_tv->v_type == VAR_LIST && lp->ll_tv->vval.v_list != NULL) if (lp->ll_tv->v_type != VAR_LIST
&& !(lp->ll_tv->v_type == VAR_DICT && lp->ll_tv->vval.v_dict != NULL) && lp->ll_tv->v_type != VAR_DICT
&& !(lp->ll_tv->v_type == VAR_BLOB && lp->ll_tv->vval.v_blob != NULL)) { && lp->ll_tv->v_type != VAR_BLOB) {
if (!quiet) { if (!quiet) {
emsg(_("E689: Can only index a List, Dictionary or Blob")); emsg(_("E689: Can only index a List, Dictionary or Blob"));
} }
return NULL; return NULL;
} }
// a NULL list/blob works like an empty list/blob, allocate one now.
if (lp->ll_tv->v_type == VAR_LIST && lp->ll_tv->vval.v_list == NULL) {
tv_list_alloc_ret(lp->ll_tv, kListLenUnknown);
} else if (lp->ll_tv->v_type == VAR_BLOB && lp->ll_tv->vval.v_blob == NULL) {
tv_blob_alloc_ret(lp->ll_tv);
}
if (lp->ll_range) { if (lp->ll_range) {
if (!quiet) { if (!quiet) {
emsg(_("E708: [:] must come last")); emsg(_("E708: [:] must come last"));

2
src/nvim/eval/typval.c
View File

@ -625,7 +625,7 @@ listitem_T *tv_list_check_range_index_one(list_T *const l, int *const n1, const
listitem_T *li = tv_list_find_index(l, n1); listitem_T *li = tv_list_find_index(l, n1);
if (li == NULL) { if (li == NULL) {
if (!quiet) { if (!quiet) {
semsg(_(e_list_index_out_of_range_nr), (int64_t)n1); semsg(_(e_list_index_out_of_range_nr), (int64_t)(*n1));
} }
return NULL; return NULL;
} }

8
test/functional/vimscript/null_spec.lua
View File

@ -53,17 +53,13 @@ describe('NULL', function()
end) end)
end end
describe('list', function() describe('list', function()
-- Incorrect behaviour
-- FIXME Should error out with different message
null_test('makes :unlet act as if it is not a list', ':unlet L[0]',
'Vim(unlet):E689: Can only index a List, Dictionary or Blob')
-- Subjectable behaviour -- Subjectable behaviour
null_expr_test('is equal to empty list', 'L == []', 0, 1) null_expr_test('is equal to empty list', 'L == []', 0, 1)
null_expr_test('is equal to empty list (reverse order)', '[] == L', 0, 1) null_expr_test('is equal to empty list (reverse order)', '[] == L', 0, 1)
-- Correct behaviour -- Correct behaviour
null_test('can be :unlet item with error message for empty list', ':unlet L[0]',
'Vim(unlet):E684: List index out of range: 0')
null_expr_test('can be indexed with error message for empty list', 'L[0]', null_expr_test('can be indexed with error message for empty list', 'L[0]',
'E684: List index out of range: 0', nil) 'E684: List index out of range: 0', nil)
null_expr_test('can be splice-indexed', 'L[:]', 0, {}) null_expr_test('can be splice-indexed', 'L[:]', 0, {})