From 5caec8d3b80f000cd7cd1cf93ea3994c33c0f8db Mon Sep 17 00:00:00 2001 From: Bjorn Neergaard Date: Tue, 11 Oct 2016 06:57:42 -0500 Subject: [PATCH 1/4] Introduce golang support This includes go vet, golint, and gofmt -e --- README.md | 1 + ale_linters/go/gofmt.vim | 47 +++++++++++++++++++++++++++++++++++++++ ale_linters/go/golint.vim | 45 +++++++++++++++++++++++++++++++++++++ ale_linters/go/govet.vim | 46 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 139 insertions(+) create mode 100644 ale_linters/go/gofmt.vim create mode 100644 ale_linters/go/golint.vim create mode 100644 ale_linters/go/govet.vim diff --git a/README.md b/README.md index 1fdca5a1..c1906487 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,7 @@ name. That seems to be the fairest way to arrange this table. | Cython (pyrex filetype) | [cython](http://cython.org/) | | D | [dmd](https://dlang.org/dmd-linux.html)^ | | Fortran | [gcc](https://gcc.gnu.org/) | +| Go | [gofmt -e](https://golang.org/cmd/gofmt/), [go vet](https://golang.org/cmd/vet/), [golint](https://godoc.org/github.com/golang/lint) | | Haskell | [ghc](https://www.haskell.org/ghc/) | | HTML | [HTMLHint](http://htmlhint.com/), [tidy](http://www.html-tidy.org/) | | JavaScript | [eslint](http://eslint.org/), [jscs](http://jscs.info/), [jshint](http://jshint.com/) | diff --git a/ale_linters/go/gofmt.vim b/ale_linters/go/gofmt.vim new file mode 100644 index 00000000..d42d83eb --- /dev/null +++ b/ale_linters/go/gofmt.vim @@ -0,0 +1,47 @@ +" Author: neersighted +" Description: gofmt for Go files + +if exists('g:loaded_ale_linters_go_gofmt') + finish +endif + +let g:loaded_ale_linters_go_gofmt = 1 + +function! ale_linters#go#gofmt#Handle(buffer, lines) + " Matches patterns line the following: + " + " file1.go:5:2: expected declaration, found 'STRING' "log" + " file2.go:17:2: expected declaration, found 'go' + let l:pattern = '^.*:\(\d\+\):\(\d\+\): \(.\+\)$' + let l:output = [] + + for l:line in a:lines + let l:match = matchlist(l:line, l:pattern) + + if len(l:match) == 0 + continue + endif + + " vcol is Needed to indicate that the column is a character. + call add(l:output, { + \ 'bufnr': a:buffer, + \ 'lnum': l:match[1] + 0, + \ 'vcol': 0, + \ 'col': l:match[2] + 0, + \ 'text': l:match[3], + \ 'type': 'E', + \ 'nr': -1, + \}) + endfor + + return l:output +endfunction + +call ale#linter#Define('go', { +\ 'name': 'gofmt', +\ 'output_stream': 'stderr', +\ 'executable': 'gofmt', +\ 'command': g:ale#util#stdin_wrapper . ' .go gofmt -e', +\ 'callback': 'ale_linters#go#gofmt#Handle', +\}) + diff --git a/ale_linters/go/golint.vim b/ale_linters/go/golint.vim new file mode 100644 index 00000000..2e9c17bb --- /dev/null +++ b/ale_linters/go/golint.vim @@ -0,0 +1,45 @@ +" Author: neersighted +" Description: golint for Go files + +if exists('g:loaded_ale_linters_go_golint') + finish +endif + +let g:loaded_ale_linters_go_golint = 1 + +function! ale_linters#go#golint#Handle(buffer, lines) + " Matches patterns line the following: + " + " file1.go:53:10: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) + " file2.go:67:14: should omit type [][]byte from declaration of var matches; it will be inferred from the right-hand side + let l:pattern = '^.*:\(\d\+\):\(\d\+\): \(.\+\)$' + let l:output = [] + + for l:line in a:lines + let l:match = matchlist(l:line, l:pattern) + + if len(l:match) == 0 + continue + endif + + " vcol is Needed to indicate that the column is a character. + call add(l:output, { + \ 'bufnr': a:buffer, + \ 'lnum': l:match[1] + 0, + \ 'vcol': 0, + \ 'col': l:match[2] + 0, + \ 'text': l:match[3], + \ 'type': 'W', + \ 'nr': -1, + \}) + endfor + + return l:output +endfunction + +call ale#linter#Define('go', { +\ 'name': 'golint', +\ 'executable': 'golint', +\ 'command': g:ale#util#stdin_wrapper . ' .go golint', +\ 'callback': 'ale_linters#go#golint#Handle', +\}) diff --git a/ale_linters/go/govet.vim b/ale_linters/go/govet.vim new file mode 100644 index 00000000..0ee5dd74 --- /dev/null +++ b/ale_linters/go/govet.vim @@ -0,0 +1,46 @@ +" Author: neersighted +" Description: go vet for Go files + +if exists('g:loaded_ale_linters_go_govet') + finish +endif + +let g:loaded_ale_linters_go_govet = 1 + +function! ale_linters#go#govet#Handle(buffer, lines) + " Matches patterns line the following: + " + " file.go:27: missing argument for Printf("%s"): format reads arg 2, have only 1 args + let l:pattern = '^.*:\(\d\+\): \(.\+\)$' + let l:output = [] + + for l:line in a:lines + let l:match = matchlist(l:line, l:pattern) + + if len(l:match) == 0 + continue + endif + + " vcol is Needed to indicate that the column is a character. + call add(l:output, { + \ 'bufnr': a:buffer, + \ 'lnum': l:match[1] + 0, + \ 'vcol': 0, + \ 'col': 0, + \ 'text': l:match[2], + \ 'type': 'W', + \ 'nr': -1, + \}) + endfor + + return l:output +endfunction + +call ale#linter#Define('go', { +\ 'name': 'go vet', +\ 'output_stream': 'stderr', +\ 'executable': 'go', +\ 'command': g:ale#util#stdin_wrapper . ' .go go vet', +\ 'callback': 'ale_linters#go#govet#Handle', +\}) + From 23442a2ec3e9bede0e50f0836e1dbfcafb49c05a Mon Sep 17 00:00:00 2001 From: Bjorn Neergaard Date: Tue, 11 Oct 2016 07:48:42 -0500 Subject: [PATCH 2/4] Introduce generic unix formatter Two wrapper functions allow treating lines as errors or as warnings --- ale_linters/go/gofmt.vim | 32 +------------------------------ ale_linters/go/golint.vim | 32 +------------------------------ ale_linters/go/govet.vim | 31 +----------------------------- autoload/ale/handlers.vim | 40 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 92 deletions(-) diff --git a/ale_linters/go/gofmt.vim b/ale_linters/go/gofmt.vim index d42d83eb..83c4d811 100644 --- a/ale_linters/go/gofmt.vim +++ b/ale_linters/go/gofmt.vim @@ -7,41 +7,11 @@ endif let g:loaded_ale_linters_go_gofmt = 1 -function! ale_linters#go#gofmt#Handle(buffer, lines) - " Matches patterns line the following: - " - " file1.go:5:2: expected declaration, found 'STRING' "log" - " file2.go:17:2: expected declaration, found 'go' - let l:pattern = '^.*:\(\d\+\):\(\d\+\): \(.\+\)$' - let l:output = [] - - for l:line in a:lines - let l:match = matchlist(l:line, l:pattern) - - if len(l:match) == 0 - continue - endif - - " vcol is Needed to indicate that the column is a character. - call add(l:output, { - \ 'bufnr': a:buffer, - \ 'lnum': l:match[1] + 0, - \ 'vcol': 0, - \ 'col': l:match[2] + 0, - \ 'text': l:match[3], - \ 'type': 'E', - \ 'nr': -1, - \}) - endfor - - return l:output -endfunction - call ale#linter#Define('go', { \ 'name': 'gofmt', \ 'output_stream': 'stderr', \ 'executable': 'gofmt', \ 'command': g:ale#util#stdin_wrapper . ' .go gofmt -e', -\ 'callback': 'ale_linters#go#gofmt#Handle', +\ 'callback': 'ale#handlers#HandleUnixFormatAsError', \}) diff --git a/ale_linters/go/golint.vim b/ale_linters/go/golint.vim index 2e9c17bb..25787e0e 100644 --- a/ale_linters/go/golint.vim +++ b/ale_linters/go/golint.vim @@ -7,39 +7,9 @@ endif let g:loaded_ale_linters_go_golint = 1 -function! ale_linters#go#golint#Handle(buffer, lines) - " Matches patterns line the following: - " - " file1.go:53:10: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) - " file2.go:67:14: should omit type [][]byte from declaration of var matches; it will be inferred from the right-hand side - let l:pattern = '^.*:\(\d\+\):\(\d\+\): \(.\+\)$' - let l:output = [] - - for l:line in a:lines - let l:match = matchlist(l:line, l:pattern) - - if len(l:match) == 0 - continue - endif - - " vcol is Needed to indicate that the column is a character. - call add(l:output, { - \ 'bufnr': a:buffer, - \ 'lnum': l:match[1] + 0, - \ 'vcol': 0, - \ 'col': l:match[2] + 0, - \ 'text': l:match[3], - \ 'type': 'W', - \ 'nr': -1, - \}) - endfor - - return l:output -endfunction - call ale#linter#Define('go', { \ 'name': 'golint', \ 'executable': 'golint', \ 'command': g:ale#util#stdin_wrapper . ' .go golint', -\ 'callback': 'ale_linters#go#golint#Handle', +\ 'callback': 'ale#handlers#HandleUnixFormatAsWarning', \}) diff --git a/ale_linters/go/govet.vim b/ale_linters/go/govet.vim index 0ee5dd74..9db39ead 100644 --- a/ale_linters/go/govet.vim +++ b/ale_linters/go/govet.vim @@ -7,40 +7,11 @@ endif let g:loaded_ale_linters_go_govet = 1 -function! ale_linters#go#govet#Handle(buffer, lines) - " Matches patterns line the following: - " - " file.go:27: missing argument for Printf("%s"): format reads arg 2, have only 1 args - let l:pattern = '^.*:\(\d\+\): \(.\+\)$' - let l:output = [] - - for l:line in a:lines - let l:match = matchlist(l:line, l:pattern) - - if len(l:match) == 0 - continue - endif - - " vcol is Needed to indicate that the column is a character. - call add(l:output, { - \ 'bufnr': a:buffer, - \ 'lnum': l:match[1] + 0, - \ 'vcol': 0, - \ 'col': 0, - \ 'text': l:match[2], - \ 'type': 'W', - \ 'nr': -1, - \}) - endfor - - return l:output -endfunction - call ale#linter#Define('go', { \ 'name': 'go vet', \ 'output_stream': 'stderr', \ 'executable': 'go', \ 'command': g:ale#util#stdin_wrapper . ' .go go vet', -\ 'callback': 'ale_linters#go#govet#Handle', +\ 'callback': 'ale#handlers#HandleUnixFormatAsError', \}) diff --git a/autoload/ale/handlers.vim b/autoload/ale/handlers.vim index e595ae48..ed846abb 100644 --- a/autoload/ale/handlers.vim +++ b/autoload/ale/handlers.vim @@ -4,6 +4,46 @@ scriptencoding utf-8 " linter which outputs warnings and errors in a format accepted by one of " these functions can simply use one of these pre-defined error handlers. +function! s:HandleUnixFormat(buffer, lines, type) abort + " Matches patterns line the following: + " + " file.go:27: missing argument for Printf("%s"): format reads arg 2, have only 1 args + " file.go:53:10: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) + " file.go:5:2: expected declaration, found 'STRING' "log" + let l:pattern = '^[^:]\+:\(\d\+\):\?\(\d\+\)\?: \(.\+\)$' + let l:output = [] + + for l:line in a:lines + let l:match = matchlist(l:line, l:pattern) + + if len(l:match) == 0 + continue + endif + + " vcol is Needed to indicate that the column is a character. + call add(l:output, { + \ 'bufnr': a:buffer, + \ 'lnum': l:match[1] + 0, + \ 'vcol': 0, + \ 'col': l:match[2] + 0, + \ 'text': l:match[3], + \ 'type': a:type, + \ 'nr': -1, + \}) + endfor + + return l:output +endfunction + +function! ale#handlers#HandleUnixFormatAsError(buffer, lines) abort + return s:HandleUnixFormat(a:buffer, a:lines, 'E') +endfunction + +function! ale#handlers#HandleUnixFormatAsWarning(buffer, lines) abort + return s:HandleUnixFormat(a:buffer, a:lines, 'W') +endfunction + + function! ale#handlers#HandleGCCFormat(buffer, lines) abort " Look for lines like the following. " From ef14a044703a51b70e318713b8ae4ba809150278 Mon Sep 17 00:00:00 2001 From: Bjorn Neergaard Date: Tue, 11 Oct 2016 08:54:41 -0500 Subject: [PATCH 3/4] Make HandleUnixFormat Windows-compatible --- autoload/ale/handlers.vim | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/autoload/ale/handlers.vim b/autoload/ale/handlers.vim index ed846abb..cca35d46 100644 --- a/autoload/ale/handlers.vim +++ b/autoload/ale/handlers.vim @@ -4,13 +4,15 @@ scriptencoding utf-8 " linter which outputs warnings and errors in a format accepted by one of " these functions can simply use one of these pre-defined error handlers. +let s:path_pattern = '[a-zA-Z]\?\\\?:\?[[:alnum:]/\.-]\+' + function! s:HandleUnixFormat(buffer, lines, type) abort " Matches patterns line the following: " " file.go:27: missing argument for Printf("%s"): format reads arg 2, have only 1 args " file.go:53:10: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) " file.go:5:2: expected declaration, found 'STRING' "log" - let l:pattern = '^[^:]\+:\(\d\+\):\?\(\d\+\)\?: \(.\+\)$' + let l:pattern = '^' . s:path_pattern . ':\(\d\+\):\?\(\d\+\)\?: \(.\+\)$' let l:output = [] for l:line in a:lines From 1074afbd08544739f7be6522e48f242a4b5a7023 Mon Sep 17 00:00:00 2001 From: Bjorn Neergaard Date: Tue, 11 Oct 2016 08:58:01 -0500 Subject: [PATCH 4/4] Add new go linters to the help --- doc/ale.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/ale.txt b/doc/ale.txt index cb6d9305..dbecf4f3 100644 --- a/doc/ale.txt +++ b/doc/ale.txt @@ -55,6 +55,7 @@ The following languages and tools are supported. * Cython (pyrex filetype): 'cython' * D: 'dmd' * Fortran: 'gcc' +* Go: 'gofmt -e', 'go vet', 'golint' * Haskell: 'ghc' * HTML: 'HTMLHint', 'tidy' * JavaScript: 'eslint', 'jscs', 'jshint'