Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-03 16:15:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

close editors - use mru list

Browse Source
This commit is contained in:
Benjamin Pasero
2017-12-06 10:33:33 +01:00
parent 279d957a25
commit a982a8c120
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/browser/parts/editor/editorPart.ts
+15 -12
View File
@@ -692,9 +692,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
}
// Check for dirty and veto
const editorsToClose = arrays.flatten(groups.map(group => group.getEditors().map(editor => { return { group, editor }; })));
return this.handleDirty(editorsToClose).then(veto => {
return this.handleDirty(arrays.flatten(groups.map(group => group.getEditors(true /* in MRU order */).map(editor => { return { group, editor }; })))).then(veto => {
if (veto) {
return;
}
@@ -709,19 +707,24 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
return TPromise.wrap<void>(null);
}
let editors = group.getEditors();
let editorsToClose = group.getEditors(true /* in MRU order */);
// Filter: unmodified only
if (filter.unmodifiedOnly) {
editors = editors.filter(e => !e.isDirty());
editorsToClose = editorsToClose.filter(e => !e.isDirty());
}
// Filter: direction (left / right)
if (!types.isUndefinedOrNull(filter.direction)) {
editorsToClose = (filter.direction === Direction.LEFT) ? editorsToClose.slice(0, group.indexOf(filter.except)) : editorsToClose.slice(group.indexOf(filter.except) + 1);
}
// Filter: except
else {
editorsToClose = editorsToClose.filter(e => !filter.except || !e.matches(filter.except));
}
// Check for dirty and veto
let editorsToClose: EditorInput[];
if (types.isUndefinedOrNull(filter.direction)) {
editorsToClose = editors.filter(e => !filter.except || !e.matches(filter.except));
} else {
editorsToClose = (filter.direction === Direction.LEFT) ? editors.slice(0, group.indexOf(filter.except)) : editors.slice(group.indexOf(filter.except) + 1);
}
return this.handleDirty(editorsToClose.map(editor => { return { group, editor }; }), true /* ignore if opened in other group */).then(veto => {
if (veto) {
return;