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

Fix completions for intellicode

Browse Source 
IntelliCode uses `insertText`  on all of its suggestions. When completing properties, we were incorrectly assuming that only bracket suggestions would use `insertText`
This commit is contained in:
Matt Bierner
2018-12-02 11:53:04 -08:00
parent e39a97deb7
commit e42d74ce9a
1 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,33 +64,26 @@ class MyCompletionItem extends vscode.CompletionItem {
this.position = position; this.position = position;
this.useCodeSnippet = useCodeSnippetsOnMethodSuggest && (this.kind === vscode.CompletionItemKind.Function || this.kind === vscode.CompletionItemKind.Method); this.useCodeSnippet = useCodeSnippetsOnMethodSuggest && (this.kind === vscode.CompletionItemKind.Function || this.kind === vscode.CompletionItemKind.Method);
if (tsEntry.replacementSpan) { if (tsEntry.replacementSpan) {
this.range = typeConverters.Range.fromTextSpan(tsEntry.replacementSpan); this.range = typeConverters.Range.fromTextSpan(tsEntry.replacementSpan);
} // Make sure we only replace a single line at most
if (!this.range.isSingleLine) {
if (tsEntry.insertText) { this.range = new vscode.Range(this.range.start.line, this.range.start.character, this.range.start.line, line.length);
this.insertText = tsEntry.insertText;
this.filterText = tsEntry.insertText;
if (tsEntry.replacementSpan) {
this.range = typeConverters.Range.fromTextSpan(tsEntry.replacementSpan);
// Make sure we only replace a single line at most
if (!this.range.isSingleLine) {
this.range = new vscode.Range(this.range.start.line, this.range.start.character, this.range.start.line, line.length);
}
} }
} }
// For #63100, always add fake insert text for member completions this.insertText = tsEntry.insertText;
this.filterText = tsEntry.insertText;
if (completionContext.isMemberCompletion && completionContext.dotAccessorContext) { if (completionContext.isMemberCompletion && completionContext.dotAccessorContext) {
this.range = completionContext.dotAccessorContext.range; this.filterText = completionContext.dotAccessorContext.text + (this.insertText || this.label);
this.filterText = completionContext.dotAccessorContext.text + this.label; if (!this.range) {
if (!this.insertText) { this.range = completionContext.dotAccessorContext.range;
this.insertText = completionContext.dotAccessorContext.text + this.label; this.insertText = this.filterText;
} }
} }
if (tsEntry.kindModifiers) { if (tsEntry.kindModifiers) {
const kindModifiers = new Set(tsEntry.kindModifiers.split(/\s+/g)); const kindModifiers = new Set(tsEntry.kindModifiers.split(/\s+/g));