Merge branch 'master' into sridhars

1 files changed, 7 insertions, 33 deletions

diff --git a/ale_linters/go/gobuild.vim b/ale_linters/go/gobuild.vim
index c4608071..cef1ff88 100644
--- a/ale_linters/go/gobuild.vim
+++ b/ale_linters/go/gobuild.vim
@@ -3,38 +3,15 @@
 " Description: go build for Go files
 " inspired by work from dzhou121 <dzhou121@gmail.com>
 
+call ale#Set('go_go_executable', 'go')
 call ale#Set('go_gobuild_options', '')
 
-function! ale_linters#go#gobuild#ResetEnv() abort
-    unlet! s:go_env
-endfunction
-
-function! ale_linters#go#gobuild#GoEnv(buffer) abort
-    if exists('s:go_env')
-        return ''
-    endif
-
-    return 'go env GOPATH GOROOT'
-endfunction
-
-function! ale_linters#go#gobuild#GetCommand(buffer, goenv_output) abort
+function! ale_linters#go#gobuild#GetCommand(buffer) abort
     let l:options = ale#Var(a:buffer, 'go_gobuild_options')
 
-    if !exists('s:go_env')
-        let s:go_env = {
-        \   'GOPATH': a:goenv_output[0],
-        \   'GOROOT': a:goenv_output[1],
-        \}
-    endif
-
-    let l:gopath_env_command = has('win32')
-    \   ? 'set GOPATH=' . ale#Escape(s:go_env.GOPATH) . ' && '
-    \   : 'GOPATH=' . ale#Escape(s:go_env.GOPATH) . ' '
-
     " Run go test in local directory with relative path
-    return l:gopath_env_command
-    \   . ale#path#BufferCdString(a:buffer)
-    \   . 'go test'
+    return ale#path#BufferCdString(a:buffer)
+    \   . ale#Var(a:buffer, 'go_go_executable') . ' test'
     \   . (!empty(l:options) ? ' ' . l:options : '')
     \   . ' -c -o /dev/null ./'
 endfunction
@@ -45,7 +22,6 @@ function! ale_linters#go#gobuild#GetMatches(lines) abort
     " 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"
-
     " go test returns relative paths so use tail of filename as part of pattern matcher
     let l:pattern = '\v^([a-zA-Z]?:?[^:]+):(\d+):?(\d+)?:? (.+)$'
 
@@ -72,11 +48,9 @@ endfunction
 call ale#linter#Define('go', {
 \   'name': 'gobuild',
 \   'aliases': ['go build'],
-\   'executable': 'go',
-\   'command_chain': [
-\     {'callback': 'ale_linters#go#gobuild#GoEnv', 'output_stream': 'stdout'},
-\     {'callback': 'ale_linters#go#gobuild#GetCommand', 'output_stream': 'stderr'},
-\   ],
+\   'executable_callback': ale#VarFunc('go_go_executable'),
+\   'command_callback': 'ale_linters#go#gobuild#GetCommand',
+\   'output_stream': 'stderr',
 \   'callback': 'ale_linters#go#gobuild#Handler',
 \   'lint_file': 1,
 \})