Simplify exception messages: Do not print source content if it is identical to failed token content

Author: Kirill Nesmeyanov

src/Exception/ParseException.php

@@ -32,11 +32,11 @@ final public function __construct(string $message, int $code = 0, ?\Throwable $p
      * @param int<0, max> $offset
      * @throws SourceExceptionInterface
      */
-    public static function fromUnexpectedToken(string $char, string $statement, int $offset): static
+    public static function fromUnexpectedToken(string $token, string $statement, int $offset): static
     {
-        $message = \vsprintf('Syntax error, unexpected %s in %s %s', [
-            Formatter::token($char),
-            Formatter::source($statement),
+        $message = \vsprintf('Syntax error, unexpected %s%s %s', [
+            Formatter::token($token),
+            $token === $statement ? '' : ' in ' . Formatter::source($statement),
             Formatter::suffix($statement, $offset),
         ]);
 
@@ -51,9 +51,9 @@ public static function fromUnexpectedToken(string $char, string $statement, int
      */
     public static function fromUnrecognizedToken(string $token, string $statement, int $offset): static
     {
-        $message = \vsprintf('Syntax error, unrecognized %s in %s %s', [
+        $message = \vsprintf('Syntax error, unrecognized %s%s %s', [
             Formatter::token($token),
-            Formatter::source($statement),
+            $token === $statement ? '' : ' in ' . Formatter::source($statement),
             Formatter::suffix($statement, $offset),
         ]);
 

src/Parser.php

@@ -200,7 +200,7 @@ private function unexpectedTokenError(UnexpectedTokenException $e, ReadableInter
         $token = $e->getToken();
 
         return ParseException::fromUnexpectedToken(
-            char: $token->getValue(),
+            token: $token->getValue(),
             statement: $source->getContents(),
             offset: $token->getOffset(),
         );