summaryrefslogtreecommitdiff
path: root/ale_linters/d/dmd.vim
diff options
context:
space:
mode:
Diffstat (limited to 'ale_linters/d/dmd.vim')
-rw-r--r--ale_linters/d/dmd.vim15
1 files changed, 10 insertions, 5 deletions
diff --git a/ale_linters/d/dmd.vim b/ale_linters/d/dmd.vim
index 82668a21..f38e812c 100644
--- a/ale_linters/d/dmd.vim
+++ b/ale_linters/d/dmd.vim
@@ -87,15 +87,20 @@ function! ale_linters#d#dmd#Handle(buffer, lines) abort
" Matches patterns lines like the following:
" /tmp/tmp.qclsa7qLP7/file.d(1): Error: function declaration without return type. (Note that constructors are always named 'this')
" /tmp/tmp.G1L5xIizvB.d(8,8): Error: module weak_reference is in file 'dstruct/weak_reference.d' which cannot be read
- let l:pattern = '^[^(]\+(\([0-9]\+\)\,\?\([0-9]*\)): \([^:]\+\): \(.\+\)'
+ let l:pattern = '\v^(\f+)\((\d+)(,(\d+))?\): (\w+): (.+)$'
let l:output = []
+ let l:dir = expand('#' . a:buffer . ':p:h')
for l:match in ale#util#GetMatches(a:lines, l:pattern)
+ " If dmd was invoked with relative path, match[1] is relative, otherwise it is absolute.
+ " As we invoke dmd with the buffer path (in /tmp), this will generally be absolute already
+ let l:fname = ale#path#GetAbsPath(l:dir, l:match[1])
call add(l:output, {
- \ 'lnum': l:match[1],
- \ 'col': l:match[2],
- \ 'type': l:match[3] is# 'Warning' ? 'W' : 'E',
- \ 'text': l:match[4],
+ \ 'filename': l:fname,
+ \ 'lnum': l:match[2],
+ \ 'col': l:match[4],
+ \ 'type': l:match[5] is# 'Warning' || l:match[5] is# 'Deprecation' ? 'W' : 'E',
+ \ 'text': l:match[6],
\})
endfor