fix test - do not overwrite interactive Editor with a notebook editor

Author: amunger

extensions/vscode-api-tests/src/singlefolder-tests/interactiveWindow.test.ts

@@ -73,7 +73,7 @@ async function addCellAndRun(code: string, notebook: vscode.NotebookDocument) {
 		await saveAllFilesAndCloseAll();
 	});
 
-	test.skip('Can open an interactive window and execute from input box', async () => {
+	test('Can open an interactive window and execute from input box', async () => {
 		assert.ok(vscode.workspace.workspaceFolders);
 		const { notebookEditor, inputUri } = await createInteractiveWindow(defaultKernel);
 
@@ -89,7 +89,7 @@ async function addCellAndRun(code: string, notebook: vscode.NotebookDocument) {
 		assert.strictEqual(notebookEditor.notebook.cellAt(0).kind, vscode.NotebookCellKind.Code);
 	});
 
-	test.skip('Interactive window scrolls after execute', async () => {
+	test('Interactive window scrolls after execute', async () => {
 		assert.ok(vscode.workspace.workspaceFolders);
 		const { notebookEditor } = await createInteractiveWindow(defaultKernel);
 
@@ -103,7 +103,7 @@ async function addCellAndRun(code: string, notebook: vscode.NotebookDocument) {
 
 	});
 
-	test.skip('Interactive window has the correct kernel', async () => {
+	test('Interactive window has the correct kernel', async () => {
 		assert.ok(vscode.workspace.workspaceFolders);
 		await createInteractiveWindow(defaultKernel);
 

src/vs/workbench/contrib/interactive/browser/interactive.contribution.ts

@@ -96,7 +96,8 @@ export class InteractiveDocumentContribution extends Disposable implements IWork
 				providerDisplayName: 'Interactive Notebook',
 				displayName: 'Interactive',
 				filenamePattern: ['*.interactive'],
-				exclusive: true
+				exclusive: true,
+				externalEditor: true
 			}));
 		}
 

src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.ts

@@ -278,8 +278,12 @@ export class NotebookProviderInfoStore extends Disposable {
 			throw new Error(`notebook type '${info.id}' ALREADY EXISTS`);
 		}
 		this._contributedEditors.set(info.id, info);
-		const editorRegistration = this._registerContributionPoint(info);
-		this._contributedEditorDisposables.add(editorRegistration);
+		let editorRegistration: IDisposable | undefined;
+		// Don't overwrite editor contributions if they come from elsewhere
+		if (!info.externalEditor) {
+			editorRegistration = this._registerContributionPoint(info);
+			this._contributedEditorDisposables.add(editorRegistration);
+		}
 
 		const mementoObject = this._memento.getMemento(StorageScope.PROFILE, StorageTarget.MACHINE);
 		mementoObject[NotebookProviderInfoStore.CUSTOM_EDITORS_ENTRY_ID] = Array.from(this._contributedEditors.values());
@@ -289,7 +293,7 @@ export class NotebookProviderInfoStore extends Disposable {
 			const mementoObject = this._memento.getMemento(StorageScope.PROFILE, StorageTarget.MACHINE);
 			mementoObject[NotebookProviderInfoStore.CUSTOM_EDITORS_ENTRY_ID] = Array.from(this._contributedEditors.values());
 			this._memento.saveMemento();
-			editorRegistration.dispose();
+			editorRegistration?.dispose();
 			this._contributedEditors.delete(info.id);
 		});
 	}
@@ -637,6 +641,7 @@ export class NotebookService extends Disposable implements INotebookService {
 			exclusive: data.exclusive,
 			priority: RegisteredEditorPriority.default,
 			selectors: [],
+			externalEditor: !!data.externalEditor
 		});
 
 		info.update({ selectors: data.filenamePattern });

src/vs/workbench/contrib/notebook/common/notebookCommon.ts

@@ -533,6 +533,8 @@ export interface INotebookContributionData {
 	displayName: string;
 	filenamePattern: (string | glob.IRelativePattern | INotebookExclusiveDocumentFilter)[];
 	exclusive: boolean;
+	/// Editor contribution is handled elswhere e.g. interactive
+	externalEditor?: boolean;
 }
 
 

src/vs/workbench/contrib/notebook/common/notebookProvider.ts

@@ -20,6 +20,7 @@ export interface NotebookEditorDescriptor {
 	readonly priority: RegisteredEditorPriority;
 	readonly providerDisplayName: string;
 	readonly exclusive: boolean;
+	readonly externalEditor?: boolean;
 }
 
 export class NotebookProviderInfo {
@@ -30,6 +31,7 @@ export class NotebookProviderInfo {
 	readonly priority: RegisteredEditorPriority;
 	readonly providerDisplayName: string;
 	readonly exclusive: boolean;
+	readonly externalEditor: boolean;
 
 	private _selectors: NotebookSelector[];
 	get selectors() {
@@ -57,6 +59,7 @@ export class NotebookProviderInfo {
 			transientOutputs: false,
 			cellContentMetadata: {}
 		};
+		this.externalEditor = !!descriptor.externalEditor;
 	}
 
 	update(args: { selectors?: NotebookSelector[]; options?: TransientOptions }) {