patch 8.2.1527: Vim9: cannot use a function name at script level

Problem:    Vim9: cannot use a function name as a function reference at script
            level.
Solution:   Check if a name is a function name. (closes #6789)

diff --git a/src/evalvars.c b/src/evalvars.c
index fbf521e718b1b39273b9721708f9f3cb1e513853..a946c75ba7de4e4059b61f3b40b592a51ec0980e 100644 (file)
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -2461,6 +2461,20 @@ eval_variable(
                tv = sv->sv_tv;
            }
        }
+       else if (in_vim9script())
+       {
+           ufunc_T *ufunc = find_func(name, FALSE, NULL);
+
+           if (ufunc != NULL)
+           {
+               foundFunc = TRUE;
+               if (rettv != NULL)
+               {
+                   rettv->v_type = VAR_FUNC;
+                   rettv->vval.v_string = vim_strsave(ufunc->uf_name);
+               }
+           }
+       }
     }
 
     if (!foundFunc)

diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index 4ff0fd7e2524c5510bfac56daff39c4c25425edb..e8e7668282911c245b7dbfe386513cee6265c0d8 100644 (file)
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -1668,6 +1668,17 @@ def Test_expr7_lambda_vim9script()
   CheckScriptSuccess(lines)
 enddef
 
+def Test_epxr7_funcref()
+  let lines =<< trim END
+    def RetNumber(): number
+      return 123
+    enddef
+    let FuncRef = RetNumber
+    assert_equal(123, FuncRef())
+  END
+  CheckDefAndScriptSuccess(lines)
+enddef
+
 def Test_expr7_dict()
   # dictionary
   assert_equal(g:dict_empty, {})

diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index 245817b998ade3a208a7850e72eb1916f7eeae48..952b67522dfb85cbbdfcc9b001334308a6beb893 100644 (file)
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -1684,8 +1684,9 @@ def Test_vim9script_funcref()
   delete('Xscript.vim')
 enddef
 
-" Check that when searcing for "FilterFunc" it doesn't find the import in the
-" script where FastFilter() is called from.
+" Check that when searching for "FilterFunc" it finds the import in the
+" script where FastFilter() is called from, both as a string and as a direct
+" function reference.
 def Test_vim9script_funcref_other_script()
   let filterLines =<< trim END
     vim9script
@@ -1695,22 +1696,26 @@ def Test_vim9script_funcref_other_script()
     export def FastFilter(): list<number>
       return range(10)->filter('FilterFunc')
     enddef
+    export def FastFilterDirect(): list<number>
+      return range(10)->filter(FilterFunc)
+    enddef
   END
   writefile(filterLines, 'Xfilter.vim')
 
   let lines =<< trim END
     vim9script
-    import {FilterFunc, FastFilter} from './Xfilter.vim'
+    import {FilterFunc, FastFilter, FastFilterDirect} from './Xfilter.vim'
     def Test()
       let x: list<number> = FastFilter()
     enddef
     Test()
+    def TestDirect()
+      let x: list<number> = FastFilterDirect()
+    enddef
+    TestDirect()
   END
-  writefile(lines, 'Ximport.vim')
-  assert_fails('source Ximport.vim', 'E121:')
-
+  CheckScriptSuccess(lines)
   delete('Xfilter.vim')
-  delete('Ximport.vim')
 enddef
 
 def Test_vim9script_reload_delfunc()

diff --git a/src/version.c b/src/version.c
index 514cc6890c0e3e8cc86398d2948637f4e2c70b24..0b63281873c7e8b05805463bcf66800e5f4f0917 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1527,
 /**/
     1526,
 /**/