Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-17 01:13:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Disable process revive and confirmation on web

Browse Source 
Web always rejects when async code is used
This commit is contained in:
Daniel Imms
2021-09-22 05:26:45 -07:00
parent 3a83568ab0
commit 26c686bcde
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/terminal/browser/terminalService.ts
+13 -3
View File
@@ -537,7 +537,17 @@ export class TerminalService implements ITerminalService {
return this._defaultProfileName;
}
private async _onBeforeShutdown(reason: ShutdownReason): Promise<boolean> {
private _onBeforeShutdown(reason: ShutdownReason): boolean | Promise<boolean> {
// Never veto on web as this would block all windows from being closed. This disables
// process revive as we can't handle it on shutdown.
if (isWeb) {
this._isShuttingDown = true;
return false;
}
return this._onBeforeShutdownAsync(reason);
}
private async _onBeforeShutdownAsync(reason: ShutdownReason): Promise<boolean> {
if (this.instances.length === 0) {
// No terminal instances, don't veto
return false;
@@ -559,7 +569,7 @@ export class TerminalService implements ITerminalService {
(this.configHelper.config.confirmOnExit === 'hasChildProcesses' && this.instances.some(e => e.hasChildProcesses))
);
if (hasDirtyInstances) {
return this._onBeforeShutdownAsync(reason);
return this._onBeforeShutdownConfirmation(reason);
}
}
@@ -589,7 +599,7 @@ export class TerminalService implements ITerminalService {
}
}
private async _onBeforeShutdownAsync(reason: ShutdownReason): Promise<boolean> {
private async _onBeforeShutdownConfirmation(reason: ShutdownReason): Promise<boolean> {
// veto if configured to show confirmation and the user chose not to exit
const veto = await this._showTerminalCloseConfirmation();
if (!veto) {