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.2603: Vim9: no effect if user command is also a function

Browse Source 
Problem:    Vim9: no effect if user command is also a function.
Solution:   Check for paren following. (closes #7960)
This commit is contained in:
Bram Moolenaar
2021-03-14 13:21:35 +01:00
parent 2e34c34be1
commit 77b10ffad4
7 changed files with 76 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/vim9compile.c
View File

@@ -391,19 +391,29 @@ variable_exists(char_u *name, size_t len, cctx_T *cctx)
* imported or function.
*/
static int
item_exists(char_u *name, size_t len, cctx_T *cctx)
item_exists(char_u *name, size_t len, int cmd UNUSED, cctx_T *cctx)
{
int is_global;
char_u *p;
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;
// This is similar to what is in lookup_scriptitem():
// Find a function, so that a following "->" works.
// Require "(" or "->" to follow, "Cmd" is a user command while "Cmd()" is
// a function call.
p = skipwhite(name + len);
if (name[len] == '(' || (p[0] == '-' && p[1] == '>'))
{
// Do not check for an internal function, since it might also be a
// valid command, such as ":split" versuse "split()".
// Skip "g:" before a function name.
is_global = (name[0] == 'g' && name[1] == ':');
return find_func(is_global ? name + 2 : name, is_global, cctx) != NULL;
}
return FALSE;
}
/*
@@ -8429,8 +8439,8 @@ compile_def_function(
}
}
}
p = find_ex_command(&ea, NULL, starts_with_colon ? NULL
: (int (*)(char_u *, size_t, cctx_T *))item_exists, &cctx);
p = find_ex_command(&ea, NULL, starts_with_colon
? NULL : item_exists, &cctx);
if (p == NULL)
{