Cache source packages when reference/revision is available

fixtures/composer.json

@@ -0,0 +1,6 @@
+{
+    "require": {
+        "example/example-version": "1.0.7",
+        "example/example-reference": "dev-master"
+    }
+}

fixtures/vendor/example/example-reference/test.php

@@ -0,0 +1 @@
+<?php

fixtures/vendor/example/example-version/test.php

@@ -0,0 +1,3 @@
+<?php
+
+

src/Indexer.php

@@ -149,15 +149,26 @@ public function index(): Promise
                 $cacheKey = null;
                 $index = null;
                 foreach (array_merge($this->composerLock->packages, $this->composerLock->{'packages-dev'}) as $package) {
-                    // Check if package name matches and version is absolute
-                    // Dynamic constraints are not cached, because they can change every time
+                    if ($package->name !== $packageName) {
+                        continue;
+                    }
+                    // Check if package can be cached.
                     $packageVersion = ltrim($package->version, 'v');
-                    if ($package->name === $packageName && strpos($packageVersion, 'dev') === false) {
+                    // If package is anchored to a version
+                    if (strpos($packageVersion, 'dev') === false) {
                         $packageKey = $packageName . ':' . $packageVersion;
                         $cacheKey = self::CACHE_VERSION . ':' . $packageKey;
                         // Check cache
                         $index = yield $this->cache->get($cacheKey);
                         break;
+
+                    // If package is checked out
+                    } else if (isset($package->source->reference)) {
+                        $packageKey = $packageName . ':' . $package->source->reference;
+                        $cacheKey = self::CACHE_VERSION . ':' . $packageKey;
+                        // Check cache
+                        $index = yield $this->cache->get($cacheKey);
+                        break;
                     }
                 }
                 if ($index !== null) {

tests/LanguageServerTest.php

@@ -53,19 +53,27 @@ public function testIndexingWithDirectFileAccess()
         $promise = new Promise;
         $input = new MockProtocolStream;
         $output = new MockProtocolStream;
-        $output->on('message', function (Message $msg) use ($promise) {
+        $cacheVersionCalled = false;
+        $cacheReferenceCalled = false;
+        $output->on('message', function (Message $msg) use ($promise, &$cacheVersionCalled, &$cacheReferenceCalled) {
             if ($msg->body->method === 'window/logMessage' && $promise->state === Promise::PENDING) {
                 if ($msg->body->params->type === MessageType::ERROR) {
                     $promise->reject(new Exception($msg->body->params->message));
-                } else if (strpos($msg->body->params->message, 'All 27 PHP files parsed') !== false) {
+                } else if (preg_match('/All [0-9]+ PHP files parsed/', $msg->body->params->message)) {
                     $promise->fulfill();
+                } else if (preg_match('#(Storing|Restored) example/example-version:.* (in|from) cache#', $msg->body->params->message)) {
+                    $cacheVersionCalled = true;
+                } else if (preg_match('#(Storing|Restored) example/example-reference:.* (in|from) cache#', $msg->body->params->message)) {
+                    $cacheReferenceCalled = true;
                 }
             }
         });
         $server = new LanguageServer($input, $output);
         $capabilities = new ClientCapabilities;
         $server->initialize($capabilities, realpath(__DIR__ . '/../fixtures'), getmypid());
         $promise->wait();
+        $this->assertTrue($cacheVersionCalled);
+        $this->assertTrue($cacheReferenceCalled);
     }
 
     public function testIndexingWithFilesAndContentRequests()
@@ -103,7 +111,7 @@ public function testIndexingWithFilesAndContentRequests()
                     if ($promise->state === Promise::PENDING) {
                         $promise->reject(new Exception($msg->body->params->message));
                     }
-                } else if (strpos($msg->body->params->message, 'All 27 PHP files parsed') !== false) {
+                } else if (preg_match('/All [0-9]+ PHP files parsed/', $msg->body->params->message)) {
                     $promise->fulfill();
                 }
             }