From e8ab8aa2b83cad79abefe67ed2d4edeb51f33083 Mon Sep 17 00:00:00 2001 From: Michal Niewrzal Date: Wed, 23 Nov 2016 18:38:57 +0100 Subject: [PATCH] Make processId optional for initialization (#178) --- src/LanguageServer.php | 4 ++-- tests/LanguageServerTest.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/LanguageServer.php b/src/LanguageServer.php index a2c1f52..43f0544 100644 --- a/src/LanguageServer.php +++ b/src/LanguageServer.php @@ -107,12 +107,12 @@ class LanguageServer extends AdvancedJsonRpc\Dispatcher /** * The initialize request is sent as the first request from the client to the server. * - * @param int $processId The process Id of the parent process that started the server. * @param ClientCapabilities $capabilities The capabilities provided by the client (editor) * @param string|null $rootPath The rootPath of the workspace. Is null if no folder is open. + * @param int|null $processId The process Id of the parent process that started the server. Is null if the process has not been started by another process. If the parent process is not alive then the server should exit (see exit notification) its process. * @return InitializeResult */ - public function initialize(int $processId, ClientCapabilities $capabilities, string $rootPath = null): InitializeResult + public function initialize(ClientCapabilities $capabilities, string $rootPath = null, int $processId = null): InitializeResult { $this->rootPath = $rootPath; $this->clientCapabilities = $capabilities; diff --git a/tests/LanguageServerTest.php b/tests/LanguageServerTest.php index 272c458..2e0fb4e 100644 --- a/tests/LanguageServerTest.php +++ b/tests/LanguageServerTest.php @@ -68,7 +68,7 @@ class LanguageServerTest extends TestCase }); $server = new LanguageServer($input, $output); $capabilities = new ClientCapabilities; - $server->initialize(getmypid(), $capabilities, realpath(__DIR__ . '/../fixtures')); + $server->initialize($capabilities, realpath(__DIR__ . '/../fixtures'), getmypid()); $promise->wait(); } @@ -116,7 +116,7 @@ class LanguageServerTest extends TestCase $capabilities = new ClientCapabilities; $capabilities->xfilesProvider = true; $capabilities->xcontentProvider = true; - $server->initialize(getmypid(), $capabilities, $rootPath); + $server->initialize($capabilities, $rootPath, getmypid()); $promise->wait(); $this->assertTrue($filesCalled); $this->assertTrue($contentCalled);