summaryrefslogtreecommitdiff
path: root/ale_linters/go
diff options
context:
space:
mode:
authorMartin Tournoij <martin@arp242.net>2018-08-23 00:08:33 +0100
committerMartin Tournoij <martin@arp242.net>2018-08-23 00:42:19 +0100
commit18ec66bd21bd2c0f61a422bfd5498866385b9e70 (patch)
treecc6832e9fd063d437d351d8ed7048d6957289144 /ale_linters/go
parenta366d325a7c69fa20a3ab69ff8359bcd37d1487a (diff)
downloadale-18ec66bd21bd2c0f61a422bfd5498866385b9e70.zip
Remove "go env" from gobuild linter
I see no reason to do this? It is just setting the environment to what it already is? It was originally added in #297, but that entire PR is not a great idea in the first place; that PR (together with #270) tried to make the Go do non-standard and non-supported stuff like compiling packages outside of GOPATH. That's not something that works well (I tried), so was eventually removed in #465, but these "go env" calls remained, for no reason in particular, as far as I can think of. This will improve on #1834; you will now no longer get a confusing error (but still won't get a meaningful error; need to think how to do that).
Diffstat (limited to 'ale_linters/go')
-rw-r--r--ale_linters/go/gobuild.vim34
1 files changed, 4 insertions, 30 deletions
diff --git a/ale_linters/go/gobuild.vim b/ale_linters/go/gobuild.vim
index c4608071..2d6febdd 100644
--- a/ale_linters/go/gobuild.vim
+++ b/ale_linters/go/gobuild.vim
@@ -5,35 +5,11 @@
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)
+ return ale#path#BufferCdString(a:buffer)
\ . 'go test'
\ . (!empty(l:options) ? ' ' . l:options : '')
\ . ' -c -o /dev/null ./'
@@ -73,10 +49,8 @@ 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'},
-\ ],
+\ 'command_callback': 'ale_linters#go#gobuild#GetCommand',
+\ 'output_stream': 'stderr',
\ 'callback': 'ale_linters#go#gobuild#Handler',
\ 'lint_file': 1,
\})