diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-03-26 21:27:52 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-03-26 21:27:52 +0100 |
| commit | ccc25aa285498d572a735bba5afd22aec9f605f4 (patch) | |
| tree | 26e55ec7baa087e398b60f4a59767a7b6edc774a | |
| parent | c61cb8bfe1ec2cc50e6edd195cae2a3cd93d6590 (diff) | |
| download | vim-git-ccc25aa285498d572a735bba5afd22aec9f605f4.tar.gz | |
patch 8.2.2660: Vim9: no error for declaration with trailing textv8.2.2660
Problem: Vim9: no error for declaration with trailing text.
Solution: Give an error. (closes #8014)
| -rw-r--r-- | src/evalvars.c | 7 | ||||
| -rw-r--r-- | src/testdir/test_vim9_assign.vim | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 15 insertions, 3 deletions
diff --git a/src/evalvars.c b/src/evalvars.c index 79c7a9c8c..cd50ba7fd 100644 --- a/src/evalvars.c +++ b/src/evalvars.c @@ -789,8 +789,11 @@ ex_let(exarg_T *eap) { if (vim9script) { - // Vim9 declaration ":var name: type" - arg = vim9_declare_scriptvar(eap, arg); + if (!ends_excmd2(eap->cmd, skipwhite(argend))) + semsg(_(e_trailing_arg), argend); + else + // Vim9 declaration ":var name: type" + arg = vim9_declare_scriptvar(eap, arg); } else { diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim index f71226e1b..b9851a77f 100644 --- a/src/testdir/test_vim9_assign.vim +++ b/src/testdir/test_vim9_assign.vim @@ -1290,6 +1290,8 @@ def Test_var_declaration() other = 1234 g:other_var = other + var xyz: string # comment + # type is inferred var s:dict = {['a']: 222} def GetDictVal(key: any) @@ -1365,7 +1367,7 @@ def Test_var_declaration_fails() vim9script var 9var: string END - CheckScriptFailure(lines, 'E475:') + CheckScriptFailure(lines, 'E488:') CheckDefFailure(['var foo.bar = 2'], 'E1087:') CheckDefFailure(['var foo[3] = 2'], 'E1087:') @@ -1617,6 +1619,11 @@ def Test_expr_error_no_assign() echo x END CheckScriptFailureList(lines, ['E1154:', 'E121:']) + + lines =<< trim END + var x: string 'string' + END + CheckDefAndScriptFailure(lines, 'E488:') enddef diff --git a/src/version.c b/src/version.c index 373ec74b1..f172437af 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2660, +/**/ 2659, /**/ 2658, |