Revert "wip?"

This reverts commit ba73b1142c93b4d564de529ca8a074efae4ba1d4.

Author: ondrejmirtes

src/Parser/TypeParser.php

@@ -884,7 +884,7 @@ private function parseArrayShape(TokenIterator $tokens, Ast\Type\TypeNode $type,
 		$done = false;
 
 		do {
-			$tokens->skipNewLineTokens();
+			$tokens->skipNewLineTokensAndConsumeComments();
 
 			if ($tokens->tryConsumeTokenType(Lexer::TOKEN_CLOSE_CURLY_BRACKET)) {
 				return Ast\Type\ArrayShapeNode::createSealed($items, $kind);
@@ -893,6 +893,7 @@ private function parseArrayShape(TokenIterator $tokens, Ast\Type\TypeNode $type,
 			if ($tokens->tryConsumeTokenType(Lexer::TOKEN_VARIADIC)) {
 				$sealed = false;
 
+				$tokens->skipNewLineTokensAndConsumeComments();
 				if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_ANGLE_BRACKET)) {
 					if ($kind === Ast\Type\ArrayShapeNode::KIND_ARRAY) {
 						$unsealedType = $this->parseArrayShapeUnsealedType($tokens);
@@ -936,6 +937,9 @@ private function parseArrayShapeItem(TokenIterator $tokens): Ast\Type\ArrayShape
 		$startLine = $tokens->currentTokenLine();
 		$startIndex = $tokens->currentTokenIndex();
 
+		// parse any comments above the item
+		$tokens->skipNewLineTokensAndConsumeComments();
+
 		try {
 			$tokens->pushSavePoint();
 			$key = $this->parseArrayShapeKey($tokens);
@@ -973,8 +977,6 @@ private function parseArrayShapeKey(TokenIterator $tokens)
 		$startIndex = $tokens->currentTokenIndex();
 		$startLine = $tokens->currentTokenLine();
 
-		$tokens->skipNewLineTokensAndConsumeComments();
-
 		if ($tokens->isCurrentTokenType(Lexer::TOKEN_INTEGER)) {
 			$key = new Ast\ConstExpr\ConstExprIntegerNode(str_replace('_', '', $tokens->currentTokenValue()));
 			$tokens->next();