mirror of
https://github.com/Microsoft/vscode
synced 2024-09-19 10:40:41 +00:00
createModelReference(...)
This commit is contained in:
parent
0b6675494e
commit
3eddc66357
|
@ -173,7 +173,7 @@ export class SimpleEditorModelResolverService implements ITextModelResolverServi
|
|||
this.editor = new SimpleEditor(editor);
|
||||
}
|
||||
|
||||
public getModelReference(resource: URI): TPromise<IReference<ITextEditorModel>> {
|
||||
public createModelReference(resource: URI): TPromise<IReference<ITextEditorModel>> {
|
||||
let model: editorCommon.IModel;
|
||||
|
||||
model = this.editor.withTypedEditor(
|
||||
|
|
|
@ -217,7 +217,7 @@ class BulkEditModel implements IDisposable {
|
|||
}
|
||||
|
||||
forEach(this._edits, entry => {
|
||||
const promise = this._textModelResolverService.getModelReference(URI.parse(entry.key)).then(ref => {
|
||||
const promise = this._textModelResolverService.createModelReference(URI.parse(entry.key)).then(ref => {
|
||||
const model = ref.object;
|
||||
|
||||
if (!model || !model.textEditorModel) {
|
||||
|
|
|
@ -20,7 +20,7 @@ export interface ITextModelResolverService {
|
|||
* Provided a resource URI, it will return a model reference
|
||||
* which should be disposed once not needed anymore.
|
||||
*/
|
||||
getModelReference(resource: URI): TPromise<IReference<ITextEditorModel>>;
|
||||
createModelReference(resource: URI): TPromise<IReference<ITextEditorModel>>;
|
||||
|
||||
/**
|
||||
* Registers a specific `scheme` content provider.
|
||||
|
|
|
@ -324,7 +324,7 @@ class GotoDefinitionWithMouseEditorContribution implements editorCommon.IEditorC
|
|||
else {
|
||||
let result = results[0];
|
||||
|
||||
this.textModelResolverService.getModelReference(result.uri).then(ref => {
|
||||
this.textModelResolverService.createModelReference(result.uri).then(ref => {
|
||||
const model = ref.object;
|
||||
let hoverMessage: MarkedString;
|
||||
if (model && model.textEditorModel) {
|
||||
|
|
|
@ -144,7 +144,7 @@ export class FileReferences implements IDisposable {
|
|||
return TPromise.as(this);
|
||||
}
|
||||
|
||||
return textModelResolverService.getModelReference(this._uri).then(modelReference => {
|
||||
return textModelResolverService.createModelReference(this._uri).then(modelReference => {
|
||||
const model = modelReference.object;
|
||||
|
||||
if (!model) {
|
||||
|
|
|
@ -716,7 +716,7 @@ export class ReferenceWidget extends PeekViewWidget {
|
|||
this.setTitle(nls.localize('peekView.alternateTitle', "References"));
|
||||
}
|
||||
|
||||
const promise = this._textModelResolverService.getModelReference(reference.uri);
|
||||
const promise = this._textModelResolverService.createModelReference(reference.uri);
|
||||
|
||||
return TPromise.join([promise, this._tree.reveal(reference)]).then(values => {
|
||||
const ref = values[0];
|
||||
|
|
|
@ -187,7 +187,7 @@ export class MainThreadDocuments extends MainThreadDocumentsShape {
|
|||
}
|
||||
|
||||
private _handleAsResourceInput(uri: URI): TPromise<boolean> {
|
||||
return this._textModelResolverService.getModelReference(uri).then(ref => {
|
||||
return this._textModelResolverService.createModelReference(uri).then(ref => {
|
||||
const result = !!ref.object;
|
||||
ref.dispose();
|
||||
|
||||
|
|
|
@ -73,7 +73,7 @@ export class ResourceEditorInput extends EditorInput {
|
|||
|
||||
resolve(refresh?: boolean): TPromise<ITextEditorModel> {
|
||||
if (!this.promise) {
|
||||
this.promise = this.textModelResolverService.getModelReference(this.resource);
|
||||
this.promise = this.textModelResolverService.createModelReference(this.resource);
|
||||
}
|
||||
|
||||
return this.promise.then(ref => {
|
||||
|
|
|
@ -62,7 +62,7 @@ CommandsRegistry.registerCommand('_workbench.htmlZone', function (accessor: Serv
|
|||
|
||||
const textModelResolverService = accessor.get(ITextModelResolverService);
|
||||
|
||||
return textModelResolverService.getModelReference(params.resource).then(ref => {
|
||||
return textModelResolverService.createModelReference(params.resource).then(ref => {
|
||||
const model = ref.object;
|
||||
const contents = model.textEditorModel.getValue();
|
||||
ref.dispose();
|
||||
|
|
|
@ -155,7 +155,7 @@ export class HtmlPreviewPart extends BaseEditor {
|
|||
|
||||
return super.setInput(input, options).then(() => {
|
||||
const resourceUri = (<HtmlInput>input).getResource();
|
||||
return this._textModelResolverService.getModelReference(resourceUri).then(ref => {
|
||||
return this._textModelResolverService.createModelReference(resourceUri).then(ref => {
|
||||
const model = ref.object;
|
||||
|
||||
if (model instanceof BaseTextEditorModel) {
|
||||
|
|
|
@ -57,7 +57,7 @@ class EditorInputCache {
|
|||
if (editorInputPromise) {
|
||||
editorInputPromise.done(() => {
|
||||
if (reloadFromSource) {
|
||||
this.textModelResolverService.getModelReference(fileMatch.resource()).done(ref => {
|
||||
this.textModelResolverService.createModelReference(fileMatch.resource()).done(ref => {
|
||||
const model = ref.object;
|
||||
if (model.textEditorModel) {
|
||||
let replaceResource = this.getReplaceResource(fileMatch.resource());
|
||||
|
@ -109,7 +109,7 @@ class EditorInputCache {
|
|||
}
|
||||
|
||||
private createRightInput(element: FileMatch): TPromise<IEditorInput> {
|
||||
return this.textModelResolverService.getModelReference(element.resource()).then(ref => {
|
||||
return this.textModelResolverService.createModelReference(element.resource()).then(ref => {
|
||||
const model = ref.object;
|
||||
let textEditorModel = model.textEditorModel;
|
||||
let replaceResource = this.getReplaceResource(element.resource());
|
||||
|
|
|
@ -114,7 +114,7 @@ export class TextModelResolverService implements ITextModelResolverService {
|
|||
this.resourceModelCollection = instantiationService.createInstance(ResourceModelCollection);
|
||||
}
|
||||
|
||||
getModelReference(resource: URI): TPromise<IReference<ITextEditorModel>> {
|
||||
createModelReference(resource: URI): TPromise<IReference<ITextEditorModel>> {
|
||||
const uri = resource.toString();
|
||||
let promise = this.promiseCache[uri];
|
||||
|
||||
|
|
|
@ -83,7 +83,7 @@ suite('Workbench - TextModelResolverService', () => {
|
|||
(<TextFileEditorModelManager>accessor.textFileService.models).add(model.getResource(), model);
|
||||
|
||||
return model.load().then(() => {
|
||||
return accessor.textModelResolverServie.getModelReference(model.getResource()).then(ref => {
|
||||
return accessor.textModelResolverServie.createModelReference(model.getResource()).then(ref => {
|
||||
const model = ref.object;
|
||||
const editorModel = model.textEditorModel;
|
||||
|
||||
|
@ -99,7 +99,7 @@ suite('Workbench - TextModelResolverService', () => {
|
|||
const input = service.createOrGet();
|
||||
|
||||
input.resolve().then(() => {
|
||||
return accessor.textModelResolverServie.getModelReference(input.getResource()).then(ref => {
|
||||
return accessor.textModelResolverServie.createModelReference(input.getResource()).then(ref => {
|
||||
const model = ref.object;
|
||||
const editorModel = model.textEditorModel;
|
||||
|
||||
|
|
Loading…
Reference in a new issue