Fixed incorrect sourcemap generated by applySourceMap when the inital…

… sourcemap has fewer mappings than the applied sourcemap A->a | A->a = A->a B->b | = B->b C->c | = C->c D->d | = D->d An existing test had to be changed since the way it describes inexact matching is no longer the correct way to do it
mariusGundersen · Oct 24, 2015 · 6d40e0e · 6d40e0e
1 parent 0140f6d
commit 6d40e0e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/source-map-generator.js b/lib/source-map-generator.js
@@ -193,6 +193,10 @@
             line: mapping.originalLine,
             column: mapping.originalColumn
           });
+
+          var generated = aSourceMapConsumer.generatedPositionFor(original);
+          var diff = {line: mapping.originalLine - generated.line, column: mapping.originalColumn - generated.column};
+
           if (original.source != null) {
             // Copy mapping
             mapping.source = original.source;
@@ -202,8 +206,8 @@
             if (sourceRoot != null) {
               mapping.source = util.relative(sourceRoot, mapping.source);
             }
-            mapping.originalLine = original.line;
-            mapping.originalColumn = original.column;
+            mapping.originalLine = original.line + diff.line;
+            mapping.originalColumn = original.column + diff.column;
             if (original.name != null) {
               mapping.name = original.name;
             }

diff --git a/test/test-source-map-generator.js b/test/test-source-map-generator.js
@@ -707,7 +707,7 @@
       });
       expectedMap.addMapping({
         generated: { line: 2, column: 4 },
-        original: { line: 1, column: 0 },
+        original: { line: 1, column: 4 },
         source: 'original-source'
       });