model - add a isDisposed method to generic editor models

Benjamin Pasero · Benjamin Pasero · commit 17c1929af632 · 2020-09-02T16:09:09.000+02:00
diff --git a/src/vs/editor/standalone/browser/simpleServices.ts b/src/vs/editor/standalone/browser/simpleServices.ts
@@ -78,10 +78,17 @@ export class SimpleModel implements IResolvedTextEditorModel {
 		return false;
 	}
 
+	private disposed = false;
 	public dispose(): void {
+		this.disposed = true;
+
 		this._onDispose.fire();
 	}
 
+	public isDisposed(): boolean {
+		return this.disposed;
+	}
+
 	public isResolved(): boolean {
 		return true;
 	}
diff --git a/src/vs/platform/editor/common/editor.ts b/src/vs/platform/editor/common/editor.ts
@@ -18,6 +18,11 @@ export interface IEditorModel {
 	 */
 	load(): Promise<IEditorModel>;
 
+	/**
+	 * Find out if this model has been disposed.
+	 */
+	isDisposed(): boolean;
+
 	/**
 	 * Dispose associated resources
 	 */
diff --git a/src/vs/workbench/common/editor.ts b/src/vs/workbench/common/editor.ts
@@ -819,6 +819,8 @@ export class EditorModel extends Disposable implements IEditorModel {
 	private readonly _onDispose = this._register(new Emitter<void>());
 	readonly onDispose = this._onDispose.event;
 
+	private disposed = false;
+
 	/**
 	 * Causes this model to load returning a promise when loading is completed.
 	 */
@@ -833,10 +835,15 @@ export class EditorModel extends Disposable implements IEditorModel {
 		return true;
 	}
 
+	isDisposed(): boolean {
+		return this.disposed;
+	}
+
 	/**
 	 * Subclasses should implement to free resources that have been claimed through loading.
 	 */
 	dispose(): void {
+		this.disposed = true;
 		this._onDispose.fire();
 
 		super.dispose();
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
@@ -86,7 +86,6 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 	private inConflictMode = false;
 	private inOrphanMode = false;
 	private inErrorMode = false;
-	private disposed = false;
 
 	constructor(
 		public readonly resource: URI,
@@ -147,15 +146,15 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 				// file is really gone and not just a faulty file event.
 				await timeout(100);
 
-				if (this.disposed) {
+				if (this.isDisposed()) {
 					newInOrphanModeValidated = true;
 				} else {
 					const exists = await this.fileService.exists(this.resource);
 					newInOrphanModeValidated = !exists;
 				}
 			}
 
-			if (this.inOrphanMode !== newInOrphanModeValidated && !this.disposed) {
+			if (this.inOrphanMode !== newInOrphanModeValidated && !this.isDisposed()) {
 				this.setOrphaned(newInOrphanModeValidated);
 			}
 		}
@@ -697,7 +696,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 			// one after the other without waiting for the save() to complete. If we are disposed(), we risk
 			// saving contents to disk that are stale (see https://github.com/Microsoft/vscode/issues/50942).
 			// To fix this issue, we will not store the contents to disk when we got disposed.
-			if (this.disposed) {
+			if (this.isDisposed()) {
 				return;
 			}
 
@@ -955,18 +954,13 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		return this.fileService.hasCapability(this.resource, FileSystemProviderCapabilities.Readonly);
 	}
 
-	isDisposed(): boolean {
-		return this.disposed;
-	}
-
 	getStat(): IFileStatWithMetadata | undefined {
 		return this.lastResolvedFileStat;
 	}
 
 	dispose(): void {
 		this.logService.trace('[text file model] dispose()', this.resource.toString(true));
 
-		this.disposed = true;
 		this.inConflictMode = false;
 		this.inOrphanMode = false;
 		this.inErrorMode = false;
diff --git a/src/vs/workbench/services/textfile/common/textfiles.ts b/src/vs/workbench/services/textfile/common/textfiles.ts
@@ -425,7 +425,6 @@ export interface ITextFileEditorModel extends ITextEditorModel, IEncodingSupport
 	getMode(): string | undefined;
 
 	isResolved(): this is IResolvedTextFileEditorModel;
-	isDisposed(): boolean;
 }
 
 export function isTextFileEditorModel(model: ITextEditorModel): model is ITextFileEditorModel {

Original file line number	Diff line number	Diff line change
`@@ -78,10 +78,17 @@ export class SimpleModel implements IResolvedTextEditorModel {`
`78`	`78`	`return false;`
`79`	`79`	`}`
`80`	`80`
	`81`	`+ private disposed = false;`
`81`	`82`	`public dispose(): void {`
	`83`	`+ this.disposed = true;`
	`84`	`+`
`82`	`85`	`this._onDispose.fire();`
`83`	`86`	`}`
`84`	`87`
	`88`	`+ public isDisposed(): boolean {`
	`89`	`+ return this.disposed;`
	`90`	`+ }`
	`91`	`+`
`85`	`92`	`public isResolved(): boolean {`
`86`	`93`	`return true;`
`87`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -425,7 +425,6 @@ export interface ITextFileEditorModel extends ITextEditorModel, IEncodingSupport`
`425`	`425`	`getMode(): string \| undefined;`
`426`	`426`
`427`	`427`	`isResolved(): this is IResolvedTextFileEditorModel;`
`428`		`- isDisposed(): boolean;`
`429`	`428`	`}`
`430`	`429`
`431`	`430`	`export function isTextFileEditorModel(model: ITextEditorModel): model is ITextFileEditorModel {`