Merge branch 'master' into sridhars

1 files changed, 13 insertions, 2 deletions

diff --git a/ale_linters/go/golint.vim b/ale_linters/go/golint.vim
index d580fda2..4bf14fcc 100644
--- a/ale_linters/go/golint.vim
+++ b/ale_linters/go/golint.vim
@@ -1,10 +1,21 @@
 " Author: neersighted <bjorn@neersighted.com>
 " 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 '%e'
+    \   . (!empty(l:options) ? ' ' . l:options : '')
+    \   . ' %t'
+endfunction
+
 call ale#linter#Define('go', {
 \   'name': 'golint',
 \   'output_stream': 'both',
-\   'executable': 'golint',
-\   'command': 'golint %t',
+\   'executable_callback': ale#VarFunc('go_golint_executable'),
+\   'command_callback': 'ale_linters#go#golint#GetCommand',
 \   'callback': 'ale#handlers#unix#HandleAsWarning',
 \})