[CodingStyle] Skip NameImporter change when the name is already written as is

Author: GErpeldinger

rules/CodingStyle/Node/NameImporter.php

@@ -86,6 +86,11 @@ private function importNameAndCollectNewUseStatement(
         // make use of existing use import
         $nameInUse = $this->resolveNameInUse($fullyQualified, $currentUses);
         if ($nameInUse instanceof Name) {
+            // already written with this name, nothing to change
+            if ($this->isWrittenAs($file, $fullyQualified, $nameInUse)) {
+                return null;
+            }
+
             $nameInUse->setAttribute(AttributeKey::NAMESPACED_NAME, $fullyQualified->toString());
             return $nameInUse;
         }
@@ -139,6 +144,14 @@ private function importNameAndCollectNewUseStatement(
         return null;
     }
 
+    private function isWrittenAs(File $file, FullyQualified $fullyQualified, Name $name): bool
+    {
+        $oldTokens = $file->getOldTokens();
+        $startTokenPos = $fullyQualified->getStartTokenPos();
+
+        return isset($oldTokens[$startTokenPos]) && $oldTokens[$startTokenPos]->text === $name->toString();
+    }
+
     private function addUseImport(
         FileNode $fileNode,
         FullyQualified $fullyQualified,

tests/Application/ApplicationFileProcessor/ApplicationFileProcessorTest.php

@@ -43,6 +43,21 @@ public function testCleanFileIsCachedAsUnchanged(): void
         $this->assertFalse($this->changedFilesDetector->hasFileChanged($filePath));
     }
 
+    public function testShortNameNextToSameShortNameAliasIsCachedAsUnchanged(): void
+    {
+        self::$rectorConfig = null;
+        $this->bootFromConfigFiles([__DIR__ . '/config-import-names.php']);
+        $applicationFileProcessor = $this->make(ApplicationFileProcessor::class);
+        $changedFilesDetector = $this->make(ChangedFilesDetector::class);
+        $changedFilesDetector->clear();
+
+        $filePath = __DIR__ . '/Source/ImportedNextToSameShortNameAlias.php';
+
+        $applicationFileProcessor->processFiles([$filePath], new Configuration(isDryRun: true));
+
+        $this->assertFalse($changedFilesDetector->hasFileChanged($filePath));
+    }
+
     public function testOnlyRuleRunCachesUnderOwnScopeWithoutPoisoningFullRun(): void
     {
         $filePath = __DIR__ . '/Source/CleanFile.php';

tests/Application/ApplicationFileProcessor/Source/ImportedNextToSameShortNameAlias.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\Application\ApplicationFileProcessor\Source;
+
+use PhpParser\Node\Expr\BinaryOp\Plus;
+use PhpParser\Node\Expr\AssignOp\Plus as AssignPlus;
+
+final class ImportedNextToSameShortNameAlias
+{
+    public function run(Plus $plus, AssignPlus $assignPlus): void
+    {
+    }
+}

tests/Application/ApplicationFileProcessor/config-import-names.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->cacheDirectory(sys_get_temp_dir() . '/_rector_import_names_test');
+    $rectorConfig->importNames();
+};