From 65a2ce2d4b3ac4ab04dedc1db82d46a9baa10f17 Mon Sep 17 00:00:00 2001 From: Felix Becker Date: Mon, 6 Feb 2017 11:23:11 +0100 Subject: [PATCH] Include packages-dev --- src/Server/TextDocument.php | 2 +- src/Server/Workspace.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Server/TextDocument.php b/src/Server/TextDocument.php index 532d6425..624bc678 100644 --- a/src/Server/TextDocument.php +++ b/src/Server/TextDocument.php @@ -412,7 +412,7 @@ public function xdefinition(TextDocumentIdentifier $textDocument, Position $posi if (preg_match('/\/vendor\/([^\/]+\/[^\/]+)\//', $def->symbolInformation->location->uri, $matches) && $this->composerLock !== null) { // Definition is inside a dependency $packageName = $matches[1]; - foreach ($this->composerLock->packages as $package) { + foreach (array_merge($this->composerLock->packages, $this->composerLock->{'packages-dev'}) as $package) { if ($package->name === $packageName) { $symbol->package = $package; break; diff --git a/src/Server/Workspace.php b/src/Server/Workspace.php index 5aae7cfa..5c0e9fa5 100644 --- a/src/Server/Workspace.php +++ b/src/Server/Workspace.php @@ -124,7 +124,7 @@ public function xreferences($query, array $files = null): Promise // Find out package name preg_match('/\/vendor\/([^\/]+\/[^\/]+)\//', $def->symbolInformation->location->uri, $matches); $packageName = $matches[1]; - foreach ($this->composerLock->packages as $package) { + foreach (array_merge($this->composerLock->packages, $this->composerLock->{'packages-dev'}) as $package) { if ($package->name === $packageName) { $symbol->package = $package; break; @@ -165,7 +165,7 @@ public function xdependencies(): array return []; } $dependencyReferences = []; - foreach ($this->composerLock->packages as $package) { + foreach (array_merge($this->composerLock->packages, $this->composerLock->{'packages-dev'}) as $package) { $dependencyReferences[] = new DependencyReference($package); } return $dependencyReferences;