Merge pull request #753 from tsuyoshicho/fix/latest-vim-test-20200806

Author: tsuyoshicho

test/Async/Later.vimspec

@@ -89,7 +89,7 @@ Describe Async.Later
       Assert Equals(exception, v:null)
       Assert Match(
             \ messages,
-            \ '^\nHello World\nfunction .*<SNR>\d\+_throw, line 1',
+            \ '^\nHello World\n.*function .*<SNR>\d\+_throw, line 1',
             \)
     End
 

test/vital.vimspec

@@ -221,11 +221,11 @@ Describe vital
       End
 
       It can handle error stack in s:_vital_loaded(V)
-        let errorpat = '/^vital: fail to call \._vital_loaded(): FOO from:\_.*\n'
+        let errorpat = '/^vital: fail to call \._vital_loaded(): FOO from:\(\_.*\n'
         \ . '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\+\)\?)$/'
+        \ . 'function \S*_throwFOO(\.\.\.) abort Line:\d\+ (.*\/ErrorSelfmodule\.vim\( Line:\d\+\)\?)\)\?\n\?$/'
         execute 'Throws' errorpat ':call V.import("ErrorSelfmodule")'
       End
 
@@ -310,11 +310,11 @@ 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'
+        let errorpat = '/^vital: fail to call \._vital_loaded(): FOO from:\(\_.*\n'
         \ . '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\+\)\?)$/'
+        \ . 'function \S*_throwFOO(\.\.\.) abort Line:\d\+ (.*\/ErrorSelfmodule\.vim\( Line:\d\+\)\?)\)\?\n\?$/'
         execute 'Throws' errorpat ':call V.load("ErrorSelfmodule")'
       End