提交 61328fd6 编写于 作者: B Benjamin Pasero

💄

上级 742fb528
......@@ -8,6 +8,7 @@ import URI from 'vs/base/common/uri';
import {TPromise} from 'vs/base/common/winjs.base';
import {createDecorator} from 'vs/platform/instantiation/common/instantiation';
import Event from 'vs/base/common/event';
import {IDisposable} from 'vs/base/common/lifecycle';
export const IEditorService = createDecorator<IEditorService>('editorService');
......@@ -127,7 +128,7 @@ export enum Direction {
RIGHT
}
export interface IEditorInput {
export interface IEditorInput extends IDisposable {
onDispose: Event<void>;
......
......@@ -252,6 +252,10 @@ export class MainThreadDocuments extends MainThreadDocumentsShape {
if (!this._editorService.isVisible(input, true)) {
toBeDisposed.push(resource);
}
if (input) {
input.dispose();
}
});
})).then(() => {
for (let resource of toBeDisposed) {
......
......@@ -199,10 +199,8 @@ export class TextFileEditor extends BaseTextEditor {
}
private openAsBinary(input: FileEditorInput, options: EditorOptions): void {
const fileInputBinary = this.instantiationService.createInstance(FileEditorInput, input.getResource(), void 0);
fileInputBinary.setForceOpenAsBinary();
this.editorService.openEditor(fileInputBinary, options, this.position).done(null, errors.onUnexpectedError);
input.setForceOpenAsBinary();
this.editorService.openEditor(input, options, this.position).done(null, errors.onUnexpectedError);
}
private openAsFolder(input: FileEditorInput): boolean {
......
......@@ -69,7 +69,7 @@ export class WorkbenchEditorService implements IWorkbenchEditorService {
return false;
}
return this.getVisibleEditors().some((editor) => {
return this.getVisibleEditors().some(editor => {
if (!editor.input) {
return false;
}
......@@ -107,6 +107,7 @@ export class WorkbenchEditorService implements IWorkbenchEditorService {
const schema = resourceInput.resource.scheme;
if (schema === network.Schemas.http || schema === network.Schemas.https) {
window.open(resourceInput.resource.toString(true));
return TPromise.as<IEditor>(null);
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册