getActiveInteractiveWindow to getActiveOrAssociatedInteractiveWindow (#…

…10160) * getActiveOrAssociatedInteractiveWindow * fix prettier
microsoft · Jun 3, 2022 · 453f25d · 453f25d
1 parent 8de113e
commit 453f25d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/src/interactive-window/commands/exportCommands.ts b/src/interactive-window/commands/exportCommands.ts
@@ -95,7 +95,7 @@ export class ExportCommands implements IExportCommands, IDisposable {
             // so we need to get the active editor
             sourceDocument =
                 this.notebooks.activeNotebookEditor?.notebook ||
-                this.interactiveProvider?.getActiveInteractiveWindow()?.notebookDocument;
+                this.interactiveProvider?.getActiveOrAssociatedInteractiveWindow()?.notebookDocument;
             if (!sourceDocument) {
                 traceInfo('Export called without a valid exportable document active');
                 return;

diff --git a/src/interactive-window/interactiveWindowCommandListener.ts b/src/interactive-window/interactiveWindowCommandListener.ts
@@ -445,7 +445,7 @@ export class InteractiveWindowCommandListener implements IDataScienceCommandList
     }
 
     private async removeCellInInteractiveWindow(context?: NotebookCell) {
-        const interactiveWindow = this.interactiveWindowProvider.getActiveInteractiveWindow();
+        const interactiveWindow = this.interactiveWindowProvider.getActiveOrAssociatedInteractiveWindow();
         const ranges =
             context === undefined
                 ? interactiveWindow?.notebookEditor?.selections
@@ -496,7 +496,7 @@ export class InteractiveWindowCommandListener implements IDataScienceCommandList
                 (w) => w.notebookUri?.toString() === notebookUri.toString()
             );
         } else {
-            targetInteractiveWindow = this.interactiveWindowProvider.getActiveInteractiveWindow();
+            targetInteractiveWindow = this.interactiveWindowProvider.getActiveOrAssociatedInteractiveWindow();
         }
         return targetInteractiveWindow;
     }

diff --git a/src/interactive-window/interactiveWindowProvider.ts b/src/interactive-window/interactiveWindowProvider.ts
@@ -322,7 +322,7 @@ export class InteractiveWindowProvider
         this.raiseOnDidChangeActiveInteractiveWindow();
     }
 
-    public getActiveInteractiveWindow(): IInteractiveWindow | undefined {
+    public getActiveOrAssociatedInteractiveWindow(): IInteractiveWindow | undefined {
         if (this.activeWindow) {
             return this.activeWindow;
         }
@@ -339,7 +339,9 @@ export class InteractiveWindowProvider
         const targetInteractiveNotebookEditor =
             resource && getResourceType(resource) === 'interactive' ? this.get(resource)?.notebookEditor : undefined;
         const activeInteractiveNotebookEditor =
-            getResourceType(resource) === 'interactive' ? this.getActiveInteractiveWindow()?.notebookEditor : undefined;
+            getResourceType(resource) === 'interactive'
+                ? this.getActiveOrAssociatedInteractiveWindow()?.notebookEditor
+                : undefined;
 
         return targetInteractiveNotebookEditor || activeInteractiveNotebookEditor;
     }

diff --git a/src/interactive-window/types.ts b/src/interactive-window/types.ts
@@ -46,7 +46,10 @@ export interface IInteractiveWindowProvider {
      * @param owner The URI of a text document which may be associated with an interactive window.
      */
     get(owner: Uri): IInteractiveWindow | undefined;
-    getActiveInteractiveWindow(): IInteractiveWindow | undefined;
+    /**
+     * The active interactive window if it has the focus, or the interactive window associated with current active text editor
+     */
+    getActiveOrAssociatedInteractiveWindow(): IInteractiveWindow | undefined;
 }
 
 export interface IInteractiveBase extends Disposable {

diff --git a/src/platform/common/activeEditorContext.ts b/src/platform/common/activeEditorContext.ts
@@ -188,15 +188,15 @@ export class ActiveEditorContextService implements IExtensionSingleActivationSer
     private updateSelectedKernelContext() {
         const document =
             this.vscNotebook.activeNotebookEditor?.notebook ||
-            this.interactiveProvider?.getActiveInteractiveWindow()?.notebookEditor?.notebook;
+            this.interactiveProvider?.getActiveOrAssociatedInteractiveWindow()?.notebookEditor?.notebook;
         if (document && isJupyterNotebook(document) && this.controllers.getSelectedNotebookController(document)) {
             this.isJupyterKernelSelected.set(true).catch(noop);
         } else {
             this.isJupyterKernelSelected.set(false).catch(noop);
         }
     }
     private updateContextOfActiveInteractiveWindowKernel() {
-        const notebook = this.interactiveProvider?.getActiveInteractiveWindow()?.notebookEditor?.notebook;
+        const notebook = this.interactiveProvider?.getActiveOrAssociatedInteractiveWindow()?.notebookEditor?.notebook;
         const kernel = notebook ? this.kernelProvider.get(notebook.uri) : undefined;
         if (kernel) {
             const canStart = kernel.status !== 'unknown';

diff --git a/src/webviews/extension-side/variablesView/notebookWatcher.ts b/src/webviews/extension-side/variablesView/notebookWatcher.ts
@@ -111,7 +111,7 @@ export class NotebookWatcher implements INotebookWatcher {
         );
     }
     private getActiveInteractiveWindowDocument() {
-        const interactiveWindow = this.interactiveWindowProvider.getActiveInteractiveWindow();
+        const interactiveWindow = this.interactiveWindowProvider.getActiveOrAssociatedInteractiveWindow();
         if (!interactiveWindow) {
             return;
         }