fix: preserve multiline

Author: dkarlovi

grammar/php.y

@@ -1226,13 +1226,19 @@ class_constant:
 
 array_short_syntax:
       '[' array_pair_list ']'
-          { $attrs = attributes(); $attrs['kind'] = Expr\Array_::KIND_SHORT;
+          { $attrs = attributes();
+            $attrs['kind'] = $this->isMultiline($attrs)
+                ? Expr\Array_::KIND_SHORT | Expr\Array_::KIND_MULTILINE
+                : Expr\Array_::KIND_SHORT;
             $$ = new Expr\Array_($2, $attrs); }
 ;
 
 dereferenceable_scalar:
       T_ARRAY '(' array_pair_list ')'
-          { $attrs = attributes(); $attrs['kind'] = Expr\Array_::KIND_LONG;
+          { $attrs = attributes();
+            $attrs['kind'] = $this->isMultiline($attrs)
+                ? Expr\Array_::KIND_LONG | Expr\Array_::KIND_MULTILINE
+                : Expr\Array_::KIND_LONG;
             $$ = new Expr\Array_($3, $attrs);
             $this->createdArrays->attach($$); }
     | array_short_syntax                                    { $$ = $1; $this->createdArrays->attach($$); }

lib/PhpParser/Parser/Php7.php

@@ -2564,11 +2564,17 @@ protected function initReduceCallbacks(): void {
                  $self->semValue = new Expr\ClassConstFetch($self->semStack[$stackPos-(3-1)], new Expr\Error($self->getAttributes($self->tokenStartStack[$stackPos-(3-3)],  $self->tokenEndStack[$stackPos-(3-3)])), $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); $self->errorState = 2;
             },
             547 => static function ($self, $stackPos) {
-                 $attrs = $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos]); $attrs['kind'] = Expr\Array_::KIND_SHORT;
+                 $attrs = $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos]);
+            $attrs['kind'] = $self->isMultiline($attrs)
+                ? Expr\Array_::KIND_SHORT | Expr\Array_::KIND_MULTILINE
+                : Expr\Array_::KIND_SHORT;
             $self->semValue = new Expr\Array_($self->semStack[$stackPos-(3-2)], $attrs);
             },
             548 => static function ($self, $stackPos) {
-                 $attrs = $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos]); $attrs['kind'] = Expr\Array_::KIND_LONG;
+                 $attrs = $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos]);
+            $attrs['kind'] = $self->isMultiline($attrs)
+                ? Expr\Array_::KIND_LONG | Expr\Array_::KIND_MULTILINE
+                : Expr\Array_::KIND_LONG;
             $self->semValue = new Expr\Array_($self->semStack[$stackPos-(4-3)], $attrs);
             $self->createdArrays->attach($self->semValue);
             },

lib/PhpParser/Parser/Php8.php

@@ -2568,11 +2568,17 @@ protected function initReduceCallbacks(): void {
                  $self->semValue = new Expr\ClassConstFetch($self->semStack[$stackPos-(3-1)], new Expr\Error($self->getAttributes($self->tokenStartStack[$stackPos-(3-3)],  $self->tokenEndStack[$stackPos-(3-3)])), $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos])); $self->errorState = 2;
             },
             549 => static function ($self, $stackPos) {
-                 $attrs = $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos]); $attrs['kind'] = Expr\Array_::KIND_SHORT;
+                 $attrs = $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos]);
+            $attrs['kind'] = $self->isMultiline($attrs)
+                ? Expr\Array_::KIND_SHORT | Expr\Array_::KIND_MULTILINE
+                : Expr\Array_::KIND_SHORT;
             $self->semValue = new Expr\Array_($self->semStack[$stackPos-(3-2)], $attrs);
             },
             550 => static function ($self, $stackPos) {
-                 $attrs = $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos]); $attrs['kind'] = Expr\Array_::KIND_LONG;
+                 $attrs = $self->getAttributes($self->tokenStartStack[$stackPos-(4-1)], $self->tokenEndStack[$stackPos]);
+            $attrs['kind'] = $self->isMultiline($attrs)
+                ? Expr\Array_::KIND_LONG | Expr\Array_::KIND_MULTILINE
+                : Expr\Array_::KIND_LONG;
             $self->semValue = new Expr\Array_($self->semStack[$stackPos-(4-3)], $attrs);
             $self->createdArrays->attach($self->semValue);
             },

lib/PhpParser/ParserAbstract.php

@@ -1229,6 +1229,14 @@ private function isSimpleExit(array $args): bool {
         return false;
     }
 
+    protected function isMultiline(array $attributes): bool {
+        if (!isset($attributes['startLine']) || !isset($attributes['endLine'])) {
+            return false;
+        }
+
+        return $attributes['startLine'] !== $attributes['endLine'];
+    }
+
     /**
      * @param array<Node\Arg|Node\VariadicPlaceholder> $args
      * @param array<string, mixed> $attrs

test/code/prettyPrinter/stmt/arrays.test

@@ -17,6 +17,14 @@ $longMultiline = array(
 );
 -----
 $short = [1, 2, 3];
-$shortMultiline = [1, 2, 3];
+$shortMultiline = [
+    1,
+    2,
+    3,
+];
 $long = array(1, 2, 3);
-$longMultiline = array(1, 2, 3);
+$longMultiline = array(
+    1,
+    2,
+    3,
+);