FPPP: Fix code block detection during removal

Instead of checking whether there is a {/} before/after the removed
note, check whether {/} occurs in the between-node range. Dropping
that is what we're really concerned about here.

Author: nikic

lib/PhpParser/Internal/TokenStream.php

@@ -170,7 +170,7 @@ public function skipRightWhitespace(int $pos) {
         return $pos;
     }
 
-    public function findRight($pos, $findTokenType) {
+    public function findRight(int $pos, $findTokenType) {
         $tokens = $this->tokens;
         for ($count = \count($tokens); $pos < $count; $pos++) {
             $type = $tokens[$pos][0];
@@ -181,6 +181,29 @@ public function findRight($pos, $findTokenType) {
         return -1;
     }
 
+    /**
+     * Whether the given position range contains a certain token type.
+     *
+     * @param int $startPos Starting position (inclusive)
+     * @param int $endPos Ending position (exclusive)
+     * @param int|string $tokenType Token type to look for
+     * @return bool Whether the token occurs in the given range
+     */
+    public function haveTokenInRange(int $startPos, int $endPos, $tokenType) {
+        $tokens = $this->tokens;
+        for ($pos = $startPos; $pos < $endPos; $pos++) {
+            if ($tokens[$pos][0] === $tokenType) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public function haveBracesInRange(int $startPos, int $endPos) {
+        return $this->haveTokenInRange($startPos, $endPos, '{')
+            || $this->haveTokenInRange($startPos, $endPos, '}');
+    }
+
     /**
      * Get indentation before token position.
      *

lib/PhpParser/PrettyPrinterAbstract.php

@@ -802,6 +802,13 @@ protected function pArray(
                 } else if (!$skipRemovedNode) {
                     $result .= $this->origTokens->getTokenCode(
                         $pos, $itemStartPos, $indentAdjustment);
+                } else {
+                    if ($isStmtList && $this->origTokens->haveBracesInRange($pos, $itemStartPos)) {
+                        // We'd remove the brace of a code block.
+                        // TODO: Preserve formatting.
+                        $this->setIndentLevel($origIndentLevel);
+                        return null;
+                    }
                 }
 
                 if ($commentsChanged && $comments) {
@@ -865,20 +872,8 @@ protected function pArray(
                     $result .= $this->origTokens->getTokenCode(
                         $pos, $itemStartPos, $indentAdjustment);
                     $skipRemovedNode = true;
-
-                    if ($isStmtList
-                        && ($this->origTokens->haveTokenImmediatelyAfter($itemEndPos, '{')
-                            || $this->origTokens->haveTokenImmediatelyAfter($itemEndPos, '}'))
-                    ) {
-                        // We'd remove the brace of a code block.
-                        // TODO: Preserve formatting.
-                        return null;
-                    }
                 } else {
-                    if ($isStmtList
-                        && ($this->origTokens->haveTokenImmediatelyBefore($itemStartPos, '{')
-                            || $this->origTokens->haveTokenImmediatelyBefore($itemStartPos, '}'))
-                    ) {
+                    if ($isStmtList && $this->origTokens->haveBracesInRange($pos, $itemStartPos)) {
                         // We'd remove the brace of a code block.
                         // TODO: Preserve formatting.
                         return null;

test/code/formatPreservation/listRemoval.test

@@ -174,3 +174,37 @@ try {
 } catch (\Throwable $e) {
 
 }
+
+-----
+<?php
+class Foo
+{
+    private $id;
+
+    public function getId()
+    {
+    }
+
+    public function getFoo()
+    {
+    }
+}
+-----
+$stmts[0]->stmts[2] = new Node\Stmt\ClassMethod('getBar');
+$stmts[0]->stmts[3] = new Node\Stmt\ClassMethod('getBaz');
+-----
+<?php
+class Foo
+{
+    private $id;
+
+    public function getId()
+    {
+    }
+    function getBar()
+    {
+    }
+    function getBaz()
+    {
+    }
+}