Show problems from other files for gobuild and gometalinter

* Added filename keys to gobuild and gometalinter
* Removed skipping files not in current package
* Removed `--include` for gometalinter
* Fixed the tests
This commit is contained in:
Jeff Willette 2017-11-16 01:34:30 +09:00 committed by w0rp
parent 290ed4885b
commit e721f851b4
5 changed files with 15 additions and 16 deletions

View File

@ -1,4 +1,5 @@
" Author: Joshua Rubin <joshua@rubixconsulting.com>, Ben Reedy <https://github.com/breed808> " Author: Joshua Rubin <joshua@rubixconsulting.com>, Ben Reedy <https://github.com/breed808>,
" Jeff Willette <jrwillette88@gmail.com>
" Description: go build for Go files " Description: go build for Go files
" inspired by work from dzhou121 <dzhou121@gmail.com> " inspired by work from dzhou121 <dzhou121@gmail.com>
@ -39,15 +40,12 @@ function! ale_linters#go#gobuild#GetMatches(lines) abort
endfunction endfunction
function! ale_linters#go#gobuild#Handler(buffer, lines) abort function! ale_linters#go#gobuild#Handler(buffer, lines) abort
let l:dir = expand('#' . a:buffer . ':p:h')
let l:output = [] let l:output = []
for l:match in ale_linters#go#gobuild#GetMatches(a:lines) for l:match in ale_linters#go#gobuild#GetMatches(a:lines)
" Omit errors from imported go packages
if !ale#path#IsBufferPath(a:buffer, l:match[1])
continue
endif
call add(l:output, { call add(l:output, {
\ '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,
\ 'text': l:match[4], \ 'text': l:match[4],

View File

@ -1,4 +1,4 @@
" Author: Ben Reedy <https://github.com/breed808> " Author: Ben Reedy <https://github.com/breed808>, Jeff Willette <jrwillette88@gmail.com>
" Description: Adds support for the gometalinter suite for Go files " Description: Adds support for the gometalinter suite for Go files
call ale#Set('go_gometalinter_options', '') call ale#Set('go_gometalinter_options', '')
@ -14,7 +14,6 @@ function! ale_linters#go#gometalinter#GetCommand(buffer) abort
let l:options = ale#Var(a:buffer, 'go_gometalinter_options') let l:options = ale#Var(a:buffer, 'go_gometalinter_options')
return ale#Escape(l:executable) return ale#Escape(l:executable)
\ . ' --include=' . ale#Escape('^' . ale#util#EscapePCRE(l:filename))
\ . (!empty(l:options) ? ' ' . l:options : '') \ . (!empty(l:options) ? ' ' . l:options : '')
\ . ' ' . ale#Escape(fnamemodify(l:filename, ':h')) \ . ' ' . ale#Escape(fnamemodify(l:filename, ':h'))
endfunction endfunction
@ -26,10 +25,12 @@ function! ale_linters#go#gometalinter#GetMatches(lines) abort
endfunction endfunction
function! ale_linters#go#gometalinter#Handler(buffer, lines) abort function! ale_linters#go#gometalinter#Handler(buffer, lines) abort
let l:dir = expand('#' . a:buffer . ':p:h')
let l:output = [] let l:output = []
for l:match in ale_linters#go#gometalinter#GetMatches(a:lines) for l:match in ale_linters#go#gometalinter#GetMatches(a:lines)
call add(l:output, { call add(l:output, {
\ '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': tolower(l:match[4]) is# 'warning' ? 'W' : 'E', \ 'type': tolower(l:match[4]) is# 'warning' ? 'W' : 'E',

View File

@ -22,7 +22,6 @@ Execute(The gometalinter callback should return the right defaults):
\ ale_linters#go#gometalinter#GetExecutable(bufnr('')) \ ale_linters#go#gometalinter#GetExecutable(bufnr(''))
AssertEqual AssertEqual
\ ale#Escape('gometalinter') \ ale#Escape('gometalinter')
\ . ' --include=' . ale#Escape('^' . ale#util#EscapePCRE(expand('%')))
\ . ' ' . ale#Escape(getcwd()), \ . ' ' . ale#Escape(getcwd()),
\ ale_linters#go#gometalinter#GetCommand(bufnr('')) \ ale_linters#go#gometalinter#GetCommand(bufnr(''))
@ -34,7 +33,6 @@ Execute(The gometalinter callback should use a configured executable):
\ ale_linters#go#gometalinter#GetExecutable(bufnr('')) \ ale_linters#go#gometalinter#GetExecutable(bufnr(''))
AssertEqual AssertEqual
\ ale#Escape('something else') \ ale#Escape('something else')
\ . ' --include=' . ale#Escape('^' . ale#util#EscapePCRE(expand('%')))
\ . ' ' . ale#Escape(getcwd()), \ . ' ' . ale#Escape(getcwd()),
\ ale_linters#go#gometalinter#GetCommand(bufnr('')) \ ale_linters#go#gometalinter#GetCommand(bufnr(''))
@ -43,7 +41,6 @@ Execute(The gometalinter callback should use configured options):
AssertEqual AssertEqual
\ ale#Escape('gometalinter') \ ale#Escape('gometalinter')
\ . ' --include=' . ale#Escape('^' . ale#util#EscapePCRE(expand('%')))
\ . ' --foobar' \ . ' --foobar'
\ . ' ' . ale#Escape(getcwd()), \ . ' ' . ale#Escape(getcwd()),
\ ale_linters#go#gometalinter#GetCommand(bufnr('')) \ ale_linters#go#gometalinter#GetCommand(bufnr(''))

View File

@ -28,7 +28,7 @@ Execute (The gobuild handler should handle names with spaces):
\ ]), 'v:val[1:4]') \ ]), 'v:val[1:4]')
Execute (The gobuild handler should handle relative paths correctly): Execute (The gobuild handler should handle relative paths correctly):
silent file! /foo/bar/baz.go call ale#test#SetFilename('app/test.go')
AssertEqual AssertEqual
\ [ \ [
@ -37,8 +37,9 @@ Execute (The gobuild handler should handle relative paths correctly):
\ 'col': 0, \ 'col': 0,
\ 'text': 'missing argument for Printf("%s"): format reads arg 2, have only 1 args', \ 'text': 'missing argument for Printf("%s"): format reads arg 2, have only 1 args',
\ 'type': 'E', \ 'type': 'E',
\ 'filename': ale#path#Winify(expand('%:p:h') . '/test.go'),
\ }, \ },
\ ], \ ],
\ ale_linters#go#gobuild#Handler(bufnr(''), [ \ ale_linters#go#gobuild#Handler(bufnr(''), [
\ 'baz.go:27: missing argument for Printf("%s"): format reads arg 2, have only 1 args', \ 'test.go:27: missing argument for Printf("%s"): format reads arg 2, have only 1 args',
\ ]) \ ])

