improve DMD handler (#3647)

* improve DMD handler

 - ignore errors from other files
 - catch 'Deprecation' as warning
 - add tests

* adding filename key instead of filtering

* update dmd test

* fix test dmd windows
This commit is contained in:
Remi Thebault 2021-03-30 08:47:59 +02:00 committed by GitHub
parent 655f0070cd
commit 06f57ca973
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 5 deletions

View File

@ -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

View File

@ -0,0 +1,41 @@
Before:
runtime ale_linters/d/dmd.vim
call ale#test#SetDirectory('/testplugin/test/dmd')
call ale#test#SetFilename('test.d')
After:
call ale#linter#Reset()
call ale#test#RestoreDirectory()
Execute(Basic errors should be handled by dmd):
AssertEqual
\ [
\ {
\ 'filename': ale#path#Simplify(g:dir . '/test.d'),
\ 'lnum': '5',
\ 'col' : '8',
\ 'type': 'E',
\ 'text': 'module weak_reference is in file ''dstruct/weak_reference.d'' which cannot be read'
\ },
\ {
\ 'filename': ale#path#Simplify(g:dir . '/test.d'),
\ 'lnum': '20',
\ 'col' : '10',
\ 'type': 'W',
\ 'text': 'function test.thisoldfunc is deprecated'
\ },
\ {
\ 'filename': ale#path#Simplify(g:dir . '/foo.d'),
\ 'lnum': '230',
\ 'col' : '9',
\ 'type': 'W',
\ 'text': 'statement is not reachable'
\ }
\ ],
\ ale_linters#d#dmd#Handle(bufnr(''), [
\ 'test.d(5,8): Error: module weak_reference is in file ''dstruct/weak_reference.d'' which cannot be read',
\ 'import path[0] = source',
\ 'import path[1] = /usr/include/dlang/dmd',
\ ale#path#Simplify(g:dir . '/test.d') . '(20,10): Deprecation: function test.thisoldfunc is deprecated',
\ 'foo.d(230,9): Warning: statement is not reachable',
\ ])