Handle server-side errors and failed builds

Author: nickspoons

autoload/OmniSharp/actions/test.vim

@@ -76,8 +76,11 @@ endfunction
 function! s:debug.complete(response) abort
   if !a:response.Success
     call s:utils.log.warn(['Error debugging unit test', a:response.Message])
+    call OmniSharp#testrunner#StateError(s:debug.bufnr,
+    \ split(trim(a:response.Message), '\r\?\n', 1))
+  else
+    call OmniSharp#testrunner#StateSkipped(s:debug.bufnr)
   endif
-  call OmniSharp#testrunner#StateSkipped(s:debug.bufnr)
 endfunction
 
 function! s:debug.process.start(command) abort
@@ -273,8 +276,14 @@ endfunction
 " Response handler used when running a single test, or multiple tests in files
 function! s:run.process(Callback, bufnr, tests, response) abort
   let s:run.running = 0
-  if !a:response.Success | return | endif
+  if !a:response.Success
+    call OmniSharp#testrunner#StateError(a:bufnr,
+    \ split(trim(eval(a:response.Message)), '\r\?\n', 1))
+    return s:utils.log.warn('An error has occurred. This may indicate a failed build')
+  endif
   if type(a:response.Body.Results) != type([])
+    call OmniSharp#testrunner#StateError(a:bufnr,
+    \ split(trim(a:response.Body.Failure), '\r\?\n', 1))
     return s:utils.log.warn('Error: "' . a:response.Body.Failure .
     \ '"   - this may indicate a failed build')
   endif

autoload/OmniSharp/testrunner.vim

@@ -71,7 +71,11 @@ function! s:Paint() abort
     let job = OmniSharp#proc#GetJob(sln_or_dir)
     if !has_key(job, 'tests') | continue | endif
     for testproject in sort(keys(job.tests))
-      call add(lines, testproject)
+      let errors = get(get(job, 'testerrors', {}), testproject, [])
+      call add(lines, testproject . (len(errors) ? ' - ERROR' : ''))
+      for errorline in errors
+        call add(lines, '<  ' . trim(errorline, ' ', 2))
+      endfor
       for testfile in sort(keys(job.tests[testproject]))
         call add(lines, '    ' . fnamemodify(testfile, ':.'))
         let tests = job.tests[testproject][testfile]
@@ -82,33 +86,24 @@ function! s:Paint() abort
           if state ==# '-' && !has_key(test, 'spintimer')
             call s:spinner.start(test, len(lines))
           endif
-          let message = get(test, 'message', [])
-          if len(message)
-            for messageline in message
-              call add(lines, '>            ' . trim(messageline, ' ', 2))
-            endfor
-          endif
-          let stacktrace = get(test, 'stacktrace', [])
-          if len(stacktrace)
-            for st in stacktrace
-              let line = trim(st.text)
-              if has_key(st, 'filename')
-                let line = '__ ' . line . ' __'
-              else
-                let line = '_._ ' . line . ' _._'
-              endif
-              if has_key(st, 'lnum')
-                let line .= ' line ' . st.lnum
-              endif
-              call add(lines, '>              ' . line)
-            endfor
-          endif
-          let output = get(test, 'output', [])
-          if len(output)
-            for outputline in output
-              call add(lines, '//          ' . trim(outputline, ' ', 2))
-            endfor
-          endif
+          for messageline in get(test, 'message', [])
+            call add(lines, '>            ' . trim(messageline, ' ', 2))
+          endfor
+          for stacktraceline in get(test, 'stacktrace', [])
+            let line = trim(stacktraceline.text)
+            if has_key(stacktraceline, 'filename')
+              let line = '__ ' . line . ' __'
+            else
+              let line = '_._ ' . line . ' _._'
+            endif
+            if has_key(stacktraceline, 'lnum')
+              let line .= ' line ' . stacktraceline.lnum
+            endif
+            call add(lines, '>              ' . line)
+          endfor
+          for outputline in get(test, 'output', [])
+            call add(lines, '//          ' . trim(outputline, ' ', 2))
+          endfor
         endfor
         call add(lines, '__')
       endfor
@@ -151,17 +146,19 @@ function! OmniSharp#testrunner#SetTests(bufferTests) abort
   call win_gotoid(winid)
 endfunction
 
-function! s:UpdateState(bufnr, testnames, state, ...) abort
-  let message = a:0 ? a:1 : []
-  let stacktraceraw = a:0 > 1 ? a:2 : []
-  let output = a:0 > 2 ? a:3 : []
+function! s:UpdateState(bufnr, state, ...) abort
+  let opts = a:0 ? a:1 : {}
+  let job = OmniSharp#GetHost(a:bufnr).job
   let projectname = s:utils.getProjectName(a:bufnr)
+  let job.testerrors = get(job, 'testerrors', {})
+  let job.testerrors[projectname] = get(opts, 'errors', [])
+  " TODO: parse errors like the stacktrace
   let filename = fnamemodify(bufname(a:bufnr), ':p')
-  let tests = OmniSharp#GetHost(a:bufnr).job.tests[projectname][filename]
-  for testname in a:testnames
+  let tests = job.tests[projectname][filename]
+  for testname in get(opts, 'testnames', s:lasttestnames)
     if has_key(tests, testname)
       let stacktrace = []
