vital: detect script line number

Author: Milly

autoload/vital/vital.vim

@@ -177,8 +177,10 @@ function! s:_format_throwpoint(throwpoint) abort
       endif
       let info = s:_get_func_info(name)
       if !empty(info)
-        call add(funcs, printf('function %s(...) %s Line:%d (%s)',
-        \        info.funcname, join(info.attrs, ' '), lnum, info.filename))
+        let attrs = empty(info.attrs) ? '' : join([''] + info.attrs)
+        let flnum = info.lnum == 0 ? '' : printf(' Line:%d', info.lnum + lnum)
+        call add(funcs, printf('function %s(...)%s Line:%d (%s%s)',
+        \        info.funcname, attrs, lnum, info.filename, flnum))
         continue
       endif
     endif
@@ -197,9 +199,11 @@ function! s:_get_func_info(name) abort
   let body = execute(printf('verbose function %s', name))
   let lines = split(body, "\n")
   let signature = matchstr(lines[0], '^\s*\zs.*')
-  let file = matchstr(lines[1], '^\t\%(Last set from\|.\{-}:\)\s*\zs.*$')
+  let [_, file, lnum; __] = matchlist(lines[1],
+  \   '^\t\%(Last set from\|.\{-}:\)\s*\zs\(.\{-}\)\%( \S\+ \(\d\+\)\)\?$')
   return {
   \   'filename': substitute(file, '[/\\]\+', '/', 'g'),
+  \   'lnum': 0 + lnum,
   \   'funcname': a:name,
   \   'arguments': split(matchstr(signature, '(\zs.*\ze)'), '\s*,\s*'),
   \   'attrs': filter(['dict', 'abort', 'range', 'closure'], 'signature =~# (").*" . v:val)'),

test/vital.vimspec

@@ -222,9 +222,9 @@ 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.*)\n'
-        \ . 'function \d\+(\.\.\.) dict abort Line:1 (.*\/ErrorSelfmodule\.vim.*)\n'
-        \ . 'function \S*_throwFOO(\.\.\.) abort Line:1 (.*\/ErrorSelfmodule\.vim.*)$/'
+        \ . '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\+\)\?)$/'
         execute 'Throws' errorpat ':call V.import("ErrorSelfmodule")'
       End
 
@@ -308,9 +308,9 @@ 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.*)\n'
-        \ . 'function \d\+(\.\.\.) dict abort Line:1 (.*\/ErrorSelfmodule\.vim.*)\n'
-        \ . 'function \S*_throwFOO(\.\.\.) abort Line:1 (.*\/ErrorSelfmodule\.vim.*)$/'
+        \ . '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\+\)\?)$/'
         execute 'Throws' errorpat ':call V.load("ErrorSelfmodule")'
       End