Commit 2269e47

committed

Catch parse exception when consuming TOKEN_CLOSE_PHPDOC

1 parent 86b0a00 commit 2269e47Copy full SHA for 2269e47

File tree

+40

-1

lines changed

+40

-1

lines changed

Lines changed: 15 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,21 @@ public function parse(TokenIterator $tokens): Ast\PhpDoc\PhpDocNode`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`44`		`- $tokens->consumeTokenType(Lexer::TOKEN_CLOSE_PHPDOC);`
	`44`	`+ try {`
	`45`	`+ $tokens->consumeTokenType(Lexer::TOKEN_CLOSE_PHPDOC);`
	`46`	`+ } catch (\PHPStan\PhpDocParser\Parser\ParserException $e) {`
	`47`	`+ $name = '';`
	`48`	`+ if (count($children) > 0) {`
	`49`	`+ $lastChild = $children[count($children) - 1];`
	`50`	`+ if ($lastChild instanceof Ast\PhpDoc\PhpDocTagNode) {`
	`51`	`+ $name = $lastChild->name;`
	`52`	`+ }`
	`53`	`+ }`
	`54`	`+ $tokens->forwardToTheEnd();`
	`55`	`+ return new Ast\PhpDoc\PhpDocNode([`
	`56`	`+ new Ast\PhpDoc\PhpDocTagNode($name, new Ast\PhpDoc\InvalidTagValueNode($e->getMessage(), $e)),`
	`57`	`+ ]);`
	`58`	`+ }`
`45`	`59`
`46`	`60`	`return new Ast\PhpDoc\PhpDocNode(array_values($children));`
`47`	`61`	`}`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,12 @@ public function next(): void`
`153`	`153`	`$this->index++;`
`154`	`154`	`}`
`155`	`155`
	`156`	`+ public function forwardToTheEnd(): void`
	`157`	`+ {`
	`158`	`+ $lastToken = count($this->tokens) - 1;`
	`159`	`+ $this->index = $lastToken;`
	`160`	`+ }`
	`161`	`+`
`156`	`162`
`157`	`163`	`public function pushSavePoint(): void`
`158`	`164`	`{`

Lines changed: 19 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -620,6 +620,25 @@ public function provideVarTagsData(): \Iterator`
`620`	`620`	`),`
`621`	`621`	`]),`
`622`	`622`	`];`
	`623`	`+`
	`624`	`+ yield [`
	`625`	`+ 'invalid object shape',`
	`626`	`+ '/** @psalm-type PARTSTRUCTURE_PARAM = object{attribute:string, value?:string} */',`
	`627`	`+ new PhpDocNode([`
	`628`	`+ new PhpDocTagNode(`
	`629`	`+ '@psalm-type',`
	`630`	`+ new InvalidTagValueNode(`
	`631`	`+ 'Unexpected token "{", expected \'*/\' at offset 44',`
	`632`	`+ new \PHPStan\PhpDocParser\Parser\ParserException(`
	`633`	`+ '{',`
	`634`	`+ Lexer::TOKEN_OPEN_CURLY_BRACKET,`
	`635`	`+ 44,`
	`636`	`+ Lexer::TOKEN_CLOSE_PHPDOC`
	`637`	`+ )`
	`638`	`+ )`
	`639`	`+ ),`
	`640`	`+ ]),`
	`641`	`+ ];`
`623`	`642`	`}`
`624`	`643`
`625`	`644`

Comments

(0)