#852 - Capture error codes for mcs and mcsc

2 files changed, 10 insertions, 8 deletions

diff --git a/ale_linters/cs/mcs.vim b/ale_linters/cs/mcs.vim
index 3d042f99..b5c4054a 100644
--- a/ale_linters/cs/mcs.vim
+++ b/ale_linters/cs/mcs.vim
@@ -8,15 +8,16 @@ function! ale_linters#cs#mcs#Handle(buffer, lines) abort
     " Look for lines like the following.
     "
     " Tests.cs(12,29): error CSXXXX: ; expected
-    let l:pattern = '^.\+.cs(\(\d\+\),\(\d\+\)): \(.\+\): \(.\+\)'
+    let l:pattern = '^\v(.+\.cs)\((\d+),(\d+)\)\: ([^ ]+) ([^ ]+): (.+)$'
     let l:output = []
 
     for l:match in ale#util#GetMatches(a:lines, l:pattern)
         call add(l:output, {
-        \   'lnum': l:match[1] + 0,
-        \   'col': l:match[2] + 0,
-        \   'text': l:match[3] . ': ' . l:match[4],
-        \   'type': l:match[3] =~# '^error' ? 'E' : 'W',
+        \   'lnum': l:match[2] + 0,
+        \   'col': l:match[3] + 0,
+        \   'type': l:match[4] is# 'error' ? 'E' : 'W',
+        \   'code': l:match[5],
+        \   'text': l:match[6],
         \})
     endfor
 
diff --git a/ale_linters/cs/mcsc.vim b/ale_linters/cs/mcsc.vim
index 38a08556..6e51ef3a 100644
--- a/ale_linters/cs/mcsc.vim
+++ b/ale_linters/cs/mcsc.vim
@@ -60,7 +60,7 @@ function! ale_linters#cs#mcsc#Handle(buffer, lines) abort
     " NOTE: pattern also captures file name as linter compiles all
     " files within the source tree rooted at the specified source
     " path and not just the file loaded in the buffer
-    let l:pattern = '^\(.\+\.cs\)(\(\d\+\),\(\d\+\)): \(.\+\): \(.\+\)'
+    let l:pattern = '^\v(.+\.cs)\((\d+),(\d+)\)\: ([^ ]+) ([^ ]+): (.+)$'
     let l:output = []
     let l:source = ale#Var(a:buffer, 'cs_mcsc_source')
 
@@ -69,8 +69,9 @@ function! ale_linters#cs#mcsc#Handle(buffer, lines) abort
         \   'filename': fnamemodify(l:source . '/' . l:match[1], ':p'),
         \   'lnum': l:match[2] + 0,
         \   'col': l:match[3] + 0,
-        \   'text': l:match[4] . ': ' . l:match[5],
-        \   'type': l:match[4] =~# '^error' ? 'E' : 'W',
+        \   'type': l:match[4] is# 'error' ? 'E' : 'W',
+        \   'code': l:match[5],
+        \   'text': l:match[6],
         \})
     endfor