-      for st in stacktraceraw
+      for st in get(opts, 'stacktrace', [])
         let parsed = matchlist(st, 'at \(.\+\) in \([^:]\+\)\(:line \(\d\+\)\)\?')
         if len(parsed)
           call add(stacktrace, {
@@ -180,20 +177,14 @@ function! s:UpdateState(bufnr, testnames, state, ...) abort
       endfor
 
       let tests[testname].state = a:state
-      let tests[testname].message = message
+      let tests[testname].message = get(opts, 'message', [])
       let tests[testname].stacktrace = stacktrace
-      let tests[testname].output = output
+      let tests[testname].output = get(opts, 'output', [])
     endif
   endfor
   call s:Repaint()
 endfunction
 
-function! OmniSharp#testrunner#StateRunning(bufnr, testnames) abort
-  let testnames = type(a:testnames) == type([]) ? a:testnames : [a:testnames]
-  let s:lasttestnames = testnames
-  call s:UpdateState(a:bufnr, testnames, 'Running')
-endfunction
-
 function! OmniSharp#testrunner#StateComplete(location) abort
   if get(a:location, 'type', '') ==# 'E'
     let state = 'Failed'
@@ -202,14 +193,26 @@ function! OmniSharp#testrunner#StateComplete(location) abort
   else
     let state = 'Passed'
   endif
-  call s:UpdateState(a:.location.bufnr, [a:location.fullname], state,
-  \ get(a:location, 'message', []),
-  \ get(a:location, 'stacktrace', []),
-  \ get(a:location, 'output', []))
+  call s:UpdateState(a:.location.bufnr, state, {
+  \ 'testnames': [a:location.fullname],
+  \ 'message': get(a:location, 'message', []),
+  \ 'stacktrace': get(a:location, 'stacktrace', []),
+  \ 'output': get(a:location, 'output', [])
+  \})
+endfunction
+
+function! OmniSharp#testrunner#StateError(bufnr, messages) abort
+  call s:UpdateState(a:bufnr, 'Not run', {'errors': a:messages})
+endfunction
+
+function! OmniSharp#testrunner#StateRunning(bufnr, testnames) abort
+  let testnames = type(a:testnames) == type([]) ? a:testnames : [a:testnames]
+  let s:lasttestnames = testnames
+  call s:UpdateState(a:bufnr, 'Running', {'testnames': testnames})
 endfunction
 
 function! OmniSharp#testrunner#StateSkipped(bufnr) abort
-  call s:UpdateState(a:bufnr, s:lasttestnames, 'Not run')
+  call s:UpdateState(a:bufnr, 'Not run')
 endfunction
 
 

syntax/omnisharptest.vim

@@ -14,10 +14,12 @@ syn match ostBannerDelim "\%1l^.*$" contained
 syn match ostBannerDelim "\%3l^.*$" contained
 syn match ostBannerDelim "\%8l^.*$" contained
 
-syn region ostProject matchgroup=ostProjectName start="^\a.*" end="^$"me=s-1 contains=TOP transparent fold
+syn region ostProject start="^\a.*" end="^$"me=s-1 contains=TOP transparent fold
+syn match ostProjectName "^\a.*" contains=ostProjectError
+syn match ostProjectError " - ERROR$"hs=s+2 contained
 syn region ostFile start="^    \S.*" end="^__$"me=s-1 contains=TOP transparent fold
 syn match ostFileName "^    \S.*" contains=ostFilePath,ostFileExt
-syn match ostFilePath "^    \zs\%(\%(\w\+\.\)*\w\+\/\)*\ze\w\+\." conceal contained
+syn match ostFilePath "^    \zs\%(\%(\f\+\.\)*\f\+\/\)*\ze\f\+\." conceal contained
 syn match ostFileExt "\%(\.\w\+\)\+" conceal contained
 syn match ostFileDivider "^__$" conceal
 
@@ -32,6 +34,8 @@ syn match ostRunningSuffix "  -- .*" contained contains=ostRunningSpinner,ostRun
 syn match ostRunningSuffixDivider "  \zs--" conceal contained
 syn match ostRunningSpinner "  -- \zs.*" contained
 
+syn region ostError start="^<" end="^[^<]"me=s-1 contains=ostErrorPrefix,ostStackFile,ostStackFileNoLoc
+syn match ostErrorPrefix "^<" conceal contained
 syn region ostFailure start="^>" end="^[^>]"me=s-1 contains=ostFailurePrefix,ostStackFile,ostStackFileNoLoc fold
 syn match ostFailurePrefix "^>" conceal contained
 syn region ostStackFile start=" __ "hs=e+1 end=" __" contains=ostStackFileDelimiter,ostStackFileNamespace contained keepend
@@ -48,6 +52,7 @@ hi def link ostBannerHelp Comment
 hi def link ostBannerMap PreProc
 hi def link ostBannerLink Identifier
 hi def link ostProjectName Identifier
+hi def link ostProjectError WarningMsg
 hi def link ostFileName TypeDef
 hi def link ostStateNotRun Comment
 hi def link ostStateRunning Identifier