From 4bce26bb70144633713e7e8f149ba99cac511336 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 22 Jan 2021 22:06:56 +0100 Subject: [PATCH] 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. --- src/dict.c | 3 ++- src/testdir/test_vim9_script.vim | 6 ++++++ src/version.c | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/dict.c b/src/dict.c index fc8756c57..b267e240d 100644 --- 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 957671c53..9dadf1eda 100644 --- 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 c5fdf8585..02fd3fa49 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 */ +/**/ + 2393, /**/ 2392, /**/