diff --git a/ale_linters/go/golint.vim b/ale_linters/go/golint.vim deleted file mode 100644 index 79bfaeb5..00000000 --- a/ale_linters/go/golint.vim +++ /dev/null @@ -1,21 +0,0 @@ -" Author: neersighted -" Description: golint for Go files - -call ale#Set('go_golint_executable', 'golint') -call ale#Set('go_golint_options', '') - -function! ale_linters#go#golint#GetCommand(buffer) abort - let l:options = ale#Var(a:buffer, 'go_golint_options') - - return ale#go#EnvString(a:buffer) . '%e' - \ . (!empty(l:options) ? ' ' . l:options : '') - \ . ' %t' -endfunction - -call ale#linter#Define('go', { -\ 'name': 'golint', -\ 'output_stream': 'both', -\ 'executable': {b -> ale#Var(b, 'go_golint_executable')}, -\ 'command': function('ale_linters#go#golint#GetCommand'), -\ 'callback': 'ale#handlers#unix#HandleAsWarning', -\}) diff --git a/autoload/ale/linter.vim b/autoload/ale/linter.vim index 8b943ea0..093243a9 100644 --- a/autoload/ale/linter.vim +++ b/autoload/ale/linter.vim @@ -42,7 +42,7 @@ let s:default_ale_linters = { \ 'apkbuild': ['apkbuild_lint', 'secfixes_check'], \ 'csh': ['shell'], \ 'elixir': ['credo', 'dialyxir', 'dogma'], -\ 'go': ['gofmt', 'golint', 'gopls', 'govet'], +\ 'go': ['gofmt', 'gopls', 'govet'], \ 'groovy': ['npm-groovy-lint'], \ 'hack': ['hack'], \ 'help': [], diff --git a/doc/ale-go.txt b/doc/ale-go.txt index 28a06dfd..d09f6cac 100644 --- a/doc/ale-go.txt +++ b/doc/ale-go.txt @@ -6,8 +6,8 @@ ALE Go Integration *ale-go-options* Integration Information The `gometalinter` linter is disabled by default. ALE enables `gofmt`, -`golint` and `go vet` by default. It also supports `staticcheck`, `go -build`, `gosimple`, `golangserver`. +`gopls`, and `go vet` by default. It also supports `staticcheck, `go +build`, `gosimple`, `golangserver`, and `golangci-lint`. To enable `gometalinter`, update |g:ale_linters| as appropriate: > @@ -175,25 +175,6 @@ g:ale_go_golines_options *g:ale_go_golines_options* --max-length=100 (lines above 100 characters will be wrapped) -=============================================================================== -golint *ale-go-golint* - -g:ale_go_golint_executable *g:ale_go_golint_executable* - *b:ale_go_golint_executable* - Type: |String| - Default: `'golint'` - - This variable can be set to change the golint executable path. - - -g:ale_go_golint_options *g:ale_go_golint_options* - *b:ale_go_golint_options* - Type: |String| - Default: `''` - - This variable can be set to pass additional options to the golint linter. - - =============================================================================== gometalinter *ale-go-gometalinter* diff --git a/doc/ale-supported-languages-and-tools.txt b/doc/ale-supported-languages-and-tools.txt index 34a2e5ed..b6ea5035 100644 --- a/doc/ale-supported-languages-and-tools.txt +++ b/doc/ale-supported-languages-and-tools.txt @@ -213,7 +213,6 @@ Notes: * `golangci-lint`!! * `golangserver` * `golines` - * `golint` * `gometalinter`!! * `gopls` * `gosimple`!! diff --git a/doc/ale.txt b/doc/ale.txt index 9253c398..d0c7e9e9 100644 --- a/doc/ale.txt +++ b/doc/ale.txt @@ -1641,7 +1641,7 @@ g:ale_linters *g:ale_linters* \ 'apkbuild': ['apkbuild_lint', 'secfixes_check'], \ 'csh': ['shell'], \ 'elixir': ['credo', 'dialyxir', 'dogma'], - \ 'go': ['gofmt', 'golint', 'gopls', 'govet'], + \ 'go': ['gofmt', 'gopls', 'govet'], \ 'groovy': ['npm-groovy-lint'], \ 'hack': ['hack'], \ 'help': [], @@ -2987,7 +2987,6 @@ documented in additional help files. golangci-lint.........................|ale-go-golangci-lint| golangserver..........................|ale-go-golangserver| golines...............................|ale-go-golines| - golint................................|ale-go-golint| gometalinter..........................|ale-go-gometalinter| gopls.................................|ale-go-gopls| govet.................................|ale-go-govet| diff --git a/supported-tools.md b/supported-tools.md index 58e64e63..d87d53da 100644 --- a/supported-tools.md +++ b/supported-tools.md @@ -222,7 +222,6 @@ formatting. * [golangci-lint](https://github.com/golangci/golangci-lint) :warning: :floppy_disk: * [golangserver](https://github.com/sourcegraph/go-langserver) :warning: * [golines](https://github.com/segmentio/golines) - * [golint](https://godoc.org/github.com/golang/lint) * [gometalinter](https://github.com/alecthomas/gometalinter) :warning: :floppy_disk: * [gopls](https://github.com/golang/go/wiki/gopls) * [gosimple](https://github.com/dominikh/go-tools/tree/master/cmd/gosimple) :warning: :floppy_disk: diff --git a/test/handler/test_golangci_lint_handler.vader b/test/handler/test_golangci_lint_handler.vader index 58815f56..7bb6b877 100644 --- a/test/handler/test_golangci_lint_handler.vader +++ b/test/handler/test_golangci_lint_handler.vader @@ -16,17 +16,9 @@ Execute (The golangci-lint handler should handle names with spaces): \ 'expected ''package'', found ''IDENT'' gibberish', \ 'staticcheck', \ ], - \ [ - \ 'C:\something\file with spaces.go', - \ '37', - \ '5', - \ 'expected ''package'', found ''IDENT'' gibberish', - \ 'golint', - \ ], \ ], \ 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:37:5: expected ''package'', found ''IDENT'' gibberish (golint)', \ ]), 'v:val[1:5]') Execute (The golangci-lint handler should handle paths correctly): @@ -43,17 +35,9 @@ Execute (The golangci-lint handler should handle paths correctly): \ 'type': 'W', \ 'filename': ale#path#Simplify(expand('%:p:h') . '/test.go'), \ }, - \ { - \ 'lnum': 37, - \ 'col': 5, - \ 'text': 'expected ''package'', found ''IDENT'' gibberish (golint)', - \ 'type': 'W', - \ 'filename': ale#path#Simplify(expand('%:p:h') . '/test.go'), - \ }, \ ], \ ale_linters#go#golangci_lint#Handler(bufnr(''), [ \ file . ':12:3: expected ''package'', found ''IDENT'' gibberish (staticcheck)', - \ file . ':37:5: expected ''package'', found ''IDENT'' gibberish (golint)', \ ]) Execute (The golangci-lint handler should handle only typecheck lines as errors): diff --git a/test/linter/test_golint.vader b/test/linter/test_golint.vader deleted file mode 100644 index 64916707..00000000 --- a/test/linter/test_golint.vader +++ /dev/null @@ -1,30 +0,0 @@ -Before: - Save g:ale_go_go111module - - call ale#assert#SetUpLinterTest('go', 'golint') - -After: - Restore - - unlet! b:ale_go_go111module - - call ale#assert#TearDownLinterTest() - -Execute(The default golint command should be correct): - AssertLinter 'golint', ale#Escape('golint') . ' %t' - -Execute(The golint executable should be configurable): - let b:ale_go_golint_executable = 'foobar' - - AssertLinter 'foobar', ale#Escape('foobar') . ' %t' - -Execute(The golint options should be configurable): - let b:ale_go_golint_options = '--foo' - - AssertLinter 'golint', ale#Escape('golint') . ' --foo %t' - -Execute(The golint command should support Go environment variables): - let b:ale_go_go111module = 'on' - - AssertLinter 'golint', - \ ale#Env('GO111MODULE', 'on') . ale#Escape('golint') . ' %t' diff --git a/test/test_filetype_linter_defaults.vader b/test/test_filetype_linter_defaults.vader index ca73a8e5..987257f7 100644 --- a/test/test_filetype_linter_defaults.vader +++ b/test/test_filetype_linter_defaults.vader @@ -36,7 +36,7 @@ Execute(The defaults for the elixir filetype should be correct): AssertEqual [], GetLinterNames('elixir') Execute(The defaults for the go filetype should be correct): - AssertEqual ['gofmt', 'golint', 'gopls', 'govet'], GetLinterNames('go') + AssertEqual ['gofmt', 'gopls', 'govet'], GetLinterNames('go') let g:ale_linters_explicit = 1