diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-07-08 18:38:08 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-07-08 18:38:08 +0200 |
| commit | 6b7a0a8c201bbace7e69fe0709f72b95092193df (patch) | |
| tree | 86a4bf66437397f57fe4e59ffc9fc63e7e122b90 | |
| parent | b335b29e1c3428fd475026412297d5aa63b623e6 (diff) | |
| download | vim-git-8.2.1159.tar.gz | |
patch 8.2.1159: Vim9: no error for missing space after a commav8.2.1159
Problem: Vim9: no error for missing space after a comma.
Solution: Check for white space.
| -rw-r--r-- | src/testdir/test_vim9_expr.vim | 1 | ||||
| -rw-r--r-- | src/testdir/test_vim9_script.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9compile.c | 7 |
4 files changed, 11 insertions, 1 deletions
diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim index dd2a8ade5..b4e060494 100644 --- a/src/testdir/test_vim9_expr.vim +++ b/src/testdir/test_vim9_expr.vim @@ -1014,6 +1014,7 @@ def Test_expr7_list() call CheckDefExecFailure(["let x = g:anint[3]"], 'E714:') call CheckDefFailure(["let x = g:list_mixed[xxx]"], 'E1001:') + call CheckDefFailure(["let x = [1,2,3]"], 'E1069:') call CheckDefExecFailure(["let x = g:list_mixed['xx']"], 'E39:') call CheckDefFailure(["let x = g:list_mixed[0"], 'E111:') call CheckDefExecFailure(["let x = g:list_empty[3]"], 'E684:') diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim index a95761fc0..f923e1466 100644 --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -571,7 +571,7 @@ enddef def Test_try_catch_fails() call CheckDefFailure(['catch'], 'E603:') - call CheckDefFailure(['try', 'echo 0', 'catch','catch'], 'E1033:') + call CheckDefFailure(['try', 'echo 0', 'catch', 'catch'], 'E1033:') call CheckDefFailure(['try', 'echo 0', 'catch /pat'], 'E1067:') call CheckDefFailure(['finally'], 'E606:') call CheckDefFailure(['try', 'echo 0', 'finally', 'echo 1', 'finally'], 'E607:') diff --git a/src/version.c b/src/version.c index 587f29933..1af0262cc 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1159, +/**/ 1158, /**/ 1157, diff --git a/src/vim9compile.c b/src/vim9compile.c index 07aacb37c..0aae8f213 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -3060,7 +3060,14 @@ compile_list(char_u **arg, cctx_T *cctx) break; ++count; if (*p == ',') + { ++p; + if (*p != ']' && !IS_WHITE_OR_NUL(*p)) + { + semsg(_(e_white_after), ","); + return FAIL; + } + } whitep = p; p = skipwhite(p); } |