Don't show dialog if closing tab after Continue On (microsoft#187324)

* Don't show dialog if closing tab after Continue On

Author: joyceerhl

src/vs/workbench/browser/window.ts

@@ -26,6 +26,7 @@ import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/envir
 import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
 import { BrowserLifecycleService } from 'vs/workbench/services/lifecycle/browser/lifecycleService';
 import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { IHostService } from 'vs/workbench/services/host/browser/host';
 
 export class BrowserWindow extends Disposable {
 
@@ -37,7 +38,8 @@ export class BrowserWindow extends Disposable {
 		@IProductService private readonly productService: IProductService,
 		@IBrowserWorkbenchEnvironmentService private readonly environmentService: IBrowserWorkbenchEnvironmentService,
 		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IHostService private readonly hostService: IHostService
 	) {
 		super();
 
@@ -231,13 +233,15 @@ export class BrowserWindow extends Disposable {
 							);
 						}
 
-						await this.dialogService.prompt({
+						// While this dialog shows, closing the tab will not display a confirmation dialog
+						// to avoid showing the user two dialogs at once
+						await this.hostService.withExpectedShutdown(() => this.dialogService.prompt({
 							type: Severity.Info,
 							message: localize('openExternalDialogTitle', "All done. You can close this tab now."),
 							detail,
 							buttons,
 							cancelButton: true
-						});
+						}));
 					};
 
 					// We cannot know whether the protocol handler succeeded.

src/vs/workbench/services/host/browser/browserHostService.ts

@@ -521,6 +521,16 @@ export class BrowserHostService extends Disposable implements IHostService {
 		window.close();
 	}
 
+	async withExpectedShutdown<T>(expectedShutdownTask: () => Promise<T>): Promise<T> {
+		const previousShutdownReason = this.shutdownReason;
+		try {
+			this.shutdownReason = HostShutdownReason.Api;
+			return await expectedShutdownTask();
+		} finally {
+			this.shutdownReason = previousShutdownReason;
+		}
+	}
+
 	private async handleExpectedShutdown(reason: ShutdownReason): Promise<void> {
 
 		// Update shutdown reason in a way that we do

src/vs/workbench/services/host/browser/host.ts

@@ -88,5 +88,11 @@ export interface IHostService {
 	 */
 	close(): Promise<void>;
 
+	/**
+	 * Execute an asynchronous `expectedShutdownTask`. While this task is
+	 * in progress, attempts to quit the application will not be vetoed with a dialog.
+	 */
+	withExpectedShutdown<T>(expectedShutdownTask: () => Promise<T>): Promise<T>;
+
 	//#endregion
 }

src/vs/workbench/services/host/electron-sandbox/nativeHostService.ts

@@ -135,6 +135,10 @@ class WorkbenchHostService extends Disposable implements IHostService {
 		return this.nativeHostService.closeWindow();
 	}
 
+	async withExpectedShutdown<T>(expectedShutdownTask: () => Promise<T>): Promise<T> {
+		return await expectedShutdownTask();
+	}
+
 	//#endregion
 }
 

src/vs/workbench/test/browser/workbenchTestServices.ts

@@ -1435,6 +1435,9 @@ export class TestHostService implements IHostService {
 	async restart(): Promise<void> { }
 	async reload(): Promise<void> { }
 	async close(): Promise<void> { }
+	async withExpectedShutdown<T>(expectedShutdownTask: () => Promise<T>): Promise<T> {
+		return await expectedShutdownTask();
+	}
 
 	async focus(options?: { force: boolean }): Promise<void> { }