diff options
| author | w0rp <w0rp@users.noreply.github.com> | 2019-10-07 19:19:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-07 19:19:54 +0100 |
| commit | cebbb67ea6e2555f4438d61333c96764a389cf6b (patch) | |
| tree | 5752cccc0eef1eb7a32290c17b598b765b212c1e | |
| parent | 32b784219b91a99fb05a78825ce64c5a4f98f253 (diff) | |
| parent | e47c1965a611e5d8e4503ed399fefbb41caa80c4 (diff) | |
| download | ale-cebbb67ea6e2555f4438d61333c96764a389cf6b.zip | |
Merge pull request #2659 from greg0ire/psalm-language-server-option
Use the psalm executable with the LS option
| -rw-r--r-- | ale_linters/php/psalm.vim | 6 | ||||
| -rwxr-xr-x | test/command_callback/psalm-project/vendor/bin/psalm (renamed from test/command_callback/psalm-project/vendor/bin/psalm-language-server) | 0 | ||||
| -rw-r--r-- | test/command_callback/test_psalm_command_callbacks.vader | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/ale_linters/php/psalm.vim b/ale_linters/php/psalm.vim index 3cdb026a..834d0993 100644 --- a/ale_linters/php/psalm.vim +++ b/ale_linters/php/psalm.vim @@ -1,7 +1,7 @@ " Author: Matt Brown <https://github.com/muglug> " Description: plugin for Psalm, static analyzer for PHP -call ale#Set('psalm_langserver_executable', 'psalm-language-server') +call ale#Set('psalm_langserver_executable', 'psalm') call ale#Set('psalm_langserver_use_global', get(g:, 'ale_use_global_executables', 0)) function! ale_linters#php#psalm#GetProjectRoot(buffer) abort @@ -14,8 +14,8 @@ call ale#linter#Define('php', { \ 'name': 'psalm', \ 'lsp': 'stdio', \ 'executable': {b -> ale#node#FindExecutable(b, 'psalm_langserver', [ -\ 'vendor/bin/psalm-language-server', +\ 'vendor/bin/psalm', \ ])}, -\ 'command': '%e', +\ 'command': '%e --language-server', \ 'project_root': function('ale_linters#php#psalm#GetProjectRoot'), \}) diff --git a/test/command_callback/psalm-project/vendor/bin/psalm-language-server b/test/command_callback/psalm-project/vendor/bin/psalm index e69de29b..e69de29b 100755 --- a/test/command_callback/psalm-project/vendor/bin/psalm-language-server +++ b/test/command_callback/psalm-project/vendor/bin/psalm diff --git a/test/command_callback/test_psalm_command_callbacks.vader b/test/command_callback/test_psalm_command_callbacks.vader index 33d770c2..74c68d43 100644 --- a/test/command_callback/test_psalm_command_callbacks.vader +++ b/test/command_callback/test_psalm_command_callbacks.vader @@ -9,18 +9,18 @@ After: call ale#assert#TearDownLinterTest() Execute(The default executable path should be correct): - AssertLinter 'psalm-language-server', - \ ale#Escape('psalm-language-server') + AssertLinter 'psalm', + \ ale#Escape('psalm') . ' --language-server' Execute(Vendor executables should be detected): call ale#test#SetFilename('psalm-project/test.php') AssertLinter - \ ale#path#Simplify(g:dir . '/psalm-project/vendor/bin/psalm-language-server'), + \ ale#path#Simplify(g:dir . '/psalm-project/vendor/bin/psalm'), \ ale#Escape(ale#path#Simplify( \ g:dir - \ . '/psalm-project/vendor/bin/psalm-language-server' - \ )) + \ . '/psalm-project/vendor/bin/psalm' + \ )) . ' --language-server' Execute(The project path should be correct for .git directories): call ale#test#SetFilename('psalm-project/test.php') |