maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

re #127483.

Browse source
This commit is contained in:
rebornix 2021-06-30 22:10:55 -07:00
parent 0dad63a8ba
commit 7d7ab1a144
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/vs/workbench/contrib/notebook/browser/notebookDiffEditorInput.ts
View file

@ -43,6 +43,8 @@ export class NotebookDiffEditorInput extends DiffEditorInput {
return this.viewType;
}
private _cachedModel: NotebookDiffEditorModel | undefined = undefined;
constructor(
name: string | undefined,
description: string | undefined,
@ -68,14 +70,12 @@ export class NotebookDiffEditorInput extends DiffEditorInput {
}
override async resolve(): Promise<NotebookDiffEditorModel> {
const [originalEditorModel, modifiedEditorModel] = await Promise.all([
this.originalInput.resolve(),
this.modifiedInput.resolve(),
]);
this._originalTextModel?.dispose();
this._modifiedTextModel?.dispose();
this._cachedModel?.dispose();
// TODO@rebornix check how we restore the editor in text diff editor
if (!modifiedEditorModel) {
@ -88,7 +88,8 @@ export class NotebookDiffEditorInput extends DiffEditorInput {
this._originalTextModel = originalEditorModel;
this._modifiedTextModel = modifiedEditorModel;
return new NotebookDiffEditorModel(this._originalTextModel, this._modifiedTextModel);
this._cachedModel = new NotebookDiffEditorModel(this._originalTextModel, this._modifiedTextModel);
return this._cachedModel;
}
override toUntyped(group: GroupIdentifier | undefined, context: UntypedEditorContext): IResourceDiffEditorInput {