Mercurial > vim
changeset 25403:9203b28ab453 v8.2.3238
patch 8.2.3238: Vim9: error message does not indicate the location
Commit: https://github.com/vim/vim/commit/d47c39775b8d381005751b7b20da56412dafb5e4
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Jul 28 20:52:13 2021 +0200
patch 8.2.3238: Vim9: error message does not indicate the location
Problem: Vim9: error message does not indicate the location.
Solution: Add the relevant text. (issue https://github.com/vim/vim/issues/8634)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 28 Jul 2021 21:00:04 +0200 |
| parents | bdda48f01a68 |
| children | d713f6697450 |
| files | src/errors.h src/testdir/test_vim9_expr.vim src/version.c src/vim9compile.c |
| diffstat | 4 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/errors.h +++ b/src/errors.h @@ -639,3 +639,5 @@ EXTERN char e_list_or_dict_required_for_ INIT(= N_("E1227: List or Dictionary required for argument %d")); EXTERN char e_list_or_dict_or_blob_required_for_argument_nr[] INIT(= N_("E1228: List or Dictionary or Blob required for argument %d")); +EXTERN char e_expected_dictionary_for_using_key_str_but_got_str[] + INIT(= N_("E1229: Expected dictionary for using key \"%s\", but got %s"));
--- a/src/testdir/test_vim9_expr.vim +++ b/src/testdir/test_vim9_expr.vim @@ -3114,7 +3114,7 @@ func Test_expr7_fails() call CheckDefExecAndScriptFailure(["var x = +g:alist"], 'E745:', 1) call CheckDefExecAndScriptFailure(["var x = +g:adict"], 'E728:', 1) - call CheckDefAndScriptFailure2(["var x = ''", "var y = x.memb"], 'E715:', 'E488:', 2) + call CheckDefAndScriptFailure2(["var x = ''", "var y = x.memb"], 'E1229: Expected dictionary for using key "memb", but got string', 'E488:', 2) call CheckDefAndScriptFailure2(["'yes'->", "Echo()"], 'E488: Trailing characters: ->', 'E260: Missing name after ->', 1)
--- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3238, +/**/ 3237, /**/ 3236,
--- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -2177,7 +2177,11 @@ generate_STRINGMEMBER(cctx_T *cctx, char type = ((type_T **)stack->ga_data)[stack->ga_len - 1]; if (type->tt_type != VAR_DICT && type != &t_any) { - emsg(_(e_dictreq)); + char *tofree; + + semsg(_(e_expected_dictionary_for_using_key_str_but_got_str), + name, type_name(type, &tofree)); + vim_free(tofree); return FAIL; } // change dict type to dict member type