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

patch 8.2.2566: Vim9: Function name is not recognized

Browse Source 
Problem:    Vim9: Function name is not recognized.
Solution:   Change lookup_scriptvar() to also find function names.
            (closes #7770)
This commit is contained in:
Bram Moolenaar
2021-03-03 21:22:41 +01:00
parent f76ec1eeb5
commit 2e2d758902
6 changed files with 43 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/evalvars.c
View File

@@ -2788,11 +2788,11 @@ get_script_local_ht(void)
}
/*
* Look for "name[len]" in script-local variables.
* Look for "name[len]" in script-local variables and functions.
* Return OK when found, FAIL when not found.
*/
int
lookup_scriptvar(
lookup_scriptitem(
char_u *name,
size_t len,
cctx_T *dummy UNUSED)
@@ -2802,6 +2802,8 @@ lookup_scriptvar(
char_u *p;
int res;
hashitem_T *hi;
int is_global = FALSE;
char_u *fname = name;
if (ht == NULL)
return FAIL;
@@ -2824,9 +2826,24 @@ lookup_scriptvar(
// if not script-local, then perhaps imported
if (res == FAIL && find_imported(p, 0, NULL) != NULL)
res = OK;
if (p != buffer)
vim_free(p);
if (res != OK)
{
// Find a function, so that a following "->" works. Skip "g:" before a
// function name.
// Do not check for an internal function, since it might also be a
// valid command, such as ":split" versuse "split()".
if (name[0] == 'g' && name[1] == ':')
{
is_global = TRUE;
fname = name + 2;
}
if (find_func(fname, is_global, NULL) != NULL)
res = OK;
}
return res;
}