re-index changed nodes only (#7651)

Author: TomasVotruba

rules/DeadCode/Rector/Assign/RemoveDoubleAssignRector.php

@@ -55,23 +55,22 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
-        $stmts = $node->stmts;
-        if ($stmts === null) {
+        if ($node->stmts === null) {
             return null;
         }
 
         $hasChanged = false;
 
-        foreach ($stmts as $key => $stmt) {
-            if (! isset($stmts[$key + 1])) {
+        foreach ($node->stmts as $key => $stmt) {
+            if (! isset($node->stmts[$key + 1])) {
                 continue;
             }
 
             if (! $stmt instanceof Expression) {
                 continue;
             }
 
-            $nextStmt = $stmts[$key + 1];
+            $nextStmt = $node->stmts[$key + 1];
             if (! $nextStmt instanceof Expression) {
                 continue;
             }

src/Application/NodeAttributeReIndexer.php

@@ -36,6 +36,7 @@ public static function reIndexStmtsKeys(Node $node): ?Node
         }
 
         $node->stmts = array_values($node->stmts);
+
         return $node;
     }
 

src/DependencyInjection/LazyContainerFactory.php

@@ -103,7 +103,6 @@
 use Rector\NodeTypeResolver\PHPStan\Scope\NodeVisitor\GlobalVariableNodeVisitor;
 use Rector\NodeTypeResolver\PHPStan\Scope\NodeVisitor\NameNodeVisitor;
 use Rector\NodeTypeResolver\PHPStan\Scope\NodeVisitor\StaticVariableNodeVisitor;
-use Rector\NodeTypeResolver\PHPStan\Scope\NodeVisitor\StmtKeyNodeVisitor;
 use Rector\NodeTypeResolver\PHPStan\Scope\PHPStanNodeScopeResolver;
 use Rector\NodeTypeResolver\Reflection\BetterReflection\SourceLocatorProvider\DynamicSourceLocatorProvider;
 use Rector\Php80\AttributeDecorator\DoctrineConverterAttributeDecorator;
@@ -243,7 +242,6 @@ final class LazyContainerFactory
         GlobalVariableNodeVisitor::class,
         NameNodeVisitor::class,
         StaticVariableNodeVisitor::class,
-        StmtKeyNodeVisitor::class,
     ];
 
     /**

src/NodeTypeResolver/PHPStan/Scope/NodeVisitor/StmtKeyNodeVisitor.php

@@ -139,8 +139,6 @@ final public function enterNode(Node $node): int|Node|null
         // ensure origNode pulled before refactor to avoid changed during refactor, ref https://3v4l.org/YMEGN
         $originalNode = $node->getAttribute(AttributeKey::ORIGINAL_NODE) ?? $node;
 
-        NodeAttributeReIndexer::reIndexNodeAttributes($node);
-
         $refactoredNode = $this->refactor($node);
 
         // nothing to change → continue
@@ -153,6 +151,8 @@ final public function enterNode(Node $node): int|Node|null
             throw new ShouldNotHappenException($errorMessage);
         }
 
+        NodeAttributeReIndexer::reIndexNodeAttributes($node);
+
         $isIntRefactoredNode = is_int($refactoredNode);
 
         /**