Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 09:08:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

better scope try catch in provideCompletionItems

Browse Source 
We only want to swallow exceptions around the request itself
This commit is contained in:
Matt Bierner
2018-02-23 17:11:30 -08:00
parent ec3e57e946
commit a269045780
1 changed files with 38 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/typescript/src/features/completionItemProvider.ts
+38 -50
View File
@@ -263,61 +263,49 @@ export default class TypeScriptCompletionItemProvider implements vscode.Completi
return []; return [];
} }
const args: Proto.CompletionsRequestArgs = {
...vsPositionToTsFileLocation(file, position),
includeExternalModuleExports: config.autoImportSuggestions,
includeInsertTextCompletions: true
};
let msg: Proto.CompletionEntry[] | undefined = undefined;
try { try {
const args: Proto.CompletionsRequestArgs = { const response = await this.client.execute('completions', args, token);
...vsPositionToTsFileLocation(file, position), msg = response.body;
includeExternalModuleExports: config.autoImportSuggestions, if (!msg) {
includeInsertTextCompletions: true return [];
};
const msg = await this.client.execute('completions', args, token);
// This info has to come from the tsserver. See https://github.com/Microsoft/TypeScript/issues/2831
// let isMemberCompletion = false;
// let requestColumn = position.character;
// if (wordAtPosition) {
// requestColumn = wordAtPosition.startColumn;
// }
// if (requestColumn > 0) {
// let value = model.getValueInRange({
// startLineNumber: position.line,
// startColumn: requestColumn - 1,
// endLineNumber: position.line,
// endColumn: requestColumn
// });
// isMemberCompletion = value === '.';
// }
const completionItems: vscode.CompletionItem[] = [];
const body = msg.body;
if (body) {
// Only enable dot completions in TS files for now
let enableDotCompletions = document && (document.languageId === languageModeIds.typescript || document.languageId === languageModeIds.typescriptreact);
// TODO: Workaround for https://github.com/Microsoft/TypeScript/issues/13456
// Only enable dot completions when previous character is an identifier.
// Prevents incorrectly completing while typing spread operators.
if (position.character > 1) {
const preText = document.getText(new vscode.Range(
position.line, 0,
position.line, position.character - 1));
enableDotCompletions = preText.match(/[a-z_$\)\]\}]\s*$/ig) !== null;
}
for (const element of body) {
if (element.kind === PConst.Kind.warning && !config.nameSuggestions) {
continue;
}
if (!config.autoImportSuggestions && element.hasAction) {
continue;
}
const item = new MyCompletionItem(position, document, line.text, element, enableDotCompletions, config.useCodeSnippetsOnMethodSuggest);
completionItems.push(item);
}
} }
return completionItems;
} catch { } catch {
return []; return [];
} }
// Only enable dot completions in TS files for now
let enableDotCompletions = document && (document.languageId === languageModeIds.typescript || document.languageId === languageModeIds.typescriptreact);
// TODO: Workaround for https://github.com/Microsoft/TypeScript/issues/13456
// Only enable dot completions when previous character is an identifier.
// Prevents incorrectly completing while typing spread operators.
if (position.character > 1) {
const preText = document.getText(new vscode.Range(
position.line, 0,
position.line, position.character - 1));
enableDotCompletions = preText.match(/[a-z_$\)\]\}]\s*$/ig) !== null;
}
const completionItems: vscode.CompletionItem[] = [];
for (const element of msg) {
if (element.kind === PConst.Kind.warning && !config.nameSuggestions) {
continue;
}
if (!config.autoImportSuggestions && element.hasAction) {
continue;
}
const item = new MyCompletionItem(position, document, line.text, element, enableDotCompletions, config.useCodeSnippetsOnMethodSuggest);
completionItems.push(item);
}
return completionItems;
} }
private shouldTrigger(context: vscode.CompletionContext, config: Configuration, line: vscode.TextLine, position: vscode.Position) { private shouldTrigger(context: vscode.CompletionContext, config: Configuration, line: vscode.TextLine, position: vscode.Position) {