diff --git a/src/vs/workbench/services/editor/browser/editorService.ts b/src/vs/workbench/services/editor/browser/editorService.ts index 6fdebe6ca2cd61fb2d2d5da923e2745292f7428d..a24a906db1f95c3fc1c410121ec525690d55cfa9 100644 --- a/src/vs/workbench/services/editor/browser/editorService.ts +++ b/src/vs/workbench/services/editor/browser/editorService.ts @@ -19,7 +19,7 @@ import { basename, isEqual } from 'vs/base/common/resources'; import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput'; import { localize } from 'vs/nls'; import { IEditorGroupsService, IEditorGroup, GroupsOrder, IEditorReplacement, GroupChangeKind, preferredSideBySideGroupDirection, EditorsOrder } from 'vs/workbench/services/editor/common/editorGroupsService'; -import { IResourceEditor, SIDE_GROUP, IResourceEditorReplacement, IOpenEditorOverrideHandler, IVisibleEditor, IEditorService, SIDE_GROUP_TYPE, ACTIVE_GROUP_TYPE, ISaveEditorsOptions, ISaveAllEditorsOptions, IRevertAllEditorsOptions } from 'vs/workbench/services/editor/common/editorService'; +import { IResourceEditor, SIDE_GROUP, IResourceEditorReplacement, IOpenEditorOverrideHandler, IVisibleEditor, IEditorService, SIDE_GROUP_TYPE, ACTIVE_GROUP_TYPE, ISaveEditorsOptions, ISaveAllEditorsOptions, IRevertAllEditorsOptions, IBaseSaveRevertAllEditorOptions } from 'vs/workbench/services/editor/common/editorService'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { Disposable, IDisposable, dispose, toDisposable, DisposableStore } from 'vs/base/common/lifecycle'; import { coalesce } from 'vs/base/common/arrays'; @@ -712,7 +712,7 @@ export class EditorService extends Disposable implements EditorServiceImpl { } saveAll(options?: ISaveAllEditorsOptions): Promise { - return this.save(this.getAllDirtyEditors(!!options?.includeUntitled), options); + return this.save(this.getAllDirtyEditors(options), options); } async revert(editors: IEditorIdentifier | IEditorIdentifier[], options?: IRevertOptions): Promise { @@ -734,15 +734,15 @@ export class EditorService extends Disposable implements EditorServiceImpl { } async revertAll(options?: IRevertAllEditorsOptions): Promise { - return this.revert(this.getAllDirtyEditors(!!options?.includeUntitled), options); + return this.revert(this.getAllDirtyEditors(options), options); } - private getAllDirtyEditors(includeUntitled: boolean): IEditorIdentifier[] { + private getAllDirtyEditors(options?: IBaseSaveRevertAllEditorOptions): IEditorIdentifier[] { const editors: IEditorIdentifier[] = []; for (const group of this.editorGroupService.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE)) { for (const editor of group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)) { - if (editor.isDirty() && (!editor.isUntitled() || includeUntitled)) { + if (editor.isDirty() && (!editor.isUntitled() || !!options?.includeUntitled)) { editors.push({ groupId: group.id, editor }); } }