vim-patch:7.4.1842

Problem:    get() works for Partial but not for Funcref.
Solution:   Accept Funcref.  Also return the function itself. (Nikolai Pavlov)

03e19a04ac

runtime/doc/eval.txt

@@ -1957,6 +1957,7 @@ function({name} [, {arglist}] [, {dict}])
 garbagecollect([{atexit}])	none	free memory, breaking cyclic references
 get({list}, {idx} [, {def}])	any	get item {idx} from {list} or {def}
 get({dict}, {key} [, {def}])	any	get item {key} from {dict} or {def}
+get({func}, {what})		any	get property of funcref/partial {func}
 getbufline({expr}, {lnum} [, {end}])
 				List	lines {lnum} to {end} of buffer {expr}
 getbufvar({expr}, {varname} [, {def}])
@@ -3586,9 +3587,10 @@ get({dict}, {key} [, {default}])
 		Get item with key {key} from |Dictionary| {dict}.  When this
 		item is not available return {default}.  Return zero when
 		{default} is omitted.
-get({partial}, {what})
+get({func}, {what})
-		Get an item with from Funcref {partial}.  Possible values for
+		Get an item with from Funcref {func}.  Possible values for
 		{what} are:
+			'name'	The function name
 			'func'	The function
 			'dict'	The dictionary
 			'args'	The list with arguments

src/nvim/eval.c

@@ -9706,14 +9706,24 @@ static void f_get(typval_T *argvars, typval_T *rettv, FunPtr fptr)
       if (di != NULL)
         tv = &di->di_tv;
     }
-  } else if (argvars[0].v_type == VAR_PARTIAL) {
+  } else if (argvars[0].v_type == VAR_PARTIAL
-    partial_T *pt = argvars[0].vval.v_partial;
+             || argvars[0].v_type == VAR_FUNC) {
+    partial_T *pt;
+    partial_T fref_pt;
+
+    if (argvars[0].v_type == VAR_PARTIAL) {
+      pt = argvars[0].vval.v_partial;
+    } else {
+      memset(&fref_pt, 0, sizeof(fref_pt));
+      fref_pt.pt_name = argvars[0].vval.v_string;
+      pt = &fref_pt;
+    }
 
     if (pt != NULL) {
       char_u *what = get_tv_string(&argvars[1]);
 
-      if (STRCMP(what, "func") == 0) {
+      if (STRCMP(what, "func") == 0 || STRCMP(what, "name") == 0) {
-        rettv->v_type = VAR_STRING;
+        rettv->v_type = (*what == 'f' ? VAR_FUNC : VAR_STRING);
         if (pt->pt_name != NULL) {
           rettv->vval.v_string = vim_strsave(pt->pt_name);
         }

src/nvim/testdir/test_partial.vim

@@ -250,9 +250,18 @@ endfunc
 
 func Test_get_partial_items()
   let dict = {'name': 'hello'}
-  let Cb = function('MyDictFunc', ["foo", "bar"], dict)
+  let args = ["foo", "bar"]
-  call assert_equal('MyDictFunc', get(Cb, 'func'))
+  let Func = function('MyDictFunc')
-  call assert_equal(["foo", "bar"], get(Cb, 'args'))
+  let Cb = function('MyDictFunc', args, dict)
+
+  call assert_equal(Func, get(Cb, 'func'))
+  call assert_equal('MyDictFunc', get(Cb, 'name'))
+  call assert_equal(args, get(Cb, 'args'))
   call assert_equal(dict, get(Cb, 'dict'))
   call assert_fails('call get(Cb, "xxx")', 'E475:')
+
+  call assert_equal(Func, get(Func, 'func'))
+  call assert_equal('MyDictFunc', get(Func, 'name'))
+  call assert_equal([], get(Func, 'args'))
+  call assert_true(empty( get(Func, 'dict')))
 endfunc

src/nvim/version.c

@@ -598,7 +598,7 @@ static int included_patches[] = {
   // 1845 NA
   // 1844,
   // 1843 NA
-  // 1842,
+  1842,
   // 1841,
   1840,
   // 1839,