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

Simplify setting of preselect and sort text

Browse Source
This commit is contained in:
Matt Bierner
2019-05-22 14:20:01 -07:00
parent fd0aeef9a6
commit 1db653c59e
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,12 +50,7 @@ class MyCompletionItem extends vscode.CompletionItem {
) { ) {
super(tsEntry.name, MyCompletionItem.convertKind(tsEntry.kind)); super(tsEntry.name, MyCompletionItem.convertKind(tsEntry.kind));
if (tsEntry.isRecommended) { if (tsEntry.source) {
// Make sure isRecommended property always comes first
// https://github.com/Microsoft/vscode/issues/40325
this.sortText = tsEntry.sortText;
this.preselect = true;
} else if (tsEntry.source) {
// De-prioritze auto-imports // De-prioritze auto-imports
// https://github.com/Microsoft/vscode/issues/40311 // https://github.com/Microsoft/vscode/issues/40311
this.sortText = '\uffff' + tsEntry.sortText; this.sortText = '\uffff' + tsEntry.sortText;
@@ -63,6 +58,10 @@ class MyCompletionItem extends vscode.CompletionItem {
this.sortText = tsEntry.sortText; this.sortText = tsEntry.sortText;
} }
if (tsEntry.isRecommended) {
this.preselect = true;
}
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);
@@ -87,7 +86,6 @@ class MyCompletionItem extends vscode.CompletionItem {
if (tsEntry.kindModifiers) { if (tsEntry.kindModifiers) {
const kindModifiers = new Set(tsEntry.kindModifiers.split(/\s+/g)); const kindModifiers = new Set(tsEntry.kindModifiers.split(/\s+/g));
if (kindModifiers.has(PConst.KindModifiers.optional)) { if (kindModifiers.has(PConst.KindModifiers.optional)) {
if (!this.insertText) { if (!this.insertText) {
this.insertText = this.label; this.insertText = this.label;
@@ -205,7 +203,6 @@ class MyCompletionItem extends vscode.CompletionItem {
case PConst.Kind.enum: case PConst.Kind.enum:
case PConst.Kind.interface: case PConst.Kind.interface:
commitCharacters.push('.', ';'); commitCharacters.push('.', ';');
break; break;
case PConst.Kind.module: case PConst.Kind.module: