From e47c1965a611e5d8e4503ed399fefbb41caa80c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= <postmaster@greg0ire.fr>
Date: Thu, 25 Jul 2019 23:00:49 +0200
Subject: Use the psalm executable with the LS option

This is the simplest way of getting the psalm language server to run
now.
---
 ale_linters/php/psalm.vim                                      |  6 +++---
 test/command_callback/psalm-project/vendor/bin/psalm           |  0
 .../psalm-project/vendor/bin/psalm-language-server             |  0
 test/command_callback/test_psalm_command_callbacks.vader       | 10 +++++-----
 4 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100755 test/command_callback/psalm-project/vendor/bin/psalm
 delete mode 100755 test/command_callback/psalm-project/vendor/bin/psalm-language-server

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 b/test/command_callback/psalm-project/vendor/bin/psalm
new file mode 100755
index 00000000..e69de29b
diff --git a/test/command_callback/psalm-project/vendor/bin/psalm-language-server b/test/command_callback/psalm-project/vendor/bin/psalm-language-server
deleted file mode 100755
index e69de29b..00000000
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')
-- 
cgit v1.2.3