diff --git a/extensions/typescript/src/features/typeImplementationProvider.ts b/extensions/typescript/src/features/implementationProvider.ts similarity index 63% rename from extensions/typescript/src/features/typeImplementationProvider.ts rename to extensions/typescript/src/features/implementationProvider.ts index bfdabefaa55..452afad1033 100644 --- a/extensions/typescript/src/features/typeImplementationProvider.ts +++ b/extensions/typescript/src/features/implementationProvider.ts @@ -5,18 +5,18 @@ 'use strict'; -import { TypeImplementationProvider, TextDocument, Position, CancellationToken, Definition } from 'vscode'; +import { ImplementationProvider, TextDocument, Position, CancellationToken, Definition } from 'vscode'; import { ITypescriptServiceClient } from '../typescriptService'; import DefinitionProviderBase from './definitionProviderBase'; -export default class TypeScriptTypeImplementationProvider extends DefinitionProviderBase implements TypeImplementationProvider { +export default class TypeScriptImplementationProvider extends DefinitionProviderBase implements ImplementationProvider { constructor(client: ITypescriptServiceClient) { super(client); } - public provideTypeImplementation(document: TextDocument, position: Position, token: CancellationToken | boolean): Promise { + public provideImplementation(document: TextDocument, position: Position, token: CancellationToken | boolean): Promise { return this.getSymbolLocations('implementation', document, position, token); } } \ No newline at end of file diff --git a/extensions/typescript/src/typescriptMain.ts b/extensions/typescript/src/typescriptMain.ts index 8129c485492..e2ee486019f 100644 --- a/extensions/typescript/src/typescriptMain.ts +++ b/extensions/typescript/src/typescriptMain.ts @@ -25,7 +25,7 @@ import { ITypescriptServiceClientHost } from './typescriptService'; import HoverProvider from './features/hoverProvider'; import DefinitionProvider from './features/definitionProvider'; -import TypeImplementationProvider from './features/TypeImplementationProvider'; +import ImplementationProvider from './features/ImplementationProvider'; import DocumentHighlightProvider from './features/documentHighlightProvider'; import ReferenceProvider from './features/referenceProvider'; import DocumentSymbolProvider from './features/documentSymbolProvider'; @@ -149,7 +149,7 @@ class LanguageProvider { let hoverProvider = new HoverProvider(client); let definitionProvider = new DefinitionProvider(client); - let typeImplementationProvider = new TypeImplementationProvider(client); + let implementationProvider = new ImplementationProvider(client); let documentHighlightProvider = new DocumentHighlightProvider(client); let referenceProvider = new ReferenceProvider(client); let documentSymbolProvider = new DocumentSymbolProvider(client); @@ -174,7 +174,7 @@ class LanguageProvider { languages.registerDefinitionProvider(selector, definitionProvider); if (client.apiVersion.has220Features()) { // TODO: TS 2.1.5 returns incorrect results for implementation locations. - languages.registerTypeImplementationProvider(selector, typeImplementationProvider); + languages.registerImplementationProvider(selector, implementationProvider); } languages.registerDocumentHighlightProvider(selector, documentHighlightProvider); languages.registerReferenceProvider(selector, referenceProvider); diff --git a/src/vs/editor/browser/standalone/standaloneLanguages.ts b/src/vs/editor/browser/standalone/standaloneLanguages.ts index 5a836fa36b5..cbe6b16b7f4 100644 --- a/src/vs/editor/browser/standalone/standaloneLanguages.ts +++ b/src/vs/editor/browser/standalone/standaloneLanguages.ts @@ -277,8 +277,8 @@ export function registerDefinitionProvider(languageId: string, provider: modes.D /** * Register a type implementation provider (used by e.g. go to implementation). */ -export function registerTypeImplementationProvider(languageId: string, provider: modes.TypeImplementationProvider): IDisposable { - return modes.TypeImplementationProviderRegistry.register(languageId, provider); +export function registerImplementationProvider(languageId: string, provider: modes.ImplementationProvider): IDisposable { + return modes.ImplementationProviderRegistry.register(languageId, provider); } /** @@ -681,7 +681,7 @@ export function createMonacoLanguagesAPI(): typeof monaco.languages { registerDocumentSymbolProvider: registerDocumentSymbolProvider, registerDocumentHighlightProvider: registerDocumentHighlightProvider, registerDefinitionProvider: registerDefinitionProvider, - registerTypeImplementationProvider: registerTypeImplementationProvider, + registerImplementationProvider: registerImplementationProvider, registerCodeLensProvider: registerCodeLensProvider, registerCodeActionProvider: registerCodeActionProvider, registerDocumentFormattingEditProvider: registerDocumentFormattingEditProvider, diff --git a/src/vs/editor/common/editorCommon.ts b/src/vs/editor/common/editorCommon.ts index 34fa7d03769..c624e1b5e9b 100644 --- a/src/vs/editor/common/editorCommon.ts +++ b/src/vs/editor/common/editorCommon.ts @@ -3096,7 +3096,7 @@ export namespace ModeContextKeys { /** * @internal */ - export const hasTypeImplementationProvider = new RawContextKey('editorHasTypeImplementationProvider', undefined); + export const hasImplementationProvider = new RawContextKey('editorHasImplementationProvider', undefined); /** * @internal */ diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts index deb185f7c96..f3d5245e24d 100644 --- a/src/vs/editor/common/modes.ts +++ b/src/vs/editor/common/modes.ts @@ -435,11 +435,11 @@ export interface DefinitionProvider { * The type definition provider interface defines the contract between extensions and * the go to implementation feature. */ -export interface TypeImplementationProvider { +export interface ImplementationProvider { /** * Provide the implementation of the symbol at the given position and document. */ - provideTypeImplementation(model: editorCommon.IReadOnlyModel, position: Position, token: CancellationToken): Definition | Thenable; + provideImplementation(model: editorCommon.IReadOnlyModel, position: Position, token: CancellationToken): Definition | Thenable; } /** @@ -752,7 +752,7 @@ export const DefinitionProviderRegistry = new LanguageFeatureRegistry(); +export const ImplementationProviderRegistry = new LanguageFeatureRegistry(); /** * @internal diff --git a/src/vs/editor/common/modes/editorModeContext.ts b/src/vs/editor/common/modes/editorModeContext.ts index 7b35d867392..ce020fb7bb4 100644 --- a/src/vs/editor/common/modes/editorModeContext.ts +++ b/src/vs/editor/common/modes/editorModeContext.ts @@ -20,7 +20,7 @@ export class EditorModeContext { private _hasCodeActionsProvider: IContextKey; private _hasCodeLensProvider: IContextKey; private _hasDefinitionProvider: IContextKey; - private _hasTypeImplementationProvider: IContextKey; + private _hasImplementationProvider: IContextKey; private _hasHoverProvider: IContextKey; private _hasDocumentHighlightProvider: IContextKey; private _hasDocumentSymbolProvider: IContextKey; @@ -42,7 +42,7 @@ export class EditorModeContext { this._hasCodeActionsProvider = ModeContextKeys.hasCodeActionsProvider.bindTo(contextKeyService); this._hasCodeLensProvider = ModeContextKeys.hasCodeLensProvider.bindTo(contextKeyService); this._hasDefinitionProvider = ModeContextKeys.hasDefinitionProvider.bindTo(contextKeyService); - this._hasTypeImplementationProvider = ModeContextKeys.hasTypeImplementationProvider.bindTo(contextKeyService); + this._hasImplementationProvider = ModeContextKeys.hasImplementationProvider.bindTo(contextKeyService); this._hasHoverProvider = ModeContextKeys.hasHoverProvider.bindTo(contextKeyService); this._hasDocumentHighlightProvider = ModeContextKeys.hasDocumentHighlightProvider.bindTo(contextKeyService); this._hasDocumentSymbolProvider = ModeContextKeys.hasDocumentSymbolProvider.bindTo(contextKeyService); @@ -62,7 +62,7 @@ export class EditorModeContext { modes.CodeActionProviderRegistry.onDidChange(this._update, this, this._disposables); modes.CodeLensProviderRegistry.onDidChange(this._update, this, this._disposables); modes.DefinitionProviderRegistry.onDidChange(this._update, this, this._disposables); - modes.TypeImplementationProviderRegistry.onDidChange(this._update, this, this._disposables); + modes.ImplementationProviderRegistry.onDidChange(this._update, this, this._disposables); modes.HoverProviderRegistry.onDidChange(this._update, this, this._disposables); modes.DocumentHighlightProviderRegistry.onDidChange(this._update, this, this._disposables); modes.DocumentSymbolProviderRegistry.onDidChange(this._update, this, this._disposables); @@ -85,7 +85,7 @@ export class EditorModeContext { this._hasCodeActionsProvider.reset(); this._hasCodeLensProvider.reset(); this._hasDefinitionProvider.reset(); - this._hasTypeImplementationProvider.reset(); + this._hasImplementationProvider.reset(); this._hasHoverProvider.reset(); this._hasDocumentHighlightProvider.reset(); this._hasDocumentSymbolProvider.reset(); @@ -108,7 +108,7 @@ export class EditorModeContext { this._hasCodeActionsProvider.set(modes.CodeActionProviderRegistry.has(model)); this._hasCodeLensProvider.set(modes.CodeLensProviderRegistry.has(model)); this._hasDefinitionProvider.set(modes.DefinitionProviderRegistry.has(model)); - this._hasTypeImplementationProvider.set(modes.TypeImplementationProviderRegistry.has(model)); + this._hasImplementationProvider.set(modes.ImplementationProviderRegistry.has(model)); this._hasHoverProvider.set(modes.HoverProviderRegistry.has(model)); this._hasDocumentHighlightProvider.set(modes.DocumentHighlightProviderRegistry.has(model)); this._hasDocumentSymbolProvider.set(modes.DocumentSymbolProviderRegistry.has(model)); diff --git a/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts b/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts index 9a151586ae1..4951b2302d9 100644 --- a/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts +++ b/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts @@ -26,7 +26,7 @@ import { editorAction, IActionOptions, ServicesAccessor, EditorAction } from 'vs import { Location, DefinitionProviderRegistry } from 'vs/editor/common/modes'; import { ICodeEditor, IEditorMouseEvent, IMouseTarget } from 'vs/editor/browser/editorBrowser'; import { editorContribution } from 'vs/editor/browser/editorBrowserExtensions'; -import { getDeclarationsAtPosition, getTypeImplementationAtPosition } from 'vs/editor/contrib/goToDeclaration/common/goToDeclaration'; +import { getDeclarationsAtPosition, getImplementationAtPosition } from 'vs/editor/contrib/goToDeclaration/common/goToDeclaration'; import { ReferencesController } from 'vs/editor/contrib/referenceSearch/browser/referencesController'; import { ReferencesModel } from 'vs/editor/contrib/referenceSearch/browser/referencesModel'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; @@ -241,7 +241,7 @@ export class GoToImplementationAction extends DefinitionAction { label: nls.localize('actions.goToImplementation.label', "Go to Implementation"), alias: 'Go to Implementation', precondition: ContextKeyExpr.and( - ModeContextKeys.hasTypeImplementationProvider, + ModeContextKeys.hasImplementationProvider, ModeContextKeys.isInEmbeddedEditor.toNegated()), kbOpts: { kbExpr: EditorContextKeys.TextFocus, @@ -255,7 +255,7 @@ export class GoToImplementationAction extends DefinitionAction { } protected getDeclarationsAtPosition(model: editorCommon.IModel, position: corePosition.Position): TPromise { - return getTypeImplementationAtPosition(model, position); + return getImplementationAtPosition(model, position); } } @@ -270,7 +270,7 @@ export class PeekImplementationAction extends DefinitionAction { label: nls.localize('actions.peekImplementation.label', "Peek Implementation"), alias: 'Peek Implementation', precondition: ContextKeyExpr.and( - ModeContextKeys.hasTypeImplementationProvider, + ModeContextKeys.hasImplementationProvider, ModeContextKeys.isInEmbeddedEditor.toNegated()), kbOpts: { kbExpr: EditorContextKeys.TextFocus, @@ -284,7 +284,7 @@ export class PeekImplementationAction extends DefinitionAction { } protected getDeclarationsAtPosition(model: editorCommon.IModel, position: corePosition.Position): TPromise { - return getTypeImplementationAtPosition(model, position); + return getImplementationAtPosition(model, position); } } diff --git a/src/vs/editor/contrib/goToDeclaration/common/goToDeclaration.ts b/src/vs/editor/contrib/goToDeclaration/common/goToDeclaration.ts index 9cc445089f9..de1ea6a641e 100644 --- a/src/vs/editor/contrib/goToDeclaration/common/goToDeclaration.ts +++ b/src/vs/editor/contrib/goToDeclaration/common/goToDeclaration.ts @@ -9,7 +9,7 @@ import { onUnexpectedExternalError } from 'vs/base/common/errors'; import { TPromise } from 'vs/base/common/winjs.base'; import { IReadOnlyModel } from 'vs/editor/common/editorCommon'; import { CommonEditorRegistry } from 'vs/editor/common/editorCommonExtensions'; -import { DefinitionProviderRegistry, TypeImplementationProviderRegistry, Location } from 'vs/editor/common/modes'; +import { DefinitionProviderRegistry, ImplementationProviderRegistry, Location } from 'vs/editor/common/modes'; import { asWinJsPromise } from 'vs/base/common/async'; import { Position } from 'vs/editor/common/core/position'; @@ -44,14 +44,14 @@ export function getDeclarationsAtPosition(model: IReadOnlyModel, position: Posit return outputResults(promises); } -export function getTypeImplementationAtPosition(model: IReadOnlyModel, position: Position): TPromise { +export function getImplementationAtPosition(model: IReadOnlyModel, position: Position): TPromise { - const provider = TypeImplementationProviderRegistry.ordered(model); + const provider = ImplementationProviderRegistry.ordered(model); // get results const promises = provider.map((provider, idx) => { return asWinJsPromise((token) => { - return provider.provideTypeImplementation(model, position, token); + return provider.provideImplementation(model, position, token); }).then(result => { return result; }, err => { @@ -62,4 +62,4 @@ export function getTypeImplementationAtPosition(model: IReadOnlyModel, position: } CommonEditorRegistry.registerDefaultLanguageCommand('_executeDefinitionProvider', getDeclarationsAtPosition); -CommonEditorRegistry.registerDefaultLanguageCommand('_executeTypeImplementationProvider', getTypeImplementationAtPosition); \ No newline at end of file +CommonEditorRegistry.registerDefaultLanguageCommand('_executeImplementationProvider', getImplementationAtPosition); \ No newline at end of file diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts index 58e56a185d8..d8393c6fae5 100644 --- a/src/vs/monaco.d.ts +++ b/src/vs/monaco.d.ts @@ -3939,7 +3939,7 @@ declare module monaco.languages { /** * Register a type implementation provider (used by e.g. go to implementation). */ - export function registerTypeImplementationProvider(languageId: string, provider: TypeImplementationProvider): IDisposable; + export function registerImplementationProvider(languageId: string, provider: ImplementationProvider): IDisposable; /** * Register a code lens provider (used by e.g. inline code lenses). @@ -4557,11 +4557,11 @@ declare module monaco.languages { * The type definition provider interface defines the contract between extensions and * the go to implementation feature. */ - export interface TypeImplementationProvider { + export interface ImplementationProvider { /** * Provide the implementation of the symbol at the given position and document. */ - provideTypeImplementation(model: editor.IReadOnlyModel, position: Position, token: CancellationToken): Definition | Thenable; + provideImplementation(model: editor.IReadOnlyModel, position: Position, token: CancellationToken): Definition | Thenable; } /** diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts index 7e74dca12d4..2ca345727c3 100644 --- a/src/vs/vscode.d.ts +++ b/src/vs/vscode.d.ts @@ -1649,7 +1649,7 @@ declare module 'vscode' { * The type implemenetation provider interface defines the contract between extensions and * the go to implementation feature. */ - export interface TypeImplementationProvider { + export interface ImplementationProvider { /** * Provide the implementations of the symbol at the given position and document. @@ -1660,7 +1660,7 @@ declare module 'vscode' { * @return A definition or a thenable that resolves to such. The lack of a result can be * signaled by returning `undefined` or `null`. */ - provideTypeImplementation(document: TextDocument, position: Position, token: CancellationToken): ProviderResult; + provideImplementation(document: TextDocument, position: Position, token: CancellationToken): ProviderResult; } /** @@ -4164,7 +4164,7 @@ declare module 'vscode' { * @param provider An implementation provider. * @return A [disposable](#Disposable) that unregisters this provider when being disposed. */ - export function registerTypeImplementationProvider(selector: DocumentSelector, provider: TypeImplementationProvider): Disposable; + export function registerImplementationProvider(selector: DocumentSelector, provider: ImplementationProvider): Disposable; /** * Register a hover provider. diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts index a1781fa96d6..c3e38145462 100644 --- a/src/vs/workbench/api/node/extHost.api.impl.ts +++ b/src/vs/workbench/api/node/extHost.api.impl.ts @@ -211,8 +211,8 @@ export function createApiFactory(initData: IInitData, threadService: IThreadServ registerDefinitionProvider(selector: vscode.DocumentSelector, provider: vscode.DefinitionProvider): vscode.Disposable { return languageFeatures.registerDefinitionProvider(selector, provider); }, - registerTypeImplementationProvider(selector: vscode.DocumentSelector, provider: vscode.TypeImplementationProvider): vscode.Disposable { - return languageFeatures.registerTypeImplementationProvider(selector, provider); + registerImplementationProvider(selector: vscode.DocumentSelector, provider: vscode.ImplementationProvider): vscode.Disposable { + return languageFeatures.registerImplementationProvider(selector, provider); }, registerHoverProvider(selector: vscode.DocumentSelector, provider: vscode.HoverProvider): vscode.Disposable { return languageFeatures.registerHoverProvider(selector, provider); diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts index adc46fddbca..fa69f8062e7 100644 --- a/src/vs/workbench/api/node/extHost.protocol.ts +++ b/src/vs/workbench/api/node/extHost.protocol.ts @@ -361,7 +361,7 @@ export abstract class ExtHostLanguageFeaturesShape { $provideCodeLenses(handle: number, resource: URI): TPromise { throw ni(); } $resolveCodeLens(handle: number, resource: URI, symbol: modes.ICodeLensSymbol): TPromise { throw ni(); } $provideDefinition(handle: number, resource: URI, position: editorCommon.IPosition): TPromise { throw ni(); } - $provideTypeImplementation(handle: number, resource: URI, position: editorCommon.IPosition): TPromise { throw ni(); } + $provideImplementation(handle: number, resource: URI, position: editorCommon.IPosition): TPromise { throw ni(); } $provideHover(handle: number, resource: URI, position: editorCommon.IPosition): TPromise { throw ni(); } $provideDocumentHighlights(handle: number, resource: URI, position: editorCommon.IPosition): TPromise { throw ni(); } $provideReferences(handle: number, resource: URI, position: editorCommon.IPosition, context: modes.ReferenceContext): TPromise { throw ni(); } diff --git a/src/vs/workbench/api/node/extHostApiCommands.ts b/src/vs/workbench/api/node/extHostApiCommands.ts index c90ec68e3a1..c4f7b9189e9 100644 --- a/src/vs/workbench/api/node/extHostApiCommands.ts +++ b/src/vs/workbench/api/node/extHostApiCommands.ts @@ -46,7 +46,7 @@ export class ExtHostApiCommands { ], returns: 'A promise that resolves to an array of Location-instances.' }); - this._register('vscode.executeTypeImplementationProvider', this._executeTypeImplementationProvider, { + this._register('vscode.executeImplementationProvider', this._executeImplementationProvider, { description: 'Execute all implementation providers.', args: [ { name: 'uri', description: 'Uri of a text document', constraint: URI }, @@ -273,12 +273,12 @@ export class ExtHostApiCommands { }); } - private _executeTypeImplementationProvider(resource: URI, position: types.Position): Thenable { + private _executeImplementationProvider(resource: URI, position: types.Position): Thenable { const args = { resource, position: position && typeConverters.fromPosition(position) }; - return this._commands.executeCommand('_executeTypeImplementationProvider', args).then(value => { + return this._commands.executeCommand('_executeImplementationProvider', args).then(value => { if (Array.isArray(value)) { return value.map(typeConverters.location.to); } diff --git a/src/vs/workbench/api/node/extHostLanguageFeatures.ts b/src/vs/workbench/api/node/extHostLanguageFeatures.ts index 3dbfd35d2c1..80d126d0e16 100644 --- a/src/vs/workbench/api/node/extHostLanguageFeatures.ts +++ b/src/vs/workbench/api/node/extHostLanguageFeatures.ts @@ -125,17 +125,17 @@ class DefinitionAdapter { class ImplementationAdapter { private _documents: ExtHostDocuments; - private _provider: vscode.TypeImplementationProvider; + private _provider: vscode.ImplementationProvider; - constructor(documents: ExtHostDocuments, provider: vscode.TypeImplementationProvider) { + constructor(documents: ExtHostDocuments, provider: vscode.ImplementationProvider) { this._documents = documents; this._provider = provider; } - provideTypeImplementation(resource: URI, position: IPosition): TPromise { + provideImplementation(resource: URI, position: IPosition): TPromise { let doc = this._documents.getDocumentData(resource).document; let pos = TypeConverters.toPosition(position); - return asWinJsPromise(token => this._provider.provideTypeImplementation(doc, pos, token)).then(value => { + return asWinJsPromise(token => this._provider.provideImplementation(doc, pos, token)).then(value => { if (Array.isArray(value)) { return value.map(TypeConverters.location.from); } else if (value) { @@ -736,15 +736,15 @@ export class ExtHostLanguageFeatures extends ExtHostLanguageFeaturesShape { return this._withAdapter(handle, DefinitionAdapter, adapter => adapter.provideDefinition(resource, position)); } - registerTypeImplementationProvider(selector: vscode.DocumentSelector, provider: vscode.TypeImplementationProvider): vscode.Disposable { + registerImplementationProvider(selector: vscode.DocumentSelector, provider: vscode.ImplementationProvider): vscode.Disposable { const handle = this._nextHandle(); this._adapter.set(handle, new ImplementationAdapter(this._documents, provider)); this._proxy.$registerImplementationSupport(handle, selector); return this._createDisposable(handle); } - $provideTypeImplementation(handle: number, resource: URI, position: IPosition): TPromise { - return this._withAdapter(handle, ImplementationAdapter, adapter => adapter.provideTypeImplementation(resource, position)); + $provideImplementation(handle: number, resource: URI, position: IPosition): TPromise { + return this._withAdapter(handle, ImplementationAdapter, adapter => adapter.provideImplementation(resource, position)); } // --- extra info diff --git a/src/vs/workbench/api/node/mainThreadLanguageFeatures.ts b/src/vs/workbench/api/node/mainThreadLanguageFeatures.ts index 1168fc13c89..fc66a29931b 100644 --- a/src/vs/workbench/api/node/mainThreadLanguageFeatures.ts +++ b/src/vs/workbench/api/node/mainThreadLanguageFeatures.ts @@ -103,9 +103,9 @@ export class MainThreadLanguageFeatures extends MainThreadLanguageFeaturesShape } $registerImplementationSupport(handle: number, selector: vscode.DocumentSelector): TPromise { - this._registrations[handle] = modes.TypeImplementationProviderRegistry.register(selector, { - provideTypeImplementation: (model, position, token): Thenable => { - return wireCancellationToken(token, this._proxy.$provideTypeImplementation(handle, model.uri, position)); + this._registrations[handle] = modes.ImplementationProviderRegistry.register(selector, { + provideImplementation: (model, position, token): Thenable => { + return wireCancellationToken(token, this._proxy.$provideImplementation(handle, model.uri, position)); } }); return undefined; diff --git a/src/vs/workbench/test/node/api/extHostLanguageFeatures.test.ts b/src/vs/workbench/test/node/api/extHostLanguageFeatures.test.ts index 8fc51d5ce01..2ba63517c3a 100644 --- a/src/vs/workbench/test/node/api/extHostLanguageFeatures.test.ts +++ b/src/vs/workbench/test/node/api/extHostLanguageFeatures.test.ts @@ -27,7 +27,7 @@ import { ExtHostDocuments } from 'vs/workbench/api/node/extHostDocuments'; import { getDocumentSymbols } from 'vs/editor/contrib/quickOpen/common/quickOpen'; import { DocumentSymbolProviderRegistry, DocumentHighlightKind } from 'vs/editor/common/modes'; import { getCodeLensData } from 'vs/editor/contrib/codelens/common/codelens'; -import { getDeclarationsAtPosition, getTypeImplementationAtPosition } from 'vs/editor/contrib/goToDeclaration/common/goToDeclaration'; +import { getDeclarationsAtPosition, getImplementationAtPosition } from 'vs/editor/contrib/goToDeclaration/common/goToDeclaration'; import { getHover } from 'vs/editor/contrib/hover/common/hover'; import { getOccurrencesAtPosition } from 'vs/editor/contrib/wordHighlighter/common/wordHighlighter'; import { provideReferences } from 'vs/editor/contrib/referenceSearch/common/referenceSearch'; @@ -354,16 +354,16 @@ suite('ExtHostLanguageFeatures', function () { // --- type implementation - test('TypeImplementation, data conversion', function () { + test('Implementation, data conversion', function () { - disposables.push(extHost.registerTypeImplementationProvider(defaultSelector, { - provideTypeImplementation(): any { + disposables.push(extHost.registerImplementationProvider(defaultSelector, { + provideImplementation(): any { return [new types.Location(model.uri, new types.Range(1, 2, 3, 4))]; } })); return threadService.sync().then(() => { - return getTypeImplementationAtPosition(model, new EditorPosition(1, 1)).then(value => { + return getImplementationAtPosition(model, new EditorPosition(1, 1)).then(value => { assert.equal(value.length, 1); let [entry] = value; assert.deepEqual(entry.range, { startLineNumber: 2, startColumn: 3, endLineNumber: 4, endColumn: 5 });