summaryrefslogtreecommitdiff
path: root/ale_linters/go/gometalinter.vim
diff options
context:
space:
mode:
Diffstat (limited to 'ale_linters/go/gometalinter.vim')
-rw-r--r--ale_linters/go/gometalinter.vim27
1 files changed, 20 insertions, 7 deletions
diff --git a/ale_linters/go/gometalinter.vim b/ale_linters/go/gometalinter.vim
index f1abfc83..375a8b0f 100644
--- a/ale_linters/go/gometalinter.vim
+++ b/ale_linters/go/gometalinter.vim
@@ -1,8 +1,9 @@
-" 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
call ale#Set('go_gometalinter_options', '')
call ale#Set('go_gometalinter_executable', 'gometalinter')
+call ale#Set('go_gometalinter_lint_package', 0)
function! ale_linters#go#gometalinter#GetExecutable(buffer) abort
return ale#Var(a:buffer, 'go_gometalinter_executable')
@@ -10,13 +11,22 @@ endfunction
function! ale_linters#go#gometalinter#GetCommand(buffer) abort
let l:executable = ale_linters#go#gometalinter#GetExecutable(a:buffer)
- let l:filename = expand('#' . a:buffer)
+ let l:filename = expand('#' . a:buffer . ':t')
let l:options = ale#Var(a:buffer, 'go_gometalinter_options')
-
- return ale#Escape(l:executable)
- \ . ' --include=' . ale#Escape('^' . ale#util#EscapePCRE(l:filename))
- \ . (!empty(l:options) ? ' ' . l:options : '')
- \ . ' ' . ale#Escape(fnamemodify(l:filename, ':h'))
+ let l:lint_package = ale#Var(a:buffer, 'go_gometalinter_lint_package')
+
+ " BufferCdString is used so that we can be sure the paths output from gometalinter can
+ " be calculated to absolute paths in the Handler
+ if l:lint_package
+ return ale#path#BufferCdString(a:buffer)
+ \ . ale#Escape(l:executable)
+ \ . (!empty(l:options) ? ' ' . l:options : '') . ' .'
+ endif
+
+ return ale#path#BufferCdString(a:buffer)
+ \ . ale#Escape(l:executable)
+ \ . ' --include=' . ale#Escape(ale#util#EscapePCRE(l:filename))
+ \ . (!empty(l:options) ? ' ' . l:options : '') . ' .'
endfunction
function! ale_linters#go#gometalinter#GetMatches(lines) abort
@@ -26,10 +36,13 @@ function! ale_linters#go#gometalinter#GetMatches(lines) abort
endfunction
function! ale_linters#go#gometalinter#Handler(buffer, lines) abort
+ let l:dir = expand('#' . a:buffer . ':p:h')
let l:output = []
for l:match in ale_linters#go#gometalinter#GetMatches(a:lines)
+ " l:match[1] will already be an absolute path, output from gometalinter
call add(l:output, {
+ \ 'filename': ale#path#GetAbsPath(l:dir, l:match[1]),
\ 'lnum': l:match[2] + 0,
\ 'col': l:match[3] + 0,
\ 'type': tolower(l:match[4]) is# 'warning' ? 'W' : 'E',