Command to select a kernel for a Notebook (#9988)

For #9228

Author: DonJayamanne

news/1 Enhancements/9228.md

@@ -0,0 +1 @@
+Added a command to allow users to select a kernel for a `Notebook`.

package.json

@@ -581,6 +581,12 @@
                 "command": "python.analysis.clearCache",
                 "title": "%python.command.python.analysis.clearCache.title%",
                 "category": "Python"
+            },
+            {
+                "command": "python.datascience.switchKernel",
+                "title": "%DataScience.selectKernel%",
+                "category": "Python",
+                "enablement": "python.datascience.isnativeactive"
             }
         ],
         "menus": {
@@ -1011,6 +1017,12 @@
                     "command": "python.datascience.execSelectionInteractive",
                     "category": "Python",
                     "when": "editorFocus && editorLangId == python && python.datascience.featureenabled && python.datascience.ownsSelection"
+                },
+                {
+                    "command": "python.datascience.switchKernel",
+                    "title": "%DataScience.selectKernel%",
+                    "category": "Python",
+                    "when": "python.datascience.isnativeactive"
                 }
             ],
             "view/title": [

src/client/datascience/interactive-ipynb/nativeEditor.ts

@@ -479,8 +479,8 @@ export class NativeEditor extends InteractiveBase implements INotebookEditor {
         // time state changes. We use this opportunity to update our
         // extension contexts
         if (this.commandManager && this.commandManager.executeCommand) {
-            const interactiveContext = new ContextKey(EditorContexts.HaveNative, this.commandManager);
-            interactiveContext.set(!this.isDisposed).catch();
+            const nativeContext = new ContextKey(EditorContexts.HaveNative, this.commandManager);
+            nativeContext.set(!this.isDisposed).catch();
             const interactiveCellsContext = new ContextKey(EditorContexts.HaveNativeCells, this.commandManager);
             const redoableContext = new ContextKey(EditorContexts.HaveNativeRedoableCells, this.commandManager);
             const hasCellSelectedContext = new ContextKey(EditorContexts.HaveCellSelected, this.commandManager);
@@ -500,8 +500,8 @@ export class NativeEditor extends InteractiveBase implements INotebookEditor {
         super.onViewStateChanged(args);
 
         // Update our contexts
-        const interactiveContext = new ContextKey(EditorContexts.HaveNative, this.commandManager);
-        interactiveContext.set(args.current.visible && args.current.active).catch();
+        const nativeContext = new ContextKey(EditorContexts.HaveNative, this.commandManager);
+        nativeContext.set(args.current.visible && args.current.active).catch();
         this._onDidChangeViewState.fire();
     }
 

src/client/datascience/interactive-ipynb/nativeEditorProvider.ts

@@ -103,7 +103,7 @@ export class NativeEditorProvider implements INotebookEditorProvider, IAsyncDisp
             editor = await this.create(file, contents);
             this.onOpenedEditor(editor);
         } else {
-            await editor.show();
+            await this.showEditor(editor);
         }
         return editor;
     }
@@ -112,7 +112,7 @@ export class NativeEditorProvider implements INotebookEditorProvider, IAsyncDisp
         // See if this file is open or not already
         const editor = this.activeEditors.get(file.fsPath);
         if (editor) {
-            await editor.show();
+            await this.showEditor(editor);
         }
         return editor;
     }
@@ -161,17 +161,23 @@ export class NativeEditorProvider implements INotebookEditorProvider, IAsyncDisp
         this.openNotebookAndCloseEditor(editor.document, true).ignoreErrors();
     }
 
+    private async showEditor(editor: INotebookEditor) {
+        await editor.show();
+        this._onDidChangeActiveNotebookEditor.fire(this.activeEditor);
+    }
+
     private async create(file: Uri, contents: string): Promise<INotebookEditor> {
         const editor = this.serviceContainer.get<INotebookEditor>(INotebookEditor);
         await editor.load(contents, file);
         this.disposables.push(editor.closed(this.onClosedEditor.bind(this)));
         this.disposables.push(editor.executed(this.onExecutedEditor.bind(this)));
-        await editor.show();
+        await this.showEditor(editor);
         return editor;
     }
 
     private onClosedEditor(e: INotebookEditor) {
         this.activeEditors.delete(e.file.fsPath);
+        this._onDidChangeActiveNotebookEditor.fire(this.activeEditor);
     }
 
     private onExecutedEditor(e: INotebookEditor) {
@@ -183,6 +189,7 @@ export class NativeEditorProvider implements INotebookEditorProvider, IAsyncDisp
         this.disposables.push(e.saved(this.onSavedEditor.bind(this, e.file.fsPath)));
         this.openedNotebookCount += 1;
         this._onDidOpenNotebookEditor.fire(e);
+        this._onDidChangeActiveNotebookEditor.fire(this.activeEditor);
         this.disposables.push(e.onDidChangeViewState(this.onDidChangeViewState, this));
     }
     private onDidChangeViewState() {