thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.3238: Vim9: error message does not indicate the location

Browse Source 
Problem:    Vim9: error message does not indicate the location.
Solution:   Add the relevant text. (issue #8634)
This commit is contained in:
Bram Moolenaar
2021-07-28 20:52:13 +02:00
parent 53f7fccc94
commit d47c39775b
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/errors.h
View File

@@ -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"));

2
src/testdir/test_vim9_expr.vim
View File

@@ -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)

2
src/version.c
View File

@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
3238,
/**/
3237,
/**/

6
src/vim9compile.c
View File

@@ -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