Cleanup the default debug configurations. Remove emulator option. Don't pass --debug-brk by default.

Author: ivanbuhov

package.json

@@ -111,81 +111,58 @@
           {
             "name": "Sync on iOS",
             "type": "nativescript",
-            "platform": "ios",
             "request": "launch",
+            "platform": "ios",
             "appRoot": "${workspaceRoot}",
-            "sourceMaps": true,
-            "diagnosticLogging": false,
-            "emulator": false,
-            "rebuild": false,
-            "syncAllFiles": false
+            "sourceMaps": true
           },
           {
             "name": "Launch on iOS",
             "type": "nativescript",
-            "platform": "ios",
             "request": "launch",
+            "platform": "ios",
             "appRoot": "${workspaceRoot}",
             "sourceMaps": true,
-            "diagnosticLogging": false,
-            "emulator": false,
             "rebuild": true
           },
           {
             "name": "Attach on iOS",
             "type": "nativescript",
-            "platform": "ios",
             "request": "attach",
+            "platform": "ios",
             "appRoot": "${workspaceRoot}",
-            "sourceMaps": true,
-            "diagnosticLogging": false,
-            "emulator": false
+            "sourceMaps": true
           },
           {
             "name": "Sync on Android",
             "type": "nativescript",
-            "platform": "android",
             "request": "launch",
+            "platform": "android",
             "appRoot": "${workspaceRoot}",
-            "sourceMaps": true,
-            "diagnosticLogging": false,
-            "emulator": false,
-            "rebuild": false
+            "sourceMaps": true
           },
           {
             "name": "Launch on Android",
             "type": "nativescript",
-            "platform": "android",
             "request": "launch",
+            "platform": "android",
             "appRoot": "${workspaceRoot}",
             "sourceMaps": true,
-            "diagnosticLogging": false,
-            "emulator": false,
             "rebuild": true
           },
           {
             "name": "Attach on Android",
             "type": "nativescript",
-            "platform": "android",
             "request": "attach",
+            "platform": "android",
             "appRoot": "${workspaceRoot}",
-            "sourceMaps": true,
-            "diagnosticLogging": false,
-            "emulator": false
+            "sourceMaps": true
           }
         ],
         "configurationAttributes": {
           "launch": {
             "required": [],
             "properties": {
-              "runtimeArgs": {
-                "type": "array",
-                "description": "Optional arguments passed to the runtime executable.",
-                "items": {
-                  "type": "string"
-                },
-                "default": []
-              },
               "tnsArgs": {
                 "type": "array",
                 "description": "Optional arguments passed to the NativeScript CLI executable.",
@@ -219,9 +196,14 @@
                 "description": "NativeScript platform",
                 "default": null
               },
-              "emulator": {
+              "stopOnEntry": {
                 "type": "boolean",
-                "description": "Whether the app to run in emulator or on a physical device.",
+                "description": "Automatically stop on the first line after lauch",
+                "default": false
+              },
+              "noDebug": {
+                "type": "boolean",
+                "description": "If true the launch request will launch the program without enabling debugging",
                 "default": false
               },
               "rebuild": {
@@ -244,14 +226,6 @@
           "attach": {
             "required": [],
             "properties": {
-              "runtimeArgs": {
-                "type": "array",
-                "description": "Optional arguments passed to the runtime executable.",
-                "items": {
-                  "type": "string"
-                },
-                "default": []
-              },
               "tnsArgs": {
                 "type": "array",
                 "description": "Optional arguments passed to the NativeScript CLI executable.",
@@ -285,11 +259,6 @@
                 "description": "NativeScript platform",
                 "default": null
               },
-              "emulator": {
-                "type": "boolean",
-                "description": "Whether the app to run in emulator or on a physical device.",
-                "default": false
-              },
               "nativescriptCliPath": {
                 "type": "string",
                 "description": "Path to the nativescript CLI to be used by the NativeScript extension.",

src/custom-typings/debugProtocolExtensions.d.ts

@@ -2,15 +2,15 @@ import {DebugProtocol} from 'vscode-debugprotocol';
 
 declare module 'vscode-debugprotocol' {
     namespace DebugProtocol {
+
+        type RequestArguments = LaunchRequestArguments | AttachRequestArguments;
+
         interface ILaunchRequestArgs extends DebugProtocol.LaunchRequestArguments {
             platform: string;
             appRoot?: string;
-            runtimeArgs?: string[];
-            runtimeExecutable?: string;
             stopOnEntry?: boolean;
             sourceMaps?: boolean;
             diagnosticLogging?: boolean;
-            emulator?:boolean;
             request: string;
             tnsArgs?: string[];
             tnsOutput?: string;
@@ -24,7 +24,6 @@ declare module 'vscode-debugprotocol' {
             appRoot?: string;
             sourceMaps?: boolean;
             diagnosticLogging?: boolean;
-            emulator?:boolean;
             request: string;
             tnsArgs?: string[];
             tnsOutput?: string;

src/services/NsCliService.ts

@@ -133,9 +133,8 @@ export class IosProject extends NSProject {
         let command = new CommandBuilder(args.nativescriptCliPath)
             .appendParam("debug")
             .appendParam(this.platform())
-            .appendParamIf("--emulator", args.emulator)
             .appendParamIf("--start", args.request === "attach")
-            .appendParamIf("--debug-brk", args.request === "launch")
+            .appendParamIf("--debug-brk", args.request === "launch" && (args as DebugProtocol.ILaunchRequestArgs).stopOnEntry)
             .appendParamIf("--no-rebuild", !rebuild)
             .appendParamIf("--syncAllFiles", args.request === "launch" && !rebuild && (args as DebugProtocol.ILaunchRequestArgs).syncAllFiles)
             .appendParam("--no-client")
@@ -225,9 +224,8 @@ export class AndroidProject extends NSProject {
                 let command = new CommandBuilder(args.nativescriptCliPath)
                     .appendParam("debug")
                     .appendParam(this.platform())
-                    .appendParamIf("--emulator", args.emulator)
                     .appendParamIf("--no-rebuild", args.rebuild !== true)
-                    .appendParam("--debug-brk")
+                    .appendParamIf("--debug-brk", args.stopOnEntry)
                     .appendParam("--no-client")
                     .appendParams(args.tnsArgs)
                     .build();