vital: detect lambda-function

Author: Milly

autoload/vital/vital.vim

@@ -191,8 +191,12 @@ function! s:_format_throwpoint(throwpoint) abort
 endfunction
 
 function! s:_get_func_info(name) abort
-  " If name is digits, it is anonymous-function
-  let name = (a:name =~# '^\d\+$') ? printf('{%s}', a:name) : a:name
+  let name = a:name
+  if a:name =~# '^\d\+$'  " is anonymous-function
+    let name = printf('{%s}', a:name)
+  elseif a:name =~# '^<lambda>\d\+$'  " is lambda-function
+    let name = printf("{'%s'}", a:name)
+  endif
   if !exists('*' . name)
     return {}
   endif

test/_testdata/vital/testplugin/autoload/vital/__testplugin__/ErrorSelfmodule.vim

@@ -1,8 +1,17 @@
+let s:Obj = {}
+
 function! s:_vital_loaded(V) abort
-  call s:Obj._anonymous_func()
+  if exists('s:Lambda')
+    call s:Lambda()
+  else
+    call s:Obj._anonymous_func()
+  endif
 endfunction
 
-let s:Obj = {}
+if has('lambda')
+  let s:Lambda = {-> s:Obj._anonymous_func()}
+endif
+
 function! s:Obj._anonymous_func() dict abort
   call s:_throwFOO()
 endfunction

test/vital.vimspec

@@ -222,9 +222,10 @@ Describe vital
 
       It can handle error stack in s:_vital_loaded(V)
         let errorpat = '/^vital: fail to call \._vital_loaded(): FOO from:\_.*\n'
-        \ . 'function \S*_vital_loaded(\.\.\.) abort Line:1 (.*\/ErrorSelfmodule\.vim\( Line:\d\+\)\?)\n'
-        \ . 'function \d\+(\.\.\.) dict abort Line:1 (.*\/ErrorSelfmodule\.vim\( Line:\d\+\)\?)\n'
-        \ . 'function \S*_throwFOO(\.\.\.) abort Line:1 (.*\/ErrorSelfmodule\.vim\( Line:\d\+\)\?)$/'
+        \ . 'function \S*_vital_loaded(\.\.\.) abort Line:\d\+ (.*\/ErrorSelfmodule\.vim\( Line:\d\+\)\?)\n'
+        \ . (has('lambda') ? 'function <lambda>\d\+(\.\.\.) Line:\d\+ (.*\/ErrorSelfmodule\.vim\( Line:\d\+\)\?)\n' : '')
+        \ . 'function \d\+(\.\.\.) dict abort Line:\d\+ (.*\/ErrorSelfmodule\.vim\( Line:\d\+\)\?)\n'
+        \ . 'function \S*_throwFOO(\.\.\.) abort Line:\d\+ (.*\/ErrorSelfmodule\.vim\( Line:\d\+\)\?)$/'
         execute 'Throws' errorpat ':call V.import("ErrorSelfmodule")'
       End
 
@@ -308,9 +309,10 @@ Describe vital
       It can handle error stack in s:_vital_loaded(V)
         let V = vital#{g:testplugin_name}#new()
         let errorpat = '/^vital: fail to call \._vital_loaded(): FOO from:\_.*\n'
-        \ . 'function \S*_vital_loaded(\.\.\.) abort Line:1 (.*\/ErrorSelfmodule\.vim\( Line:\d\+\)\?)\n'
-        \ . 'function \d\+(\.\.\.) dict abort Line:1 (.*\/ErrorSelfmodule\.vim\( Line:\d\+\)\?)\n'
-        \ . 'function \S*_throwFOO(\.\.\.) abort Line:1 (.*\/ErrorSelfmodule\.vim\( Line:\d\+\)\?)$/'
+        \ . 'function \S*_vital_loaded(\.\.\.) abort Line:\d\+ (.*\/ErrorSelfmodule\.vim\( Line:\d\+\)\?)\n'
+        \ . (has('lambda') ? 'function <lambda>\d\+(\.\.\.) Line:\d\+ (.*\/ErrorSelfmodule\.vim\( Line:\d\+\)\?)\n' : '')
+        \ . 'function \d\+(\.\.\.) dict abort Line:\d\+ (.*\/ErrorSelfmodule\.vim\( Line:\d\+\)\?)\n'
+        \ . 'function \S*_throwFOO(\.\.\.) abort Line:\d\+ (.*\/ErrorSelfmodule\.vim\( Line:\d\+\)\?)$/'
         execute 'Throws' errorpat ':call V.load("ErrorSelfmodule")'
       End