Merge from vscode dbe62be3266ffb6772a7f3db0bf61d63f4aa7f65 (#9337)

This commit is contained in:
Anthony Dresser
2020-02-26 00:23:48 -08:00
committed by GitHub
parent d2892ff78b
commit 067fcc8dfb
42 changed files with 384 additions and 409 deletions

View File

@@ -642,14 +642,13 @@ export abstract class BaseCloseAllAction extends Action {
return;
}
let saveOrRevert: boolean;
if (confirm === ConfirmResult.DONT_SAVE) {
saveOrRevert = await this.editorService.revertAll({ soft: true, includeUntitled: true });
await this.editorService.revertAll({ soft: true, includeUntitled: true });
} else {
saveOrRevert = await this.editorService.saveAll({ reason: SaveReason.EXPLICIT, includeUntitled: true });
await this.editorService.saveAll({ reason: SaveReason.EXPLICIT, includeUntitled: true });
}
if (saveOrRevert) {
if (!this.workingCopyService.hasDirty) {
return this.doCloseAll();
}
}