Skip to content

Commit

Permalink
Merge pull request #2101 from hori-ryota/feature/fix-overriding-metal…
Browse files Browse the repository at this point in the history
…inter-command

Fix overriding metalinter command (fix #1622)
  • Loading branch information
bhcleek authored Dec 29, 2018
2 parents 23409ac + ad160a2 commit 8ddabb1
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions autoload/go/lint.vim
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,22 @@ function! go#lint#Gometa(bang, autosave, ...) abort
let goargs = a:000
endif

let bin_path = go#path#CheckBinPath("gometalinter")
if empty(bin_path)
return
endif
if empty(go#config#MetalinterCommand())
let bin_path = go#path#CheckBinPath("gometalinter")
if empty(bin_path)
return
endif

let cmd = [bin_path]
let cmd += ["--disable-all"]

let cmd = [bin_path]
let cmd += ["--disable-all"]
" gometalinter has a --tests flag to tell its linters whether to run
" against tests. While not all of its linters respect this flag, for those
" that do, it means if we don't pass --tests, the linter won't run against
" test files. One example of a linter that will not run against tests if
" we do not specify this flag is errcheck.
let cmd += ["--tests"]

if a:autosave || empty(go#config#MetalinterCommand())
" linters
let linters = a:autosave ? go#config#MetalinterAutosaveEnabled() : go#config#MetalinterEnabled()
for linter in linters
Expand All @@ -27,16 +34,9 @@ function! go#lint#Gometa(bang, autosave, ...) abort
for linter in go#config#MetalinterDisabled()
let cmd += ["--disable=".linter]
endfor

" gometalinter has a --tests flag to tell its linters whether to run
" against tests. While not all of its linters respect this flag, for those
" that do, it means if we don't pass --tests, the linter won't run against
" test files. One example of a linter that will not run against tests if
" we do not specify this flag is errcheck.
let cmd += ["--tests"]
else
" the user wants something else, let us use it.
let cmd += split(go#config#MetalinterCommand(), " ")
let cmd = split(go#config#MetalinterCommand(), " ")
endif

if a:autosave
Expand Down

0 comments on commit 8ddabb1

Please sign in to comment.