fix: variables in bundled code with source maps aren't renamed properly (#2202)

Fixes #2201

Author: connor4312

src/common/positions.ts

@@ -83,7 +83,7 @@ export class Base1Position implements IPosition {
 }
 
 /**
- * A position that starts a line 0 and column 1 (used by sourcemaps).
+ * A position that starts a line 1 and column 0 (used by sourcemaps).
  */
 export class Base01Position implements IPosition {
   declare readonly __isBase01: undefined;

src/common/sourceMaps/renameScopeAndSourceMap.ts

@@ -33,7 +33,7 @@ export const extractScopeRenames = async (source: string, sourceMap: SourceMap)
   ) => {
     // keep things as numbers for performance: number in upper bits (until MAX_SAFE_INTEGER),
     // column in lower 32 bits.
-    const cacheKey = (generatedLineBase0 * 0x7fffffff) | generatedColumnBase0;
+    const cacheKey = (generatedLineBase0 * 0x7fffffff) + generatedColumnBase0;
     if (usedMappings.has(cacheKey)) {
       return undefined;
     }
@@ -75,16 +75,10 @@ export const extractScopeRenames = async (source: string, sourceMap: SourceMap)
 
         const generatedLineBase0 = i;
         const generatedColumnBase0 = mapping[0];
-        if (
-          generatedLineBase0 === node.range.begin.base0.lineNumber
-          && node.range.begin.base0.columnNumber > generatedColumnBase0
-        ) {
+        if (generatedLineBase0 === start.lineNumber && start.columnNumber > generatedColumnBase0) {
           continue;
         }
-        if (
-          generatedLineBase0 === node.range.end.base0.lineNumber
-          && node.range.end.base0.columnNumber < generatedColumnBase0
-        ) {
+        if (generatedLineBase0 === end.lineNumber && end.columnNumber < generatedColumnBase0) {
           continue;
         }