Skip to content

Commit cf8ed8f

Browse files
authored
Change sortText for class member completions (microsoft#48196)
* change sortText for class member completions * update test * create new sort text member for class snippets * change values of sort text enum
1 parent f12922c commit cf8ed8f

24 files changed

+165
-136
lines changed

src/services/completions.ts

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,15 @@ namespace ts.Completions {
1717
SuggestedClassMembers = "14",
1818
GlobalsOrKeywords = "15",
1919
AutoImportSuggestions = "16",
20-
JavascriptIdentifiers = "17",
21-
DeprecatedLocalDeclarationPriority = "18",
22-
DeprecatedLocationPriority = "19",
23-
DeprecatedOptionalMember = "20",
24-
DeprecatedMemberDeclaredBySpreadAssignment = "21",
25-
DeprecatedSuggestedClassMembers = "22",
26-
DeprecatedGlobalsOrKeywords = "23",
27-
DeprecatedAutoImportSuggestions = "24"
20+
ClassMemberSnippets = "17",
21+
JavascriptIdentifiers = "18",
22+
DeprecatedLocalDeclarationPriority = "19",
23+
DeprecatedLocationPriority = "20",
24+
DeprecatedOptionalMember = "21",
25+
DeprecatedMemberDeclaredBySpreadAssignment = "22",
26+
DeprecatedSuggestedClassMembers = "23",
27+
DeprecatedGlobalsOrKeywords = "24",
28+
DeprecatedAutoImportSuggestions = "25"
2829
}
2930

3031
const enum SortTextId {
@@ -37,8 +38,8 @@ namespace ts.Completions {
3738
AutoImportSuggestions = 16,
3839

3940
// Don't use these directly.
40-
_JavaScriptIdentifiers = 17,
41-
_DeprecatedStart = 18,
41+
_JavaScriptIdentifiers = 18,
42+
_DeprecatedStart = 19,
4243
_First = LocalDeclarationPriority,
4344

4445
DeprecatedOffset = _DeprecatedStart - _First,
@@ -769,6 +770,7 @@ namespace ts.Completions {
769770
isClassLikeMemberCompletion(symbol, location)) {
770771
let importAdder;
771772
({ insertText, isSnippet, importAdder, replacementSpan } = getEntryForMemberCompletion(host, program, options, preferences, name, symbol, location, contextToken, formatContext));
773+
sortText = SortText.ClassMemberSnippets; // sortText has to be lower priority than the sortText for keywords. See #47852.
772774
if (importAdder?.hasFixes()) {
773775
hasAction = true;
774776
source = CompletionSource.ClassMemberSnippet;

tests/baselines/reference/completionsCommentsClass.baseline

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3760,7 +3760,7 @@
37603760
"name": "escape",
37613761
"kind": "function",
37623762
"kindModifiers": "deprecated,declare",
3763-
"sortText": "23",
3763+
"sortText": "24",
37643764
"displayParts": [
37653765
{
37663766
"text": "function",
@@ -3850,7 +3850,7 @@
38503850
"name": "unescape",
38513851
"kind": "function",
38523852
"kindModifiers": "deprecated,declare",
3853-
"sortText": "23",
3853+
"sortText": "24",
38543854
"displayParts": [
38553855
{
38563856
"text": "function",

0 commit comments

Comments
 (0)