From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 19 Oct 2020 19:45:07 +0000 (+0200)
Subject: patch 8.2.1868: Vim9: no error for missing space after comma in dict
X-Git-Tag: v8.2.1868
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a13e185e5de95b150555134b34030bd47c4e22b;p=vim

patch 8.2.1868: Vim9: no error for missing space after comma in dict

Problem:    Vim9: no error for missing space after comma in dict.
Solution:   Check for white space. (closes #6672)
---

diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index a4e7c510e..94d23c649 100644
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -1880,6 +1880,7 @@ def Test_expr7_dict()
   CheckDefFailure(["var x = #{a : 8}"], 'E1068:', 1)
   CheckDefFailure(["var x = #{a :8}"], 'E1068:', 1)
   CheckDefFailure(["var x = #{a: 8 , b: 9}"], 'E1068:', 1)
+  CheckDefFailure(["var x = #{a: 1,b: 2}"], 'E1069:', 1)
 
   CheckDefFailure(["var x = #{8: 8}"], 'E1014:', 1)
   CheckDefFailure(["var x = #{xxx}"], 'E720:', 1)
diff --git a/src/version.c b/src/version.c
index 97a3b71db..90ab88ab6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1868,
 /**/
     1867,
 /**/
diff --git a/src/vim9compile.c b/src/vim9compile.c
index d9908d30b..cd5e45bc6 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -2996,6 +2996,11 @@ compile_dict(char_u **arg, cctx_T *cctx, int literal, ppconst_T *ppconst)
 	    return FAIL;
 	}
 	whitep = *arg + 1;
+	if (!IS_WHITE_OR_NUL(*whitep))
+	{
+	    semsg(_(e_white_space_required_after_str), ",");
+	    return FAIL;
+	}
 	*arg = skipwhite(*arg + 1);
     }