提交 3abecd3e 编写于 作者: B Benjamin Pasero

Revert "resolveEditorModel: dispose input after model is resolved"

This reverts commit 8ee72d25.
上级 8ee72d25
......@@ -107,7 +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);
}
}
......@@ -198,29 +198,12 @@ export class WorkbenchEditorService implements IWorkbenchEditorService {
public resolveEditorModel(input: IEditorInput, refresh?: boolean): TPromise<IEditorModel>;
public resolveEditorModel(input: IResourceInput, refresh?: boolean): TPromise<ITextEditorModel>;
public resolveEditorModel(input: any, refresh?: boolean): TPromise<IEditorModel> {
let disposeInput = !(input instanceof EditorInput); // dispose input if we created it in here
return this.createInput(input).then(typedInput => {
let resolvePromise: TPromise<IEditorModel>;
if (typedInput instanceof EditorInput) {
resolvePromise = typedInput.resolve(!!refresh);
} else {
resolvePromise = TPromise.as<IEditorModel>(null);
return typedInput.resolve(!!refresh);
}
return resolvePromise.then(model => {
if (disposeInput) {
typedInput.dispose();
}
return model;
}, error => {
if (disposeInput) {
typedInput.dispose();
}
return TPromise.wrapError(error);
});
return TPromise.as<IEditorModel>(null);
});
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册