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.3695: confusing error for missing key (#26420)

Browse Source 
Problem:    Confusing error for missing key.
Solution:   Use the actualy key for the error. (closes vim/vim#9241)

5c1ec439f0

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq 2023-12-06 16:49:40 +08:00 committed by GitHub
parent 401ce9f3fd
commit f22e9e10f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/eval.c
View File

@ -3735,8 +3735,12 @@ static int eval_index_inner(typval_T *rettv, bool is_range, typval_T *var1, typv
dictitem_T *const item = tv_dict_find(rettv->vval.v_dict, key, keylen); dictitem_T *const item = tv_dict_find(rettv->vval.v_dict, key, keylen);
if (item == NULL && verbose) { if (item == NULL && verbose) {
if (keylen > 0) {
semsg(_(e_dictkey_len), keylen, key);
} else {
semsg(_(e_dictkey), key); semsg(_(e_dictkey), key);
} }
}
if (item == NULL || tv_is_luafunc(&item->di_tv)) { if (item == NULL || tv_is_luafunc(&item->di_tv)) {
return FAIL; return FAIL;
} }

1
src/nvim/globals.h
View File

@ -887,6 +887,7 @@ EXTERN const char e_invalblob[] INIT(= N_("E978: Invalid operation for Blob"));
EXTERN const char e_toomanyarg[] INIT(= N_("E118: Too many arguments for function: %s")); EXTERN const char e_toomanyarg[] INIT(= N_("E118: Too many arguments for function: %s"));
EXTERN const char e_toofewarg[] INIT(= N_("E119: Not enough arguments for function: %s")); EXTERN const char e_toofewarg[] INIT(= N_("E119: Not enough arguments for function: %s"));
EXTERN const char e_dictkey[] INIT(= N_("E716: Key not present in Dictionary: \"%s\"")); EXTERN const char e_dictkey[] INIT(= N_("E716: Key not present in Dictionary: \"%s\""));
EXTERN const char e_dictkey_len[] INIT(= N_("E716: Key not present in Dictionary: \"%.*s\""));
EXTERN const char e_listreq[] INIT(= N_("E714: List required")); EXTERN const char e_listreq[] INIT(= N_("E714: List required"));
EXTERN const char e_listblobreq[] INIT(= N_("E897: List or Blob required")); EXTERN const char e_listblobreq[] INIT(= N_("E897: List or Blob required"));
EXTERN const char e_listdictarg[] INIT(= N_("E712: Argument of %s must be a List or Dictionary")); EXTERN const char e_listdictarg[] INIT(= N_("E712: Argument of %s must be a List or Dictionary"));

2
src/nvim/lua/executor.c
View File

@ -115,7 +115,7 @@ lua_State *get_global_lstate(void)
/// Convert lua error into a Vim error message /// Convert lua error into a Vim error message
/// ///
/// @param lstate Lua interpreter state. /// @param lstate Lua interpreter state.
/// @param[in] msg Message base, must contain one `%*s`. /// @param[in] msg Message base, must contain one `%.*s`.
void nlua_error(lua_State *const lstate, const char *const msg) void nlua_error(lua_State *const lstate, const char *const msg)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_ALL
{ {

19
test/old/testdir/test_listdict.vim
View File

@ -455,6 +455,25 @@ func Test_dict_func_remove()
END END
call CheckLegacyAndVim9Failure(lines, 'E716:') call CheckLegacyAndVim9Failure(lines, 'E716:')
let lines =<< trim END
let d = {'a-b': 55}
echo d.a-b
END
call CheckScriptFailure(lines, 'E716: Key not present in Dictionary: "a"')
let lines =<< trim END
vim9script
var d = {'a-b': 55}
echo d.a-b
END
call CheckScriptFailure(lines, 'E716: Key not present in Dictionary: "a"')
let lines =<< trim END
var d = {'a-b': 55}
echo d.a-b
END
call CheckDefFailure(lines, 'E1004: White space required before and after ''-''')
let lines =<< trim END let lines =<< trim END
let d = {1: 'a', 3: 'c'} let d = {1: 'a', 3: 'c'}
call remove(d, []) call remove(d, [])