complete #518

Author: DonJayamanne

package.json

@@ -232,6 +232,11 @@
               "program"
             ],
             "properties": {
+              "module": {
+                "type": "string",
+                "description": "Name of the module to be debugged.",
+                "default": ""
+              },
               "program": {
                 "type": "string",
                 "description": "Absolute path to the program.",
@@ -374,6 +379,21 @@
             "stopOnEntry": true,
             "pythonPath": "${config.python.pythonPath}",
             "program": "${file}",
+            "cwd": "null",
+            "debugOptions": [
+              "WaitOnAbnormalExit",
+              "WaitOnNormalExit",
+              "RedirectOutput"
+            ]
+          },
+          {
+            "name": "Python Module",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config.python.pythonPath}",
+            "module": "module.name",
+            "cwd": "${workspaceRoot}",
             "debugOptions": [
               "WaitOnAbnormalExit",
               "WaitOnNormalExit",
@@ -387,6 +407,7 @@
             "stopOnEntry": true,
             "pythonPath": "${config.python.pythonPath}",
             "program": "${file}",
+            "cwd": "null",
             "console": "integratedTerminal",
             "debugOptions": [
               "WaitOnAbnormalExit",
@@ -400,6 +421,7 @@
             "stopOnEntry": true,
             "pythonPath": "${config.python.pythonPath}",
             "program": "${file}",
+            "cwd": "null",
             "console": "externalTerminal",
             "debugOptions": [
               "WaitOnAbnormalExit",
@@ -413,6 +435,7 @@
             "stopOnEntry": true,
             "pythonPath": "${config.python.pythonPath}",
             "program": "${workspaceRoot}/manage.py",
+            "cwd": "null",
             "args": [
               "runserver",
               "--noreload"
@@ -431,6 +454,7 @@
             "stopOnEntry": false,
             "pythonPath": "${config.python.pythonPath}",
             "program": "fully qualified path fo 'flask' executable. Generally located along with python interpreter",
+            "cwd": "null",
             "env": {
               "FLASK_APP": "${workspaceRoot}/quickstart/app.py"
             },
@@ -452,6 +476,7 @@
             "stopOnEntry": false,
             "pythonPath": "${config.python.pythonPath}",
             "program": "${workspaceRoot}/run.py",
+            "cwd": "null",
             "args": [],
             "debugOptions": [
               "WaitOnAbnormalExit",
@@ -466,6 +491,7 @@
             "stopOnEntry": true,
             "pythonPath": "${config.python.pythonPath}",
             "program": "${workspaceRoot}/console.py",
+            "cwd": "null",
             "args": [
               "dev",
               "runserver",

src/client/debugger/Common/Contracts.ts

@@ -1,7 +1,7 @@
 "use strict";
 import * as net from "net";
-import {DebugProtocol} from "vscode-debugprotocol";
-import {OutputEvent} from "vscode-debugadapter";
+import { DebugProtocol } from "vscode-debugprotocol";
+import { OutputEvent } from "vscode-debugadapter";
 
 export class TelemetryEvent extends OutputEvent {
     body: {
@@ -42,6 +42,7 @@ export interface ExceptionHandling {
 
 export interface LaunchRequestArguments extends DebugProtocol.LaunchRequestArguments {
     /** An absolute path to the program to debug. */
+    module?: string;
     program: string;
     pythonPath: string;
     /** Automatically stop target after launch. If not specified, target does not stop. */

src/client/debugger/DebugClients/LocalDebugClient.ts

@@ -181,6 +181,9 @@ export class LocalDebugClient extends DebugClient {
         }
 
         let programArgs = Array.isArray(this.args.args) && this.args.args.length > 0 ? this.args.args : [];
+        if (typeof this.args.module === 'string' && this.args.module.length > 0) {
+            return [vsDebugOptions, '-m', this.args.module].concat(programArgs);
+        }
         return [vsDebugOptions, this.args.program].concat(programArgs);
         // Use this ability to debug unit tests or modules
         // Adding breakpoints programatically to the first executable line of the test program