Skip to content

Commit c8ffa3e

Browse files
shmaxondrejmirtes
authored andcommitted
consume newlines
1 parent b23fbb1 commit c8ffa3e

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

src/Parser/TypeParser.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,12 +221,15 @@ private function tryParseArray(TokenIterator $tokens, Ast\Type\TypeNode $type):
221221
private function parseArrayShape(TokenIterator $tokens, Ast\Type\TypeNode $type): Ast\Type\TypeNode
222222
{
223223
$tokens->consumeTokenType(Lexer::TOKEN_OPEN_CURLY_BRACKET);
224+
$tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
224225
$items = [$this->parseArrayShapeItem($tokens)];
225226

226227
while ($tokens->tryConsumeTokenType(Lexer::TOKEN_COMMA)) {
228+
$tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
227229
$items[] = $this->parseArrayShapeItem($tokens);
228230
}
229231

232+
$tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
230233
$tokens->consumeTokenType(Lexer::TOKEN_CLOSE_CURLY_BRACKET);
231234

232235
return new Ast\Type\ArrayShapeNode($items);

tests/PHPStan/Parser/TypeParserTest.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,12 @@ public function provideParseData(): array
393393
]),
394394
],
395395
[
396-
'array{a: int, b: array{c: callable(): int}}',
396+
'array{
397+
a: int,
398+
b: array{
399+
c: callable(): int
400+
}
401+
}',
397402
new ArrayShapeNode([
398403
new ArrayShapeItemNode(
399404
new IdentifierTypeNode('a'),

0 commit comments

Comments
 (0)