bug fix, launch using vscode and then fallback

Author: DonJayamanne

src/client/debugger/DebugClients/DebugClient.ts

@@ -14,7 +14,7 @@ export enum DebugType {
 }
 export abstract class DebugClient extends EventEmitter {
     protected debugSession: DebugSession;
-    constructor(args: any, debugSession: DebugSession) {
+    constructor(protected args: any, debugSession: DebugSession) {
         super();
         this.debugSession = debugSession;
     }

src/client/debugger/DebugClients/LocalDebugClient.ts

@@ -18,14 +18,12 @@ const VALID_DEBUG_OPTIONS = [
     'DjangoDebugging'];
 
 export class LocalDebugClient extends DebugClient {
-    protected args: LaunchRequestArguments;
     protected pyProc: child_process.ChildProcess;
     protected pythonProcess: IPythonProcess;
     protected debugServer: BaseDebugServer;
     // tslint:disable-next-line:no-any
     constructor(args: any, debugSession: DebugSession, private canLaunchTerminal: boolean) {
         super(args, debugSession);
-        this.args = args;
     }
 
     public CreateDebugServer(pythonProcess: IPythonProcess): BaseDebugServer {
@@ -170,16 +168,6 @@ export class LocalDebugClient extends DebugClient {
     private launchExternalTerminal(sudo: boolean, cwd: string, pythonPath: string, args: string[], env: {}) {
         return new Promise((resolve, reject) => {
             if (this.canLaunchTerminal) {
-                open({ wait: false, app: [pythonPath].concat(args), cwd, env, sudo: sudo }).then(proc => {
-                    this.pyProc = proc;
-                    resolve();
-                }, error => {
-                    if (!this.debugServer && this.debugServer.IsRunning) {
-                        return;
-                    }
-                    reject(error);
-                });
-            } else {
                 const command = sudo ? 'sudo' : pythonPath;
                 const commandArgs = sudo ? [pythonPath].concat(args) : args;
                 const isExternalTerminal = this.args.console === 'externalTerminal';
@@ -198,6 +186,16 @@ export class LocalDebugClient extends DebugClient {
                         reject(response);
                     }
                 });
+            } else {
+                open({ wait: false, app: [pythonPath].concat(args), cwd, env, sudo: sudo }).then(proc => {
+                    this.pyProc = proc;
+                    resolve();
+                }, error => {
+                    if (!this.debugServer && this.debugServer.IsRunning) {
+                        return;
+                    }
+                    reject(error);
+                });
             }
         });
     }

src/client/debugger/DebugClients/NonDebugClient.ts

@@ -9,11 +9,9 @@ import { DebugType } from './DebugClient';
 import { LocalDebugClient } from './LocalDebugClient';
 
 export class NonDebugClient extends LocalDebugClient {
-    protected args: LaunchRequestArguments;
     // tslint:disable-next-line:no-any
     constructor(args: LaunchRequestArguments, debugSession: DebugSession, canLaunchTerminal: boolean) {
         super(args, debugSession, canLaunchTerminal);
-        this.args = args;
     }
 
     public get DebugType(): DebugType {

src/client/debugger/Main.ts

@@ -242,7 +242,7 @@ export class PythonDebugger extends DebugSession {
         const telemetryProps: DebuggerTelemetry = {
             trigger: 'launch',
             console: args.console,
-            debugOptions: args.debugOptions.join(","),
+            debugOptions: (Array.isArray(args.debugOptions) ? args.debugOptions : []).join(","),
             pyspark: typeof args.pythonPath === 'string' && args.pythonPath.indexOf('spark-submit') > 0,
             hasEnvVars: args.env && typeof args.env === "object" && Object.keys(args.env).length > 0
         };

src/client/providers/jediProxy.ts

@@ -188,7 +188,7 @@ export class JediProxy implements vscode.Disposable {
     private spawnRetryAttempts = 0;
     private spawnProcess(dir: string) {
         try {
-            let environmentVariables = { 'PYTHONUNBUFFERED': '1' };
+            let environmentVariables: Object & { [key: string]: string } = { 'PYTHONUNBUFFERED': '1' };
             let customEnvironmentVars = getCustomEnvVarsSync(vscode.Uri.file(dir));
             if (customEnvironmentVars) {
                 environmentVariables = mergeEnvVariables(environmentVariables, customEnvironmentVars);

src/client/refactor/proxy.ts

@@ -104,7 +104,7 @@ export class RefactorProxy extends vscode.Disposable {
     private initialize(pythonPath: string): Promise<string> {
         return new Promise<any>((resolve, reject) => {
             this._initializeReject = reject;
-            let environmentVariables = { 'PYTHONUNBUFFERED': '1' };
+            let environmentVariables: Object & { [key: string]: string } = { 'PYTHONUNBUFFERED': '1' };
             let customEnvironmentVars = getCustomEnvVarsSync(vscode.Uri.file(this.workspaceRoot));
             if (customEnvironmentVars) {
                 environmentVariables = mergeEnvVariables(environmentVariables, customEnvironmentVars);