thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.5167: get(Fn, 'name') on funcref returns special byte code

Browse Source 
Problem:    get(Fn, 'name') on funcref returns special byte code.
Solution:   Use the printable name.
This commit is contained in:
Bram Moolenaar
2022-06-27 11:45:52 +01:00
parent f65cc665fa
commit 1ae8c262df
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/evalfunc.c
View File

@@ -4719,19 +4719,23 @@ f_get(typval_T *argvars, typval_T *rettv)
if (pt != NULL)
{
char_u *what = tv_get_string(&argvars[1]);
char_u *n;
if (STRCMP(what, "func") == 0 || STRCMP(what, "name") == 0)
{
char_u *name = partial_name(pt);
rettv->v_type = (*what == 'f' ? VAR_FUNC : VAR_STRING);
n = partial_name(pt);
if (n == NULL)
if (name == NULL)
rettv->vval.v_string = NULL;
else
{
rettv->vval.v_string = vim_strsave(n);
if (rettv->v_type == VAR_FUNC)
func_ref(rettv->vval.v_string);
func_ref(name);
if (*what == 'n' && pt->pt_name == NULL
&& pt->pt_func != NULL)
// use <SNR> instead of the byte code
name = printable_func_name(pt->pt_func);
rettv->vval.v_string = vim_strsave(name);
}
}
else if (STRCMP(what, "dict") == 0)

9
src/testdir/test_getvar.vim
View File

@@ -134,11 +134,20 @@ func Test_get_lambda()
call assert_equal([], get(l:L, 'args'))
endfunc
func s:FooBar()
endfunc
" get({func}, {what} [, {default}])
func Test_get_func()
let l:F = function('tr')
call assert_equal('tr', get(l:F, 'name'))
call assert_equal(l:F, get(l:F, 'func'))
let Fb_func = function('s:FooBar')
call assert_match('<SNR>\d\+_FooBar', get(Fb_func, 'name'))
let Fb_ref = funcref('s:FooBar')
call assert_match('<SNR>\d\+_FooBar', get(Fb_ref, 'name'))
call assert_equal({'func has': 'no dict'}, get(l:F, 'dict', {'func has': 'no dict'}))
call assert_equal(0, get(l:F, 'dict'))
call assert_equal([], get(l:F, 'args'))

2
src/version.c
View File

@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
5167,
/**/
5166,
/**/