Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-22 11:19:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't complete jsx tag as function call (#180171)

Browse Source 
Fixes #177606
This commit is contained in:
Matt Bierner
2023-04-17 21:12:28 -07:00
committed by GitHub
parent 735b7910e9
commit 95396f14db
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
extensions/typescript-language-features/src/languageFeatures/completions.ts
View File

@@ -36,7 +36,7 @@ interface CompletionContext {
readonly dotAccessorContext?: DotAccessorContext; readonly dotAccessorContext?: DotAccessorContext;
readonly enableCallCompletions: boolean; readonly enableCallCompletions: boolean;
readonly useCodeSnippetsOnMethodSuggest: boolean; readonly completeFunctionCalls: boolean;
readonly wordRange: vscode.Range | undefined; readonly wordRange: vscode.Range | undefined;
readonly line: string; readonly line: string;
@@ -91,7 +91,7 @@ class MyCompletionItem extends vscode.CompletionItem {
this.preselect = tsEntry.isRecommended; this.preselect = tsEntry.isRecommended;
this.position = position; this.position = position;
this.useCodeSnippet = completionContext.useCodeSnippetsOnMethodSuggest && (this.kind === vscode.CompletionItemKind.Function || this.kind === vscode.CompletionItemKind.Method); this.useCodeSnippet = completionContext.completeFunctionCalls && (this.kind === vscode.CompletionItemKind.Function || this.kind === vscode.CompletionItemKind.Method);
this.range = this.getRangeFromReplacementSpan(tsEntry, completionContext); this.range = this.getRangeFromReplacementSpan(tsEntry, completionContext);
this.commitCharacters = MyCompletionItem.getCommitCharacters(completionContext, tsEntry); this.commitCharacters = MyCompletionItem.getCommitCharacters(completionContext, tsEntry);
@@ -295,10 +295,22 @@ class MyCompletionItem extends vscode.CompletionItem {
// Noop // Noop
} }
const line = document.lineAt(position.line);
// Don't complete function call if there is already something that looks like a function call // Don't complete function call if there is already something that looks like a function call
// https://github.com/microsoft/vscode/issues/18131 // https://github.com/microsoft/vscode/issues/18131
const after = document.lineAt(position.line).text.slice(position.character);
return after.match(/^[a-z_$0-9]*\s*\(/gi) === null; const after = line.text.slice(position.character);
if (after.match(/^[a-z_$0-9]*\s*\(/gi)) {
return false;
}
// Don't complete function call if it looks like a jsx tag.
const before = line.text.slice(0, position.character);
if (before.match(/<\s*[\w]*$/gi)) {
return false;
}
return true;
} }
private getCodeActions( private getCodeActions(
@@ -633,7 +645,7 @@ class ApplyCompletionCodeActionCommand implements Command {
} }
interface CompletionConfiguration { interface CompletionConfiguration {
readonly useCodeSnippetsOnMethodSuggest: boolean; readonly completeFunctionCalls: boolean;
readonly nameSuggestions: boolean; readonly nameSuggestions: boolean;
readonly pathSuggestions: boolean; readonly pathSuggestions: boolean;
readonly autoImportSuggestions: boolean; readonly autoImportSuggestions: boolean;
@@ -641,7 +653,7 @@ interface CompletionConfiguration {
} }
namespace CompletionConfiguration { namespace CompletionConfiguration {
export const useCodeSnippetsOnMethodSuggest = 'suggest.completeFunctionCalls'; export const completeFunctionCalls = 'suggest.completeFunctionCalls';
export const nameSuggestions = 'suggest.names'; export const nameSuggestions = 'suggest.names';
export const pathSuggestions = 'suggest.paths'; export const pathSuggestions = 'suggest.paths';
export const autoImportSuggestions = 'suggest.autoImports'; export const autoImportSuggestions = 'suggest.autoImports';
@@ -653,7 +665,7 @@ namespace CompletionConfiguration {
): CompletionConfiguration { ): CompletionConfiguration {
const config = vscode.workspace.getConfiguration(modeId, resource); const config = vscode.workspace.getConfiguration(modeId, resource);
return { return {
useCodeSnippetsOnMethodSuggest: config.get<boolean>(CompletionConfiguration.useCodeSnippetsOnMethodSuggest, false), completeFunctionCalls: config.get<boolean>(CompletionConfiguration.completeFunctionCalls, false),
pathSuggestions: config.get<boolean>(CompletionConfiguration.pathSuggestions, true), pathSuggestions: config.get<boolean>(CompletionConfiguration.pathSuggestions, true),
autoImportSuggestions: config.get<boolean>(CompletionConfiguration.autoImportSuggestions, true), autoImportSuggestions: config.get<boolean>(CompletionConfiguration.autoImportSuggestions, true),
nameSuggestions: config.get<boolean>(CompletionConfiguration.nameSuggestions, true), nameSuggestions: config.get<boolean>(CompletionConfiguration.nameSuggestions, true),
@@ -782,10 +794,10 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider<
isMemberCompletion, isMemberCompletion,
dotAccessorContext, dotAccessorContext,
isInValidCommitCharacterContext: this.isInValidCommitCharacterContext(document, position), isInValidCommitCharacterContext: this.isInValidCommitCharacterContext(document, position),
enableCallCompletions: !completionConfiguration.useCodeSnippetsOnMethodSuggest, enableCallCompletions: !completionConfiguration.completeFunctionCalls,
wordRange, wordRange,
line: line.text, line: line.text,
useCodeSnippetsOnMethodSuggest: completionConfiguration.useCodeSnippetsOnMethodSuggest, completeFunctionCalls: completionConfiguration.completeFunctionCalls,
useFuzzyWordRangeLogic: this.client.apiVersion.lt(API.v390), useFuzzyWordRangeLogic: this.client.apiVersion.lt(API.v390),
}; };