diff options
| -rw-r--r-- | ale_linters/go/golangci_lint.vim | 2 | ||||
| -rw-r--r-- | test/linter/test_golangci_lint.vader | 21 |
2 files changed, 10 insertions, 13 deletions
diff --git a/ale_linters/go/golangci_lint.vim b/ale_linters/go/golangci_lint.vim index 78087b5e..a3643370 100644 --- a/ale_linters/go/golangci_lint.vim +++ b/ale_linters/go/golangci_lint.vim @@ -3,7 +3,7 @@ call ale#Set('go_golangci_lint_options', '') call ale#Set('go_golangci_lint_executable', 'golangci-lint') -call ale#Set('go_golangci_lint_package', 0) +call ale#Set('go_golangci_lint_package', 1) function! ale_linters#go#golangci_lint#GetCommand(buffer) abort let l:filename = expand('#' . a:buffer . ':t') diff --git a/test/linter/test_golangci_lint.vader b/test/linter/test_golangci_lint.vader index c4dfb79b..3d41cfe4 100644 --- a/test/linter/test_golangci_lint.vader +++ b/test/linter/test_golangci_lint.vader @@ -14,25 +14,22 @@ After: Execute(The golangci-lint defaults should be correct): AssertLinterCwd '%s:h', AssertLinter 'golangci-lint', - \ ale#Escape('golangci-lint') - \ . ' run ' . ale#Escape(expand('%' . ':t')) - \ . ' ' + \ ale#Escape('golangci-lint') . ' run ' Execute(The golangci-lint callback should use a configured executable): let b:ale_go_golangci_lint_executable = 'something else' AssertLinter 'something else', \ ale#Escape('something else') - \ . ' run ' . ale#Escape(expand('%' . ':t')) - \ . ' ' + \ . ' run ' Execute(The golangci-lint callback should use configured options): let b:ale_go_golangci_lint_options = '--foobar' AssertLinter 'golangci-lint', \ ale#Escape('golangci-lint') - \ . ' run ' . ale#Escape(expand('%' . ':t')) - \ . ' --foobar' + \ . ' run ' + \ . '--foobar' Execute(The golangci-lint callback should support environment variables): let b:ale_go_go111module = 'on' @@ -40,11 +37,11 @@ Execute(The golangci-lint callback should support environment variables): AssertLinter 'golangci-lint', \ ale#Env('GO111MODULE', 'on') \ . ale#Escape('golangci-lint') - \ . ' run ' . ale#Escape(expand('%' . ':t')) - \ . ' ' + \ . ' run ' Execute(The golangci-lint `lint_package` option should use the correct command): - let b:ale_go_golangci_lint_package = 1 - + let b:ale_go_golangci_lint_package = 0 AssertLinter 'golangci-lint', - \ ale#Escape('golangci-lint') . ' run ' + \ ale#Escape('golangci-lint') + \ . ' run ' . ale#Escape(expand('%' . ':t')) + \ . ' ' |