Already not depending on args.cwd to be passed to the debug adapter by VS Code

Author: ivanbuhov

package.json

@@ -87,7 +87,7 @@
             "type": "nativescript",
             "platform": "ios",
             "request": "launch",
-            "appRoot": ".",
+            "appRoot": "${workspaceRoot}",
             "sourceMaps": true,
             "diagnosticLogging": false,
             "emulator": false
@@ -97,7 +97,7 @@
             "type": "nativescript",
             "platform": "ios",
             "request": "attach",
-            "appRoot": ".",
+            "appRoot": "${workspaceRoot}",
             "sourceMaps": true,
             "diagnosticLogging": false,
             "emulator": false
@@ -107,7 +107,7 @@
             "type": "nativescript",
             "platform": "ios",
             "request": "launch",
-            "appRoot": ".",
+            "appRoot": "${workspaceRoot}",
             "sourceMaps": true,
             "diagnosticLogging": false,
             "emulator": true
@@ -117,7 +117,7 @@
             "type": "nativescript",
             "platform": "ios",
             "request": "attach",
-            "appRoot": ".",
+            "appRoot": "${workspaceRoot}",
             "sourceMaps": true,
             "diagnosticLogging": false,
             "emulator": true
@@ -127,7 +127,7 @@
             "type": "nativescript",
             "platform": "android",
             "request": "launch",
-            "appRoot": ".",
+            "appRoot": "${workspaceRoot}",
             "sourceMaps": true,
             "diagnosticLogging": false,
             "emulator": false
@@ -137,7 +137,7 @@
             "type": "nativescript",
             "platform": "android",
             "request": "launch",
-            "appRoot": ".",
+            "appRoot": "${workspaceRoot}",
             "sourceMaps": true,
             "diagnosticLogging": false,
             "emulator": true
@@ -147,7 +147,7 @@
             "type": "nativescript",
             "platform": "android",
             "request": "attach",
-            "appRoot": ".",
+            "appRoot": "${workspaceRoot}",
             "sourceMaps": false,
             "diagnosticLogging": false,
             "emulator": false
@@ -157,7 +157,7 @@
             "type": "nativescript",
             "platform": "android",
             "request": "attach",
-            "appRoot": ".",
+            "appRoot": "${workspaceRoot}",
             "sourceMaps": false,
             "diagnosticLogging": false,
             "emulator": true

webkit/utilities.ts

@@ -399,17 +399,7 @@ export function errP(msg: any): Promise<any> {
  * Calculates the appRoot from a launch/attach request. The appRoot is the root directory of the NativeScript app.
  */
 export function getAppRoot(args: ILaunchRequestArgs | IAttachRequestArgs): string {
-    let appRoot: string;
-    if (args.appRoot) {
-        appRoot = args.appRoot;
-        if (!path.isAbsolute(appRoot)) {
-            appRoot = path.resolve(args.cwd, appRoot);
-        }
-    } else {
-        appRoot = args.cwd;
-    }
-
-    return appRoot;
+    return (args.appRoot && path.isAbsolute(args.appRoot)) ? args.appRoot : '';
 }
 
 /**

webkit/webKitAdapterInterfaces.d.ts

@@ -1,7 +1,6 @@
 import {DebugProtocol} from 'vscode-debugprotocol';
 
 export interface ILaunchRequestArgs extends DebugProtocol.LaunchRequestArguments {
-    cwd: string; /* Automatically set by VS Code to the currently opened folder */
     platform: string;
     appRoot?: string;
     runtimeArgs?: string[];
@@ -15,7 +14,6 @@ export interface ILaunchRequestArgs extends DebugProtocol.LaunchRequestArguments
 }
 
 export interface IAttachRequestArgs extends DebugProtocol.AttachRequestArguments {
-    cwd: string; /* Automatically set by VS Code to the currently opened folder */
     platform: string;
     appRoot?: string;
     sourceMaps?: boolean;