From b07a39de485db5709a6b3e2f96e66ab06dd76279 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 22 Oct 2020 19:00:01 +0200 Subject: [PATCH] patch 8.2.1889: Vim9: errornous error for missing white space after {} Problem: Vim9: errornous error for missing white space after {}. Solution: Don't skip over white space after {}. (issue #7167) --- src/dict.c | 2 +- src/testdir/test_vim9_expr.vim | 6 ++++++ src/version.c | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/dict.c b/src/dict.c index 503f5a522..8d076441b 100644 --- a/src/dict.c +++ b/src/dict.c @@ -950,7 +950,7 @@ failret: return FAIL; } - *arg = skipwhite(*arg + 1); + *arg = *arg + 1; if (evaluate) rettv_dict_set(rettv, d); diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim index 94d23c649..9b5b4ff2e 100644 --- a/src/testdir/test_vim9_expr.vim +++ b/src/testdir/test_vim9_expr.vim @@ -1124,6 +1124,12 @@ def Test_expr5_vim9script() END CheckScriptFailure(lines, 'E15:', 2) + lines =<< trim END + vim9script + echo {} - 22 + END + CheckScriptFailure(lines, 'E731:', 2) + lines =<< trim END vim9script echo 'abc' is? 'abc' diff --git a/src/version.c b/src/version.c index 04bc2483d..97f9cba2f 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 */ +/**/ + 1889, /**/ 1888, /**/ -- 2.50.1