💄

jrieken · jrieken · commit 523034152d5b · 2020-08-31T16:45:02.000+02:00
diff --git a/src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts b/src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts
@@ -121,7 +121,7 @@ export class NotebookEditorModel extends EditorModel implements IWorkingCopy, IN
 
 	async load(options?: INotebookLoadOptions): Promise<NotebookEditorModel> {
 		if (options?.forceReadFromDisk) {
-			return this.loadFromProvider(true, undefined, undefined);
+			return this._loadFromProvider(true, undefined, undefined);
 		}
 
 		if (this.isResolved()) {
@@ -134,10 +134,10 @@ export class NotebookEditorModel extends EditorModel implements IWorkingCopy, IN
 			return this; // Make sure meanwhile someone else did not succeed in loading
 		}
 
-		return this.loadFromProvider(false, options?.editorId, backup?.meta?.backupId);
+		return this._loadFromProvider(false, options?.editorId, backup?.meta?.backupId);
 	}
 
-	private async loadFromProvider(forceReloadFromDisk: boolean, editorId: string | undefined, backupId: string | undefined) {
+	private async _loadFromProvider(forceReloadFromDisk: boolean, editorId: string | undefined, backupId: string | undefined) {
 		const notebook = await this._notebookService.resolveNotebook(this.viewType!, this.resource, forceReloadFromDisk, editorId, backupId);
 		this._notebook = notebook!;
 		const newStats = await this._resolveStats(this.resource);
@@ -254,10 +254,5 @@ export class NotebookEditorModel extends EditorModel implements IWorkingCopy, IN
 		} catch (e) {
 			return undefined;
 		}
-
-	}
-
-	dispose() {
-		super.dispose();
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ export class NotebookEditorModel extends EditorModel implements IWorkingCopy, IN`
`121`	`121`
`122`	`122`	`async load(options?: INotebookLoadOptions): Promise<NotebookEditorModel> {`
`123`	`123`	`if (options?.forceReadFromDisk) {`
`124`		`- return this.loadFromProvider(true, undefined, undefined);`
	`124`	`+ return this._loadFromProvider(true, undefined, undefined);`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`if (this.isResolved()) {`
`@@ -134,10 +134,10 @@ export class NotebookEditorModel extends EditorModel implements IWorkingCopy, IN`
`134`	`134`	`return this; // Make sure meanwhile someone else did not succeed in loading`
`135`	`135`	`}`
`136`	`136`
`137`		`- return this.loadFromProvider(false, options?.editorId, backup?.meta?.backupId);`
	`137`	`+ return this._loadFromProvider(false, options?.editorId, backup?.meta?.backupId);`
`138`	`138`	`}`
`139`	`139`
`140`		`- private async loadFromProvider(forceReloadFromDisk: boolean, editorId: string \| undefined, backupId: string \| undefined) {`
	`140`	`+ private async _loadFromProvider(forceReloadFromDisk: boolean, editorId: string \| undefined, backupId: string \| undefined) {`
`141`	`141`	`const notebook = await this._notebookService.resolveNotebook(this.viewType!, this.resource, forceReloadFromDisk, editorId, backupId);`
`142`	`142`	`this._notebook = notebook!;`
`143`	`143`	`const newStats = await this._resolveStats(this.resource);`
`@@ -254,10 +254,5 @@ export class NotebookEditorModel extends EditorModel implements IWorkingCopy, IN`
`254`	`254`	`} catch (e) {`
`255`	`255`	`return undefined;`
`256`	`256`	`}`
`257`		`-`
`258`		`- }`
`259`		`-`
`260`		`- dispose() {`
`261`		`- super.dispose();`
`262`	`257`	`}`
`263`	`258`	`}`