fix microsoft#75861 (microsoft#89908)

Benjamin Pasero · Benjamin Pasero · commit 6a8dc7ad4fc3 · 2020-02-03T11:34:12.000+01:00
diff --git a/src/vs/workbench/electron-browser/window.ts b/src/vs/workbench/electron-browser/window.ts
@@ -612,10 +612,18 @@ export class ElectronWindow extends Disposable {
 		// are closed that the user wants to wait for. When this happens we delete
 		// the wait marker file to signal to the outside that editing is done.
 		const listener = this.editorService.onDidCloseEditor(async event => {
-			const closedResource = toResource(event.editor, { supportSideBySide: SideBySideEditor.MASTER });
+			const detailsResource = toResource(event.editor, { supportSideBySide: SideBySideEditor.DETAILS });
+			const masterResource = toResource(event.editor, { supportSideBySide: SideBySideEditor.MASTER });
+
+			// Remove from resources to wait for based on the
+			// resources from editors that got closed
+			resourcesToWaitFor = resourcesToWaitFor.filter(resourceToWaitFor => {
+				if (isEqual(resourceToWaitFor, masterResource) || isEqual(resourceToWaitFor, detailsResource)) {
+					return false; // remove - the closing editor matches this resource
+				}
 
-			// Remove from resources to wait for
-			resourcesToWaitFor = resourcesToWaitFor.filter(resourceToWaitFor => !isEqual(closedResource, resourceToWaitFor));
+				return true; // keep - not yet closed
+			});
 
 			if (resourcesToWaitFor.length === 0) {
 				// If auto save is configured with the default delay (1s) it is possible
