[Core] Refactor RectifiedAnalyzer: early check against AbstractScopeA…

…wareRector instead of Original node (#2295)
rectorphp · May 12, 2022 · cd2a644 · cd2a644
1 parent 2ccb535
commit cd2a644
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/src/ProcessAnalyzer/RectifiedAnalyzer.php b/src/ProcessAnalyzer/RectifiedAnalyzer.php
@@ -51,21 +51,17 @@ private function shouldContinue(RectifiedNode $rectifiedNode, RectorInterface $r
             return false;
         }
 
+        if ($rector instanceof AbstractScopeAwareRector) {
+            $scope = $node->getAttribute(AttributeKey::SCOPE);
+            return $scope instanceof Scope;
+        }
+
         $originalNode = $node->getAttribute(AttributeKey::ORIGINAL_NODE);
         if ($originalNode instanceof Node) {
             return true;
         }
 
         $startTokenPos = $node->getStartTokenPos();
-        if ($startTokenPos >= 0) {
-            return false;
-        }
-
-        if (! $rector instanceof AbstractScopeAwareRector) {
-            return true;
-        }
-
-        $scope = $node->getAttribute(AttributeKey::SCOPE);
-        return $scope instanceof Scope;
+        return $startTokenPos < 0;
     }
 }