diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-07-28 20:52:13 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-07-28 20:52:13 +0200 |
| commit | d47c39775b8d381005751b7b20da56412dafb5e4 (patch) | |
| tree | b5da177ef8fecdf379f397130272f1f05ffdcbb0 | |
| parent | 53f7fccc9413c9f770694b56f40f242d383b2d5f (diff) | |
patch 8.2.3238: Vim9: error message does not indicate the locationv8.2.3238
Problem: Vim9: error message does not indicate the location.
Solution: Add the relevant text. (issue #8634)
| -rw-r--r-- | src/errors.h | 2 | ||||
| -rw-r--r-- | src/testdir/test_vim9_expr.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9compile.c | 6 |
4 files changed, 10 insertions, 2 deletions
diff --git a/src/errors.h b/src/errors.h index 3cbdb53ee9..40925f89e6 100644 --- a/src/errors.h +++ b/src/errors.h @@ -639,3 +639,5 @@ EXTERN char e_list_or_dict_required_for_argument_nr[] 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")); diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim index 88f725b43f..f207056fc3 100644 --- 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) diff --git a/src/version.c b/src/version.c index eb656652f5..6a8f7c8af9 100644 --- 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, diff --git a/src/vim9compile.c b/src/vim9compile.c index 0d54db3d5b..cb00f03484 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -2177,7 +2177,11 @@ generate_STRINGMEMBER(cctx_T *cctx, char_u *name, size_t len) 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 |