Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 18:49:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Catch errors on signature help provider

Browse Source 
Part of #46852
This commit is contained in:
Matt Bierner
2018-04-23 17:43:33 -07:00
parent a05e0f354d
commit 93ff0d0c14
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
extensions/typescript-language-features/src/features/signatureHelpProvider.ts
View File

@@ -3,13 +3,13 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { SignatureHelpProvider, SignatureHelp, SignatureInformation, ParameterInformation, TextDocument, Position, CancellationToken } from 'vscode';
import * as Previewer from '../utils/previewer';
import { CancellationToken, ParameterInformation, Position, SignatureHelp, SignatureHelpProvider, SignatureInformation, TextDocument } from 'vscode';
import * as Proto from '../protocol';
import { ITypeScriptServiceClient } from '../typescriptService';
import * as Previewer from '../utils/previewer';
import * as typeConverters from '../utils/typeConverters';
export default class TypeScriptSignatureHelpProvider implements SignatureHelpProvider {
public constructor(
@@ -23,9 +23,14 @@ export default class TypeScriptSignatureHelpProvider implements SignatureHelpPro
}
const args: Proto.SignatureHelpRequestArgs = typeConverters.Position.toFileLocationRequestArgs(filepath, position);
const response = await this.client.execute('signatureHelp', args, token);
const info = response.body;
if (!info) {
let info: Proto.SignatureHelpItems | undefined = undefined;
try {
const response = await this.client.execute('signatureHelp', args, token);
info = response.body;
if (!info) {
return null;
}
} catch {
return null;
}
@@ -35,8 +40,8 @@ export default class TypeScriptSignatureHelpProvider implements SignatureHelpPro
info.items.forEach((item, i) => {
// keep active parameter in bounds
if (i === info.selectedItemIndex && item.isVariadic) {
result.activeParameter = Math.min(info.argumentIndex, item.parameters.length - 1);
if (i === info!.selectedItemIndex && item.isVariadic) {
result.activeParameter = Math.min(info!.argumentIndex, item.parameters.length - 1);
}
const signature = new SignatureInformation('');