Catch parse exception when consuming TOKEN_CLOSE_PHPDOC

phpstan · Mar 22, 2021 · 2269e47 · 2269e47
1 parent 86b0a00
commit 2269e47
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 1 deletion.
diff --git a/src/Parser/PhpDocParser.php b/src/Parser/PhpDocParser.php
@@ -41,7 +41,21 @@ public function parse(TokenIterator $tokens): Ast\PhpDoc\PhpDocNode
 			}
 		}
 
-		$tokens->consumeTokenType(Lexer::TOKEN_CLOSE_PHPDOC);
+		try {
+			$tokens->consumeTokenType(Lexer::TOKEN_CLOSE_PHPDOC);
+		} catch (\PHPStan\PhpDocParser\Parser\ParserException $e) {
+			$name = '';
+			if (count($children) > 0) {
+				$lastChild = $children[count($children) - 1];
+				if ($lastChild instanceof Ast\PhpDoc\PhpDocTagNode) {
+					$name = $lastChild->name;
+				}
+			}
+			$tokens->forwardToTheEnd();
+			return new Ast\PhpDoc\PhpDocNode([
+				new Ast\PhpDoc\PhpDocTagNode($name, new Ast\PhpDoc\InvalidTagValueNode($e->getMessage(), $e)),
+			]);
+		}
 
 		return new Ast\PhpDoc\PhpDocNode(array_values($children));
 	}

diff --git a/src/Parser/TokenIterator.php b/src/Parser/TokenIterator.php
@@ -153,6 +153,12 @@ public function next(): void
 		$this->index++;
 	}
 
+	public function forwardToTheEnd(): void
+	{
+		$lastToken = count($this->tokens) - 1;
+		$this->index = $lastToken;
+	}
+
 
 	public function pushSavePoint(): void
 	{

diff --git a/tests/PHPStan/Parser/PhpDocParserTest.php b/tests/PHPStan/Parser/PhpDocParserTest.php
@@ -620,6 +620,25 @@ public function provideVarTagsData(): \Iterator
 				),
 			]),
 		];
+
+		yield [
+			'invalid object shape',
+			'/** @psalm-type PARTSTRUCTURE_PARAM = object{attribute:string, value?:string} */',
+			new PhpDocNode([
+				new PhpDocTagNode(
+					'@psalm-type',
+					new InvalidTagValueNode(
+						'Unexpected token "{", expected \'*/\' at offset 44',
+						new \PHPStan\PhpDocParser\Parser\ParserException(
+							'{',
+							Lexer::TOKEN_OPEN_CURLY_BRACKET,
+							44,
+							Lexer::TOKEN_CLOSE_PHPDOC
+						)
+					)
+				),
+			]),
+		];
 	}