diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim index 3d16053561..a942dd4dea 100644 --- 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:') diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim index 24078f56ed..1f9768ff9a 100644 --- 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 - return items({'k' : 'v'}) + return items({'k': 'v'}) enddef def RetListString(): list diff --git a/src/version.c b/src/version.c index 46d027d14e..b290fdcb1b 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1429, /**/ 1428, /**/ diff --git a/src/vim9compile.c b/src/vim9compile.c index dfcff508fa..502c66f372 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -2593,14 +2593,21 @@ compile_dict(char_u **arg, cctx_T *cctx, int literal) } } - *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; } - whitep = *arg + 1; *arg = skipwhite(*arg + 1); if (may_get_next_line(whitep, arg, cctx) == FAIL) {