Editor inputs marked as deleted for virtual resources (fix microsoft#133947)

Author: bpasero

src/vs/workbench/services/textfile/browser/textFileService.ts

@@ -109,14 +109,20 @@ export abstract class AbstractTextFileService extends Disposable implements ITex
 					}
 				}));
 
+				// Removals: once a text file model is no longer
+				// under our control, make sure to signal this as
+				// decoration change because from this point on we
+				// have no way of updating the decoration anymore.
+				this._register(this.files.onDidRemove(modelUri => this._onDidChange.fire([modelUri])));
+
 				// Changes
 				this._register(this.files.onDidChangeReadonly(model => this._onDidChange.fire([model.resource])));
 				this._register(this.files.onDidChangeOrphaned(model => this._onDidChange.fire([model.resource])));
 			}
 
 			provideDecorations(uri: URI): IDecorationData | undefined {
 				const model = this.files.get(uri);
-				if (!model) {
+				if (!model || model.isDisposed()) {
 					return undefined;
 				}
 

src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts

@@ -34,6 +34,9 @@ export class TextFileEditorModelManager extends Disposable implements ITextFileE
 	private readonly _onDidResolve = this._register(new Emitter<ITextFileResolveEvent>());
 	readonly onDidResolve = this._onDidResolve.event;
 
+	private readonly _onDidRemove = this._register(new Emitter<URI>());
+	readonly onDidRemove = this._onDidRemove.event;
+
 	private readonly _onDidChangeDirty = this._register(new Emitter<TextFileEditorModel>());
 	readonly onDidChangeDirty = this._onDidChangeDirty.event;
 
@@ -446,7 +449,7 @@ export class TextFileEditorModelManager extends Disposable implements ITextFileE
 	}
 
 	protected remove(resource: URI): void {
-		this.mapResourceToModel.delete(resource);
+		const removed = this.mapResourceToModel.delete(resource);
 
 		const disposeListener = this.mapResourceToDisposeListener.get(resource);
 		if (disposeListener) {
@@ -459,6 +462,10 @@ export class TextFileEditorModelManager extends Disposable implements ITextFileE
 			dispose(modelListener);
 			this.mapResourceToModelListeners.delete(resource);
 		}
+
+		if (removed) {
+			this._onDidRemove.fire(resource);
+		}
 	}
 
 	//#region Save participants

src/vs/workbench/services/textfile/common/textfiles.ts

@@ -336,6 +336,7 @@ export interface ITextFileEditorModelManager {
 	readonly onDidResolve: Event<ITextFileResolveEvent>;
 	readonly onDidChangeDirty: Event<ITextFileEditorModel>;
 	readonly onDidChangeReadonly: Event<ITextFileEditorModel>;
+	readonly onDidRemove: Event<URI>;
 	readonly onDidChangeOrphaned: Event<ITextFileEditorModel>;
 	readonly onDidChangeEncoding: Event<ITextFileEditorModel>;
 	readonly onDidSaveError: Event<ITextFileEditorModel>;

src/vs/workbench/services/textfile/test/browser/textFileEditorModelManager.test.ts

@@ -187,6 +187,7 @@ suite('Files - TextFileEditorModelManager', () => {
 		const resource2 = toResource.call(this, '/path/other.txt');
 
 		let resolvedCounter = 0;
+		let removedCounter = 0;
 		let gotDirtyCounter = 0;
 		let gotNonDirtyCounter = 0;
 		let revertedCounter = 0;
@@ -199,6 +200,12 @@ suite('Files - TextFileEditorModelManager', () => {
 			}
 		});
 
+		manager.onDidRemove(resource => {
+			if (resource.toString() === resource1.toString() || resource.toString() === resource2.toString()) {
+				removedCounter++;
+			}
+		});
+
 		manager.onDidChangeDirty(model => {
 			if (model.resource.toString() === resource1.toString()) {
 				if (model.isDirty()) {
@@ -247,6 +254,7 @@ suite('Files - TextFileEditorModelManager', () => {
 		model2.dispose();
 
 		await model1.revert();
+		assert.strictEqual(removedCounter, 2);
 		assert.strictEqual(gotDirtyCounter, 2);
 		assert.strictEqual(gotNonDirtyCounter, 2);
 		assert.strictEqual(revertedCounter, 1);

src/vs/workbench/services/workingCopy/common/abstractFileWorkingCopyManager.ts

@@ -81,7 +81,7 @@ export abstract class BaseFileWorkingCopyManager<M extends IFileWorkingCopyModel
 		this._onDidCreate.fire(workingCopy);
 	}
 
-	protected remove(resource: URI): void {
+	protected remove(resource: URI): boolean {
 
 		// Dispose any existing listener
 		const disposeListener = this.mapResourceToDisposeListener.get(resource);
@@ -91,7 +91,7 @@ export abstract class BaseFileWorkingCopyManager<M extends IFileWorkingCopyModel
 		}
 
 		// Remove from our working copy map
-		this.mapResourceToWorkingCopy.delete(resource);
+		return this.mapResourceToWorkingCopy.delete(resource);
 	}
 
 	//#region Get / Get all

src/vs/workbench/services/workingCopy/common/fileWorkingCopyManager.ts

@@ -219,14 +219,20 @@ export class FileWorkingCopyManager<S extends IStoredFileWorkingCopyModel, U ext
 					}
 				}));
 
+				// Removals: once a stored working copy is no longer
+				// under our control, make sure to signal this as
+				// decoration change because from this point on we
+				// have no way of updating the decoration anymore.
+				this._register(this.stored.onDidRemove(workingCopyUri => this._onDidChange.fire([workingCopyUri])));
+
 				// Changes
 				this._register(this.stored.onDidChangeReadonly(workingCopy => this._onDidChange.fire([workingCopy.resource])));
 				this._register(this.stored.onDidChangeOrphaned(workingCopy => this._onDidChange.fire([workingCopy.resource])));
 			}
 
 			provideDecorations(uri: URI): IDecorationData | undefined {
 				const workingCopy = this.stored.get(uri);
-				if (!workingCopy) {
+				if (!workingCopy || workingCopy.isDisposed()) {
 					return undefined;
 				}
 

src/vs/workbench/services/workingCopy/common/storedFileWorkingCopyManager.ts

@@ -71,6 +71,11 @@ export interface IStoredFileWorkingCopyManager<M extends IStoredFileWorkingCopyM
 	 */
 	readonly onDidRevert: Event<IStoredFileWorkingCopy<M>>;
 
+	/**
+	 * An event for when a stored file working copy is removed from the manager.
+	 */
+	readonly onDidRemove: Event<URI>;
+
 	/**
 	 * Allows to resolve a stored file working copy. If the manager already knows
 	 * about a stored file working copy with the same `URI`, it will return that
@@ -152,6 +157,9 @@ export class StoredFileWorkingCopyManager<M extends IStoredFileWorkingCopyModel>
 	private readonly _onDidRevert = this._register(new Emitter<IStoredFileWorkingCopy<M>>());
 	readonly onDidRevert = this._onDidRevert.event;
 
+	private readonly _onDidRemove = this._register(new Emitter<URI>());
+	readonly onDidRemove = this._onDidRemove.event;
+
 	//#endregion
 
 	private readonly mapResourceToWorkingCopyListeners = new ResourceMap<IDisposable>();
@@ -549,15 +557,21 @@ export class StoredFileWorkingCopyManager<M extends IStoredFileWorkingCopyModel>
 		this.mapResourceToWorkingCopyListeners.set(workingCopy.resource, workingCopyListeners);
 	}
 
-	protected override remove(resource: URI): void {
-		super.remove(resource);
+	protected override remove(resource: URI): boolean {
+		const removed = super.remove(resource);
 
 		// Dispose any exsting working copy listeners
 		const workingCopyListener = this.mapResourceToWorkingCopyListeners.get(resource);
 		if (workingCopyListener) {
 			dispose(workingCopyListener);
 			this.mapResourceToWorkingCopyListeners.delete(resource);
 		}
+
+		if (removed) {
+			this._onDidRemove.fire(resource);
+		}
+
+		return removed;
 	}
 
 	//#endregion

src/vs/workbench/services/workingCopy/common/untitledFileWorkingCopyManager.ts

@@ -233,15 +233,17 @@ export class UntitledFileWorkingCopyManager<M extends IUntitledFileWorkingCopyMo
 		}
 	}
 
-	protected override remove(resource: URI): void {
-		super.remove(resource);
+	protected override remove(resource: URI): boolean {
+		const removed = super.remove(resource);
 
 		// Dispose any exsting working copy listeners
 		const workingCopyListener = this.mapResourceToWorkingCopyListeners.get(resource);
 		if (workingCopyListener) {
 			dispose(workingCopyListener);
 			this.mapResourceToWorkingCopyListeners.delete(resource);
 		}
+
+		return removed;
 	}
 
 	//#endregion

src/vs/workbench/services/workingCopy/test/browser/storedFileWorkingCopyManager.test.ts

@@ -182,6 +182,7 @@ suite('StoredFileWorkingCopyManager', () => {
 
 		let createdCounter = 0;
 		let resolvedCounter = 0;
+		let removedCounter = 0;
 		let gotDirtyCounter = 0;
 		let gotNonDirtyCounter = 0;
 		let revertedCounter = 0;
@@ -192,6 +193,12 @@ suite('StoredFileWorkingCopyManager', () => {
 			createdCounter++;
 		});
 
+		manager.onDidRemove(resource => {
+			if (resource.toString() === resource1.toString() || resource.toString() === resource2.toString()) {
+				removedCounter++;
+			}
+		});
+
 		manager.onDidResolve(workingCopy => {
 			if (workingCopy.resource.toString() === resource1.toString()) {
 				resolvedCounter++;
@@ -256,6 +263,7 @@ suite('StoredFileWorkingCopyManager', () => {
 		workingCopy2.dispose();
 
 		await workingCopy1.revert();
+		assert.strictEqual(removedCounter, 2);
 		assert.strictEqual(gotDirtyCounter, 3);
 		assert.strictEqual(gotNonDirtyCounter, 2);
 		assert.strictEqual(revertedCounter, 1);