editors - make closing a non-resolved editor on file deletes work with any editor

Author: bpasero

src/vs/workbench/services/editor/browser/editorService.ts

@@ -36,6 +36,7 @@ import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/ur
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { ILogService } from 'vs/platform/log/common/log';
 import { ContributedEditorPriority, DEFAULT_EDITOR_ASSOCIATION, IEditorOverrideService } from 'vs/workbench/services/editor/common/editorOverrideService';
+import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
 
 type CachedEditorInput = ResourceEditorInput | IFileEditorInput | UntitledTextEditorInput;
 type OpenInEditorGroup = IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE;
@@ -75,6 +76,7 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
 		@ILogService private readonly logService: ILogService,
 		@IEditorOverrideService private readonly editorOverrideService: IEditorOverrideService,
+		@IWorkingCopyService private readonly workingCopyService: IWorkingCopyService
 	) {
 		super();
 
@@ -318,11 +320,11 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 				}
 
 				// Handle deletes in opened editors depending on:
-				// - the user has not disabled the setting `closeOnFileDelete`
-				// - the file change is local
-				// - the input is  a file that is not resolved (we need to dispose because
-				//   we cannot restore otherwise since we do not have the contents)
-				if (this.closeOnFileDelete || !isExternal || (this.fileEditorInputFactory.isFileEditorInput(editor) && !editor.isResolved())) {
+				// - we close any editor when `closeOnFileDelete: true`
+				// - we close any editor when the delete occured from within VSCode
+				// - we close any editor without resolved working copy assuming that
+				//   this editor could not be opened after the file is gone
+				if (this.closeOnFileDelete || !isExternal || !this.workingCopyService.has(resource)) {
 
 					// Do NOT close any opened editor that matches the resource path (either equal or being parent) of the
 					// resource we move to (movedTo). Otherwise we would close a resource that has been renamed to the same

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

@@ -90,6 +90,13 @@ export interface IWorkingCopyService {
 	 */
 	registerWorkingCopy(workingCopy: IWorkingCopy): IDisposable;
 
+	/**
+	 * Whether a working copy with the given resource exists.
+	 *
+	 * @param resource the resource of the working copy to check
+	 */
+	has(resource: URI): boolean;
+
 	//#endregion
 }
 
@@ -175,6 +182,10 @@ export class WorkingCopyService extends Disposable implements IWorkingCopyServic
 		}
 	}
 
+	has(resource: URI): boolean {
+		return this.mapResourceToWorkingCopies.has(resource);
+	}
+
 	//#endregion
 
 

src/vs/workbench/services/workingCopy/test/common/workingCopyService.test.ts

@@ -33,6 +33,7 @@ suite('WorkingCopyService', () => {
 
 		// resource 1
 		const resource1 = URI.file('/some/folder/file.txt');
+		assert.strictEqual(service.has(resource1), false);
 		const copy1 = new TestWorkingCopy(resource1);
 		const unregister1 = service.registerWorkingCopy(copy1);
 
@@ -42,6 +43,7 @@ suite('WorkingCopyService', () => {
 		assert.strictEqual(onDidRegister[0], copy1);
 		assert.strictEqual(service.dirtyCount, 0);
 		assert.strictEqual(service.isDirty(resource1), false);
+		assert.strictEqual(service.has(resource1), true);
 		assert.strictEqual(service.hasDirty, false);
 
 		copy1.setDirty(true);
@@ -75,6 +77,7 @@ suite('WorkingCopyService', () => {
 		assert.strictEqual(onDidUnregister.length, 1);
 		assert.strictEqual(onDidUnregister[0], copy1);
 		assert.strictEqual(service.workingCopies.length, 0);
+		assert.strictEqual(service.has(resource1), false);
 
 		// resource 2
 		const resource2 = URI.file('/some/folder/file-dirty.txt');