patch 8.2.4161: Vim9: warning for missing white space after imported variable
Problem: Vim9: warning for missing white space after imported variable.
Solution: Do not skip white space. (closes #9567)
diff --git a/src/testdir/test_vim9_import.vim b/src/testdir/test_vim9_import.vim
index 49ff165..6a38106 100644
--- a/src/testdir/test_vim9_import.vim
+++ b/src/testdir/test_vim9_import.vim
@@ -67,6 +67,11 @@
enddef
g:funcref_result = GetExported()
+ def GetName(): string
+ return expo.exp_name .. 'son'
+ enddef
+ g:long_name = GetName()
+
g:imported_name = expo.exp_name
expo.exp_name ..= ' Doe'
expo.exp_name = expo.exp_name .. ' Maar'
@@ -98,6 +103,7 @@
assert_equal('Exported', g:imported_func)
assert_equal('Exported', g:funcref_result)
assert_equal('John', g:imported_name)
+ assert_equal('Johnson', g:long_name)
assert_equal('John Doe Maar', g:imported_name_appended)
assert_false(exists('g:name'))
@@ -109,7 +115,7 @@
unlet g:exported_i2
unlet g:exported_later
unlet g:imported_func
- unlet g:imported_name g:imported_name_appended
+ unlet g:imported_name g:long_name g:imported_name_appended
delete('Ximport.vim')
# similar, with line breaks
diff --git a/src/version.c b/src/version.c
index 901d671..fae00dc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4161,
+/**/
4160,
/**/
4159,
diff --git a/src/vim9expr.c b/src/vim9expr.c
index 7cc3078..d5bb276 100644
--- a/src/vim9expr.c
+++ b/src/vim9expr.c
@@ -321,7 +321,6 @@
cctx, TRUE);
}
*p = cc;
- p = skipwhite(p);
*end = p;
if (done)
return res;