Use scanRange to prevent variable shadowing

graphemecluster · Apr 27, 2024 · 76acd92 · 76acd92
1 parent 5c75b2d
commit 76acd92
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
@@ -2508,22 +2508,17 @@ export function createScanner(languageVersion: ScriptTarget, skipTrivia: boolean
                     pos++;
                 }
                 if (reportErrors) {
-                    const endOfRegExpFlags = pos;
-                    pos = startOfRegExpBody;
-                    const saveTokenPos = tokenStart;
-                    const saveTokenFlags = tokenFlags;
-                    scanRegularExpressionWorker(text, endOfRegExpBody, regExpFlags, /*annexB*/ true);
-                    pos = endOfRegExpFlags;
-                    tokenStart = saveTokenPos;
-                    tokenFlags = saveTokenFlags;
+                    scanRange(startOfRegExpBody, endOfRegExpBody - startOfRegExpBody, () => {
+                        scanRegularExpressionWorker(regExpFlags, /*annexB*/ true);
+                    });
                 }
             }
             tokenValue = text.substring(tokenStart, pos);
             token = SyntaxKind.RegularExpressionLiteral;
         }
         return token;
 
-        function scanRegularExpressionWorker(text: string, end: number, regExpFlags: RegularExpressionFlags, annexB: boolean) {
+        function scanRegularExpressionWorker(regExpFlags: RegularExpressionFlags, annexB: boolean) {
             /** Grammar parameter */
             const unicodeMode = !!(regExpFlags & RegularExpressionFlags.UnicodeMode);
             /** Grammar parameter */