summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-10-22 19:00:01 +0200
committerBram Moolenaar <Bram@vim.org>2020-10-22 19:00:01 +0200
commitb07a39de485db5709a6b3e2f96e66ab06dd76279 (patch)
tree52cc16b985d05060eccbbe7964bdfda1224c7a1b
parente6e70a10f118ecfa9df2425e8724bc009bd09929 (diff)
patch 8.2.1889: Vim9: errornous error for missing white space after {}v8.2.1889
Problem: Vim9: errornous error for missing white space after {}. Solution: Don't skip over white space after {}. (issue #7167)
-rw-r--r--src/dict.c2
-rw-r--r--src/testdir/test_vim9_expr.vim6
-rw-r--r--src/version.c2
3 files changed, 9 insertions, 1 deletions
diff --git a/src/dict.c b/src/dict.c
index 503f5a5223..8d076441b1 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 94d23c6494..9b5b4ff2e4 100644
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -1126,6 +1126,12 @@ def Test_expr5_vim9script()
lines =<< trim END
vim9script
+ echo {} - 22
+ END
+ CheckScriptFailure(lines, 'E731:', 2)
+
+ lines =<< trim END
+ vim9script
echo 'abc' is? 'abc'
END
CheckScriptFailure(lines, 'E15:', 2)
diff --git a/src/version.c b/src/version.c
index 04bc2483d2..97f9cba2fc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1889,
+/**/
1888,
/**/
1887,