mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
patch 8.2.3766: converting a funcref to a string leaves out "g:"
Problem: Converting a funcref to a string leaves out "g:", causing the meaning of the name depending on the context. Solution: Prepend "g:" for a global function.
This commit is contained in:
10
src/eval.c
10
src/eval.c
@@ -5006,7 +5006,15 @@ echo_string_core(
|
|||||||
ga_concat(&ga, (char_u *)"function(");
|
ga_concat(&ga, (char_u *)"function(");
|
||||||
if (fname != NULL)
|
if (fname != NULL)
|
||||||
{
|
{
|
||||||
ga_concat(&ga, fname);
|
// When using uf_name prepend "g:" for a global function.
|
||||||
|
if (pt->pt_name == NULL && fname[0] == '\''
|
||||||
|
&& vim_isupper(fname[1]))
|
||||||
|
{
|
||||||
|
ga_concat(&ga, (char_u *)"'g:");
|
||||||
|
ga_concat(&ga, fname + 1);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
ga_concat(&ga, fname);
|
||||||
vim_free(fname);
|
vim_free(fname);
|
||||||
}
|
}
|
||||||
if (pt != NULL && pt->pt_argc > 0)
|
if (pt != NULL && pt->pt_argc > 0)
|
||||||
|
@@ -2771,5 +2771,10 @@ func Test_builtin_check()
|
|||||||
call assert_fails('call extend(g:, #{bar: { -> "foo" }}, "force")', 'E704:')
|
call assert_fails('call extend(g:, #{bar: { -> "foo" }}, "force")', 'E704:')
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_funcref_to_string()
|
||||||
|
let Fn = funcref('g:Test_funcref_to_string')
|
||||||
|
call assert_equal("function('g:Test_funcref_to_string')", string(Fn))
|
||||||
|
endfunc
|
||||||
|
|
||||||
|
|
||||||
" vim: shiftwidth=2 sts=2 expandtab
|
" vim: shiftwidth=2 sts=2 expandtab
|
||||||
|
@@ -753,6 +753,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
3766,
|
||||||
/**/
|
/**/
|
||||||
3765,
|
3765,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user