Merge pull request #1770 from fredemmott/hack

Split Hack out from PHP, modernize

3 files changed, 57 insertions, 28 deletions

diff --git a/ale_linters/hack/hack.vim b/ale_linters/hack/hack.vim
new file mode 100644
index 00000000..aea428cc
--- /dev/null
+++ b/ale_linters/hack/hack.vim
@@ -0,0 +1,22 @@
+" Author: Fred Emmott <fe@fb.com>
+" Description: Hack support via `hack lsp`
+
+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')
+
+    return !empty(l:hhconfig) ? fnamemodify(l:hhconfig, ':h') : ''
+endfunction
+
+function! ale_linters#hack#hack#GetExecutable(buffer) abort
+    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': '%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
new file mode 100644
index 00000000..5070dc4e
--- /dev/null
+++ b/ale_linters/hack/hhast.vim
@@ -0,0 +1,35 @@
+" Author: Fred Emmott <fe@fb.com>
+" Description: Hack support via `hhast lsp`
+
+call ale#Set('hack_hhast_executable', 'vendor/bin/hhast-lint')
+
+function! ale_linters#hack#hhast#GetProjectRoot(buffer) abort
+    " 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: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 : ''
+endfunction
+
+function! ale_linters#hack#hhast#GetExecutable(buffer) abort
+    let l:root = ale_linters#hack#hhast#GetProjectRoot(a:buffer)
+    let l:relative = ale#Var(a:buffer, 'hack_hhast_executable')
+    let l:absolute = findfile(l:relative, l:root)
+
+    return !empty(l:absolute) ? l:absolute : ''
+endfunction
+
+call ale#linter#Define('hack', {
+\   'name': 'hhast',
+\   'lsp': 'stdio',
+\   'executable_callback': 'ale_linters#hack#hhast#GetExecutable',
+\   'command': '%e --mode lsp --from vim-ale',
+\   'project_root_callback': 'ale_linters#hack#hhast#GetProjectRoot',
+\})
diff --git a/ale_linters/php/hack.vim b/ale_linters/php/hack.vim
deleted file mode 100644
index 77d3a588..00000000
--- a/ale_linters/php/hack.vim
+++ /dev/null
@@ -1,28 +0,0 @@
-" Author: Zefei Xuan <https://github.com/zefei>
-" Description: Hack type checking (http://hacklang.org/)
-
-function! ale_linters#php#hack#Handle(buffer, lines) abort
-    let l:pattern = '^\(.*\):\(\d\+\):\(\d\+\),\(\d\+\): \(.\+])\)$'
-    let l:output = []
-
-    for l:match in ale#util#GetMatches(a:lines, l:pattern)
-        if a:buffer != bufnr(l:match[1])
-            continue
-        endif
-
-        call add(l:output, {
-        \   'lnum': l:match[2] + 0,
-        \   'col': l:match[3] + 0,
-        \   'text': l:match[5],
-        \})
-    endfor
-
-    return l:output
-endfunction
-
-call ale#linter#Define('php', {
-\   'name': 'hack',
-\   'executable': 'hh_client',
-\   'command': 'hh_client --retries 0 --retry-if-init false',
-\   'callback': 'ale_linters#php#hack#Handle',
-\})