summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-07-23 20:09:10 +0200
committerBram Moolenaar <Bram@vim.org>2020-07-23 20:09:10 +0200
commitbfba8651a51b66fdc52848f32c77aa925586e250 (patch)
tree133adb26773b341ecd479f56b1940ea587d00765
parent637cd7d1c9fa0ee47951ccdc310a388cb7ecfada (diff)
patch 8.2.1284: Vim9: skipping over type includes following white spacev8.2.1284
Problem: Vim9: skipping over type includes following white space, leading to an error for missing white space. Solution: Do not skip over white space after the type.
-rw-r--r--src/testdir/test_vim9_func.vim10
-rw-r--r--src/version.c2
-rw-r--r--src/vim9compile.c2
3 files changed, 13 insertions, 1 deletions
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 25c40c8b98..c8c6afee09 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -283,6 +283,16 @@ def Test_call_funcref()
assert_equal(123, Bar(Funcref))
END
CheckScriptSuccess(lines)
+
+ lines =<< trim END
+ vim9script
+ def UseNumber(nr: number)
+ echo nr
+ enddef
+ let Funcref: func(number) = function('UseNumber')
+ Funcref(123)
+ END
+ CheckScriptSuccess(lines)
enddef
let SomeFunc = function('len')
diff --git a/src/version.c b/src/version.c
index ab410712a5..91edd4ad85 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1284,
+/**/
1283,
/**/
1282,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 3be8733eaf..e032e23a92 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -1944,7 +1944,7 @@ skip_type(char_u *start)
if (p[1] == ':')
p = skip_type(skipwhite(p + 2));
else
- p = skipwhite(p + 1);
+ ++p;
}
}
else