mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-13 01:52:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.1913: Error message with :unlet! and non-existing dictionary item (#36549)

Browse Source 
Problem:  Error message with :unlet! and non-existing dictionary item
          (Coacher)
Solution: Set GLV_QUIET when using unlet with bang attribute

fixes: vim/vim#18516
closes: vim/vim#18734

b8119920eb

Co-authored-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq
2025-11-14 07:32:42 +08:00
committed by GitHub
parent 1a5f0ba201
commit 16e9c21d8d
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/eval/vars.c
View File

@@ -1520,7 +1520,7 @@ static char *ex_let_one(char *arg, typval_T *const tv, const bool copy, const bo
/// ":unlet[!] var1 ... " command. /// ":unlet[!] var1 ... " command.
void ex_unlet(exarg_T *eap) void ex_unlet(exarg_T *eap)
{ {
ex_unletlock(eap, eap->arg, 0, do_unlet_var); ex_unletlock(eap, eap->arg, 0, eap->forceit ? GLV_QUIET : 0, do_unlet_var);
} }
/// ":lockvar" and ":unlockvar" commands /// ":lockvar" and ":unlockvar" commands
@@ -1536,7 +1536,7 @@ void ex_lockvar(exarg_T *eap)
arg = skipwhite(arg); arg = skipwhite(arg);
} }
ex_unletlock(eap, arg, deep, do_lock_var); ex_unletlock(eap, arg, deep, 0, do_lock_var);
} }
/// Common parsing logic for :unlet, :lockvar and :unlockvar. /// Common parsing logic for :unlet, :lockvar and :unlockvar.
@@ -1548,7 +1548,8 @@ void ex_lockvar(exarg_T *eap)
/// @param[in] deep Levels to (un)lock for :(un)lockvar, -1 to (un)lock /// @param[in] deep Levels to (un)lock for :(un)lockvar, -1 to (un)lock
/// everything. /// everything.
/// @param[in] callback Appropriate handler for the command. /// @param[in] callback Appropriate handler for the command.
static void ex_unletlock(exarg_T *eap, char *argstart, int deep, ex_unletlock_callback callback) static void ex_unletlock(exarg_T *eap, char *argstart, int deep, int glv_flags,
ex_unletlock_callback callback)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_ALL
{ {
char *arg = argstart; char *arg = argstart;
@@ -1573,7 +1574,7 @@ static void ex_unletlock(exarg_T *eap, char *argstart, int deep, ex_unletlock_ca
} else { } else {
// Parse the name and find the end. // Parse the name and find the end.
name_end = get_lval(arg, NULL, &lv, true, eap->skip || error, name_end = get_lval(arg, NULL, &lv, true, eap->skip || error,
0, FNE_CHECK_START); glv_flags, FNE_CHECK_START);
if (lv.ll_name == NULL) { if (lv.ll_name == NULL) {
error = true; // error, but continue parsing. error = true; // error, but continue parsing.
} }

12
test/old/testdir/test_unlet.vim
View File

@@ -64,4 +64,16 @@ func Test_unlet_complete()
call assert_true(!exists('$FOOBAR') || empty($FOOBAR)) call assert_true(!exists('$FOOBAR') || empty($FOOBAR))
endfunc endfunc
func Test_unlet_nonexisting_key()
let g:base = {}
call assert_fails(':unlet g:base["foobar"]', 'E716:')
try
unlet! g:base["foobar"]
catch
call assert_report("error when unletting non-existing dict key")
endtry
unlet g:base
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab