Suggested changes

2 files changed, 9 insertions, 22 deletions

diff --git a/ale_linters/hack/hack.vim b/ale_linters/hack/hack.vim
index 03c384a7..aea428cc 100644
--- a/ale_linters/hack/hack.vim
+++ b/ale_linters/hack/hack.vim
@@ -1,7 +1,7 @@
 " Author: Fred Emmott <fe@fb.com>
 " Description: Hack support via `hack lsp`
 
-call ale#Set('hack_hhclient_executable', 'hh_client')
+call ale#Set('hack_hack_executable', 'hh_client')
 
 function! ale_linters#hack#hack#GetProjectRoot(buffer) abort
     let l:hhconfig = ale#path#FindNearestFile(a:buffer, '.hhconfig')
@@ -10,20 +10,13 @@ function! ale_linters#hack#hack#GetProjectRoot(buffer) abort
 endfunction
 
 function! ale_linters#hack#hack#GetExecutable(buffer) abort
-    return ale#Var(a:buffer, 'hack_hhclient_executable')
-endfunction
-
-
-function! ale_linters#hack#hack#GetCommand(buffer) abort
-    let l:executable = ale_linters#hack#hack#GetExecutable(a:buffer)
-
-    return ale#Escape(l:executable).' lsp --from vim-ale'
+    return ale#Var(a:buffer, 'hack_hack_executable')
 endfunction
 
 call ale#linter#Define('hack', {
 \   'name': 'hack',
 \   'lsp': 'stdio',
 \   'executable_callback': 'ale_linters#hack#hack#GetExecutable',
-\   'command_callback': 'ale_linters#hack#hack#GetCommand',
+\   'command': '%e lsp --from vim-ale',
 \   'project_root_callback': 'ale_linters#hack#hack#GetProjectRoot',
 \})
diff --git a/ale_linters/hack/hhast.vim b/ale_linters/hack/hhast.vim
index 61649b71..5070dc4e 100644
--- a/ale_linters/hack/hhast.vim
+++ b/ale_linters/hack/hhast.vim
@@ -4,12 +4,15 @@
 call ale#Set('hack_hhast_executable', 'vendor/bin/hhast-lint')
 
 function! ale_linters#hack#hhast#GetProjectRoot(buffer) abort
-    let l:root = ale_linters#hack#hack#GetProjectRoot(a:buffer)
+    " Find the hack root, then figure out if it's also an HHAST root.
+    " Don't try to use lint configurations from vendor/foo/bar/hhast-lint.json
+    let l:hhconfig = ale#path#FindNearestFile(a:buffer, '.hhconfig')
 
-    if empty(l:root)
+    if empty(l:hhconfig)
       return ''
     endif
 
+    let l:root = fnamemodify(l:hhconfig, ':h')
     let l:hhast_config = findfile('hhast-lint.json', l:root)
 
     return !empty(l:hhast_config) ? l:root : ''
@@ -23,19 +26,10 @@ function! ale_linters#hack#hhast#GetExecutable(buffer) abort
     return !empty(l:absolute) ? l:absolute : ''
 endfunction
 
-
-function! ale_linters#hack#hhast#GetCommand(buffer) abort
-    let l:executable = ale_linters#hack#hhast#GetExecutable(a:buffer)
-
-    return ale#Escape(l:executable).' --mode lsp --from vim-ale'
-endfunction
-
-function !
-
 call ale#linter#Define('hack', {
 \   'name': 'hhast',
 \   'lsp': 'stdio',
 \   'executable_callback': 'ale_linters#hack#hhast#GetExecutable',
-\   'command_callback': 'ale_linters#hack#hhast#GetCommand',
+\   'command': '%e --mode lsp --from vim-ale',
 \   'project_root_callback': 'ale_linters#hack#hhast#GetProjectRoot',
 \})