Download file:// sourcemaps correctly. Fix #205, fix Microsoft/vscode…

…-chrome-debug#460
microsoft · Aug 14, 2017 · a78782b · a78782b
1 parent 9881b3c
commit a78782b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/sourceMaps/sourceMapFactory.ts b/src/sourceMaps/sourceMapFactory.ts
@@ -93,13 +93,14 @@ function getSourceMapContent(pathToGenerated: string, mapPath: string): Promise<
 
 function loadSourceMapContents(mapPathOrURL: string): Promise<string> {
     let contentsP: Promise<string>;
-    if (utils.isURL(mapPathOrURL)) {
+    if (utils.isURL(mapPathOrURL) && !utils.isFileUrl(mapPathOrURL)) {
         logger.log(`SourceMaps.loadSourceMapContents: Downloading sourcemap file from ${mapPathOrURL}`);
         contentsP = downloadSourceMapContents(mapPathOrURL).catch(e => {
             logger.error(`SourceMaps.loadSourceMapContents: Could not download sourcemap from ${mapPathOrURL}`);
             return null;
         });
     } else {
+        mapPathOrURL = utils.canonicalizeUrl(mapPathOrURL);
         contentsP = new Promise((resolve, reject) => {
             logger.log(`SourceMaps.loadSourceMapContents: Reading local sourcemap file from ${mapPathOrURL}`);
             fs.readFile(mapPathOrURL, (err, data) => {

diff --git a/src/utils.ts b/src/utils.ts
@@ -120,11 +120,15 @@ export function canonicalizeUrl(urlOrPath: string): string {
     return urlOrPath;
 }
 
+export function isFileUrl(candidate: string): boolean {
+    return candidate.startsWith('file:///');
+}
+
 /**
  * If urlOrPath is a file URL, removes the 'file:///', adjusting for platform differences
  */
 export function fileUrlToPath(urlOrPath: string): string {
-    if (urlOrPath.startsWith('file:///')) {
+    if (isFileUrl(urlOrPath)) {
         urlOrPath = urlOrPath.replace('file:///', '');
         urlOrPath = decodeURIComponent(urlOrPath);
         if (urlOrPath[0] !== '/' && !urlOrPath.match(/^[A-Za-z]:/)) {