From 755e5c6cdeda9b1b3d48153a17de0c3f8048e6a9 Mon Sep 17 00:00:00 2001 From: Felix Becker Date: Tue, 10 Jan 2017 16:28:12 -0800 Subject: [PATCH] Fix tests --- tests/LanguageServerTest.php | 3 +++ tests/Server/ServerTestCase.php | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/LanguageServerTest.php b/tests/LanguageServerTest.php index 6f8e705..6bfa3c9 100644 --- a/tests/LanguageServerTest.php +++ b/tests/LanguageServerTest.php @@ -41,6 +41,9 @@ class LanguageServerTest extends TestCase $serverCapabilities->completionProvider = new CompletionOptions; $serverCapabilities->completionProvider->resolveProvider = false; $serverCapabilities->completionProvider->triggerCharacters = ['$', '>']; + $serverCapabilities->xworkspaceReferencesProvider = true; + $serverCapabilities->xdefinitionProvider = true; + $serverCapabilities->xdependenciesProvider = true; $this->assertEquals(new InitializeResult($serverCapabilities), $result); } diff --git a/tests/Server/ServerTestCase.php b/tests/Server/ServerTestCase.php index a4661a2..e37844a 100644 --- a/tests/Server/ServerTestCase.php +++ b/tests/Server/ServerTestCase.php @@ -45,13 +45,15 @@ abstract class ServerTestCase extends TestCase public function setUp() { - $projectIndex = new ProjectIndex(new Index, new DependenciesIndex); + $sourceIndex = new Index; + $dependenciesIndex = new DependenciesIndex; + $projectIndex = new ProjectIndex($sourceIndex, $dependenciesIndex); $definitionResolver = new DefinitionResolver($projectIndex); $client = new LanguageClient(new MockProtocolStream, new MockProtocolStream); $this->documentLoader = new PhpDocumentLoader(new FileSystemContentRetriever, $projectIndex, $definitionResolver); $this->textDocument = new Server\TextDocument($this->documentLoader, $definitionResolver, $client, $projectIndex); - $this->workspace = new Server\Workspace($projectIndex, $client); + $this->workspace = new Server\Workspace($projectIndex, $dependenciesIndex, $sourceIndex, null, $this->documentLoader); $globalSymbolsUri = pathToUri(realpath(__DIR__ . '/../../fixtures/global_symbols.php')); $globalReferencesUri = pathToUri(realpath(__DIR__ . '/../../fixtures/global_references.php'));