execute code even if startup code fails

DonJayamanne · DonJayamanne · commit 88c95e6b53a0 · 2016-09-23T13:10:20.000+10:00
diff --git a/src/client/common/utils.ts b/src/client/common/utils.ts
@@ -222,12 +222,9 @@ export function formatErrorForLogging(error: Error | string): string {
         if (error.message) {
             message = `Error Message: ${error.message}`;
         }
-        if (error.name) {
+        if (error.name && error.message.indexOf(error.name) === -1) {
             message += `, (${error.message})`;
         }
-        if (error.stack) {
-            message += os.EOL + error.stack;
-        }
     }
     return message;
 }
diff --git a/src/client/jupyter/kernel-manager.ts b/src/client/jupyter/kernel-manager.ts
@@ -98,12 +98,6 @@ export class KernelManagerImpl extends EventEmitter {
             return this.startKernel(kernelSpec, language);
         }).catch(reason => {
             let message = `No kernel for language '${language}' found. Ensure you have a Jupyter or IPython kernel installed for it.`;
-            if (hasKernelSpec) {
-                message = 'Failed to start the kernel.';
-            }
-            if (typeof reason === 'object' && reason.message) {
-                message = reason.message;
-            }
             vscode.window.showErrorMessage(message);
             this.outputChannel.appendLine(formatErrorForLogging(reason));
             return;
@@ -146,13 +140,11 @@ export class KernelManagerImpl extends EventEmitter {
             let errorMessage = 'Failed to execute kernel startup code. ';
             kernel.execute(startupCode, (result: { type: string, stream: string, message?: string, data: { [key: string]: string } | string }) => {
                 if (result.stream === 'status' && result.type === 'text') {
-                    if (result.data === 'ok') {
-                        return resolve();
-                    }
                     if (result.data === 'error') {
                         this.outputChannel.appendLine(errorMessage);
-                        return reject(new Error(errorMessage));
+                        vscode.window.showWarningMessage(errorMessage);
                     }
+                    return resolve();
                 }
                 if (result.stream === 'error' && result.type === 'text' && typeof result.message === 'string') {
                     errorMessage += 'Details: ' + result.message;

Original file line number	Diff line number	Diff line change
`@@ -222,12 +222,9 @@ export function formatErrorForLogging(error: Error \| string): string {`
`222`	`222`	`if (error.message) {`
`223`	`223`	message = `Error Message: ${error.message}`;
`224`	`224`	`}`
`225`		`- if (error.name) {`
	`225`	`+ if (error.name && error.message.indexOf(error.name) === -1) {`
`226`	`226`	message += `, (${error.message})`;
`227`	`227`	`}`
`228`		`- if (error.stack) {`
`229`		`- message += os.EOL + error.stack;`
`230`		`- }`
`231`	`228`	`}`
`232`	`229`	`return message;`
`233`	`230`	`}`