aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.2.2575: Vim9: a function name with "->" in the next line doesn't work

Browse Source 
Problem:    Vim9: a function name with "->" in the next line doesn't work.
Solution:   Recognize a function name by itself. (closes #7770)
This commit is contained in:
Bram Moolenaar
2021-03-06 21:01:09 +01:00
parent 04947cc6ed
commit 6914e87d3c
3 changed files with 43 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/vim9compile.c
View File

@@ -386,6 +386,26 @@ variable_exists(char_u *name, size_t len, cctx_T *cctx)
|| find_imported(name, len, cctx) != NULL;
}
/*
* Return TRUE if "name" is a local variable, argument, script variable,
* imported or function.
*/
static int
item_exists(char_u *name, size_t len, cctx_T *cctx)
{
int is_global;
if (variable_exists(name, len, cctx))
return TRUE;
// 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()".
is_global = (name[0] == 'g' && name[1] == ':');
return find_func(is_global ? name + 2 : name, is_global, cctx) != NULL;
}
/*
* Check if "p[len]" is already defined, either in script "import_sid" or in
* compilation context "cctx". "cctx" is NULL at the script level.
@@ -728,7 +748,7 @@ get_compare_isn(exprtype_T exprtype, vartype_T type1, vartype_T type2)
}
else if (type1 == VAR_ANY || type2 == VAR_ANY
|| ((type1 == VAR_NUMBER || type1 == VAR_FLOAT)
&& (type2 == VAR_NUMBER || type2 ==VAR_FLOAT)))
&& (type2 == VAR_NUMBER || type2 == VAR_FLOAT)))
isntype = ISN_COMPAREANY;
if ((exprtype == EXPR_IS || exprtype == EXPR_ISNOT)
@@ -8399,8 +8419,7 @@ compile_def_function(
}
}
p = find_ex_command(&ea, NULL, starts_with_colon ? NULL
: (int (*)(char_u *, size_t, cctx_T *))variable_exists,
&cctx);
: (int (*)(char_u *, size_t, cctx_T *))item_exists, &cctx);
if (p == NULL)
{