From 238201805dd23ea422a107b3170de7892335137b Mon Sep 17 00:00:00 2001 From: Fred Emmott Date: Fri, 27 Jul 2018 13:50:59 -0700 Subject: Split Hack out from PHP, modernize fixes #1738 - Replace previous `hh_client` usage with LSP client - Add `HHAST` linter - Split Hack from PHP: Hack is increasingly diverging from PHP: - Hack tools do not understand PHP - Most PHP tools do not handle Hack code well (including vim's syntax highightling files) - http://github.com/hhvm/vim-hack now sets filetype to `hack` --- ale_linters/hack/hack.vim | 27 +++++++++++++++++++++++++++ ale_linters/hack/hhast.vim | 34 ++++++++++++++++++++++++++++++++++ ale_linters/php/hack.vim | 28 ---------------------------- 3 files changed, 61 insertions(+), 28 deletions(-) create mode 100644 ale_linters/hack/hack.vim create mode 100644 ale_linters/hack/hhast.vim delete mode 100644 ale_linters/php/hack.vim (limited to 'ale_linters') diff --git a/ale_linters/hack/hack.vim b/ale_linters/hack/hack.vim new file mode 100644 index 00000000..0253767a --- /dev/null +++ b/ale_linters/hack/hack.vim @@ -0,0 +1,27 @@ +" Author: Fred Emmott +" Description: Hack support via `hack lsp` + +call ale#Set('hack_hhclient_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_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' +endfunction + +call ale#linter#Define('hack', { +\ 'name': 'hack', +\ 'lsp': 'stdio', +\ 'executable_callback': 'ale_linters#hack#hack#GetExecutable', +\ 'command_callback': 'ale_linters#hack#hack#GetCommand', +\ '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..8ff5a962 --- /dev/null +++ b/ale_linters/hack/hhast.vim @@ -0,0 +1,34 @@ +" Author: Fred Emmott +" Description: Hack support via `hhast lsp` + +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) + if empty(l:root) + return '' + endif + 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 + + +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 + +call ale#linter#Define('hack', { +\ 'name': 'hhast', +\ 'lsp': 'stdio', +\ 'executable_callback': 'ale_linters#hack#hhast#GetExecutable', +\ 'command_callback': 'ale_linters#hack#hhast#GetCommand', +\ '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 -" 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', -\}) -- cgit v1.2.3