thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.1426: Vim9: cannot call autoload function in :def function

Browse Source 
Problem:    Vim9: cannot call autoload function in :def function.
Solution:   Load the autoload script. (closes #6690)
This commit is contained in:
Bram Moolenaar
2020-08-12 15:21:22 +02:00
parent 575f24b3f3
commit a177344dc0
5 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vim9compile.c
View File

@@ -2214,6 +2214,7 @@ compile_call(
int error = FCERR_NONE;
ufunc_T *ufunc;
int res = FAIL;
int is_autoload;
// we can evaluate "has('name')" at compile time
if (varlen == 3 && STRNCMP(*arg, "has", 3) == 0)
@@ -2258,7 +2259,8 @@ compile_call(
if (compile_arguments(arg, cctx, &argcount) == FAIL)
goto theend;
if (ASCII_ISLOWER(*name) && name[1] != ':')
is_autoload = vim_strchr(name, '#') != NULL;
if (ASCII_ISLOWER(*name) && name[1] != ':' && !is_autoload)
{
int idx;
@@ -2281,8 +2283,9 @@ compile_call(
// If the name is a variable, load it and use PCALL.
// Not for g:Func(), we don't know if it is a variable or not.
// Not for eome#Func(), it will be loaded later.
p = namebuf;
if (STRNCMP(namebuf, "g:", 2) != 0
if (STRNCMP(namebuf, "g:", 2) != 0 && !is_autoload
&& compile_load(&p, namebuf + varlen, cctx, FALSE) == OK)
{
garray_T *stack = &cctx->ctx_type_stack;
@@ -2295,7 +2298,7 @@ compile_call(
// A global function may be defined only later. Need to figure out at
// runtime. Also handles a FuncRef at runtime.
if (STRNCMP(namebuf, "g:", 2) == 0)
if (STRNCMP(namebuf, "g:", 2) == 0 || is_autoload)
res = generate_UCALL(cctx, name, argcount);
else
semsg(_(e_unknownfunc), namebuf);