Fix scanning of comment

phalcon · Oct 27, 2024 · cd2ec3b · cd2ec3b
1 parent 3dc9ebd
commit cd2ec3b
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/Scanner/Scanner.php b/src/Scanner/Scanner.php
@@ -43,6 +43,10 @@ public function scanForToken(): int
                 $next       = $this->state->getNext();
                 $doubleNext = $this->state->getNext(2);
 
+                if ($cursor === "\n") {
+                    $this->state->incrementActiveLine();
+                }
+
                 if ($cursor === null || ($cursor === '{' && ($next === '%' || $next === '{' || $next === '#'))) {
                     if ($next !== '#') {
                         $this->state->setMode(Compiler::PHVOLT_MODE_CODE);
@@ -71,6 +75,7 @@ public function scanForToken(): int
                         while ($next = $this->state->incrementStart()->getStart()) {
                             $doubleNext = $this->state->getNext();
                             if ($next === '#' && $doubleNext === '}') {
+                                $this->state->incrementStart(2);
                                 $this->token->setOpcode(Compiler::PHVOLT_T_IGNORE);
                                 return 0;
                             } elseif ($next === "\n") {
@@ -84,10 +89,6 @@ public function scanForToken(): int
                     return 0;
                 }
 
-                if ($cursor === "\n") {
-                    $this->state->incrementActiveLine();
-                }
-
                 $this->state->rawFragment .= $cursor;
                 $this->state->incrementStart();
             } else {