fix microsoft#135097.

Author: rebornix

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

@@ -7,7 +7,7 @@ import { localize } from 'vs/nls';
 import { VSBuffer } from 'vs/base/common/buffer';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Disposable } from 'vs/base/common/lifecycle';
+import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
 import { parse } from 'vs/base/common/marshalling';
 import { assertType } from 'vs/base/common/types';
 import { URI } from 'vs/base/common/uri';
@@ -52,6 +52,9 @@ import { peekViewBorder /*, peekViewEditorBackground, peekViewResultsBackground
 import * as icons from 'vs/workbench/contrib/notebook/browser/notebookIcons';
 import { isFalsyOrWhitespace } from 'vs/base/common/strings';
 import { EditOperation } from 'vs/editor/common/core/editOperation';
+import { ITextModelContentProvider, ITextModelService } from 'vs/editor/common/services/resolverService';
+import { ITextModel } from 'vs/editor/common/model';
+import { IModelService } from 'vs/editor/common/services/modelService';
 
 
 Registry.as<IEditorPaneRegistry>(EditorExtensions.EditorPane).registerEditorPane(
@@ -218,8 +221,35 @@ export class InteractiveDocumentContribution extends Disposable implements IWork
 	}
 }
 
+class InteractiveInputContentProvider implements ITextModelContentProvider {
+
+	private readonly _registration: IDisposable;
+
+	constructor(
+		@ITextModelService textModelService: ITextModelService,
+		@IModelService private readonly _modelService: IModelService,
+	) {
+		this._registration = textModelService.registerTextModelContentProvider(Schemas.vscodeInteractiveInput, this);
+	}
+
+	dispose(): void {
+		this._registration.dispose();
+	}
+
+	async provideTextContent(resource: URI): Promise<ITextModel | null> {
+		const existing = this._modelService.getModel(resource);
+		if (existing) {
+			return existing;
+		}
+		let result: ITextModel | null = this._modelService.createModel('', null, resource, false);
+		return result;
+	}
+}
+
+
 const workbenchContributionsRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
 workbenchContributionsRegistry.registerWorkbenchContribution(InteractiveDocumentContribution, LifecyclePhase.Starting);
+workbenchContributionsRegistry.registerWorkbenchContribution(InteractiveInputContentProvider, LifecyclePhase.Starting);
 
 export class InteractiveEditorSerializer implements IEditorSerializer {
 	canSerialize(): boolean {

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

@@ -330,7 +330,7 @@ export class InteractiveEditor extends EditorPane {
 			}
 		}));
 
-		const editorModel = input.resolveInput(this.#notebookWidget.value?.activeKernel?.supportedLanguages[0] ?? 'plaintext');
+		const editorModel = await input.resolveInput(this.#notebookWidget.value?.activeKernel?.supportedLanguages[0] ?? 'plaintext');
 		this.#codeEditorWidget.setModel(editorModel);
 		this.#widgetDisposableStore.add(this.#codeEditorWidget.onDidFocusEditorWidget(() => this.#onDidFocusWidget.fire()));
 		this.#widgetDisposableStore.add(this.#codeEditorWidget.onDidContentSizeChange(e => {

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

@@ -4,11 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Event } from 'vs/base/common/event';
+import { IReference } from 'vs/base/common/lifecycle';
 import * as paths from 'vs/base/common/path';
 import { isEqual } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
-import { ITextModel } from 'vs/editor/common/model';
 import { IModelService } from 'vs/editor/common/services/modelService';
+import { IResolvedTextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IUntypedEditorInput } from 'vs/workbench/common/editor';
 import { EditorInput } from 'vs/workbench/common/editor/editorInput';
@@ -54,16 +55,12 @@ export class InteractiveEditorInput extends EditorInput implements ICompositeNot
 	private _inputResolver: Promise<IResolvedNotebookEditorModel | null> | null;
 	private _editorModelReference: IResolvedNotebookEditorModel | null;
 
-	private _inputModel: ITextModel | null;
-
-	get inputModel() {
-		return this._inputModel;
-	}
+	private _inputModelRef: IReference<IResolvedTextEditorModel> | null;
 
 	get primary(): EditorInput {
 		return this._notebookEditorInput;
 	}
-	private _modelService: IModelService;
+	private _textModelService: ITextModelService;
 	private _interactiveDocumentService: IInteractiveDocumentService;
 
 
@@ -73,6 +70,8 @@ export class InteractiveEditorInput extends EditorInput implements ICompositeNot
 		title: string | undefined,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IModelService modelService: IModelService,
+		@ITextModelService textModelService: ITextModelService,
+
 		@IInteractiveDocumentService interactiveDocumentService: IInteractiveDocumentService
 	) {
 		const input = NotebookEditorInput.create(instantiationService, resource, 'interactive', {});
@@ -83,8 +82,8 @@ export class InteractiveEditorInput extends EditorInput implements ICompositeNot
 		this._inputResource = inputResource;
 		this._inputResolver = null;
 		this._editorModelReference = null;
-		this._inputModel = null;
-		this._modelService = modelService;
+		this._inputModelRef = null;
+		this._textModelService = textModelService;
 		this._interactiveDocumentService = interactiveDocumentService;
 
 		this._registerListeners();
@@ -131,14 +130,15 @@ export class InteractiveEditorInput extends EditorInput implements ICompositeNot
 		return this._inputResolver;
 	}
 
-	resolveInput(language: string) {
-		if (this._inputModel) {
-			return this._inputModel;
+	async resolveInput(language: string) {
+		if (this._inputModelRef) {
+			return this._inputModelRef.object.textEditorModel;
 		}
 
 		this._interactiveDocumentService.willCreateInteractiveDocument(this.resource!, this.inputResource, language);
-		this._inputModel = this._modelService.createModel('', null, this.inputResource, false);
-		return this._inputModel;
+		this._inputModelRef = await this._textModelService.createModelReference(this.inputResource);
+
+		return this._inputModelRef.object.textEditorModel;
 	}
 
 	override matches(otherInput: EditorInput | IUntypedEditorInput): boolean {
@@ -170,8 +170,8 @@ export class InteractiveEditorInput extends EditorInput implements ICompositeNot
 		this._editorModelReference?.dispose();
 		this._editorModelReference = null;
 		this._interactiveDocumentService.willRemoveInteractiveDocument(this.resource!, this.inputResource);
-		this._inputModel?.dispose();
-		this._inputModel = null;
+		this._inputModelRef?.dispose();
+		this._inputModelRef = null;
 		super.dispose();
 	}
 }