Commit 877b8f2

mvorisekondrejmirtes

authored and

committed

simplify/unify parseGeneric method

1 parent 8202c44 commit 877b8f2Copy full SHA for 877b8f2

File tree

1 file changed

+12

-21

lines changed

src/Parser
- TypeParser.php

1 file changed

+12

-21

lines changed

`‎src/Parser/TypeParser.php`

Lines changed: 12 additions & 21 deletions

Original file line number	Diff line number	Diff line change
`@@ -398,42 +398,33 @@ public function isHtml(TokenIterator $tokens): bool`
`398`	`398`	`public function parseGeneric(TokenIterator $tokens, Ast\Type\IdentifierTypeNode $baseType): Ast\Type\GenericTypeNode`
`399`	`399`	`{`
`400`	`400`	`$tokens->consumeTokenType(Lexer::TOKEN_OPEN_ANGLE_BRACKET);`
`401`		`- $tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);`
`402`	`401`
	`402`	`+ $startLine = $baseType->getAttribute(Ast\Attribute::START_LINE);`
	`403`	`+ $startIndex = $baseType->getAttribute(Ast\Attribute::START_INDEX);`
`403`	`404`	`$genericTypes = [];`
`404`	`405`	`$variances = [];`
`405`	`406`
`406`		`- [$genericTypes[], $variances[]] = $this->parseGenericTypeArgument($tokens);`
`407`		`-`
`408`		`- $tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);`
`409`		`-`
`410`		`- while ($tokens->tryConsumeTokenType(Lexer::TOKEN_COMMA)) {`
	`407`	`+ $isFirst = true;`
	`408`	`+ while ($isFirst \|\| $tokens->tryConsumeTokenType(Lexer::TOKEN_COMMA)) {`
`411`	`409`	`$tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);`
`412`		`- if ($tokens->tryConsumeTokenType(Lexer::TOKEN_CLOSE_ANGLE_BRACKET)) {`
`413`		`- // trailing comma case`
`414`		`- $type = new Ast\Type\GenericTypeNode($baseType, $genericTypes, $variances);`
`415`		`- $startLine = $baseType->getAttribute(Ast\Attribute::START_LINE);`
`416`		`- $startIndex = $baseType->getAttribute(Ast\Attribute::START_INDEX);`
`417`		`- if ($startLine !== null && $startIndex !== null) {`
`418`		`- $type = $this->enrichWithAttributes($tokens, $type, $startLine, $startIndex);`
`419`		`- }`
`420`	`410`
`421`		`- return $type;`
	`411`	`+ // trailing comma case`
	`412`	`+ if (!$isFirst && $tokens->isCurrentTokenType(Lexer::TOKEN_CLOSE_ANGLE_BRACKET)) {`
	`413`	`+ break;`
`422`	`414`	`}`
	`415`	`+ $isFirst = false;`
	`416`	`+`
`423`	`417`	`[$genericTypes[], $variances[]] = $this->parseGenericTypeArgument($tokens);`
`424`		`- $tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);`
`425`	`418`	`}`
`426`	`419`
`427`		`- $tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);`
`428`		`- $tokens->consumeTokenType(Lexer::TOKEN_CLOSE_ANGLE_BRACKET);`
`429`		`-`
`430`	`420`	`$type = new Ast\Type\GenericTypeNode($baseType, $genericTypes, $variances);`
`431`		`- $startLine = $baseType->getAttribute(Ast\Attribute::START_LINE);`
`432`		`- $startIndex = $baseType->getAttribute(Ast\Attribute::START_INDEX);`
`433`	`421`	`if ($startLine !== null && $startIndex !== null) {`
`434`	`422`	`$type = $this->enrichWithAttributes($tokens, $type, $startLine, $startIndex);`
`435`	`423`	`}`
`436`	`424`
	`425`	`+ $tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);`
	`426`	`+ $tokens->consumeTokenType(Lexer::TOKEN_CLOSE_ANGLE_BRACKET);`
	`427`	`+`
`437`	`428`	`return $type;`
`438`	`429`	`}`
`439`	`430`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 877b8f2

File tree

1 file changed

1 file changed

`‎src/Parser/TypeParser.php`

0 commit comments