1
0
forked from aniani/vim

patch 8.2.2660: Vim9: no error for declaration with trailing text

Problem:    Vim9: no error for declaration with trailing text.
Solution:   Give an error. (closes #8014)
This commit is contained in:
Bram Moolenaar
2021-03-26 21:27:52 +01:00
parent c61cb8bfe1
commit ccc25aa285
3 changed files with 15 additions and 3 deletions

View File

@@ -789,8 +789,11 @@ ex_let(exarg_T *eap)
{ {
if (vim9script) if (vim9script)
{ {
// Vim9 declaration ":var name: type" if (!ends_excmd2(eap->cmd, skipwhite(argend)))
arg = vim9_declare_scriptvar(eap, arg); semsg(_(e_trailing_arg), argend);
else
// Vim9 declaration ":var name: type"
arg = vim9_declare_scriptvar(eap, arg);
} }
else else
{ {

View File

@@ -1290,6 +1290,8 @@ def Test_var_declaration()
other = 1234 other = 1234
g:other_var = other g:other_var = other
var xyz: string # comment
# type is inferred # type is inferred
var s:dict = {['a']: 222} var s:dict = {['a']: 222}
def GetDictVal(key: any) def GetDictVal(key: any)
@@ -1365,7 +1367,7 @@ def Test_var_declaration_fails()
vim9script vim9script
var 9var: string var 9var: string
END END
CheckScriptFailure(lines, 'E475:') CheckScriptFailure(lines, 'E488:')
CheckDefFailure(['var foo.bar = 2'], 'E1087:') CheckDefFailure(['var foo.bar = 2'], 'E1087:')
CheckDefFailure(['var foo[3] = 2'], 'E1087:') CheckDefFailure(['var foo[3] = 2'], 'E1087:')
@@ -1617,6 +1619,11 @@ def Test_expr_error_no_assign()
echo x echo x
END END
CheckScriptFailureList(lines, ['E1154:', 'E121:']) CheckScriptFailureList(lines, ['E1154:', 'E121:'])
lines =<< trim END
var x: string 'string'
END
CheckDefAndScriptFailure(lines, 'E488:')
enddef enddef

View File

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