restart jupyter adapter if python path changes

DonJayamanne · DonJayamanne · commit aefe1cacf70c · 2016-10-26T08:58:16.000+11:00
diff --git a/src/client/extension.ts b/src/client/extension.ts
@@ -80,9 +80,9 @@ export function activate(context: vscode.ExtensionContext) {
     context.subscriptions.push(vscode.languages.registerDocumentRangeFormattingEditProvider(PYTHON, formatProvider));
 
 
-    jupMain = new jup.Jupyter(lintingOutChannel);
+    jupMain = new jup.Jupyter(lintingOutChannel, vscode.workspace.rootPath);
     const documentHasJupyterCodeCells = jupMain.hasCodeCells.bind(jupMain);
-    jupMain.activate(vscode.workspace.rootPath);
+    jupMain.activate();
     context.subscriptions.push(jupMain);
 
     context.subscriptions.push(new LintProvider(context, lintingOutChannel, vscode.workspace.rootPath, documentHasJupyterCodeCells));
diff --git a/src/client/jupyter/kernel-manager.ts b/src/client/jupyter/kernel-manager.ts
@@ -29,6 +29,7 @@ export class KernelManagerImpl extends EventEmitter {
         this.disposables.push(vscode.commands.registerCommand(Commands.Jupyter.StartKernelForKernelSpeck, this.startKernel.bind(this)));
     }
     public dispose() {
+        this.removeAllListeners();
         this._runningKernels.forEach(kernel => {
             kernel.dispose();
         });
diff --git a/src/client/jupyter/main.ts b/src/client/jupyter/main.ts
@@ -12,26 +12,53 @@ import * as telemetryHelper from '../common/telemetry';
 import * as telemetryContracts from '../common/telemetryContracts';
 import * as main from './jupyter_client/main';
 import { KernelRestartedError, KernelShutdownError } from './common/errors';
+import { PythonSettings } from '../common/configSettings';
 
-// Todo: Refactor the error handling and displaying of messages
+const pythonSettings = PythonSettings.getInstance();
 
+// Todo: Refactor the error handling and displaying of messages
 export class Jupyter extends vscode.Disposable {
     public kernelManager: KernelManagerImpl;
     public kernel: Kernel = null;
     private status: KernelStatus;
     private disposables: vscode.Disposable[];
     private display: JupyterDisplay;
     private codeLensProvider: JupyterCodeLensProvider;
-    constructor(private outputChannel: vscode.OutputChannel) {
+    private lastUsedPythonPath: string;
+    constructor(private outputChannel: vscode.OutputChannel, private rootPath: string) {
         super(() => { });
         this.disposables = [];
         this.registerCommands();
         this.registerKernelCommands();
+
+        pythonSettings.on('change', this.onConfigurationChanged.bind(this));
+        this.lastUsedPythonPath = pythonSettings.pythonPath;
+    }
+    private onConfigurationChanged() {
+        if (this.lastUsedPythonPath === pythonSettings.pythonPath) {
+            return;
+        }
+        this.kernelManager.dispose();
+        this.createKernelManager();
+    }
+    public dispose() {
+        this.kernelManager.dispose();
+        this.disposables.forEach(d => d.dispose());
     }
-    activate(rootPath: string) {
-        const jupyterClient = new main.JupyterClientAdapter(this.outputChannel, rootPath);
+    private createKernelManager() {
+        const jupyterClient = new main.JupyterClientAdapter(this.outputChannel, this.rootPath);
         this.kernelManager = new KernelManagerImpl(this.outputChannel, jupyterClient);
-        this.disposables.push(this.kernelManager);
+
+        // This happend when user changes it from status bar
+        this.kernelManager.on('kernelChanged', (kernel: Kernel, language: string) => {
+            if (this.kernel !== kernel && (this.kernel && this.kernel.kernelSpec.language === kernel.kernelSpec.language)) {
+                this.onKernelChanged(kernel);
+            }
+        });
+    }
+    activate() {
+        this.createKernelManager();
+
         this.disposables.push(vscode.window.onDidChangeActiveTextEditor(this.onEditorChanged.bind(this)));
         this.codeLensProvider = new JupyterCodeLensProvider();
         this.disposables.push(vscode.languages.registerCodeLensProvider(PythonLanguage, this.codeLensProvider));
@@ -40,13 +67,6 @@ export class Jupyter extends vscode.Disposable {
         this.disposables.push(this.status);
         this.display = new JupyterDisplay(this.codeLensProvider);
         this.disposables.push(this.display);
-
-        // This happend when user changes it from status bar
-        this.kernelManager.on('kernelChanged', (kernel: Kernel, language: string) => {
-            if (this.kernel !== kernel && (this.kernel && this.kernel.kernelSpec.language === kernel.kernelSpec.language)) {
-                this.onKernelChanged(kernel);
-            }
-        });
     }
     public hasCodeCells(document: vscode.TextDocument, token: vscode.CancellationToken): Promise<boolean> {
         return new Promise<boolean>(resolve => {
@@ -59,9 +79,6 @@ export class Jupyter extends vscode.Disposable {
             });
         });
     }
-    public dispose() {
-        this.disposables.forEach(d => d.dispose());
-    }
     private onEditorChanged(editor: vscode.TextEditor) {
         if (!editor || !editor.document) {
             return;

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ export class KernelManagerImpl extends EventEmitter {`
`29`	`29`	`this.disposables.push(vscode.commands.registerCommand(Commands.Jupyter.StartKernelForKernelSpeck, this.startKernel.bind(this)));`
`30`	`30`	`}`
`31`	`31`	`public dispose() {`
	`32`	`+ this.removeAllListeners();`
`32`	`33`	`this._runningKernels.forEach(kernel => {`
`33`	`34`	`kernel.dispose();`
`34`	`35`	`});`