Merge pull request #788 from msmakouz/bugfix/buffer-offset

spiral · Sep 13, 2022 · 17c9e6b · 17c9e6b
1 parent e1ca142
commit 17c9e6b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/Lexer/Buffer.php b/src/Lexer/Buffer.php
@@ -53,7 +53,7 @@ public function next(): Byte|Token|null
             $this->buffer[] = $n;
         }
 
-        if ($n !== null) {
+        if ($n !== null && $n->offset !== null) {
             $this->offset = $n->offset;
         }
 

diff --git a/tests/BufferTest.php b/tests/BufferTest.php
@@ -9,6 +9,7 @@
 use Spiral\Stempler\Lexer\Byte;
 use Spiral\Stempler\Lexer\StreamInterface;
 use Spiral\Stempler\Lexer\StringStream;
+use Spiral\Stempler\Lexer\Token;
 
 class BufferTest extends TestCase
 {
@@ -120,6 +121,10 @@ public function testOffset(): void
 
         $this->assertEquals(new Byte(2, 'c'), $src->next());
         $this->assertEquals(2, $src->getOffset());
+
+        $src = new Buffer($this->generateToken(new StringStream('abc')));
+        $this->assertEquals(new Token(0, null, 'a'), $src->next());
+        $this->assertEquals(0, $src->getOffset());
     }
 
     public function testLookupBytes(): void
@@ -148,4 +153,11 @@ private function generate(StreamInterface $src)
             yield new Byte($src->getOffset(), $src->peak());
         }
     }
+
+    private function generateToken(StreamInterface $src): \Generator
+    {
+        while (!$src->isEOI()) {
+            yield new Token(0, null, $src->peak());
+        }
+    }
 }