From 069f90852f1444cac50491c10dfbd339a3f9e0c8 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 13 Aug 2021 17:48:25 +0200
Subject: [PATCH] patch 8.2.3337: completing "call g:" returns entries with
just "g:"
Problem: Completing "call g:" returns entries with just "g:". (Naohiro Ono)
Solution: Skip empty strings returned by get_user_func_name(). (closes #8753)
---
src/evalfunc.c | 2 +-
src/testdir/test_cmdline.vim | 5 +++++
src/version.c | 2 ++
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/evalfunc.c b/src/evalfunc.c
index b90c6d760d..2b50798f4f 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -2304,7 +2304,7 @@ get_function_name(expand_T *xp, int idx)
if (intidx < 0)
{
name = get_user_func_name(xp, idx);
- if (name != NULL)
+ if (name != NULL && *name != NUL)
{
if (*name != '<' && STRNCMP("g:", xp->xp_pattern, 2) == 0)
return cat_prefix_varname('g', name);
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index 90afe4516c..3c5513b88e 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -657,6 +657,11 @@ func Test_cmdline_complete_user_func()
" g: prefix also works
call feedkeys(":echo g:Test_cmdline_complete_user_f\<Tab>\<Home>\"\<cr>", 'tx')
call assert_match('"echo g:Test_cmdline_complete_user_func', @:)
+
+ " using g: prefix does not result in just "g:" matches from a lambda
+ let Fx = { a -> a }
+ call feedkeys(":echo g:\<Tab>\<Home>\"\<cr>", 'tx')
+ call assert_match('"echo g:[A-Z]', @:)
endfunc
func Test_cmdline_complete_user_names()
diff --git a/src/version.c b/src/version.c
index a31b4941a5..64137dbd00 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 3337,
/**/
3336,
/**/
--
GitLab