handle multiple comments

phpstan · Sep 28, 2023 · 5d9be65 · 5d9be65
1 parent 9bea470
commit 5d9be65
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/src/Printer/Printer.php b/src/Printer/Printer.php
@@ -717,7 +717,7 @@ protected function pComments(array $comments, string $beforeAsteriskIndent, stri
 			$formattedComments[] = str_replace("\n", "\n" . $beforeAsteriskIndent . '*' . $afterAsteriskIndent, $comment->getReformattedText() ?? '');
 		}
 
-		return implode("\n", $formattedComments);
+		return implode("\n$beforeAsteriskIndent*$afterAsteriskIndent", $formattedComments);
 	}
 
 	/**

diff --git a/tests/PHPStan/Parser/TypeParserTest.php b/tests/PHPStan/Parser/TypeParserTest.php
@@ -148,6 +148,19 @@ public function provideParseData(): array
 					),
 				]),
 			],
+			[
+				'array{
+					/* a is for apple */ /* and also for aardvark */
+					a: int,
+				}',
+				new ArrayShapeNode([
+					new ArrayShapeItemNode(
+						new IdentifierTypeNode('a'),
+						false,
+						new IdentifierTypeNode('int')
+					),
+				]),
+			],
 			[
 				'array{
 					// a is for apple

diff --git a/tests/PHPStan/Printer/PrinterTest.php b/tests/PHPStan/Printer/PrinterTest.php
@@ -691,6 +691,17 @@ public function enterNode(Node $node)
  */'
 					)]);
 					$node->items[] = $commentedNode;
+
+					$commentedNode = new ArrayShapeItemNode(new IdentifierTypeNode('f'), false, new IdentifierTypeNode('string'));
+					$commentedNode->setAttribute(Attribute::COMMENTS, [
+						new Comment(
+						'/* A single line comment  */'
+						),
+						new Comment(
+							'/* Another one on the same line  */'
+						)
+					]);
+					$node->items[] = $commentedNode;
 				}
 
 				return $node;
@@ -722,7 +733,10 @@ public function enterNode(Node $node)
  *   * multiline
  *   * comment with leading asterisks
  *   */
- *  e: string
+ *  e: string,
+ *  /* A single line comment  */
+ *  /* Another one on the same line  */
+ *  f: string
  * }
  */',
 			$addItemsWithCommentsToMultilineArrayShape,