Added support for an empty comment

chesszebra · Feb 22, 2022 · a490936 · a490936
1 parent a223e5f
commit a490936
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/src/Lexer/AbstractLexer.php b/src/Lexer/AbstractLexer.php
@@ -97,7 +97,7 @@ public function getNextToken(): ?TokenInterface
         }
 
         // Match a comment:
-        if (preg_match('/^\s*\{(.+?)\}\s*/s', $this->buffer, $matches)) {
+        if (preg_match('/^\s*\{(.*?)\}\s*/s', $this->buffer, $matches)) {
             $this->buffer = substr($this->buffer, strlen($matches[0]));
             return new Comment($matches[1]);
         }

diff --git a/tests/Lexer/StringLexerTest.php b/tests/Lexer/StringLexerTest.php
@@ -9,6 +9,7 @@
 
 namespace ChessZebra\PortableGameNotation\Lexer;
 
+use ChessZebra\PortableGameNotation\Token\Comment;
 use ChessZebra\PortableGameNotation\Token\MoveNumber;
 use PHPUnit\Framework\TestCase;
 
@@ -27,4 +28,34 @@ public function testConstructor()
         // Assert
         static::assertInstanceOf(MoveNumber::class, $result);
     }
+
+    public function testEmptyComment()
+    {
+        // Arrange
+        $buffer = '{}';
+
+        $lexer = new StringLexer($buffer);
+
+        // Act
+        $result = $lexer->peekNextToken();
+
+        // Assert
+        static::assertInstanceOf(Comment::class, $result);
+        static::assertEquals('', $result->getComment());
+    }
+
+    public function testPopulatedComment()
+    {
+        // Arrange
+        $buffer = '{ hello world }';
+
+        $lexer = new StringLexer($buffer);
+
+        // Act
+        $result = $lexer->peekNextToken();
+
+        // Assert
+        static::assertInstanceOf(Comment::class, $result);
+        static::assertEquals(' hello world ', $result->getComment());
+    }
 }