patch 8.2.2393: Vim9: error message when script line starts with "[{"

Problem:    Vim9: error message when script line starts with "[{".
Solution:   Do not give an error for checking for end of list.

diff --git a/src/dict.c b/src/dict.c
index fc8756c57bc32d931aa5b718dcc0cced51cc3618..b267e240db130afccc5d2bd91313dbbcf21a090b 100644 (file)
--- a/src/dict.c
+++ b/src/dict.c
@@ -1032,7 +1032,8 @@ eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal)
 
     if (**arg != '}')
     {
-       semsg(_(e_missing_dict_end), *arg);
+       if (evalarg != NULL)
+           semsg(_(e_missing_dict_end), *arg);
 failret:
        if (d != NULL)
            dict_free(d);

diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index 957671c53b03148a4b1bb471cff31c9026f5e807..9dadf1edaa8b22e6a5484a524accdb780a9c7616 100644 (file)
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -815,6 +815,12 @@ def Test_list_vimscript()
       # comment 6
   END
   assert_equal(['# comment 1', 'two', '# comment 3', '', 'five', '# comment 6'], lines)
+
+  lines =<< trim END
+    [{
+      a: 0}]->string()->assert_equal("[{'a': 0}]")
+  END
+  CheckDefAndScriptSuccess(lines)
 enddef
 
 if has('channel')

diff --git a/src/version.c b/src/version.c
index c5fdf85855733a9ec7aaf4db1edf0516b08f3355..02fd3fa49f11cc8afe86d0e30a8c083e9d2c815b 100644 (file)
--- 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 */
+/**/
+    2393,
 /**/
     2392,
 /**/