summaryrefslogtreecommitdiff
path: root/ale_linters/haskell/hie.vim
diff options
context:
space:
mode:
Diffstat (limited to 'ale_linters/haskell/hie.vim')
-rw-r--r--ale_linters/haskell/hie.vim15
1 files changed, 9 insertions, 6 deletions
diff --git a/ale_linters/haskell/hie.vim b/ale_linters/haskell/hie.vim
index 558d36a3..3ff1180a 100644
--- a/ale_linters/haskell/hie.vim
+++ b/ale_linters/haskell/hie.vim
@@ -3,10 +3,6 @@
call ale#Set('haskell_hie_executable', 'hie')
-function! ale_linters#haskell#hie#GetExecutable(buffer) abort
- return ale#Var(a:buffer, 'haskell_hie_executable')
-endfunction
-
function! ale_linters#haskell#hie#GetProjectRoot(buffer) abort
" Search for the stack file first
let l:project_file = ale#path#FindNearestFile(a:buffer, 'stack.yaml')
@@ -35,10 +31,17 @@ function! ale_linters#haskell#hie#GetProjectRoot(buffer) abort
return l:project_file
endfunction
+function! ale_linters#haskell#hie#GetCommand(buffer) abort
+ let l:executable = ale#Var(a:buffer, 'haskell_hie_executable')
+
+ return ale#handlers#haskell_stack#EscapeExecutable(l:executable, 'hie')
+\ . ' --lsp'
+endfunction
+
call ale#linter#Define('haskell', {
\ 'name': 'hie',
\ 'lsp': 'stdio',
-\ 'command': '%e --lsp',
-\ 'executable_callback': 'ale_linters#haskell#hie#GetExecutable',
+\ 'command_callback': 'ale_linters#haskell#hie#GetCommand',
+\ 'executable_callback': ale#VarFunc('haskell_hie_executable'),
\ 'project_root_callback': 'ale_linters#haskell#hie#GetProjectRoot',
\})