TASK: Let ParserException carry only the affected range in source

...rather than the entire affected token.

Author: grebaldi

src/Language/Parser/ParserException.php

@@ -22,19 +22,19 @@
 
 namespace PackageFactory\ComponentEngine\Language\Parser;
 
-use PackageFactory\ComponentEngine\Parser\Tokenizer\Token;
+use PackageFactory\ComponentEngine\Parser\Source\Range;
 
 abstract class ParserException extends \Exception
 {
     protected function __construct(
         int $code,
         string $message,
-        public readonly Token $affectedToken,
+        public readonly Range $affectedRangeInSource,
         ?\Exception $cause = null
     ) {
         $message = sprintf(
             '[%s] %s',
-            $affectedToken->boundaries->start->toDebugString(),
+            $affectedRangeInSource->start->toDebugString(),
             $message
         );
 

src/Language/Parser/TypeReference/TypeReferenceCouldNotBeParsed.php

@@ -24,21 +24,21 @@
 
 use PackageFactory\ComponentEngine\Language\AST\Node\TypeReference\InvalidTypeReferenceNode;
 use PackageFactory\ComponentEngine\Language\Parser\ParserException;
-use PackageFactory\ComponentEngine\Parser\Tokenizer\Token;
+use PackageFactory\ComponentEngine\Parser\Source\Range;
 
 final class TypeReferenceCouldNotBeParsed extends ParserException
 {
     public static function becauseOfInvalidTypeReferenceNode(
         InvalidTypeReferenceNode $cause,
-        Token $affectedToken
+        Range $affectedRangeInSource
     ): self {
         return new self(
             code: 1690542466,
             message: sprintf(
                 'TypeReferenceNode could not be parsed, because the result would be invalid: %s',
                 $cause->getMessage()
             ),
-            affectedToken: $affectedToken,
+            affectedRangeInSource: $affectedRangeInSource,
             cause: $cause
         );
     }

src/Language/Parser/TypeReference/TypeReferenceParser.php

@@ -50,14 +50,16 @@ public function parse(\Iterator $tokens): TypeReferenceNode
         $closingArrayToken = $this->extractClosingArrayToken($tokens);
         $isArray = !is_null($closingArrayToken);
 
+        $rangeInSource = Range::from(
+            $startingToken->boundaries->start,
+            $closingArrayToken?->boundaries->end
+                ?? $typeNameNodes->getLast()->attributes->rangeInSource->end
+        );
+
         try {
             return new TypeReferenceNode(
                 attributes: new NodeAttributes(
-                    rangeInSource: Range::from(
-                        $startingToken->boundaries->start,
-                        $closingArrayToken?->boundaries->end
-                            ?? $typeNameNodes->getLast()->attributes->rangeInSource->end
-                    )
+                    rangeInSource: $rangeInSource
                 ),
                 names: $typeNameNodes,
                 isArray: $isArray,
@@ -66,7 +68,7 @@ public function parse(\Iterator $tokens): TypeReferenceNode
         } catch (InvalidTypeReferenceNode $e) {
             throw TypeReferenceCouldNotBeParsed::becauseOfInvalidTypeReferenceNode(
                 cause: $e,
-                affectedToken: $startingToken
+                affectedRangeInSource: $rangeInSource
             );
         }
     }

test/Unit/Language/Parser/TypeReference/TypeReferenceParserTest.php

@@ -209,7 +209,6 @@ public function throwsParserExceptionWhenInvalidTypeReferenceOccurs(): void
     {
         $typeReferenceParser = new TypeReferenceParser();
         $tokens = Tokenizer::fromSource(Source::fromString('?Foo[]'))->getIterator();
-        $startingToken = $tokens->current();
 
         $this->expectException(ParserException::class);
         $this->expectExceptionObject(
@@ -223,7 +222,10 @@ public function throwsParserExceptionWhenInvalidTypeReferenceOccurs(): void
                         )
                     ),
                 ),
-                affectedToken: $startingToken
+                affectedRangeInSource: Range::from(
+                    new Position(0, 0),
+                    new Position(0, 4)
+                )
             )
         );