support comment after comma

Author: shmax

src/Parser/TypeParser.php

@@ -5,6 +5,7 @@
 use LogicException;
 use PHPStan\PhpDocParser\Ast;
 use PHPStan\PhpDocParser\Lexer\Lexer;
+use function array_merge;
 use function in_array;
 use function str_replace;
 use function strpos;
@@ -105,6 +106,18 @@ public function enrichWithAttributes(TokenIterator $tokens, Ast\Node $type, int
 		return $type;
 	}
 
+	/**
+	 * @param list<Ast\Comment> $comments
+	 */
+	public function appendComments(Ast\Node $type, array $comments = []): Ast\Node
+	{
+		if ($this->useCommentsAttributes) {
+			$type->setAttribute(Ast\Attribute::COMMENTS, array_merge($comments, $type->getAttribute(Ast\Attribute::COMMENTS) ?? []));
+		}
+
+		return $type;
+	}
+
 	/** @phpstan-impure */
 	private function subParse(TokenIterator $tokens): Ast\Type\TypeNode
 	{
@@ -770,6 +783,8 @@ private function parseArrayShape(TokenIterator $tokens, Ast\Type\TypeNode $type,
 		$items = [];
 		$sealed = true;
 
+		$done = false;
+
 		do {
 			$tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
 
@@ -783,10 +798,20 @@ private function parseArrayShape(TokenIterator $tokens, Ast\Type\TypeNode $type,
 				break;
 			}
 
-			$items[] = $this->parseArrayShapeItem($tokens);
-
+			$item = $this->parseArrayShapeItem($tokens);
+			$items[] = $item;
 			$tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
-		} while ($tokens->tryConsumeTokenType(Lexer::TOKEN_COMMA));
+			if (!$tokens->tryConsumeTokenType(Lexer::TOKEN_COMMA)) {
+				$done = true;
+			}
+			if ($tokens->currentTokenType() !== Lexer::TOKEN_COMMENT) {
+				continue;
+			}
+
+			$this->appendComments($item, [new Ast\Comment($tokens->currentTokenValue(), $tokens->currentTokenLine(), $tokens->currentTokenIndex())]);
+			$tokens->next();
+
+		} while (!$done);
 
 		$tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
 		$tokens->consumeTokenType(Lexer::TOKEN_CLOSE_CURLY_BRACKET);

tests/PHPStan/Parser/TypeParserTest.php

@@ -164,7 +164,7 @@ public function provideParseData(): array
 			],
 			[
 				'array{
-					a: int // a is for after,
+					a: int, // a is for after,
 				}',
 				new ArrayShapeNode([
 					new ArrayShapeItemNode(
@@ -174,6 +174,26 @@ public function provideParseData(): array
 					),
 				]),
 			],
+			[
+				'array{
+					a: int, // a is for after,
+					b: string, /* 	b is for banana,
+					 			*  	which is good to know
+					 			*/
+				}',
+				new ArrayShapeNode([
+					new ArrayShapeItemNode(
+						new IdentifierTypeNode('a'),
+						false,
+						new IdentifierTypeNode('int')
+					),
+					new ArrayShapeItemNode(
+						new IdentifierTypeNode('b'),
+						false,
+						new IdentifierTypeNode('string')
+					),
+				]),
+			],
 			[
 				'array{
 					/* a is also for aardvark */