fix various things

Author: shmax

src/Parser/TypeParser.php

@@ -29,7 +29,11 @@ class TypeParser
 	private $useIndexAttributes;
 
 	/**
-	 * @param array{lines?: bool, indexes?: bool, comments?: bool} $usedAttributes
+	 * @param array{
+	 *     lines?: bool,
+	 *     indexes?: bool,
+	 *     comments?: bool
+	 * } $usedAttributes
 	 */
 	public function __construct(
 		?ConstExprParser $constExprParser = null,
@@ -71,25 +75,25 @@ public function parse(TokenIterator $tokens): Ast\Type\TypeNode
 	 * @template T of Ast\Node
 	 * @param T $type
 	 * @param list<Ast\Comment> $comments
+	 *
 	 * @return T
 	 */
 	public function enrichWithAttributes(TokenIterator $tokens, Ast\Node $type, int $startLine, int $startIndex, array $comments = []): Ast\Node
 	{
-		if ($tokens->currentTokenType() === Lexer::TOKEN_COMMENT) {
-			$comments[] = new Ast\Comment(
-				$tokens->currentTokenValue(),
-				$tokens->currentTokenLine(),
-				$tokens->currentTokenIndex()
-			);
-			$tokens->next();
-		}
-
 		if ($this->useLinesAttributes) {
 			$type->setAttribute(Ast\Attribute::START_LINE, $startLine);
 			$type->setAttribute(Ast\Attribute::END_LINE, $tokens->currentTokenLine());
 		}
 
 		if ($this->useCommentsAttributes) {
+			if ($tokens->currentTokenType() === Lexer::TOKEN_COMMENT) {
+				$comments[] = new Ast\Comment(
+					$tokens->currentTokenValue(),
+					$tokens->currentTokenLine(),
+					$tokens->currentTokenIndex()
+				);
+				$tokens->next();
+			}
 			$type->setAttribute(Ast\Attribute::COMMENTS, $comments);
 		}
 
@@ -754,6 +758,11 @@ private function tryParseArrayOrOffsetAccess(TokenIterator $tokens, Ast\Type\Typ
 		return $type;
 	}
 
+
+	/**
+	 * @phpstan-impure
+	 * @param Ast\Type\ArrayShapeNode::KIND_* $kind
+	 */
 	private function parseArrayShape(TokenIterator $tokens, Ast\Type\TypeNode $type, string $kind): Ast\Type\ArrayShapeNode
 	{
 		$tokens->consumeTokenType(Lexer::TOKEN_OPEN_CURLY_BRACKET);
@@ -785,12 +794,14 @@ private function parseArrayShape(TokenIterator $tokens, Ast\Type\TypeNode $type,
 		return new Ast\Type\ArrayShapeNode($items, $sealed, $kind);
 	}
 
+
 	/** @phpstan-impure */
 	private function parseArrayShapeItem(TokenIterator $tokens): Ast\Type\ArrayShapeItemNode
 	{
 		$startLine = $tokens->currentTokenLine();
 		$startIndex = $tokens->currentTokenIndex();
 
+		// parse any comments above the item
 		$comments = [];
 		while (1) {
 			if ($tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL)) {
@@ -809,6 +820,12 @@ private function parseArrayShapeItem(TokenIterator $tokens): Ast\Type\ArrayShape
 			$optional = $tokens->tryConsumeTokenType(Lexer::TOKEN_NULLABLE);
 			$tokens->consumeTokenType(Lexer::TOKEN_COLON);
 			$value = $this->parse($tokens);
+
+			// parse comment to the right of the item
+			if ($tokens->currentTokenType() === Lexer::TOKEN_COMMENT) {
+				$comments[] = new Ast\Comment($tokens->currentTokenValue(), $tokens->currentTokenLine(), $tokens->currentTokenIndex());
+				$tokens->next();
+			}
 			$tokens->dropSavePoint();
 
 			return $this->enrichWithAttributes(

tests/PHPStan/Parser/TypeParserTest.php

@@ -207,6 +207,7 @@ public function provideParseData(): array
 			[
 				'string // with comment after',
 				new IdentifierTypeNode('string'),
+				Lexer::TOKEN_COMMENT,
 			],
 			[
 				'string',