Support for selecting different kernels

DonJayamanne · DonJayamanne · commit 3c798a20d2cc · 2016-09-23T10:09:19.000+10:00
diff --git a/src/client/common/constants.ts b/src/client/common/constants.ts
@@ -24,6 +24,7 @@ export namespace Commands {
         export const Get_All_KernelSpecs = 'jupyter:getAllKernelSpecs';
         export const Select_Kernel = 'jupyter:selectKernel';
         export const Kernel_Options = 'jupyter:kernelOptions';
+        export const StartKernelForKernelSpeck = 'jupyter:sartKernelForKernelSpecs';
         export const ExecuteRangeInKernel = 'jupyter:execRangeInKernel';
         export const ExecuteSelectionOrLineInKernel = 'jupyter.runSelectionLine';
         export namespace Cell {
diff --git a/src/client/jupyter/display/kernelPicker.ts b/src/client/jupyter/display/kernelPicker.ts
@@ -24,7 +24,11 @@ export class KernelPicker extends vscode.Disposable {
                 if (kernelSpecs.length === 0) {
                     return resolve();
                 }
-                this.displayKernelPicker(kernelSpecs).then(resolve);
+                this.displayKernelPicker(kernelSpecs).then((kernelSpec: KernelspecMetadata) => {
+                    if (kernelSpec) {
+                        vscode.commands.executeCommand(Commands.Jupyter.StartKernelForKernelSpeck, kernelSpec, kernelSpec.language);
+                    }
+                });
             });
         });
     }
diff --git a/src/client/jupyter/kernel-manager.ts b/src/client/jupyter/kernel-manager.ts
@@ -9,13 +9,14 @@ import {ZMQKernel} from './zmq-kernel';
 import {launchSpec} from 'spawnteract';
 import {KernelspecMetadata, Kernelspec} from './contracts';
 import {Commands} from '../common/constants';
+import {EventEmitter} from 'events';
 
-export class KernelManagerImpl extends vscode.Disposable {
+export class KernelManagerImpl extends EventEmitter {
     private _runningKernels: Map<string, Kernel>;
     private _kernelSpecs: { [key: string]: Kernelspec };
     private disposables: vscode.Disposable[];
     constructor(private outputChannel: vscode.OutputChannel) {
-        super(() => { });
+        super();
         this.disposables = [];
         this._runningKernels = new Map<string, Kernel>();
         this._kernelSpecs = this.getKernelSpecsFromSettings();
@@ -24,6 +25,7 @@ export class KernelManagerImpl extends vscode.Disposable {
 
     private registerCommands() {
         this.disposables.push(vscode.commands.registerCommand(Commands.Jupyter.Get_All_KernelSpecs_For_Language, this.getAllKernelSpecsFor.bind(this)));
+        this.disposables.push(vscode.commands.registerCommand(Commands.Jupyter.StartKernelForKernelSpeck, this.startKernel.bind(this)));
     }
     public dispose() {
         this._runningKernels.forEach(kernel => {
@@ -35,6 +37,7 @@ export class KernelManagerImpl extends vscode.Disposable {
     public setRunningKernelFor(language: string, kernel: Kernel) {
         kernel.kernelSpec.language = language;
         this._runningKernels.set(language, kernel);
+        this.emit('kernelChanged', kernel, language);
         return kernel;
     }
 
@@ -114,10 +117,11 @@ export class KernelManagerImpl extends vscode.Disposable {
     }
 
     public startKernel(kernelSpec: KernelspecMetadata, language: string): Promise<Kernel> {
-        // console.log('KernelManager: startKernelFor:', language);
-        const projectPath = path.dirname(vscode.window.activeTextEditor.document.fileName);
+        this.destroyRunningKernelFor(language);
+        // This doesn't always work
+        // const projectPath = path.dirname(vscode.window.activeTextEditor.document.fileName);
         const spawnOptions = {
-            cwd: projectPath
+            cwd: vscode.workspace.rootPath
         };
         return launchSpec(kernelSpec, spawnOptions).then(result => {
             const kernel = new ZMQKernel(kernelSpec, language, result.config, result.connectionFile, result.spawn);
diff --git a/src/client/jupyter/main.ts b/src/client/jupyter/main.ts
@@ -35,6 +35,13 @@ export class Jupyter extends vscode.Disposable {
         this.disposables.push(this.status);
         this.display = new JupyterDisplay(codeLensProvider, highlightProvider);
         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 dispose() {
         this.disposables.forEach(d => d.dispose());

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,11 @@ export class KernelPicker extends vscode.Disposable {`
`24`	`24`	`if (kernelSpecs.length === 0) {`
`25`	`25`	`return resolve();`
`26`	`26`	`}`
`27`		`- this.displayKernelPicker(kernelSpecs).then(resolve);`
	`27`	`+ this.displayKernelPicker(kernelSpecs).then((kernelSpec: KernelspecMetadata) => {`
	`28`	`+ if (kernelSpec) {`
	`29`	`+ vscode.commands.executeCommand(Commands.Jupyter.StartKernelForKernelSpeck, kernelSpec, kernelSpec.language);`
	`30`	`+ }`
	`31`	`+ });`
`28`	`32`	`});`
`29`	`33`	`});`
`30`	`34`	`}`