additional error handling

DonJayamanne · DonJayamanne · commit a0233016efb0 · 2016-03-02T10:46:24.000+11:00
diff --git a/README.md b/README.md
@@ -103,6 +103,9 @@ Works on both Windows and Mac.
 
 ## Change Log
 
+### Version 0.2.8
+* Improved error handling in the extension
+
 ### Version 0.2.8
 * Added support for debugging django applications
  + Debugging templates is not supported at this stage
diff --git a/src/client/common/configSettings.ts b/src/client/common/configSettings.ts
@@ -12,7 +12,7 @@ export interface IPythonSettings {
 }
 export interface IUnitTestSettings {
     nosetestsEnabled: boolean;
-    nosetestPath:string;
+    nosetestPath: string;
     unittestEnabled: boolean;
 }
 export interface IPylintCategorySeverity {
@@ -51,7 +51,7 @@ export class PythonSettings implements IPythonSettings {
 
         this.initializeSettings();
     }
-    private getVirtualenvPath() {
+    private getVirtualenvPath(): string {
         var currentPath: string = vscode.workspace.rootPath;
         if (process.platform == 'win32') {
             var bin: string = "Scripts";
@@ -63,11 +63,12 @@ export class PythonSettings implements IPythonSettings {
         }
         return fs.existsSync(_path)
             ? _path
-            : this.pythonPath;
+            : null;
     }
     private initializeSettings() {
         var pythonSettings = vscode.workspace.getConfiguration("python");
-        this.pythonPath = this.getVirtualenvPath()
+        var virtualEnvPath = this.getVirtualenvPath();
+        this.pythonPath = typeof virtualEnvPath === "string" ? virtualEnvPath : pythonSettings.get<string>("pythonPath");
         var lintingSettings = pythonSettings.get<ILintingSettings>("linting");
         if (this.linting) {
             Object.assign<ILintingSettings, ILintingSettings>(this.linting, lintingSettings);
diff --git a/src/client/providers/jediProxy.ts b/src/client/providers/jediProxy.ts
@@ -162,22 +162,29 @@ function killProcess() {
     catch (ex) { }
 }
 
+function handleError(source: string, errorMessage: string) {
+    console.error(`Error (${source}) ${errorMessage}`);
+    vscode.window.showErrorMessage(`There was an error in the python extension. Error ${errorMessage}`);
+}
+
 function spawnProcess(dir: string) {
     try {
         proc = child_process.spawn(pythonSettings.pythonPath, ["-u", "completion.py"], {
             cwd: dir
         });
     }
     catch (ex) {
-        var x = "";
+        return handleError("spawnProcess", ex.message);
     }
     proc.stderr.on("data", (data) => {
-        console.error("Error " + data);
+        handleError("stderr", data);
     });
-
     proc.on("end", (end) => {
         console.error("End - " + end);
     });
+    proc.on("error", error => {
+        handleError("error", error);
+    });
 
     proc.stdout.on("data", (data) => {
         var dataStr = previousData = previousData + data + ""
@@ -187,7 +194,7 @@ function spawnProcess(dir: string) {
             previousData = "";
         }
         catch (ex) {
-            console.log(ex.message);
+            handleError("stdout", ex.message);
             return;
         }
 
@@ -309,13 +316,28 @@ function spawnProcess(dir: string) {
 
 function sendCommand<T extends ICommandResult>(cmd: ICommand<T>): Promise<T> {
     return new Promise<ICommandResult>((resolve, reject) => {
+        if (!proc) {
+            return reject("Python proc not initialized");
+        }
         var exexcutionCmd = <IExecutionCommand<T>>cmd;
         var payload = createPayload(exexcutionCmd);
         exexcutionCmd.resolve = resolve;
         exexcutionCmd.reject = reject;
-        proc.stdin.write(JSON.stringify(payload) + "\n");
-        commands.set(exexcutionCmd.id, exexcutionCmd);
-        commandQueue.push(exexcutionCmd.id);
+        try {
+            proc.stdin.write(JSON.stringify(payload) + "\n");
+            commands.set(exexcutionCmd.id, exexcutionCmd);
+            commandQueue.push(exexcutionCmd.id);
+        }
+        catch (ex) {
+            //If 'This socket is closed.' that means process didn't start at all (at least not properly)
+            if (ex.message === "This socket is closed.") {
+                killProcess();
+            }
+            else {
+                handleError("sendCommand", ex.message);
+            }
+            reject(ex.message);
+        }
     });
 }
 
@@ -447,7 +469,7 @@ export class JediProxyHandler<R extends ICommandResult, T> {
         this.cancellationTokenSource = new vscode.CancellationTokenSource();
         executionCmd.token = this.cancellationTokenSource.token;
 
-        this.jediProxy.sendCommand<R>(executionCmd).then(data=> this.onResolved(data));
+        this.jediProxy.sendCommand<R>(executionCmd).then(data=> this.onResolved(data), () => { });
         this.lastCommandId = executionCmd.id;
         this.lastToken = token;
         this.promiseResolve = resolve;
