[Core] Add BetterNodeFinder::findFirstInlinedPrevious() (#2238)

* [Core] Add BetterNodeFinder::findFirstInlinedPrevious() * phpstan * add comment * add comment
rectorphp · May 5, 2022 · 7f5acb6 · 7f5acb6
1 parent aa6524e
commit 7f5acb6
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 15 deletions.
diff --git a/rules/Php80/Rector/Switch_/ChangeSwitchToMatchRector.php b/rules/Php80/Rector/Switch_/ChangeSwitchToMatchRector.php
@@ -143,13 +143,12 @@ private function processReturn(Match_ $match): ?Return_
 
     private function changeToAssign(Switch_ $switch, Match_ $match, Expr $assignExpr): Assign
     {
-        $prevInitializedAssign = $this->betterNodeFinder->findFirstPrevious(
+        $prevInitializedAssign = $this->betterNodeFinder->findFirstInlinedPrevious(
             $switch,
             fn (Node $node): bool => $node instanceof Assign && $this->nodeComparator->areNodesEqual(
                 $node->var,
                 $assignExpr
-            ),
-            false
+            )
         );
 
         $assign = new Assign($assignExpr, $match);

diff --git a/src/PhpParser/Node/BetterNodeFinder.php b/src/PhpParser/Node/BetterNodeFinder.php
@@ -270,25 +270,39 @@ public function findPreviousAssignToExpr(Expr $expr): ?Node
     }
 
     /**
+     * Only search in previous Node/Stmt
+     *
      * @param callable(Node $node): bool $filter
      */
-    public function findFirstPrevious(Node $node, callable $filter, bool $lookupParent = true): ?Node
+    public function findFirstInlinedPrevious(Node $node, callable $filter): ?Node
     {
-        // move to previous Node
         $previousNode = $node->getAttribute(AttributeKey::PREVIOUS_NODE);
-        if ($previousNode instanceof Node) {
-            $foundNode = $this->findFirst($previousNode, $filter);
+        if (! $previousNode instanceof Node) {
+            return null;
+        }
 
-            // we found what we need
-            if ($foundNode instanceof Node) {
-                return $foundNode;
-            }
+        $foundNode = $this->findFirst($previousNode, $filter);
 
-            return $this->findFirstPrevious($previousNode, $filter, $lookupParent);
+        // we found what we need
+        if ($foundNode instanceof Node) {
+            return $foundNode;
         }
 
-        if (! $lookupParent) {
-            return null;
+        return $this->findFirstInlinedPrevious($previousNode, $filter);
+    }
+
+    /**
+     * Search in previous Node/Stmt, when no Node found, lookup previous Stmt of Parent Node
+     *
+     * @param callable(Node $node): bool $filter
+     */
+    public function findFirstPrevious(Node $node, callable $filter): ?Node
+    {
+        $foundNode = $this->findFirstInlinedPrevious($node, $filter);
+
+        // we found what we need
+        if ($foundNode instanceof Node) {
+            return $foundNode;
         }
 
         $parent = $node->getAttribute(AttributeKey::PARENT_NODE);
@@ -297,7 +311,7 @@ public function findFirstPrevious(Node $node, callable $filter, bool $lookupPare
         }
 
         if ($parent instanceof Node) {
-            return $this->findFirstPrevious($parent, $filter, $lookupParent);
+            return $this->findFirstPrevious($parent, $filter);
         }
 
         return null;