From 76885d753d6749294ab4745e3ceccb6b352b7dfd Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Wed, 21 Jul 2021 11:33:13 -0700 Subject: [PATCH] Use static list of commit characters Testing this for the TS side. We think that being consistent may be better than trying to be smart here --- .../src/languageFeatures/completions.ts | 39 ++++--------------- 1 file changed, 7 insertions(+), 32 deletions(-) diff --git a/extensions/typescript-language-features/src/languageFeatures/completions.ts b/extensions/typescript-language-features/src/languageFeatures/completions.ts index 0f3bfb1e8c7..7721992b174 100644 --- a/extensions/typescript-language-features/src/languageFeatures/completions.ts +++ b/extensions/typescript-language-features/src/languageFeatures/completions.ts @@ -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, tsEntry); + this.commitCharacters = MyCompletionItem.getCommitCharacters(completionContext); this.insertText = isSnippet && tsEntry.insertText ? new vscode.SnippetString(tsEntry.insertText) : tsEntry.insertText; this.filterText = this.getFilterText(completionContext.line, tsEntry.insertText); @@ -489,42 +489,17 @@ class MyCompletionItem extends vscode.CompletionItem { } } - private static getCommitCharacters(context: CompletionContext, entry: Proto.CompletionEntry): string[] | undefined { + private static getCommitCharacters(context: CompletionContext): string[] | undefined { if (context.isNewIdentifierLocation || !context.isInValidCommitCharacterContext) { return undefined; } - const commitCharacters: string[] = []; - switch (entry.kind) { - case PConst.Kind.memberGetAccessor: - case PConst.Kind.memberSetAccessor: - case PConst.Kind.constructSignature: - case PConst.Kind.callSignature: - case PConst.Kind.indexSignature: - case PConst.Kind.enum: - case PConst.Kind.interface: - commitCharacters.push('.', ';'); - break; - - case PConst.Kind.module: - case PConst.Kind.alias: - case PConst.Kind.const: - case PConst.Kind.let: - case PConst.Kind.variable: - case PConst.Kind.localVariable: - case PConst.Kind.memberVariable: - case PConst.Kind.class: - case PConst.Kind.function: - case PConst.Kind.method: - case PConst.Kind.keyword: - case PConst.Kind.parameter: - commitCharacters.push('.', ',', ';'); - if (context.enableCallCompletions) { - commitCharacters.push('('); - } - break; + const commitCharacters: string[] = ['.', ',', ';']; + if (context.enableCallCompletions) { + commitCharacters.push('('); } - return commitCharacters.length === 0 ? undefined : commitCharacters; + + return commitCharacters; } }