From a4bed89652baf8bf5b24791e8c9b6c8183290026 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Fri, 7 Dec 2018 13:00:18 -0800 Subject: [PATCH] :lipstick: --- .../src/features/definitionProviderBase.ts | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/extensions/typescript-language-features/src/features/definitionProviderBase.ts b/extensions/typescript-language-features/src/features/definitionProviderBase.ts index 45e52d4c2e2..2ce74daa6fb 100644 --- a/extensions/typescript-language-features/src/features/definitionProviderBase.ts +++ b/extensions/typescript-language-features/src/features/definitionProviderBase.ts @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; -import * as Proto from '../protocol'; import { ITypeScriptServiceClient } from '../typescriptService'; import * as typeConverters from '../utils/typeConverters'; @@ -20,20 +19,18 @@ export default class TypeScriptDefinitionProviderBase { position: vscode.Position, token: vscode.CancellationToken ): Promise { - const filepath = this.client.toOpenedFilePath(document); - if (!filepath) { + const file = this.client.toOpenedFilePath(document); + if (!file) { return undefined; } - const args = typeConverters.Position.toFileLocationRequestArgs(filepath, position); - + const args = typeConverters.Position.toFileLocationRequestArgs(file, position); const response = await this.client.execute(definitionType, args, token); - if (response.type !== 'response') { + if (response.type !== 'response' || !response.body) { return undefined; } - const locations: Proto.FileSpan[] = (response && response.body) || []; - return locations.map(location => + return response.body.map(location => typeConverters.Location.fromTextSpan(this.client.toResource(location.file), location)); } } \ No newline at end of file