default debug config options

DonJayamanne · DonJayamanne · commit 8d0f73af38d1 · 2016-09-08T14:12:42.000+10:00
diff --git a/package.json b/package.json
@@ -161,9 +161,9 @@
                 "default": false
               },
               "console": {
-								"enum": [ "internalConsole", "integratedTerminal", "externalTerminal" ],
+								"enum": [ "none", "integratedTerminal", "externalTerminal" ],
 								"description": "Where to launch the debug target: internal console, integrated terminal, or external terminal.",
-								"default": "internalConsole"
+								"default": "none"
 							},
               "cwd": {
                 "type": "string",
@@ -276,13 +276,26 @@
             ]
           },
           {
-            "name": "Python Console App",
+            "name": "Python Integrated Console App",
             "type": "python",
             "request": "launch",
             "stopOnEntry": true,
             "pythonPath": "${config.python.pythonPath}",
             "program": "${file}",
-            "externalConsole": true,
+            "console": "integratedTerminal", 
+            "debugOptions": [
+              "WaitOnAbnormalExit",
+              "WaitOnNormalExit"
+            ]
+          },
+          {
+            "name": "Python External Console App",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config.python.pythonPath}",
+            "program": "${file}",
+            "console": "externalTerminal", 
             "debugOptions": [
               "WaitOnAbnormalExit",
               "WaitOnNormalExit"
@@ -306,6 +319,21 @@
               "DjangoDebugging"
             ]
           },
+          {
+            "name": "Flask",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config.python.pythonPath}",
+            "program": "${workspaceRoot}/run.py",
+            "args": [
+            ],
+            "debugOptions": [
+              "WaitOnAbnormalExit",
+              "WaitOnNormalExit",
+              "RedirectOutput"
+            ]
+          },
           {
             "name": "Watson",
             "type": "python",
@@ -325,7 +353,7 @@
             ]
           },
           {
-            "name": "Attach",
+            "name": "Attach (Remote Debug)",
             "type": "python",
             "request": "attach",
             "localRoot": "${workspaceRoot}",
diff --git a/src/client/debugger/Common/Contracts.ts b/src/client/debugger/Common/Contracts.ts
@@ -53,7 +53,7 @@ export interface LaunchRequestArguments extends DebugProtocol.LaunchRequestArgum
     debugOptions?: string[];
     env?: Object;
     exceptionHandling?: ExceptionHandling;
-    console?: "internalConsole" | "integratedTerminal" | "externalTerminal";
+    console?: "none" | "integratedTerminal" | "externalTerminal";
 }
 
 export interface AttachRequestArguments extends DebugProtocol.AttachRequestArguments {
diff --git a/src/client/debugger/DebugClients/LocalDebugClient.ts b/src/client/debugger/DebugClients/LocalDebugClient.ts
@@ -105,7 +105,7 @@ export class LocalDebugClient extends DebugClient {
             let launcherArgs = this.buildLauncherArguments();
 
             let args = [ptVSToolsFilePath, processCwd, dbgServer.port.toString(), "34806ad9-833a-4524-8cd6-18ca4aa74f14"].concat(launcherArgs);
-            if (this.args.externalConsole === true) {
+            if (this.args.console === 'externalTerminal') {
                 const isSudo = Array.isArray(this.args.debugOptions) && this.args.debugOptions.some(opt => opt === 'Sudo');
                 open({ wait: false, app: [pythonPath].concat(args), cwd: processCwd, env: environmentVariables, sudo: isSudo }).then(proc => {
                     this.pyProc = proc;
diff --git a/src/client/debugger/DebugClients/NonDebugClient.ts b/src/client/debugger/DebugClients/NonDebugClient.ts
@@ -77,7 +77,7 @@ export class NonDebugClient extends DebugClient {
             let launcherArgs = this.buildLauncherArguments();
 
             let args = launcherArgs;
-            if (this.args.externalConsole === true) {
+            if (this.args.console === 'externalTerminal') {
                 open({ wait: false, app: [pythonPath].concat(args), cwd: processCwd, env: environmentVariables }).then(proc => {
                     this.pyProc = proc;
                     this.pyProc.on('exit', () => {
diff --git a/src/client/debugger/Main.ts b/src/client/debugger/Main.ts
@@ -142,7 +142,7 @@ export class PythonDebugger extends DebugSession {
         this.sendResponse(this.entryResponse);
         this.debuggerLoadedPromiseResolve();
         if (!this.launchArgs.console) {
-            this.launchArgs.console = this.launchArgs.externalConsole === true ? 'externalTerminal' : 'internalConsole';
+            this.launchArgs.console = this.launchArgs.externalConsole === true ? 'externalTerminal' : 'none';
         }
         if (this.launchArgs && this.launchArgs.stopOnEntry === true) {
             this.sendEvent(new StoppedEvent("entry", pyThread.Id));
@@ -179,7 +179,7 @@ export class PythonDebugger extends DebugSession {
             return this.sendErrorResponse(response, 2001, `File does not exist. "${args.program}"`);
         }
         this.sendEvent(new TelemetryEvent(telemetryContracts.Debugger.Load, {
-            Debug_ExternalConsole: args.externalConsole === true ? "true" : "false",
+            Debug_Console: args.console,
             Debug_DebugOptions: args.debugOptions.join(","),
             Debug_DJango: args.debugOptions.indexOf("DjangoDebugging") >= 0 ? "true" : "false",
             Debug_HasEnvVaraibles: args.env && typeof args.env === "object" ? "true" : "false"

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ export interface LaunchRequestArguments extends DebugProtocol.LaunchRequestArgum`
`53`	`53`	`debugOptions?: string[];`
`54`	`54`	`env?: Object;`
`55`	`55`	`exceptionHandling?: ExceptionHandling;`
`56`		`- console?: "internalConsole" \| "integratedTerminal" \| "externalTerminal";`
	`56`	`+ console?: "none" \| "integratedTerminal" \| "externalTerminal";`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`export interface AttachRequestArguments extends DebugProtocol.AttachRequestArguments {`