mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-07-13 12:50:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.1667: local function name cannot shadow a global function name

Browse Source 
Problem:    Local function name cannot shadow a global function name.
Solution:   Ignore global functions when checking a script-local or scoped
            function name. (closes vim/vim#6926)

0f769815c8

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
Jan Edmund Lazo
2025-12-20 00:56:27 -05:00
parent e1aceb0068
commit ffb4526376
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/nvim/eval/userfunc.c
View File

@@ -717,16 +717,24 @@ ufunc_T *find_func(const char *name)
return NULL; return NULL;
} }
/// @return true if "ufunc" is a global function.
static bool func_is_global(const ufunc_T *ufunc)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_PURE
{
return (uint8_t)ufunc->uf_name[0] != K_SPECIAL;
}
/// Copy the function name of "fp" to buffer "buf". /// Copy the function name of "fp" to buffer "buf".
/// "buf" must be able to hold the function name plus three bytes. /// "buf" must be able to hold the function name plus three bytes.
/// Takes care of script-local function names. /// Takes care of script-local function names.
static int cat_func_name(char *buf, size_t bufsize, ufunc_T *fp) static int cat_func_name(char *buf, size_t bufsize, const ufunc_T *fp)
FUNC_ATTR_NONNULL_ALL
{ {
int len = -1; int len = -1;
size_t uflen = fp->uf_namelen; size_t uflen = fp->uf_namelen;
assert(uflen > 0); assert(uflen > 0);
if ((uint8_t)fp->uf_name[0] == K_SPECIAL && uflen > 3) { if (!func_is_global(fp) && uflen > 3) {
len = snprintf(buf, bufsize, "<SNR>%s", fp->uf_name + 3); len = snprintf(buf, bufsize, "<SNR>%s", fp->uf_name + 3);
} else { } else {
len = snprintf(buf, bufsize, "%s", fp->uf_name); len = snprintf(buf, bufsize, "%s", fp->uf_name);