Fix funcname() for Vim 7.4.1608

thinca · Mar 21, 2016 · 80f1ee4 · 80f1ee4
1 parent e1aeee1
commit 80f1ee4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/autoload/themis/util.vim b/autoload/themis/util.vim
@@ -222,7 +222,19 @@ function! themis#util#is_funcname(name) abort
 endfunction
 
 function! themis#util#funcname(funcref) abort
-  return matchstr(string(a:funcref), '^function(''\zs.*\ze'')$')
+  if has('patch-7.4.1608')
+    " From Vim 7.4.1608, the result of string() with Partial
+    " (a kind of Funcref) contains {arglist} and {self} as follows
+    "
+    " function('100', [1], {'method': function('100')})
+    "
+    " E724 occurs if the {arglist} or {self} contains a circular reference
+    " Ignore this error with :silent!
+    silent! let str = string(function(a:funcref, {}))
+  else
+    let str = string(a:funcref)
+  endif
+  return matchstr(str, '^function(''\zs[^'']\{-}\ze''')
 endfunction
 
 function! themis#util#get_full_title(obj, ...) abort

diff --git a/test/util.vimspec b/test/util.vimspec
@@ -84,7 +84,7 @@ Describe util
       let obj = {}
       function! obj.func() abort
       endfunction
-      let funcname = matchstr(string(obj.func), 'function(''\zs.\{-}\ze'')')
+      let funcname = matchstr(string(obj.func), '^function(''\zs[^'']\{-}\ze''')
       unlet obj
       Assert False(themis#util#funcdata(funcname).exists)
     End