1 files changed, 5 insertions, 24 deletions

diff --git a/scripts/plugin-stub-generator/src/Generator.php b/scripts/plugin-stub-generator/src/Generator.php
index dd62da60..0b8ef037 100644
--- a/scripts/plugin-stub-generator/src/Generator.php
+++ b/scripts/plugin-stub-generator/src/Generator.php
@@ -159,7 +159,7 @@ final class Generator
             return [];
         }
         $surface = [];
-        $parentFqcn = $class->extends === null ? null : $this->resolvedName($class->extends);
+        $parentFqcn = $class->extends === null ? null : SourceFile::resolvedName($class->extends);
         if ($parentFqcn !== null) {
             $surface = $this->surfaces[$parentFqcn] ?? $this->surfaceFromRealClass($parentFqcn);
         }
@@ -195,7 +195,7 @@ final class Generator
                 . '; only rust-proxy and contract classes can become proxy stubs';
         }
 
-        $parentFqcn = $class->extends === null ? null : $this->resolvedName($class->extends);
+        $parentFqcn = $class->extends === null ? null : SourceFile::resolvedName($class->extends);
         $isRoot = $parentFqcn === null;
         if ($parentFqcn !== null && !isset($this->targetSet[$parentFqcn])) {
             if (isset($this->runtimeSet[$parentFqcn])) {
@@ -348,7 +348,7 @@ final class Generator
         $header = "// Generated by scripts/plugin-stub-generator; do not edit by hand.\n"
             . "// Proxy stub for $fqcn: the public surface forwards to the Rust-side entity over RPC.";
         $text = "<?php\n\n$header\n\nnamespace {$file->namespace};\n\n";
-        $uses = $this->usedImports($file, $decl . "\n" . $body);
+        $uses = $file->importsUsedBy($decl . "\n" . $body);
         if ($uses !== '') {
             $text .= $uses . "\n\n";
         }
@@ -446,11 +446,11 @@ final class Generator
             }
             $out[] = $file;
             foreach ($file->classLike->extends as $parent) {
-                $visit($this->resolvedName($parent));
+                $visit(SourceFile::resolvedName($parent));
             }
         };
         foreach ($class->implements as $interface) {
-            $visit($this->resolvedName($interface));
+            $visit(SourceFile::resolvedName($interface));
         }
         return $out;
     }
@@ -527,23 +527,4 @@ final class Generator
         }
         return $fingerprint;
     }
-
-    /** The original file's imports, restricted to names the emitted stub actually uses. */
-    private function usedImports(SourceFile $file, string $emittedText): string
-    {
-        $kept = [];
-        foreach ($file->aliases as $alias => $fqcn) {
-            if (preg_match('/(?<![\\\\$\w])' . preg_quote($alias, '/') . '\b/', $emittedText) === 1) {
-                $kept[] = 'use ' . $fqcn
-                    . (str_ends_with($fqcn, '\\' . $alias) || $fqcn === $alias ? '' : " as $alias") . ';';
-            }
-        }
-        return implode("\n", $kept);
-    }
-
-    private function resolvedName(Name $name): string
-    {
-        $resolved = $name->getAttribute('resolvedName');
-        return $resolved instanceof Name ? $resolved->toString() : $name->toString();
-    }
 }