icedream
/
php-language-server
1
0
Fork 0
Code Releases Activity

Merge f3554e602d into 9dc1656592

pull/641/merge
dmakovec 2018-12-16 19:44:17 +00:00 committed by GitHub
parent 9dc1656592 f3554e602d
commit 23a6a3730d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/LanguageServer.php
View File

@ -218,10 +218,18 @@ class LanguageServer extends AdvancedJsonRpc\Dispatcher
sortUrisLevelOrder($composerLockFiles); sortUrisLevelOrder($composerLockFiles);
if (!empty($composerLockFiles)) { if (!empty($composerLockFiles)) {
$this->composerLock = json_decode(yield $this->contentRetriever->retrieve($composerLockFiles[0])); $packages = [];
$packagesDev = [];
foreach ($composerLockFiles as $composerLockFile) {
$composerLock = json_decode(yield $this->contentRetriever->retrieve($composerLockFile));
$packages = array_merge($packages, $composerLock->packages);
$packagesDev = array_merge($packagesDev, $composerLock->{'packages-dev'});
}
$this->composerLock = $composerLock;
$this->composerLock->packages = $packages;
$this->composerLock->{'packages-dev'} = $packagesDev;
} }
} }
$cache = $capabilities->xcacheProvider ? new ClientCache($this->client) : new FileSystemCache; $cache = $capabilities->xcacheProvider ? new ClientCache($this->client) : new FileSystemCache;
// Index in background // Index in background