diff --git a/src/Client/Workspace.php b/src/Client/Workspace.php index 2057340..820fc45 100644 --- a/src/Client/Workspace.php +++ b/src/Client/Workspace.php @@ -56,7 +56,7 @@ class Workspace * the result for the first configuration item in the params). * * @param ConfigurationItem[] $items - * @return Promise + * @return Promise */ public function configuration(array $items): Promise { diff --git a/src/LanguageServer.php b/src/LanguageServer.php index 4a04d73..9548b7d 100644 --- a/src/LanguageServer.php +++ b/src/LanguageServer.php @@ -341,9 +341,7 @@ class LanguageServer extends AdvancedJsonRpc\Dispatcher // request configuration if it is supported // support comes with protocol version 3.6.0 if ($this->clientCapabilities->workspace->configuration) { - $configurationitem = new ConfigurationItem(); - $configurationitem->section = 'php'; - $configuration = yield $this->client->workspace->configuration([$configurationitem]); + $configuration = yield $this->client->workspace->configuration([new ConfigurationItem('php')]); $options = $this->mapper->map($configuration[0], new Options()); } diff --git a/src/Protocol/ConfigurationItem.php b/src/Protocol/ConfigurationItem.php index 5ef9a27..dff8b95 100644 --- a/src/Protocol/ConfigurationItem.php +++ b/src/Protocol/ConfigurationItem.php @@ -1,4 +1,5 @@ section = $section; + $this->scopeUri = $scopeUri; + } } diff --git a/src/Server/Workspace.php b/src/Server/Workspace.php index ac8f92b..61230e6 100644 --- a/src/Server/Workspace.php +++ b/src/Server/Workspace.php @@ -221,7 +221,7 @@ class Workspace } $this->projectIndex->wipe(); - $this->indexer->index()->otherwise('\\LanguageServer\\crash'); + yield $this->indexer->index(); } } catch (\JsonMapper_Exception $exception) { $this->client->window->showMessage(