Fix willRename behavior

afonsocarlos · afonsocarlos · commit 95a9ba039797 · 2024-01-07T02:07:33.000Z
Rename only the original reference as described in WillRenameFiles LSP
specifications
diff --git a/lib/Rename/Adapter/ClassMover/FileRenamer.php b/lib/Rename/Adapter/ClassMover/FileRenamer.php
@@ -43,7 +43,7 @@ public function renameFile(TextDocumentUri $from, TextDocumentUri $to): Promise
             $references = $this->client->class()->referencesTo($fromClass);
 
             // rename class definition
-            $locatedEdits = $this->replaceDefinition($to, $fromClass, $toClass);
+            $locatedEdits = $this->replaceDefinition($from, $fromClass, $toClass);
 
             $edits = TextEdits::none();
             $seen = [];
diff --git a/lib/Rename/Tests/Adapter/ClassMover/FileRenamerTest.php b/lib/Rename/Tests/Adapter/ClassMover/FileRenamerTest.php
@@ -52,6 +52,29 @@ public function testRenameReferencesInTwoFiles(): void
         self::assertCount(3, $edits->toLocatedTextEdits(), 'Locates two references');
     }
 
+    /**
+     * Tests that the definition is renamed on the original file as described
+     * in the LSP spec. Note that we use the "Simple" file-to-class name
+     * strategy which scans the contents of the destination file to get the
+     * class name. Therefore, despite having to save the renamed file, we do
+     * not add it to the InMemoryDocumentLocator to simulate the behavior when
+     * using Composer that has no reference to the new file, only the old one.
+     */
+    public function testRenameReferencesToNewFile(): void
+    {
+        $document1 = $this->createDocument('One.php', '<?php class One{}');
+        $document2 = $this->createDocument('Two.php', '<?php class Two{}; One::class;');
+
+        file_put_contents($document2->uri()->path(), $document2->__toString());
+        $renamer = $this->createRenamer([$document1], [(new ClassRecord('One'))->setType('class')]);
+
+        $edits = wait($renamer->renameFile($document1->uri(), $document2->uri()));
+
+        self::assertInstanceOf(LocatedTextEditsMap::class, $edits);
+        assert($edits instanceof LocatedTextEditsMap);
+        self::assertCount(1, $edits->toLocatedTextEdits(), 'Locates one reference');
+    }
+
     /**
      * @param TextDocument[] $textDocuments
      * @param Record[] $records
