Clean up output and conceal namespaces

Author: nickspoons

autoload/OmniSharp/testrunner.vim

@@ -66,25 +66,34 @@ function! s:Paint() abort
     for testproject in sort(keys(job.tests))
       call add(lines, testproject)
       for testfile in sort(keys(job.tests[testproject]))
-        call add(lines, '  ' . fnamemodify(testfile, ':.'))
+        call add(lines, '    ' . fnamemodify(testfile, ':.'))
         let tests = job.tests[testproject][testfile]
         for name in sort(keys(tests), {a,b -> tests[a].lnum > tests[b].lnum})
           let test = tests[name]
           let state = s:utils.state2char[test.state]
-          call add(lines, printf('%s       %s', state, name))
+          call add(lines, printf('%s        %s', state, name))
           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))
+              call add(lines, '>            ' . trim(messageline, ' ', 2))
             endfor
           endif
           let stacktrace = get(test, 'stacktrace', [])
           if len(stacktrace)
-            for stacktraceline in stacktrace
-              call add(lines, '>           ' . trim(stacktraceline, ' ', 2))
+            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', [])
@@ -137,13 +146,32 @@ endfunction
 
 function! s:UpdateState(bufnr, testnames, state, ...) abort
   let message = a:0 ? a:1 : []
-  let stacktrace = a:0 > 1 ? a:2 : []
+  let stacktraceraw = a:0 > 1 ? a:2 : []
   let output = a:0 > 2 ? a:3 : []
   let projectname = s:utils.getProjectName(a:bufnr)
   let filename = fnamemodify(bufname(a:bufnr), ':p')
   let tests = OmniSharp#GetHost(a:bufnr).job.tests[projectname][filename]
   for testname in a:testnames
     if has_key(tests, testname)
+      let stacktrace = []
+      for st in stacktraceraw
+        let parsed = matchlist(st, 'at \(.\+\) in \([^:]\+\)\(:line \(\d\+\)\)\?')
+        if len(parsed)
+          call add(stacktrace, {
+          \ 'text': parsed[1],
+          \ 'filename': parsed[2],
+          \ 'lnum': str2nr(parsed[4])
+          \})
+        else
+          let parsed = matchlist(st, 'at \(.\+\)')
+          if len(parsed)
+            call add(stacktrace, {'text': parsed[1]})
+          else
+            call add(stacktrace, {'text': st})
+          endif
+        endif
+      endfor
+
       let tests[testname].state = a:state
       let tests[testname].message = message
       let tests[testname].stacktrace = stacktrace

syntax/omnisharptest.vim

@@ -9,21 +9,30 @@ syn region ostIntro start="\%1l" end="^$" contains=ostIntroDelim transparent
 syn match ostIntroDelim "^=\+$" contained
 
 syn region ostProject matchgroup=ostProjectName start="^\a.*" end="^$"me=s-1 contains=TOP transparent fold
-syn region ostFile matchgroup=ostFileName start="^  \S.*" end="^__$"me=s-1 contains=TOP transparent fold
+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 ostFileExt "\%(\.\w\+\)\+" conceal contained
 syn match ostFileDivider "^__$" conceal
 
-syn match ostStateNotRun "^|.*" contains=ostStatePrefix
-syn match ostStateRunning "^-.*" contains=ostStatePrefix,ostRunningSuffix
-syn match ostStatePassed "^\*.*" contains=ostStatePrefix
-syn match ostStateFailed "^!.*" contains=ostStatePrefix
+syn match ostStateNotRun "^|.*" contains=ostStatePrefix,ostTestNamespace
+syn match ostStateRunning "^-.*" contains=ostStatePrefix,ostTestNamespace,ostRunningSuffix
+syn match ostStatePassed "^\*.*" contains=ostStatePrefix,ostTestNamespace
+syn match ostStateFailed "^!.*" contains=ostStatePrefix,ostTestNamespace
 syn match ostStatePrefix "^[|\*!-]" conceal contained
+syn match ostTestNamespace "\%(\w\+\.\)*\ze\w\+" conceal contained
 
 syn match ostRunningSuffix "  -- .*" contained contains=ostRunningSpinner,ostRunningSuffixDivider
 syn match ostRunningSuffixDivider "  \zs--" conceal contained
 syn match ostRunningSpinner "  -- \zs.*" contained
 
-syn region ostFailure start="^>" end="^[^>]"me=s-1 contains=ostFailurePrefix fold
+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
+syn match ostStackFileDelimiter " __" conceal contained
+syn region ostStackFileNoLoc start=" _._ "hs=e+1 end=" _._" contains=ostStackFileNoLocDelimiter,ostStackFileNamespace contained keepend
+syn match ostStackFileNoLocDelimiter " _._" conceal contained
+syn match ostStackFileNamespace "\%(\w\+\.\)*\ze\w\+\.\w\+(" conceal contained
 syn region ostOutput start="^//" end="^[^/]"me=s-1 contains=ostOutputPrefix fold
 syn match ostOutputPrefix "^//" conceal contained
 
@@ -35,6 +44,7 @@ hi def link ostStateRunning Identifier
 hi def link ostRunningSpinner Normal
 hi def link ostStatePassed Title
 hi def link ostStateFailed WarningMsg
+hi def link ostStackFile Underlined
 hi def link ostOutput Comment
 
 let b:current_syntax = 'omnisharptest'