fixes #224

DonJayamanne · DonJayamanne · commit eb9474c5a2d4 · 2016-09-06T15:25:33.000+10:00
diff --git a/package.json b/package.json
@@ -175,7 +175,8 @@
                     "RedirectOutput",
                     "DebugStdLib",
                     "BreakOnSystemExitZero",
-                    "DjangoDebugging"
+                    "DjangoDebugging",
+                    "Sudo"
                   ]
                 },
                 "default": [
diff --git a/src/client/common/open.ts b/src/client/common/open.ts
@@ -29,12 +29,12 @@ export function open(opts: any): Promise<childProcess.ChildProcess> {
     }
 
     if (process.platform === 'darwin') {
-        cmd = 'osascript';
+        const sudoPrefix = opts.sudo === true ? 'sudo ' : '';
+        cmd = 'osascript';        
         args = [ '-e', 'tell application "terminal"',
                 '-e', 'activate',
-                '-e', 'do script "' + [opts.app].concat(appArgs).join(" ") + '"',
+                '-e', 'do script "' + sudoPrefix + [opts.app].concat(appArgs).join(" ") + '"',
                 '-e', 'end tell' ];
-        
     } else if (process.platform === 'win32') {
         cmd = 'cmd';
         args.push('/c', 'start');
@@ -52,7 +52,8 @@ export function open(opts: any): Promise<childProcess.ChildProcess> {
         }
     } else {
         cmd = 'gnome-terminal';
-        args = ['-x', 'sh', '-c', `"${opts.app}" ${appArgs.join(" ")}`]
+        const sudoPrefix = opts.sudo === true ? 'sudo ' : '';
+        args = ['-x', 'sh', '-c', `"${sudoPrefix}${opts.app}" ${appArgs.join(" ")}`]
     }
 
     var cp = childProcess.spawn(cmd, args, cpOpts);
diff --git a/src/client/debugger/DebugClients/LocalDebugClient.ts b/src/client/debugger/DebugClients/LocalDebugClient.ts
@@ -15,6 +15,12 @@ let LineByLineReader = require("line-by-line");
 
 const PTVS_FILES = ["visualstudio_ipython_repl.py", "visualstudio_py_debugger.py",
     "visualstudio_py_launcher.py", "visualstudio_py_repl.py", "visualstudio_py_util.py"];
+const VALID_DEBUG_OPTIONS = ["WaitOnAbnormalExit",
+                    "WaitOnNormalExit",
+                    "RedirectOutput",
+                    "DebugStdLib",
+                    "BreakOnSystemExitZero",
+                    "DjangoDebugging"];
 
 export class LocalDebugClient extends DebugClient {
     protected args: LaunchRequestArguments;
@@ -92,7 +98,8 @@ export class LocalDebugClient extends DebugClient {
 
             let args = [ptVSToolsFilePath, processCwd, dbgServer.port.toString(), "34806ad9-833a-4524-8cd6-18ca4aa74f14"].concat(launcherArgs);
             if (this.args.externalConsole === true) {
-                open({ wait: false, app: [pythonPath].concat(args), cwd: processCwd, env: environmentVariables }).then(proc => {
+                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;
                     resolve();
                 }, error => {
@@ -144,7 +151,7 @@ export class LocalDebugClient extends DebugClient {
     protected buildLauncherArguments(): string[] {
         let vsDebugOptions = "WaitOnAbnormalExit,WaitOnNormalExit,RedirectOutput";
         if (Array.isArray(this.args.debugOptions)) {
-            vsDebugOptions = this.args.debugOptions.join(",");
+            vsDebugOptions = this.args.debugOptions.filter(opt => VALID_DEBUG_OPTIONS.indexOf(opt) >= 0).join(",");
         }
 
         let programArgs = Array.isArray(this.args.args) && this.args.args.length > 0 ? this.args.args : [];
