Handle golangci_lint warning and error messages correctly (#4182)

* Handle golangci_lint warning and error messages correctly

* Fix linter warning

Co-authored-by: Richard Jonas <richard.jonas@derivco.se>
This commit is contained in:
Richard Jonas 2022-05-04 13:05:32 +02:00 committed by GitHub
parent 4e6a7debb4
commit 9e1351499c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 8 deletions

View File

@ -24,7 +24,7 @@ function! ale_linters#go#golangci_lint#GetCommand(buffer) abort
endfunction endfunction
function! ale_linters#go#golangci_lint#GetMatches(lines) abort function! ale_linters#go#golangci_lint#GetMatches(lines) abort
let l:pattern = '\v^([a-zA-Z]?:?[^:]+):(\d+):?(\d+)?:?:?:?\s\*?(.+)$' let l:pattern = '\v^([a-zA-Z]?:?[^:]+):(\d+):?(\d+)?:?:?:?\s\*?(.+)\s+\((.+)\)$'
return ale#util#GetMatches(a:lines, l:pattern) return ale#util#GetMatches(a:lines, l:pattern)
endfunction endfunction
@ -34,14 +34,20 @@ function! ale_linters#go#golangci_lint#Handler(buffer, lines) abort
let l:output = [] let l:output = []
for l:match in ale_linters#go#golangci_lint#GetMatches(a:lines) for l:match in ale_linters#go#golangci_lint#GetMatches(a:lines)
if l:match[5] is# 'typecheck'
let l:msg_type = 'E'
else
let l:msg_type = 'W'
endif
" l:match[1] will already be an absolute path, output from " l:match[1] will already be an absolute path, output from
" golangci_lint " golangci_lint
call add(l:output, { call add(l:output, {
\ 'filename': ale#path#GetAbsPath(l:dir, l:match[1]), \ 'filename': ale#path#GetAbsPath(l:dir, l:match[1]),
\ 'lnum': l:match[2] + 0, \ 'lnum': l:match[2] + 0,
\ 'col': l:match[3] + 0, \ 'col': l:match[3] + 0,
\ 'type': 'E', \ 'type': l:msg_type,
\ 'text': l:match[4], \ 'text': l:match[4] . ' (' . l:match[5] . ')',
\}) \})
endfor endfor

View File

@ -13,19 +13,21 @@ Execute (The golangci-lint handler should handle names with spaces):
\ 'C:\something\file with spaces.go', \ 'C:\something\file with spaces.go',
\ '12', \ '12',
\ '3', \ '3',
\ 'expected ''package'', found ''IDENT'' gibberish (staticcheck)', \ 'expected ''package'', found ''IDENT'' gibberish',
\ 'staticcheck',
\ ], \ ],
\ [ \ [
\ 'C:\something\file with spaces.go', \ 'C:\something\file with spaces.go',
\ '37', \ '37',
\ '5', \ '5',
\ 'expected ''package'', found ''IDENT'' gibberish (golint)', \ 'expected ''package'', found ''IDENT'' gibberish',
\ 'golint',
\ ], \ ],
\ ], \ ],
\ map(ale_linters#go#golangci_lint#GetMatches([ \ map(ale_linters#go#golangci_lint#GetMatches([
\ 'C:\something\file with spaces.go:12:3: expected ''package'', found ''IDENT'' gibberish (staticcheck)', \ 'C:\something\file with spaces.go:12:3: expected ''package'', found ''IDENT'' gibberish (staticcheck)',
\ 'C:\something\file with spaces.go:37:5: expected ''package'', found ''IDENT'' gibberish (golint)', \ 'C:\something\file with spaces.go:37:5: expected ''package'', found ''IDENT'' gibberish (golint)',
\ ]), 'v:val[1:4]') \ ]), 'v:val[1:5]')
Execute (The golangci-lint handler should handle paths correctly): Execute (The golangci-lint handler should handle paths correctly):
call ale#test#SetFilename('app/test.go') call ale#test#SetFilename('app/test.go')
@ -38,14 +40,14 @@ Execute (The golangci-lint handler should handle paths correctly):
\ 'lnum': 12, \ 'lnum': 12,
\ 'col': 3, \ 'col': 3,
\ 'text': 'expected ''package'', found ''IDENT'' gibberish (staticcheck)', \ 'text': 'expected ''package'', found ''IDENT'' gibberish (staticcheck)',
\ 'type': 'E', \ 'type': 'W',
\ 'filename': ale#path#Simplify(expand('%:p:h') . '/test.go'), \ 'filename': ale#path#Simplify(expand('%:p:h') . '/test.go'),
\ }, \ },
\ { \ {
\ 'lnum': 37, \ 'lnum': 37,
\ 'col': 5, \ 'col': 5,
\ 'text': 'expected ''package'', found ''IDENT'' gibberish (golint)', \ 'text': 'expected ''package'', found ''IDENT'' gibberish (golint)',
\ 'type': 'E', \ 'type': 'W',
\ 'filename': ale#path#Simplify(expand('%:p:h') . '/test.go'), \ 'filename': ale#path#Simplify(expand('%:p:h') . '/test.go'),
\ }, \ },
\ ], \ ],
@ -53,3 +55,30 @@ Execute (The golangci-lint handler should handle paths correctly):
\ file . ':12:3: expected ''package'', found ''IDENT'' gibberish (staticcheck)', \ file . ':12:3: expected ''package'', found ''IDENT'' gibberish (staticcheck)',
\ file . ':37:5: expected ''package'', found ''IDENT'' gibberish (golint)', \ file . ':37:5: expected ''package'', found ''IDENT'' gibberish (golint)',
\ ]) \ ])
Execute (The golangci-lint handler should handle only typecheck lines as errors):
call ale#test#SetFilename('app/main.go')
let file = ale#path#GetAbsPath(expand('%:p:h'), 'test.go')
AssertEqual
\ [
\ {
\ 'lnum': 30,
\ 'col': 5,
\ 'text': 'variable ''err'' is not used (typecheck)',
\ 'type': 'E',
\ 'filename': ale#path#Simplify(expand('%:p:h') . '/test.go'),
\ },
\ {
\ 'lnum': 505,
\ 'col': 75,
\ 'text': 'Magic number: 404, in <argument> detected (gomnd)',
\ 'type': 'W',
\ 'filename': ale#path#Simplify(expand('%:p:h') . '/test.go'),
\ }
\ ],
\ ale_linters#go#golangci_lint#Handler(bufnr(''), [
\ file . ':30:5: variable ''err'' is not used (typecheck)',
\ file . ':505:75: Magic number: 404, in <argument> detected (gomnd)',
\ ])