Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't return trigger characters for ambient JS suggestions #130727

Merged
merged 1 commit into from Aug 13, 2021
Merged

Don't return trigger characters for ambient JS suggestions #130727

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions extensions/typescript-language-features/src/languageFeatures/completions.ts
View file
Open in desktop
Expand Up @@ -89,7 +89,7 @@ class MyCompletionItem extends vscode.CompletionItem {
this.useCodeSnippet = completionContext.useCodeSnippetsOnMethodSuggest && (this.kind === vscode.CompletionItemKind.Function || this.kind === vscode.CompletionItemKind.Method);

this.range = this.getRangeFromReplacementSpan(tsEntry, completionContext);
this.commitCharacters = MyCompletionItem.getCommitCharacters(completionContext);
this.commitCharacters = MyCompletionItem.getCommitCharacters(completionContext, tsEntry);
this.insertText = isSnippet && tsEntry.insertText ? new vscode.SnippetString(tsEntry.insertText) : tsEntry.insertText;
this.filterText = this.getFilterText(completionContext.line, tsEntry.insertText);

Expand Down Expand Up @@ -489,7 +489,11 @@ class MyCompletionItem extends vscode.CompletionItem {
}
}

private static getCommitCharacters(context: CompletionContext): string[] | undefined {
private static getCommitCharacters(context: CompletionContext, entry: Proto.CompletionEntry): string[] | undefined {
if (entry.kind === PConst.Kind.warning) { // Ambient JS word based suggestion
return undefined;
}

if (context.isNewIdentifierLocation || !context.isInValidCommitCharacterContext) {
return undefined;
}
Expand Down