Better fix for microsoft/vscode#69118

microsoft · Mar 9, 2019 · 296f155 · 296f155
1 parent f8d962c
commit 296f155
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/chrome/chromeDebugAdapter.ts b/src/chrome/chromeDebugAdapter.ts
@@ -1986,7 +1986,7 @@ export abstract class ChromeDebugAdapter implements IDebugAdapter {
             stackFrames,
             totalFrames
         };
-        this._pathTransformer.stackTraceResponse(stackTraceResponse);
+        await this._pathTransformer.stackTraceResponse(stackTraceResponse);
         await this._sourceMapTransformer.stackTraceResponse(stackTraceResponse);
 
         await Promise.all(stackTraceResponse.stackFrames.map(async (frame, i) => {

diff --git a/src/transformers/remotePathTransformer.ts b/src/transformers/remotePathTransformer.ts
@@ -63,7 +63,10 @@ export class RemotePathTransformer extends UrlPathTransformer {
     }
 
     public async scriptParsed(scriptPath: string): Promise<string> {
-        scriptPath = await super.scriptParsed(scriptPath);
+        if (!this.shouldMapPaths(scriptPath)) {
+            scriptPath = await super.scriptParsed(scriptPath);
+        }
+
         scriptPath = this.getClientPathFromTargetPath(scriptPath) || scriptPath;
 
         return scriptPath;
@@ -89,7 +92,7 @@ export class RemotePathTransformer extends UrlPathTransformer {
 
     private shouldMapPaths(remotePath: string): boolean {
         // Map paths only if localRoot/remoteRoot are set, and the remote path is absolute on some system
-        return !!this._localRoot && !!this._remoteRoot && (path.posix.isAbsolute(remotePath) || path.win32.isAbsolute(remotePath));
+        return !!this._localRoot && !!this._remoteRoot && (path.posix.isAbsolute(remotePath) || path.win32.isAbsolute(remotePath) || utils.isFileUrl(remotePath));
     }
 
     public getClientPathFromTargetPath(remotePath: string): string {