patch 8.2.1431: Vim9: no error for white space before comma in dict

Problem:    Vim9: no error for white space before comma in dict.
Solution:   Check for extra white space. (closes #6674)

diff --git a/src/dict.c b/src/dict.c
index b6c9016342d2209d9b4b1b5c6c3b32560950e732..a5569e68b61f0d1a0d6d55a50defcaca390ecadf 100644 (file)
--- a/src/dict.c
+++ b/src/dict.c
@@ -922,7 +922,12 @@ eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal)
        if (!had_comma)
        {
            if (evaluate)
-               semsg(_(e_missing_dict_comma), *arg);
+           {
+               if (**arg == ',')
+                   semsg(_(e_no_white_before), ",");
+               else
+                   semsg(_(e_missing_dict_comma), *arg);
+           }
            goto failret;
        }
     }

diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index e963d9471ddfececc21cbd28e54cea3a42d76cb9..09792effbd7fdbeebd770d1e87bff283d4019be1 100644 (file)
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -1506,6 +1506,7 @@ def Test_expr7_dict()
   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 = #{a: 8 , b: 9}"], 'E1068:')
 
   call CheckDefFailure(["let x = #{8: 8}"], 'E1014:')
   call CheckDefFailure(["let x = #{xxx}"], 'E720:')
@@ -1577,6 +1578,12 @@ def Test_expr7_dict_vim9script()
       let d = #{one:1}
   END
   CheckScriptFailure(lines, 'E1069:')
+
+  lines =<< trim END
+      vim9script
+      let d = #{one: 1 , two: 2}
+  END
+  CheckScriptFailure(lines, 'E1068:')
 enddef
 
 let g:oneString = 'one'

diff --git a/src/version.c b/src/version.c
index 7bafa94330cf26f6102e07c8cb04e1907929ad80..06fce6e7f81afb284d3d7b379f4b9c470595b096 100644 (file)
--- 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 */
+/**/
+    1431,
 /**/
     1430,
 /**/

diff --git a/src/vim9compile.c b/src/vim9compile.c
index 6c43ad2f919385a171c45b54de0d3f5eacf0b50a..8b58d968898a26d1bfed7967b1c669f193f65bdd 100644 (file)
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -2638,6 +2638,11 @@ compile_dict(char_u **arg, cctx_T *cctx, int literal)
            semsg(_(e_missing_dict_comma), *arg);
            goto failret;
        }
+       if (IS_WHITE_OR_NUL(*whitep))
+       {
+           semsg(_(e_no_white_before), ",");
+           return FAIL;
+       }
        whitep = *arg + 1;
        *arg = skipwhite(*arg + 1);
     }