avoid conflict between new and legacy kernel

rebornix · rebornix · commit be44e409b229 · 2020-07-16T09:55:05.000-07:00
diff --git a/extensions/vscode-notebook-tests/src/notebook.test.ts b/extensions/vscode-notebook-tests/src/notebook.test.ts
@@ -125,7 +125,7 @@ suite('Notebook API tests', () => {
 		await firstEditorClose;
 	});
 
-	test('editor open/close event', async function () {
+	test('editor open/close event 2', async function () {
 		const resource = vscode.Uri.file(join(vscode.workspace.rootPath || '', './first.vsctestnb'));
 		let count = 0;
 		const disposables: vscode.Disposable[] = [];
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
@@ -1151,8 +1151,8 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 
 				if (this._activeKernel) {
 					// TODO@rebornix temp any cast, should be removed once we remove legacy kernel support
-					if ((this._activeKernel as any).executeNotebook) {
-						await (this._activeKernel as INotebookKernelInfo2).executeNotebook(this._notebookViewModel!.uri, undefined, tokenSource.token);
+					if ((this._activeKernel as INotebookKernelInfo2).executeNotebookCell) {
+						await (this._activeKernel as INotebookKernelInfo2).executeNotebookCell!(this._notebookViewModel!.uri, undefined, tokenSource.token);
 					} else {
 						await this.notebookService.executeNotebook2(this._notebookViewModel!.viewType, this._notebookViewModel!.uri, this._activeKernel.id, tokenSource.token);
 					}
@@ -1206,8 +1206,8 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 
 				if (this._activeKernel) {
 					// TODO@rebornix temp any cast, should be removed once we remove legacy kernel support
-					if ((this._activeKernel as any).executeNotebook) {
-						await (this._activeKernel as INotebookKernelInfo2).executeNotebook(this._notebookViewModel!.uri, cell.handle, tokenSource.token);
+					if ((this._activeKernel as INotebookKernelInfo2).executeNotebookCell) {
+						await (this._activeKernel as INotebookKernelInfo2).executeNotebookCell!(this._notebookViewModel!.uri, cell.handle, tokenSource.token);
 					} else {
 
 						return await this.notebookService.executeNotebookCell2(viewType, notebookUri, cell.handle, this._activeKernel.id, tokenSource.token);
diff --git a/src/vs/workbench/contrib/notebook/common/notebookCommon.ts b/src/vs/workbench/contrib/notebook/common/notebookCommon.ts
@@ -648,7 +648,7 @@ export interface INotebookKernelInfoDto2 {
 
 export interface INotebookKernelInfo2 extends INotebookKernelInfoDto2 {
 	resolve(uri: URI, editorId: string): Promise<void>;
-	executeNotebook(uri: URI, handle: number | undefined, token: CancellationToken): Promise<void>;
+	executeNotebookCell?(uri: URI, handle: number | undefined, token: CancellationToken): Promise<void>;
 }
 
 export interface INotebookKernelProvider {

Original file line number	Diff line number	Diff line change
`@@ -648,7 +648,7 @@ export interface INotebookKernelInfoDto2 {`
`648`	`648`
`649`	`649`	`export interface INotebookKernelInfo2 extends INotebookKernelInfoDto2 {`
`650`	`650`	`resolve(uri: URI, editorId: string): Promise<void>;`
`651`		`- executeNotebook(uri: URI, handle: number \| undefined, token: CancellationToken): Promise<void>;`
	`651`	`+ executeNotebookCell?(uri: URI, handle: number \| undefined, token: CancellationToken): Promise<void>;`
`652`	`652`	`}`
`653`	`653`
`654`	`654`	`export interface INotebookKernelProvider {`