VimPlug/ale
1
0
Fork 0
mirror of https://github.com/dense-analysis/ale.git synced 2025-12-06 20:54:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2819 from greg0ire/psalm_extra_options

Browse Source 
Add the possiblity to add extra psalm options
This commit is contained in:
w0rp
2019-10-29 17:21:01 +00:00
committed by GitHub
parent 9a0b604a99 95b8689835
commit e259dd525f
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ale_linters/php/psalm.vim
View File

@@ -2,6 +2,7 @@
" Description: plugin for Psalm, static analyzer for PHP " Description: plugin for Psalm, static analyzer for PHP
call ale#Set('psalm_langserver_executable', 'psalm') call ale#Set('psalm_langserver_executable', 'psalm')
call ale#Set('psalm_langserver_options', '')
call ale#Set('psalm_langserver_use_global', get(g:, 'ale_use_global_executables', 0)) call ale#Set('psalm_langserver_use_global', get(g:, 'ale_use_global_executables', 0))
function! ale_linters#php#psalm#GetProjectRoot(buffer) abort function! ale_linters#php#psalm#GetProjectRoot(buffer) abort
@@ -10,12 +11,16 @@ function! ale_linters#php#psalm#GetProjectRoot(buffer) abort
return !empty(l:git_path) ? fnamemodify(l:git_path, ':h:h') : '' return !empty(l:git_path) ? fnamemodify(l:git_path, ':h:h') : ''
endfunction endfunction
function! ale_linters#php#psalm#GetCommand(buffer) abort
return '%e --language-server' . ale#Pad(ale#Var(a:buffer, 'psalm_langserver_options'))
endfunction
call ale#linter#Define('php', { call ale#linter#Define('php', {
\ 'name': 'psalm', \ 'name': 'psalm',
\ 'lsp': 'stdio', \ 'lsp': 'stdio',
\ 'executable': {b -> ale#node#FindExecutable(b, 'psalm_langserver', [ \ 'executable': {b -> ale#node#FindExecutable(b, 'psalm_langserver', [
\ 'vendor/bin/psalm', \ 'vendor/bin/psalm',
\ ])}, \ ])},
\ 'command': '%e --language-server', \ 'command': function('ale_linters#php#psalm#GetCommand'),
\ 'project_root': function('ale_linters#php#psalm#GetProjectRoot'), \ 'project_root': function('ale_linters#php#psalm#GetProjectRoot'),
\}) \})

7
doc/ale-php.txt
View File

@@ -189,6 +189,13 @@ g:ale_php_psalm_executable *g:ale_php_psalm_executable*
This variable sets the executable used for psalm. This variable sets the executable used for psalm.
g:ale_psalm_langserver_options *g:ale_psalm_langserver_options*
*b:ale_psalm_langserver_options*
Type: |String|
Default: `''`
This variable can be set to pass additional options to psalm.
=============================================================================== ===============================================================================
php-cs-fixer *ale-php-php-cs-fixer* php-cs-fixer *ale-php-php-cs-fixer*

8
test/command_callback/test_psalm_command_callbacks.vader
View File

@@ -22,6 +22,14 @@ Execute(Vendor executables should be detected):
\ . '/psalm-project/vendor/bin/psalm' \ . '/psalm-project/vendor/bin/psalm'
\ )) . ' --language-server' \ )) . ' --language-server'
Execute(User provided options should be used):
let g:ale_psalm_langserver_options = '--my-user-provided-option my-value'
AssertLinter 'psalm',
\ ale#Escape('psalm')
\ . ' --language-server --my-user-provided-option my-value'
Execute(The project path should be correct for .git directories): Execute(The project path should be correct for .git directories):
call ale#test#SetFilename('psalm-project/test.php') call ale#test#SetFilename('psalm-project/test.php')