Fix issue where anonymous classes in lists are not formatted correctly

lkrms · Jan 2, 2025 · 247242c · 247242c
1 parent 14cc586
commit 247242c
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 8 deletions.
diff --git a/src/Formatter.php b/src/Formatter.php
@@ -989,7 +989,7 @@ public function format(
 
                 case \T_OPEN_PARENTHESIS:
                     $prev = $parent->PrevCode;
-                    if ($prev && (
+                    if (!$prev || !(
                         $idx->BeforeListParenthesis[$prev->id] || (
                             $prev->id === \T_CLOSE_BRACE
                             && !($prev->Flags & TokenFlag::STRUCTURAL_BRACE)
@@ -999,22 +999,26 @@ public function format(
                             && $idx->FunctionOrFn[$prev->PrevCode->id]
                         )
                     )) {
-                        break;
+                        continue 2;
                     }
-                    continue 2;
+                    break;
 
                 case \T_OPEN_BRACKET:
-                    if ($parent->isArrayOpenBracket()) {
-                        break;
+                    if (!$parent->isArrayOpenBracket()) {
+                        continue 2;
                     }
-                    continue 2;
+                    break;
             }
 
             $items ??= $parent->children()
                               ->filter(
                                   fn(Token $t, ?Token $next, ?Token $prev) =>
-                                      $t->id !== $delimiter && (
-                                          !$prev || ($t->PrevCode && $t->PrevCode->id === $delimiter)
+                                      $t->id !== $delimiter
+                                      && $t->Statement === $t
+                                      && (
+                                          !$prev
+                                          || !$t->PrevCode
+                                          || $t->PrevCode->id === $delimiter
                                       )
                               );
 

diff --git a/src/Parser.php b/src/Parser.php
@@ -656,6 +656,7 @@ private function parseStatements(array $scopes, ?array &$statements): void
                 //     lists, arrays, `for` expressions
                 //   - between non-structural braces, e.g. in `match`
                 //     expressions
+                //   - not after `implements` in anonymous class declarations
 
                 if (
                     !$token->NextSibling
@@ -687,6 +688,7 @@ private function parseStatements(array $scopes, ?array &$statements): void
                             $parent->id === \T_OPEN_BRACE
                             && !($parent->Flags & TokenFlag::STRUCTURAL_BRACE)
                         ))
+                        && $token->skipPrevCodeFrom($idx->DeclarationList)->id !== \T_IMPLEMENTS
                     )
                 ) {
                     $end = $token->CloseBracket ?? $token;

diff --git a/src/TokenIndex.php b/src/TokenIndex.php
@@ -895,6 +895,15 @@ class TokenIndex implements HasTokenIndex, Immutable
     ]
         + self::TOKEN_INDEX;
 
+    /**
+     * T_COMMA, T_NAME_FULLY_QUALIFIED, T_NAME_QUALIFIED, T_NAME_RELATIVE,
+     * T_STATIC, T_STRING
+     *
+     * @var array<int,bool>
+     */
+    public array $DeclarationList = self::DECLARATION_LIST
+        + self::TOKEN_INDEX;
+
     /**
      * T_ABSTRACT, T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG,
      * T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG, T_AND, T_ATTRIBUTE_COMMENT,

diff --git a/tests/unit/FormatterTest.php b/tests/unit/FormatterTest.php
@@ -498,6 +498,36 @@ function a()
 goto bar;
 }
 bar: qux();
+PHP,
+                $formatter,
+            ],
+            'anonymous class commas in array scope' => [
+                <<<'PHP'
+<?php
+$foo = new Bar(
+    [
+        'baz' => [
+            new class implements Foo, Bar {
+                public const FOO = 1;
+            },
+            'qux',
+        ],
+    ],
+);
+
+PHP,
+                <<<'PHP'
+<?php
+$foo = new Bar(
+[
+'baz' => [
+new class implements Foo, Bar {
+public const FOO = 1;
+},
+'qux',
+],
+],
+);
 PHP,
                 $formatter,
             ],

diff --git a/tests/unit/ParserTest.php b/tests/unit/ParserTest.php
@@ -1011,6 +1011,29 @@ public static function statementsProvider(): array
     case $bar ? fn(): ?int => null : $foo:
         break;
 }
+PHP,
+            ],
+            'anonymous class commas in array scope' => [
+                [
+                    "T1:L2:'\$foo' - T32:L11:';'",
+                    "T6:L3:'[' - T30:L10:','",
+                    "T7:L4:'\'baz\'' - T28:L9:','",
+                    "T10:L5:'new' - T24:L7:','",
+                    "T17:L6:'public' - T22:L6:';'",
+                    "T25:L8:'\'qux\'' - T26:L8:','",
+                ],
+                <<<'PHP'
+<?php
+$foo = new Bar(
+    [
+        'baz' => [
+            new class implements Foo, Bar {
+                public const FOO = 1;
+            },
+            'qux',
+        ],
+    ],
+);
 PHP,
             ],
         ];