Remove controllers from ThirdParty Kernels (#10884)

* Separate kernel providers * Fix tests * Fix tests * Misc * Remote notebook * Misc fixes * Misc * Misc
microsoft · Jul 21, 2022 · 545c0a7 · 545c0a7
1 parent 0b1ff9f
commit 545c0a7
Show file tree

Hide file tree

Showing 18 changed files with 505 additions and 437 deletions.
diff --git a/src/interactive-window/interactiveWindow.ts b/src/interactive-window/interactiveWindow.ts
@@ -257,10 +257,9 @@ export class InteractiveWindow implements IInteractiveWindowLoadable {
             // When connecting, we need to update the sys info message
             this.updateSysInfoMessage(this.getSysInfoMessage(metadata, SysInfoReason.Start), false, sysInfoCell);
             const kernel = await KernelConnector.connectToNotebookKernel(
-                controller,
                 metadata,
                 this.serviceContainer,
-                { resource: this.owner, notebook: this.notebookDocument },
+                { resource: this.owner, notebook: this.notebookDocument, controller },
                 new DisplayOptions(false),
                 this.internalDisposables,
                 'jupyterExtension',

diff --git a/src/kernels/errors/kernelErrorHandler.ts b/src/kernels/errors/kernelErrorHandler.ts
@@ -279,14 +279,15 @@ export abstract class DataScienceErrorHandler implements IDataScienceErrorHandle
                 err instanceof InvalidRemoteJupyterServerUriHandleError
                     ? this.extensions.getExtension(err.extensionId)?.packageJSON.displayName || err.extensionId
                     : '';
+            const options = actionSource === 'jupyterExtension' ? [DataScience.selectDifferentKernel()] : [];
             const selection = await this.applicationShell.showErrorMessage(
                 err instanceof InvalidRemoteJupyterServerUriHandleError
                     ? DataScience.remoteJupyterServerProvidedBy3rdPartyExtensionNoLongerValid().format(extensionName)
                     : DataScience.remoteJupyterConnectionFailedWithServer().format(serverName),
                 { detail: message, modal: true },
                 DataScience.removeRemoteJupyterConnectionButtonText(),
                 DataScience.changeRemoteJupyterConnectionButtonText(),
-                DataScience.selectDifferentKernel()
+                ...options
             );
             switch (selection) {
                 case DataScience.removeRemoteJupyterConnectionButtonText(): {

diff --git a/src/kernels/execution/kernelExecution.ts b/src/kernels/execution/kernelExecution.ts
diff --git a/src/kernels/helpers.ts b/src/kernels/helpers.ts
@@ -6,7 +6,7 @@ const NamedRegexp = require('named-js-regexp') as typeof import('named-js-regexp
 import * as path from '../platform/vscode-path/path';
 import * as uriPath from '../platform/vscode-path/resources';
 import * as nbformat from '@jupyterlab/nbformat';
-import type { KernelSpec } from '@jupyterlab/services';
+import type { Kernel, KernelSpec } from '@jupyterlab/services';
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 import cloneDeep = require('lodash/cloneDeep');
 import * as url from 'url-parse';
@@ -1452,7 +1452,7 @@ export type SilentExecutionErrorOptions = {
 };
 
 export async function executeSilently(
-    session: IKernelConnectionSession,
+    session: IKernelConnectionSession | Kernel.IKernelConnection,
     code: string,
     errorOptions?: SilentExecutionErrorOptions
 ): Promise<nbformat.IOutput[]> {