Fix missing implements code action (phpactor#2668)

Consider the resolved name of the interface instead of `getText`

Author: dantleech

CHANGELOG.md

@@ -17,6 +17,7 @@ Bug fixes:
 
   - Only filter new object expression names in contextual completion #2603
   - Fixing include and exclude patterns #2593 @mamazu
+  - Fix missing @implements code action #2668 @dantleech
 
 ## 2024-03-09
 

lib/CodeTransform/Adapter/WorseReflection/Transformer/UpdateDocblockGenericTransformer.php

@@ -49,7 +49,6 @@ public function transform(SourceCode $code): Promise
                     $builder->use($classType->name()->__toString());
                 }
 
-
                 $tag = match($diagnostic->isExtends()) {
                     true => new ExtendsTagPrototype(
                         $diagnostic->missingGenericType(),

lib/CodeTransform/Tests/Adapter/WorseReflection/Transformer/UpdateDocblockGenericTransformerTest.php

@@ -28,6 +28,14 @@ public function testTransform(string $example, string $expected): void
             'Example2.php',
             '<?php /** @template T of object */class NeedsObject{ }'
         );
+        $this->workspace()->put(
+            'Example3.php',
+            '<?php /** @template T */interface GenericInterface{ }'
+        );
+        $this->workspace()->put(
+            'Example4.php',
+            '<?php /** @template T of object */interface NeedsObjectInterface{ }'
+        );
         $reflector = $this->reflectorForWorkspace($example);
         $transformer = $this->createTransformer($reflector);
         $transformed = wait($transformer->transform($source))->apply($source);
@@ -165,6 +173,47 @@ class Foobar extends NeedsObject {
                 }
                 EOT
         ];
+        yield 'implements' => [
+            <<<'EOT'
+                <?php
+
+                namespace Foo;
+                use \GenericInterface;
+
+                class Foobar implements GenericInterface {
+                }
+                EOT
+            ,
+            <<<'EOT'
+                <?php
+
+                namespace Foo;
+                use \GenericInterface;
+                /**
+                 * @implements GenericInterface<mixed>
+                 */
+                class Foobar implements GenericInterface {
+                }
+                EOT
+        ];
+        yield 'implements of' => [
+            <<<'EOT'
+                <?php
+
+                class Foobar implements NeedsObjectInterface {
+                }
+                EOT
+            ,
+            <<<'EOT'
+                <?php
+
+                /**
+                 * @implements NeedsObjectInterface<object>
+                 */
+                class Foobar implements NeedsObjectInterface {
+                }
+                EOT
+        ];
     }
 
     private function createTransformer(Reflector $reflector): UpdateDocblockGenericTransformer

lib/CodeTransform/Tests/Adapter/WorseReflection/WorseTestCase.php

@@ -7,6 +7,7 @@
 use Phpactor\WorseReflection\Bridge\Phpactor\MemberProvider\DocblockMemberProvider;
 use Phpactor\WorseReflection\Bridge\TolerantParser\Diagnostics\AssignmentToMissingPropertyProvider;
 use Phpactor\WorseReflection\Bridge\TolerantParser\Diagnostics\DocblockMissingExtendsTagProvider;
+use Phpactor\WorseReflection\Bridge\TolerantParser\Diagnostics\DocblockMissingImplementsTagProvider;
 use Phpactor\WorseReflection\Bridge\TolerantParser\Diagnostics\DocblockMissingParamProvider;
 use Phpactor\WorseReflection\Bridge\TolerantParser\Diagnostics\DocblockMissingReturnTypeProvider;
 use Phpactor\WorseReflection\Bridge\TolerantParser\Diagnostics\MissingMemberProvider;
@@ -31,6 +32,7 @@ public function reflectorForWorkspace(?string $source = null): Reflector
         $builder->addDiagnosticProvider(new UnusedImportProvider());
         $builder->addDiagnosticProvider(new DocblockMissingParamProvider());
         $builder->addDiagnosticProvider(new DocblockMissingExtendsTagProvider());
+        $builder->addDiagnosticProvider(new DocblockMissingImplementsTagProvider());
 
         foreach ((array)glob($this->workspace()->path('/*.php')) as $file) {
             if ($file === false) {

lib/WorseReflection/Bridge/TolerantParser/Diagnostics/Docblock/ClassGenericDiagnosticHelper.php

@@ -38,7 +38,14 @@ public function diagnosticsForExtends(
     public function diagnosticsForImplements(Reflector $reflector, ByteOffsetRange $range, ReflectionClassLike $class, ?ReflectionClassLike $genericClass): Generator
     {
         if ($class instanceof ReflectionClass) {
-            yield from $this->fromReflectionClass($reflector, $range, $class, $genericClass, $class->docblock()->implements(), '@implements');
+            yield from $this->fromReflectionClass(
+                $reflector,
+                $range,
+                $class,
+                $genericClass,
+                $class->docblock()->implements(),
+                '@implements'
+            );
         }
     }
 
@@ -64,7 +71,10 @@ private function fromReflectionClass(
             return;
         }
 
-        $genericTypes = array_filter($genericTypes, fn (Type $extendTagType) => $parentClass->type()->accepts($extendTagType)->isTrue());
+        $genericTypes = array_filter(
+            $genericTypes,
+            fn (Type $extendTagType) => $parentClass->type()->accepts($extendTagType)->isTrue()
+        );
 
         $defaultGenericType = new GenericClassType(
             $reflector,

lib/WorseReflection/Bridge/TolerantParser/Diagnostics/DocblockMissingImplementsTagProvider.php

@@ -3,6 +3,7 @@
 namespace Phpactor\WorseReflection\Bridge\TolerantParser\Diagnostics;
 
 use Microsoft\PhpParser\Node;
+use Microsoft\PhpParser\Node\QualifiedName;
 use Microsoft\PhpParser\Node\Statement\ClassDeclaration;
 use PHPUnit\Framework\Assert;
 use Phpactor\TextDocument\ByteOffsetRange;
@@ -53,8 +54,12 @@ public function exit(NodeContextResolver $resolver, Frame $frame, Node $node): i
         if ($class instanceof ReflectionClass) {
             /** @phpstan-ignore-next-line TP Lies */
             foreach ($node->classInterfaceClause?->interfaceNameList?->getChildNodes() ?? [] as $implementedInterface) {
+                if (!$implementedInterface instanceof QualifiedName) {
+                    continue;
+                }
                 try {
-                    $implementedInterface = $resolver->reflector()->reflectClassLike($implementedInterface->getText());
+                    $name = (string)$implementedInterface->getResolvedName();
+                    $implementedInterface = $resolver->reflector()->reflectClassLike($name);
                 } catch (NotFound) {
                     continue;
                 }