microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-09 09:24:12 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity

Close other files does not close diff editor, md previews (fixes #3405)

Browse Source
This commit is contained in:
Benjamin Pasero
2016-03-03 07:47:02 +01:00
parent 6f9385fb3d
commit 2ddf83aacc
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/vs/workbench/parts/files/browser/fileActions.ts
View File

@@ -1806,7 +1806,7 @@ export abstract class BaseCloseWorkingFileAction extends Action {
model: WorkingFilesModel,
elements: WorkingFileEntry[],
@IUntitledEditorService private untitledEditorService: IUntitledEditorService,
@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
@IWorkbenchEditorService protected editorService: IWorkbenchEditorService,
@ITextFileService private textFileService: ITextFileService,
@IMessageService private messageService: IMessageService,
@IQuickOpenService private quickOpenService: IQuickOpenService
@@ -1921,6 +1921,10 @@ export class CloseAllWorkingFilesAction extends BaseCloseWorkingFileAction {
this.listenerToDispose = model.onModelChange(this.onModelChange, this);
}
public run(): TPromise<boolean> {
return super.run().then(() => closeNonFileEditors(this.editorService)); // close non file editors too
}
private onModelChange(event: Files.IWorkingFileModelChangeEvent): void {
this.enabled = (this.model.count() > 0);
}
@@ -1948,7 +1952,7 @@ export class CloseOneWorkingFileAction extends BaseCloseWorkingFileAction {
@IMessageService messageService: IMessageService,
@IQuickOpenService quickOpenService: IQuickOpenService
) {
super(CloseAllWorkingFilesAction.ID, nls.localize('closeLabel', "Close File"), element.dirty ? 'action-close-dirty-file' : 'action-close-file', model, [element], untitledEditorService, editorService, textFileService, messageService, quickOpenService);
super(CloseOneWorkingFileAction.ID, nls.localize('closeLabel', "Close File"), element.dirty ? 'action-close-dirty-file' : 'action-close-file', model, [element], untitledEditorService, editorService, textFileService, messageService, quickOpenService);
}
}
@@ -1965,7 +1969,11 @@ export class CloseOtherWorkingFilesAction extends BaseCloseWorkingFileAction {
@IMessageService messageService: IMessageService,
@IQuickOpenService quickOpenService: IQuickOpenService
) {
super(CloseAllWorkingFilesAction.ID, nls.localize('closeOtherLabel', "Close Other Files"), 'action-close-file', model, model.getEntries().filter(e => e !== element), untitledEditorService, editorService, textFileService, messageService, quickOpenService);
super(CloseOtherWorkingFilesAction.ID, nls.localize('closeOtherLabel', "Close Other Files"), 'action-close-file', model, model.getEntries().filter(e => e !== element), untitledEditorService, editorService, textFileService, messageService, quickOpenService);
}
public run(): TPromise<boolean> {
return super.run().then(() => closeNonFileEditors(this.editorService)); // close non file editors too
}
}
@@ -1988,6 +1996,12 @@ function disposeNonDirtyFileInputs(editorService: IWorkbenchEditorService, quick
});
}
function closeNonFileEditors(editorService: IWorkbenchEditorService): TPromise<boolean> {
let nonFileEditors = editorService.getVisibleEditors().filter(e => !workbenchEditorCommon.getUntitledOrFileResource(e.input, true));
return TPromise.join(nonFileEditors.map(e => editorService.closeEditor(e))).then(() => true, errors.onUnexpectedError);
}
function fileEditorInputsForResource(resource: URI, editorService: IWorkbenchEditorService, quickopenService: IQuickOpenService): FileEditorInput[] {
// Get cached ones