summaryrefslogtreecommitdiff
path: root/ale_linters/php
diff options
context:
space:
mode:
authorMatthew Brown <github@muglug.com>2018-10-19 15:51:16 -0400
committerGitHub <noreply@github.com>2018-10-19 15:51:16 -0400
commit0ed07a9ef52b5f8ac528eadb5252ed091db53265 (patch)
tree4169781b9bb5f7822c10c3a1142bdfced7f75104 /ale_linters/php
parent3bda13298860da5a88e114d812937e727d4e8f56 (diff)
downloadale-0ed07a9ef52b5f8ac528eadb5252ed091db53265.zip
Update Psalm plugin to use LSP mode
Diffstat (limited to 'ale_linters/php')
-rw-r--r--ale_linters/php/psalm.vim31
1 files changed, 12 insertions, 19 deletions
diff --git a/ale_linters/php/psalm.vim b/ale_linters/php/psalm.vim
index cd20ab81..dce59178 100644
--- a/ale_linters/php/psalm.vim
+++ b/ale_linters/php/psalm.vim
@@ -1,28 +1,21 @@
-" Author: richard marmorstein <https://github.com/twitchard>
+" Author: Matt Brown <https://github.com/muglug>
" Description: plugin for Psalm, static analyzer for PHP
-call ale#Set('php_psalm_executable', 'psalm')
+call ale#Set('psalm_langserver_executable', 'psalm-language-server')
+call ale#Set('psalm_langserver_use_global', get(g:, 'ale_use_global_executables', 0))
-function! ale_linters#php#psalm#Handle(buffer, lines) abort
- " Matches patterns like the following:
- let l:pattern = '^.*:\(\d\+\):\(\d\+\):\(\w\+\) - \(.*\)$'
- let l:output = []
+function! ale_linters#php#psalm#GetProjectRoot(buffer) abort
+ let l:git_path = ale#path#FindNearestDirectory(a:buffer, '.git')
- for l:match in ale#util#GetMatches(a:lines, l:pattern)
- call add(l:output, {
- \ 'lnum': l:match[1] + 0,
- \ 'text': l:match[4],
- \ 'type': l:match[3][:0] is# 'e' ? 'E' : 'W',
- \})
- endfor
-
- return l:output
+ return !empty(l:git_path) ? fnamemodify(l:git_path, ':h:h') : ''
endfunction
call ale#linter#Define('php', {
\ 'name': 'psalm',
-\ 'command': '%e --diff --output-format=emacs %s',
-\ 'executable_callback': ale#VarFunc('php_psalm_executable'),
-\ 'callback': 'ale_linters#php#psalm#Handle',
-\ 'lint_file': 1,
+\ 'lsp': 'stdio',
+\ 'executable_callback': ale#node#FindExecutableFunc('psalm_langserver', [
+\ 'vendor/bin/psalm-language-server',
+\ ]),
+\ 'command': '%e',
+\ 'project_root_callback': 'ale_linters#php#psalm#GetProjectRoot',
\})