View File

@ -30,7 +30,7 @@ Execute (The gometalinter handler should handle names with spaces):
\ ]), 'v:val[1:5]') \ ]), 'v:val[1:5]')
Execute (The gometalinter handler should handle relative paths correctly): Execute (The gometalinter handler should handle relative paths correctly):
silent file /foo/bar/baz.go call ale#test#SetFilename('app/test.go')
AssertEqual AssertEqual
\ [ \ [
@ -39,15 +39,17 @@ Execute (The gometalinter handler should handle relative paths correctly):
\ 'col': 3, \ 'col': 3,
\ 'text': 'expected ''package'', found ''IDENT'' gibberish (staticcheck)', \ 'text': 'expected ''package'', found ''IDENT'' gibberish (staticcheck)',
\ 'type': 'W', \ 'type': 'W',
\ 'filename': ale#path#Winify(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': 'E',
\ 'filename': ale#path#Winify(expand('%:p:h') . '/test.go'),
\ }, \ },
\ ], \ ],
\ ale_linters#go#gometalinter#Handler(bufnr(''), [ \ ale_linters#go#gometalinter#Handler(bufnr(''), [
\ 'baz.go:12:3:warning: expected ''package'', found ''IDENT'' gibberish (staticcheck)', \ 'test.go:12:3:warning: expected ''package'', found ''IDENT'' gibberish (staticcheck)',
\ 'baz.go:37:5:error: expected ''package'', found ''IDENT'' gibberish (golint)', \ 'test.go:37:5:error: expected ''package'', found ''IDENT'' gibberish (golint)',
\ ]) \ ])