Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 19:18:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

resource input: make sure it can deal with the fact that the underlying editor model gets disposed

Browse Source
This commit is contained in:
Benjamin Pasero
2016-01-11 15:40:05 +01:00
parent 82f2a8afb2
commit 8b06fb3f4c
2 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/vs/workbench/common/editor/resourceEditorInput.ts
View File

@@ -8,6 +8,7 @@ import {TPromise} from 'vs/base/common/winjs.base';
import {EditorModel, EditorInput} from 'vs/workbench/common/editor';
import {ResourceEditorModel} from 'vs/workbench/common/editor/resourceEditorModel';
import URI from 'vs/base/common/uri';
import {EventType} from 'vs/base/common/events';
import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';
import {IModelService} from 'vs/editor/common/services/modelService';
@@ -53,18 +54,20 @@ export class ResourceEditorInput extends EditorInput {
public resolve(refresh?: boolean): TPromise<EditorModel> {
// We need the resource to point to an existing model
if (!this.modelService.getModel(this.resource)) {
return TPromise.wrapError(new Error(`Document with resource ${this.resource.toString()} does not exist`));
}
// Use Cached Model
if (this.cachedModel) {
return TPromise.as<EditorModel>(this.cachedModel);
}
//Otherwise Create Model and Load
//Otherwise Create Model and handle dispose event
let model = this.instantiationService.createInstance(ResourceEditorModel, this.resource);
const unbind = model.addListener(EventType.DISPOSE, () => {
this.cachedModel = null; // make sure we do not dispose model again
unbind();
this.dispose();
});
// Load it
return model.load().then((resolvedModel: ResourceEditorModel) => {
this.cachedModel = resolvedModel;