Gh 2434 callable crash

CHANGELOG.md

@@ -11,6 +11,7 @@ Bug fixes:
   - Fix incorrect enum import #2400
   - Fix undefined var false positive for arra unpacking #2403
   - Fix autoloading class conflcits with test files #2535 @gerardroche
+  - Fix crash on resolveItem() caused by race condition (?) #2434
 
 Features:
 

lib/Extension/LanguageServerCompletion/Handler/CompletionHandler.php

@@ -134,10 +134,19 @@ public function completion(CompletionParams $params, CancellationToken $token):
      */
     public function resolveItem(RequestMessage $request): Promise
     {
+        /** @phpstan-ignore-next-line */
         return call(function () use ($request) {
+            /** @phpstan-ignore-next-line */
             $item = CompletionItem::fromArray($request->params);
-            $item = $this->resolve[$item->data]($item);
-            return $item;
+
+            if (!(is_string($item->data) || is_int($item->data)) || !array_key_exists($item->data, $this->resolve)) {
+                return $item;
+            }
+            /** @phpstan-ignore-next-line - shouldn't happen but playing safe */
+            if (null === $this->resolve[$item->data]) {
+                return $item;
+            }
+            return $this->resolve[$item->data]($item);
         });
     }
 

lib/Extension/LanguageServerCompletion/Tests/Unit/Handler/CompletionHandlerTest.php

@@ -106,6 +106,17 @@ public function testResolveCompletionItem(): void
         self::assertEquals('documentation now', $response->result->documentation->value);
     }
 
+    public function testResolveCompletionItemWithNoPreviousCompletion(): void
+    {
+        $tester = $this->create([]);
+        $response = $tester->requestAndWait(
+            'completionItem/resolve',
+            new CompletionItem('hello'),
+        );
+        self::assertNotNull($response);
+        self::assertInstanceOf(CompletionItem::class, $response->result);
+    }
+
     public function testHandleAnIncompleteListOfSuggestions(): void
     {
         $tester = $this->create([
@@ -481,6 +492,7 @@ private function createCompletor(array $suggestions, bool $isIncomplete = false)
     {
         return new class($suggestions, $isIncomplete) implements Completor {
             public function __construct(
+                /** @var Suggestion[] */
                 private array $suggestions,
                 private bool $isIncomplete
             ) {