delayed add

Author: shmax

src/Printer/Printer.php

@@ -552,6 +552,15 @@ private function printArrayFormatPreserving(array $nodes, array $originalNodes,
 						if ($parenthesesNeeded) {
 							$result .= '(';
 						}
+
+						if($insertNewline) {
+							$delayedAddComments = $delayedAddNode->getAttribute(Attribute::COMMENTS) ?? [];
+							if (count($delayedAddComments) > 0) {
+								$result .= $this->pComments($delayedAddComments, $beforeAsteriskIndent, $afterAsteriskIndent);// . "\n";
+								$result .= sprintf('%s%s*%s', $originalTokens->getDetectedNewline() ?? "\n", $beforeAsteriskIndent, $afterAsteriskIndent);
+							}
+						}
+
 						$result .= $this->printNodeFormatPreserving($delayedAddNode, $originalTokens);
 						if ($parenthesesNeeded) {
 							$result .= ')';

tests/PHPStan/Printer/PrinterTest.php

@@ -728,6 +728,39 @@ public function enterNode(Node $node)
 			$addItemsWithCommentsToMultilineArrayShape,
 		];
 
+		$prependItemsWithCommentsToMultilineArrayShape = new class extends AbstractNodeVisitor {
+
+			public function enterNode(Node $node)
+			{
+				if ($node instanceof ArrayShapeNode) {
+					$commentedNode = new ArrayShapeItemNode(new IdentifierTypeNode('a'), false, new IdentifierTypeNode('int'));
+					$commentedNode->setAttribute(Attribute::COMMENTS, [new Comment('// first item')]);
+					array_splice($node->items, 0, 0, [
+						$commentedNode,
+					]);
+				}
+
+				return $node;
+			}
+
+		};
+
+		yield [
+			'/**
+ * @return array{
+ *  b: int,
+ * }
+ */',
+			'/**
+ * @return array{
+ *  // first item
+ *  a: int,
+ *  b: int,
+ * }
+ */',
+			$prependItemsWithCommentsToMultilineArrayShape,
+		];
+
 		$changeCommentOnArrayShapeItem = new class extends AbstractNodeVisitor {
 
 			public function enterNode(Node $node)