Fixup line numbers when applying emulator patches

This fixes the test failures on PHP 7.2.
nikic · Aug 13, 2023 · d1d784a · d1d784a
1 parent 62853b1
commit d1d784a
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/lib/PhpParser/Lexer/Emulative.php b/lib/PhpParser/Lexer/Emulative.php
@@ -132,10 +132,12 @@ private function fixupTokens(): void {
 
         // We use a manual loop over the tokens, because we modify the array on the fly
         $posDelta = 0;
+        $lineDelta = 0;
         for ($i = 0, $c = \count($this->tokens); $i < $c; $i++) {
             $token = $this->tokens[$i];
             $pos = $token->pos;
             $token->pos += $posDelta;
+            $token->line += $lineDelta;
             $localPosDelta = 0;
             $len = \strlen($token->text);
             while ($patchPos >= $pos && $patchPos < $pos + $len) {
@@ -153,12 +155,14 @@ private function fixupTokens(): void {
                         );
                         $localPosDelta -= $patchTextLen;
                     }
+                    $lineDelta -= \substr_count($patchText, "\n");
                 } elseif ($patchType === 'add') {
                     // Insert into the token string
                     $token->text = substr_replace(
                         $token->text, $patchText, $patchPos - $pos + $localPosDelta, 0
                     );
                     $localPosDelta += $patchTextLen;
+                    $lineDelta += \substr_count($patchText, "\n");
                 } elseif ($patchType === 'replace') {
                     // Replace inside the token string
                     $token->text = substr_replace(