patch 8.2.1541: Vim9: cannot find function reference for s:Func
Problem: Vim9: cannot find function reference for s:Func.
Solution: Recognize <SNR> prefix. (closes #6805)
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index 49aacb0..662024c 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -1652,6 +1652,10 @@
delete('Ximport.vim')
enddef
+def s:RetSome(): string
+ return 'some'
+enddef
+
" Not exported function that is referenced needs to be accessed by the
" script-local name.
def Test_vim9script_funcref()
@@ -1683,6 +1687,9 @@
unlet g:result
delete('Xsort.vim')
delete('Xscript.vim')
+
+ let Funcref = function('s:RetSome')
+ assert_equal('some', Funcref())
enddef
" Check that when searching for "FilterFunc" it finds the import in the
diff --git a/src/userfunc.c b/src/userfunc.c
index be706bd..d918903 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -808,11 +808,12 @@
if (!is_global)
{
- int vim9script = in_vim9script();
char_u *after_script = NULL;
long sid = 0;
+ int find_script_local = in_vim9script()
+ && eval_isnamec1(*name) && name[1] != ':';
- if (vim9script)
+ if (find_script_local)
{
// Find script-local function before global one.
func = find_func_with_sid(name, current_sctx.sc_sid);
@@ -833,7 +834,7 @@
else
after_script = NULL;
}
- if (vim9script || after_script != NULL)
+ if (find_script_local || after_script != NULL)
{
// Find imported function before global one.
if (after_script != NULL && sid != current_sctx.sc_sid)
diff --git a/src/version.c b/src/version.c
index cd341e2..a76e129 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1541,
+/**/
1540,
/**/
1539,
diff --git a/src/vim9execute.c b/src/vim9execute.c
index 05cf5da..9bc0d45 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -614,6 +614,7 @@
int argcount = argcount_arg;
char_u *name = NULL;
int called_emsg_before = called_emsg;
+ int res;
if (tv->v_type == VAR_PARTIAL)
{
@@ -650,7 +651,23 @@
}
else if (tv->v_type == VAR_FUNC)
name = tv->vval.v_string;
- if (name == NULL || call_by_name(name, argcount, ectx, NULL) == FAIL)
+ if (name != NULL)
+ {
+ char_u fname_buf[FLEN_FIXED + 1];
+ char_u *tofree = NULL;
+ int error = FCERR_NONE;
+ char_u *fname;
+
+ // May need to translate <SNR>123_ to K_SNR.
+ fname = fname_trans_sid(name, fname_buf, &tofree, &error);
+ if (error != FCERR_NONE)
+ res = FAIL;
+ else
+ res = call_by_name(fname, argcount, ectx, NULL);
+ vim_free(tofree);
+ }
+
+ if (name == NULL || res == FAIL)
{
if (called_emsg == called_emsg_before)
semsg(_(e_unknownfunc),