Mercurial > vim
changeset 21759:25b659fa5ca5 v8.2.1429
patch 8.2.1429: Vim9: no error for missing white after : in dict
Commit: https://github.com/vim/vim/commit/17a836cbee6b8d8ff555f8e307f48a779908db41
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Aug 12 17:35:58 2020 +0200
patch 8.2.1429: Vim9: no error for missing white after : in dict
Problem: Vim9: no error for missing white after : in dict.
Solution: Check for white space. (closes https://github.com/vim/vim/issues/6671) Also check that there is no
white before the :.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 12 Aug 2020 17:45:04 +0200 |
| parents | 465936f1ec7a |
| children | 5abc63ecc7a4 |
| files | src/testdir/test_vim9_expr.vim src/testdir/test_vim9_func.vim src/version.c src/vim9compile.c |
| diffstat | 4 files changed, 17 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_vim9_expr.vim +++ b/src/testdir/test_vim9_expr.vim @@ -1494,6 +1494,10 @@ def Test_expr7_dict() mixed = #{a: 234} mixed = #{} + call CheckDefFailure(["let x = #{a:8}"], 'E1069:') + call CheckDefFailure(["let x = #{a : 8}"], 'E1068:') + call CheckDefFailure(["let x = #{a :8}"], 'E1068:') + call CheckDefFailure(["let x = #{8: 8}"], 'E1014:') call CheckDefFailure(["let x = #{xxx}"], 'E720:') call CheckDefFailure(["let x = #{xxx: 1", "let y = 2"], 'E722:')
--- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -774,7 +774,7 @@ func Test_InternalFuncRetType() enddef def RetListAny(): list<any> - return items({'k' : 'v'}) + return items({'k': 'v'}) enddef def RetListString(): list<string>
--- 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 */ /**/ + 1429, +/**/ 1428, /**/ 1427,
--- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -2593,14 +2593,21 @@ compile_dict(char_u **arg, cctx_T *cctx, } } - *arg = skipwhite(*arg); if (**arg != ':') { - semsg(_(e_missing_dict_colon), *arg); + if (*skipwhite(*arg) == ':') + semsg(_(e_no_white_before), ":"); + else + semsg(_(e_missing_dict_colon), *arg); return FAIL; } - whitep = *arg + 1; + if (!IS_WHITE_OR_NUL(*whitep)) + { + semsg(_(e_white_after), ":"); + return FAIL; + } + *arg = skipwhite(*arg + 1); if (may_get_next_line(whitep, arg, cctx) == FAIL) {