diff --git a/src/vs/editor/browser/standalone/simpleServices.ts b/src/vs/editor/browser/standalone/simpleServices.ts index e75c5180f04..710c1145cb4 100644 --- a/src/vs/editor/browser/standalone/simpleServices.ts +++ b/src/vs/editor/browser/standalone/simpleServices.ts @@ -173,7 +173,7 @@ export class SimpleEditorModelResolverService implements ITextModelResolverServi this.editor = new SimpleEditor(editor); } - public getModelReference(resource: URI): TPromise> { + public createModelReference(resource: URI): TPromise> { let model: editorCommon.IModel; model = this.editor.withTypedEditor( diff --git a/src/vs/editor/common/services/bulkEdit.ts b/src/vs/editor/common/services/bulkEdit.ts index f0e0139ed4b..84a65ce432f 100644 --- a/src/vs/editor/common/services/bulkEdit.ts +++ b/src/vs/editor/common/services/bulkEdit.ts @@ -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) { diff --git a/src/vs/editor/common/services/resolverService.ts b/src/vs/editor/common/services/resolverService.ts index 23ebaf331c0..aacd94b9622 100644 --- a/src/vs/editor/common/services/resolverService.ts +++ b/src/vs/editor/common/services/resolverService.ts @@ -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>; + createModelReference(resource: URI): TPromise>; /** * Registers a specific `scheme` content provider. diff --git a/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts b/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts index cd076797ced..7fbd1dbe432 100644 --- a/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts +++ b/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts @@ -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) { diff --git a/src/vs/editor/contrib/referenceSearch/browser/referencesModel.ts b/src/vs/editor/contrib/referenceSearch/browser/referencesModel.ts index 55714c77c1c..e9b7289215b 100644 --- a/src/vs/editor/contrib/referenceSearch/browser/referencesModel.ts +++ b/src/vs/editor/contrib/referenceSearch/browser/referencesModel.ts @@ -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) { diff --git a/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.ts b/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.ts index df7f0ca38fb..9d0d3e7e8f8 100644 --- a/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.ts +++ b/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.ts @@ -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]; diff --git a/src/vs/workbench/api/node/mainThreadDocuments.ts b/src/vs/workbench/api/node/mainThreadDocuments.ts index 0ce3cb8467b..fd123e00b57 100644 --- a/src/vs/workbench/api/node/mainThreadDocuments.ts +++ b/src/vs/workbench/api/node/mainThreadDocuments.ts @@ -187,7 +187,7 @@ export class MainThreadDocuments extends MainThreadDocumentsShape { } private _handleAsResourceInput(uri: URI): TPromise { - return this._textModelResolverService.getModelReference(uri).then(ref => { + return this._textModelResolverService.createModelReference(uri).then(ref => { const result = !!ref.object; ref.dispose(); diff --git a/src/vs/workbench/common/editor/resourceEditorInput.ts b/src/vs/workbench/common/editor/resourceEditorInput.ts index 6703707d2c1..6aa853fed0a 100644 --- a/src/vs/workbench/common/editor/resourceEditorInput.ts +++ b/src/vs/workbench/common/editor/resourceEditorInput.ts @@ -73,7 +73,7 @@ export class ResourceEditorInput extends EditorInput { resolve(refresh?: boolean): TPromise { if (!this.promise) { - this.promise = this.textModelResolverService.getModelReference(this.resource); + this.promise = this.textModelResolverService.createModelReference(this.resource); } return this.promise.then(ref => { diff --git a/src/vs/workbench/parts/html/browser/html.contribution.ts b/src/vs/workbench/parts/html/browser/html.contribution.ts index ff46441f2b2..7c3fb2cdc9a 100644 --- a/src/vs/workbench/parts/html/browser/html.contribution.ts +++ b/src/vs/workbench/parts/html/browser/html.contribution.ts @@ -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(); diff --git a/src/vs/workbench/parts/html/browser/htmlPreviewPart.ts b/src/vs/workbench/parts/html/browser/htmlPreviewPart.ts index 51fdec812f6..03e4e08d058 100644 --- a/src/vs/workbench/parts/html/browser/htmlPreviewPart.ts +++ b/src/vs/workbench/parts/html/browser/htmlPreviewPart.ts @@ -155,7 +155,7 @@ export class HtmlPreviewPart extends BaseEditor { return super.setInput(input, options).then(() => { const resourceUri = (input).getResource(); - return this._textModelResolverService.getModelReference(resourceUri).then(ref => { + return this._textModelResolverService.createModelReference(resourceUri).then(ref => { const model = ref.object; if (model instanceof BaseTextEditorModel) { diff --git a/src/vs/workbench/parts/search/browser/replaceService.ts b/src/vs/workbench/parts/search/browser/replaceService.ts index c3747aac4c5..cffb8d16073 100644 --- a/src/vs/workbench/parts/search/browser/replaceService.ts +++ b/src/vs/workbench/parts/search/browser/replaceService.ts @@ -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 { - 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()); diff --git a/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts b/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts index 52835fc3d18..766a4890d50 100644 --- a/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts +++ b/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts @@ -114,7 +114,7 @@ export class TextModelResolverService implements ITextModelResolverService { this.resourceModelCollection = instantiationService.createInstance(ResourceModelCollection); } - getModelReference(resource: URI): TPromise> { + createModelReference(resource: URI): TPromise> { const uri = resource.toString(); let promise = this.promiseCache[uri]; diff --git a/src/vs/workbench/services/textmodelResolver/test/textModelResolverService.test.ts b/src/vs/workbench/services/textmodelResolver/test/textModelResolverService.test.ts index 34897b4fa2c..59fa5d8f75b 100644 --- a/src/vs/workbench/services/textmodelResolver/test/textModelResolverService.test.ts +++ b/src/vs/workbench/services/textmodelResolver/test/textModelResolverService.test.ts @@ -83,7 +83,7 @@ suite('Workbench - TextModelResolverService', () => { (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;