#643 - Use pathMapping changes from -core

Author: roblourens

package.json

@@ -1,7 +1,7 @@
 {
   "name": "debugger-for-chrome",
   "displayName": "Debugger for Chrome",
-  "version": "4.3.0",
+  "version": "4.3.1-beta.0",
   "icon": "images/icon.png",
   "description": "%extension.description%",
   "author": {
@@ -24,7 +24,7 @@
   ],
   "license": "SEE LICENSE IN LICENSE.txt",
   "dependencies": {
-    "vscode-chrome-debug-core": "^4.1.4",
+    "vscode-chrome-debug-core": "^5.0.0-pre.0",
     "vscode-debugadapter": "^1.28.0-pre.2",
     "vscode-nls": "^3.2.1"
   },

src/chromeDebugAdapter.ts

@@ -187,9 +187,9 @@ export class ChromeDebugAdapter extends CoreDebugAdapter {
     }
 
     public commonArgs(args: ICommonRequestArgs): void {
-        if (!args.webRoot && args.pathMapping && args.pathMapping['/']) {
-            // Adapt pathMapping['/'] as the webRoot when not set, since webRoot is explicitly used in many places
-            args.webRoot = args.pathMapping['/'];
+        if (args.webRoot && (!args.pathMapping || !args.pathMapping['/'])) {
+            args.pathMapping = args.pathMapping || {};
+            args.pathMapping['/'] = args.webRoot;
         }
 
         args.sourceMaps = typeof args.sourceMaps === 'undefined' || args.sourceMaps;

src/chromeDebugInterfaces.d.ts

@@ -6,6 +6,7 @@ import * as Core from 'vscode-chrome-debug-core';
 import { DebugProtocol } from 'vscode-debugprotocol';
 
 export interface ICommonRequestArgs extends Core.ICommonRequestArgs {
+    webRoot?: string;
     disableNetworkCache?: boolean;
     urlFilter?: string;
 }