提交 37404919 编写于 作者: J Joao Moreno

use immortal references for inmemory resources

fixes #17008
上级 8e64404d
...@@ -23,8 +23,7 @@ class ResourceModelCollection extends ReferenceCollection<TPromise<ITextEditorMo ...@@ -23,8 +23,7 @@ class ResourceModelCollection extends ReferenceCollection<TPromise<ITextEditorMo
private providers: { [scheme: string]: ITextModelContentProvider[] } = Object.create(null); private providers: { [scheme: string]: ITextModelContentProvider[] } = Object.create(null);
constructor( constructor(
@IInstantiationService private instantiationService: IInstantiationService, @IInstantiationService private instantiationService: IInstantiationService
@IModelService private modelService: IModelService
) { ) {
super(); super();
} }
...@@ -32,7 +31,7 @@ class ResourceModelCollection extends ReferenceCollection<TPromise<ITextEditorMo ...@@ -32,7 +31,7 @@ class ResourceModelCollection extends ReferenceCollection<TPromise<ITextEditorMo
createReferencedObject(key: string): TPromise<ITextEditorModel> { createReferencedObject(key: string): TPromise<ITextEditorModel> {
const resource = URI.parse(key); const resource = URI.parse(key);
return this.resolveTextModelContent(this.modelService, key) return this.resolveTextModelContent(key)
.then(() => this.instantiationService.createInstance(ResourceEditorModel, resource)); .then(() => this.instantiationService.createInstance(ResourceEditorModel, resource));
} }
...@@ -67,15 +66,8 @@ class ResourceModelCollection extends ReferenceCollection<TPromise<ITextEditorMo ...@@ -67,15 +66,8 @@ class ResourceModelCollection extends ReferenceCollection<TPromise<ITextEditorMo
}); });
} }
private resolveTextModelContent(modelService: IModelService, key: string): TPromise<IModel> { private resolveTextModelContent(key: string): TPromise<IModel> {
const resource = URI.parse(key); const resource = URI.parse(key);
const model = modelService.getModel(resource);
if (model) {
// TODO@Joao this should never happen
return TPromise.as(model);
}
const providers = this.providers[resource.scheme] || []; const providers = this.providers[resource.scheme] || [];
const factories = providers.map(p => () => p.provideTextContent(resource)); const factories = providers.map(p => () => p.provideTextContent(resource));
...@@ -100,7 +92,8 @@ export class TextModelResolverService implements ITextModelResolverService { ...@@ -100,7 +92,8 @@ export class TextModelResolverService implements ITextModelResolverService {
constructor( constructor(
@ITextFileService private textFileService: ITextFileService, @ITextFileService private textFileService: ITextFileService,
@IUntitledEditorService private untitledEditorService: IUntitledEditorService, @IUntitledEditorService private untitledEditorService: IUntitledEditorService,
@IInstantiationService instantiationService: IInstantiationService @IInstantiationService private instantiationService: IInstantiationService,
@IModelService private modelService: IModelService
) { ) {
this.resourceModelCollection = instantiationService.createInstance(ResourceModelCollection); this.resourceModelCollection = instantiationService.createInstance(ResourceModelCollection);
} }
...@@ -133,6 +126,18 @@ export class TextModelResolverService implements ITextModelResolverService { ...@@ -133,6 +126,18 @@ export class TextModelResolverService implements ITextModelResolverService {
.then(model => new ImmortalReference(model)); .then(model => new ImmortalReference(model));
} }
// InMemory Schema: go through model service cache
// TODO ImmortalReference is a hack
if (resource.scheme === 'inmemory') {
const cachedModel = this.modelService.getModel(resource);
if (!cachedModel) {
return TPromise.wrapError('Cant resolve inmemory resource');
}
return TPromise.as(new ImmortalReference(this.instantiationService.createInstance(ResourceEditorModel, resource)));
}
const ref = this.resourceModelCollection.acquire(resource.toString()); const ref = this.resourceModelCollection.acquire(resource.toString());
return ref.object.then(model => ({ object: model, dispose: () => ref.dispose() })); return ref.object.then(model => ({ object: model, dispose: () => ref.dispose() }));
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册