More precise type indexes

Author: ondrejmirtes

src/Parser/TypeParser.php

@@ -73,11 +73,9 @@ private function enrichWithAttributes(TokenIterator $tokens, Ast\Type\TypeNode $
 
 		if ($this->useIndexAttributes) {
 			$tokensArray = $tokens->getTokens();
-			if ($tokensArray[$endIndex][Lexer::TYPE_OFFSET] === Lexer::TOKEN_CLOSE_PHPDOC) {
+			$endIndex--;
+			if ($tokensArray[$endIndex][Lexer::TYPE_OFFSET] === Lexer::TOKEN_HORIZONTAL_WS) {
 				$endIndex--;
-				if ($tokensArray[$endIndex][Lexer::TYPE_OFFSET] === Lexer::TOKEN_HORIZONTAL_WS) {
-					$endIndex--;
-				}
 			}
 
 			$type->setAttribute(Ast\Attribute::START_INDEX, $startIndex);

tests/PHPStan/Parser/PhpDocParserTest.php

@@ -5641,7 +5641,7 @@ public function testLinesAndIndexes(string $phpDoc, array $childrenLines): void
 	/**
 	 * @return array<mixed>
 	 */
-	public function dataTypeLinesAndIndexes(): iterable
+	public function dataReturnTypeLinesAndIndexes(): iterable
 	{
 		yield [
 			'/** @return Foo */',
@@ -5652,13 +5652,43 @@ public function dataTypeLinesAndIndexes(): iterable
 			'/** @return Foo*/',
 			[1, 1, 3, 3],
 		];
+
+		yield [
+			'/**
+			  * @param Foo $foo
+			  * @return Foo
+			  */',
+			[3, 3, 10, 10],
+		];
+
+		yield [
+			'/**
+			  * @return Foo
+			  * @param Foo $foo
+			  */',
+			[2, 2, 4, 4],
+		];
+
+		yield [
+			'/**
+			  * @param Foo $foo
+			  * @return Foo */',
+			[3, 3, 10, 10],
+		];
+
+		yield [
+			'/**
+			  * @param Foo $foo
+			  * @return Foo*/',
+			[3, 3, 10, 10],
+		];
 	}
 
 	/**
-	 * @dataProvider dataTypeLinesAndIndexes
+	 * @dataProvider dataReturnTypeLinesAndIndexes
 	 * @param array{int, int, int, int} $lines
 	 */
-	public function testTypeLinesAndIndexes(string $phpDoc, array $lines): void
+	public function testReturnTypeLinesAndIndexes(string $phpDoc, array $lines): void
 	{
 		$tokens = new TokenIterator($this->lexer->tokenize($phpDoc));
 		$constExprParser = new ConstExprParser(true, true);
@@ -5669,10 +5699,8 @@ public function testTypeLinesAndIndexes(string $phpDoc, array $lines): void
 		$typeParser = new TypeParser($constExprParser, true, $usedAttributes);
 		$phpDocParser = new PhpDocParser($typeParser, $constExprParser, true, true, $usedAttributes);
 		$phpDocNode = $phpDocParser->parse($tokens);
-		$this->assertInstanceOf(PhpDocTagNode::class, $phpDocNode->children[0]);
-		$this->assertInstanceOf(ReturnTagValueNode::class, $phpDocNode->children[0]->value);
-
-		$type = $phpDocNode->children[0]->value->type;
+		$returnTag = $phpDocNode->getReturnTagValues()[0];
+		$type = $returnTag->type;
 		$this->assertInstanceOf(IdentifierTypeNode::class, $type);
 
 		$this->assertSame($lines[0], $type->getAttribute(Attribute::START_LINE));

tests/PHPStan/Parser/TypeParserTest.php

@@ -1923,7 +1923,7 @@ static function (TypeNode $typeNode): TypeNode {
 					1,
 					1,
 					0,
-					13,
+					12,
 				],
 				[
 					static function (UnionTypeNode $typeNode): TypeNode {
@@ -1932,7 +1932,7 @@ static function (UnionTypeNode $typeNode): TypeNode {
 					1,
 					1,
 					0,
-					2,
+					0,
 				],
 				[
 					static function (UnionTypeNode $typeNode): TypeNode {
@@ -1941,7 +1941,40 @@ static function (UnionTypeNode $typeNode): TypeNode {
 					1,
 					1,
 					4,
-					13,
+					12,
+				],
+			],
+		];
+
+		yield [
+			'int | object{foo: int}[]    ',
+			[
+				[
+					static function (TypeNode $typeNode): TypeNode {
+						return $typeNode;
+					},
+					1,
+					1,
+					0,
+					12,
+				],
+				[
+					static function (UnionTypeNode $typeNode): TypeNode {
+						return $typeNode->types[0];
+					},
+					1,
+					1,
+					0,
+					0,
+				],
+				[
+					static function (UnionTypeNode $typeNode): TypeNode {
+						return $typeNode->types[1];
+					},
+					1,
+					1,
+					4,
+					12,
 				],
 			],
 		];
@@ -1959,7 +1992,7 @@ static function (TypeNode $typeNode): TypeNode {
 					1,
 					4,
 					0,
-					15,
+					14,
 				],
 			],
 		];