commit 47036b6bd7e5a0b38f093d9f0630f054b04fa68e
author Bram Moolenaar <Bram@vim.org> Sun Jan 16 21:18:53 2022 +0000
committer Bram Moolenaar <Bram@vim.org> Sun Jan 16 21:18:53 2022 +0000
tree a6420a344a12e688f03ca350e895a082b42ea8f1
parent c73499351aef8b611b13c70ef8706a7e98df67a8

patch 8.2.4117: Vim9: wrong white space error after using imported item

Problem:    Vim9: wrong white space error after using imported item.
Solution:   Don't skip over white space. (closes #9544)

src/eval.c

diff --git a/src/eval.c b/src/eval.c
index c8907de..a21fbba 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -6001,7 +6001,6 @@
 	    idx = find_exported(rettv->vval.v_number, exp_name, &ufunc, &type,
 						  evalarg->eval_cctx, verbose);
 	    **arg = cc;
-	    *arg = skipwhite(*arg);
 
 	    if (idx < 0 && ufunc == NULL)
 	    {

src/testdir/test_vim9_import.vim

diff --git a/src/testdir/test_vim9_import.vim b/src/testdir/test_vim9_import.vim
index 6c6911a..36caf70 100644
--- a/src/testdir/test_vim9_import.vim
+++ b/src/testdir/test_vim9_import.vim
@@ -69,6 +69,7 @@
 
     g:imported_name = expo.exp_name
     expo.exp_name ..= ' Doe'
+    expo.exp_name = expo.exp_name .. ' Maar'
     g:imported_name_appended = expo.exp_name
     g:exported_later = expo.exported
 
@@ -97,7 +98,7 @@
   assert_equal('Exported', g:imported_func)
   assert_equal('Exported', g:funcref_result)
   assert_equal('John', g:imported_name)
-  assert_equal('John Doe', g:imported_name_appended)
+  assert_equal('John Doe Maar', g:imported_name_appended)
   assert_false(exists('g:name'))
 
   Undo_export_script_lines()

src/version.c

diff --git a/src/version.c b/src/version.c
index feedd8f..1c367e6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4117,
+/**/
     4116,
 /**/
     4115,