Skip to content

Commit

Permalink
rename sort text helper
Browse files Browse the repository at this point in the history
  • Loading branch information
gabritto committed Mar 23, 2022
1 parent 6ebe361 commit 411bc18
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion src/harness/fourslashInterfaceImpl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -975,7 +975,7 @@ namespace FourSlashInterface {
return `${presetSortText}\0${symbolDisplayName}\0` as SortText;
},

AddIsSnippetSuffix(sortText: SortText): SortText {
SortBelow(sortText: SortText): SortText {
return sortText + "1" as SortText;
},
};
Expand Down
4 changes: 2 additions & 2 deletions src/services/completions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace ts.Completions {
return `${presetSortText}\0${symbolDisplayName}\0` as SortText;
},

AddIsSnippetSuffix(sortText: SortText): SortText {
SortBelow(sortText: SortText): SortText {
return sortText + "1" as SortText;
},
};
Expand Down Expand Up @@ -780,7 +780,7 @@ namespace ts.Completions {
}
({ insertText, isSnippet, importAdder, sourceDisplay } = entry);
source = CompletionSource.ObjectLiteralMethodSnippet;
sortText = SortText.AddIsSnippetSuffix(sortText);
sortText = SortText.SortBelow(sortText);
if (importAdder.hasFixes()) {
hasAction = true;
}
Expand Down
10 changes: 5 additions & 5 deletions tests/cases/fourslash/completionsObjectLiteralMethod1.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ verify.completions({
},
{
name: "bar",
sortText: completion.SortText.AddIsSnippetSuffix(
sortText: completion.SortText.SortBelow(
completion.SortText.ObjectLiteralProperty(completion.SortText.LocationPriority, "bar")),
source: completion.CompletionSource.ObjectLiteralMethodSnippet,
insertText: "bar(x: number): void {\n},",
Expand All @@ -69,7 +69,7 @@ verify.completions({
},
{
name: "bar",
sortText: completion.SortText.AddIsSnippetSuffix(
sortText: completion.SortText.SortBelow(
completion.SortText.ObjectLiteralProperty(completion.SortText.LocationPriority, "bar")),
source: completion.CompletionSource.ObjectLiteralMethodSnippet,
insertText: "bar(x: number): void {\n},",
Expand All @@ -81,7 +81,7 @@ verify.completions({
},
{
name: "foo",
sortText: completion.SortText.AddIsSnippetSuffix(
sortText: completion.SortText.SortBelow(
completion.SortText.ObjectLiteralProperty(completion.SortText.LocationPriority, "foo")),
source: completion.CompletionSource.ObjectLiteralMethodSnippet,
insertText: "foo(x: string): string {\n},",
Expand Down Expand Up @@ -119,7 +119,7 @@ verify.completions({
},
{
name: "\"space bar\"",
sortText: completion.SortText.AddIsSnippetSuffix(
sortText: completion.SortText.SortBelow(
completion.SortText.ObjectLiteralProperty(completion.SortText.LocationPriority, "\"space bar\"")),
source: completion.CompletionSource.ObjectLiteralMethodSnippet,
insertText: "\"space bar\"(): string {\n},",
Expand All @@ -141,7 +141,7 @@ verify.completions({
},
{
name: "bar",
sortText: completion.SortText.AddIsSnippetSuffix(
sortText: completion.SortText.SortBelow(
completion.SortText.ObjectLiteralProperty(completion.SortText.LocationPriority, "bar")),
source: completion.CompletionSource.ObjectLiteralMethodSnippet,
isSnippet: true,
Expand Down
2 changes: 1 addition & 1 deletion tests/cases/fourslash/completionsObjectLiteralMethod2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ verify.completions({
},
{
name: "foo",
sortText: completion.SortText.AddIsSnippetSuffix(
sortText: completion.SortText.SortBelow(
completion.SortText.ObjectLiteralProperty(completion.SortText.LocationPriority, "foo")),
source: completion.CompletionSource.ObjectLiteralMethodSnippet,
insertText: "foo(f: IFoo): void {\n},",
Expand Down
8 changes: 4 additions & 4 deletions tests/cases/fourslash/completionsObjectLiteralMethod3.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ verify.completions({
},
{
name: "M",
sortText: completion.SortText.AddIsSnippetSuffix(
sortText: completion.SortText.SortBelow(
completion.SortText.ObjectLiteralProperty(completion.SortText.LocationPriority, "M")),
source: completion.CompletionSource.ObjectLiteralMethodSnippet,
insertText: "M(x: number): void {\n},",
Expand Down Expand Up @@ -101,7 +101,7 @@ verify.completions({
},
{
name: "M",
sortText: completion.SortText.AddIsSnippetSuffix(
sortText: completion.SortText.SortBelow(
completion.SortText.ObjectLiteralProperty(completion.SortText.OptionalMember, "M")),
source: completion.CompletionSource.ObjectLiteralMethodSnippet,
insertText: "M(x: number): void {\n},",
Expand All @@ -113,7 +113,7 @@ verify.completions({
},
{
name: "N",
sortText: completion.SortText.AddIsSnippetSuffix(
sortText: completion.SortText.SortBelow(
completion.SortText.ObjectLiteralProperty(completion.SortText.LocationPriority, "N")),
source: completion.CompletionSource.ObjectLiteralMethodSnippet,
insertText: "N(x: string): void {\n},",
Expand All @@ -125,7 +125,7 @@ verify.completions({
},
{
name: "O",
sortText: completion.SortText.AddIsSnippetSuffix(
sortText: completion.SortText.SortBelow(
completion.SortText.ObjectLiteralProperty(completion.SortText.OptionalMember, "O")),
source: completion.CompletionSource.ObjectLiteralMethodSnippet,
insertText: "O(): void {\n},",
Expand Down
2 changes: 1 addition & 1 deletion tests/cases/fourslash/fourslash.ts
Original file line number Diff line number Diff line change
Expand Up @@ -853,7 +853,7 @@ declare namespace completion {

Deprecated(sortText: SortText): SortText,
ObjectLiteralProperty(presetSortText: SortText, symbolDisplayName: string): SortText,
AddIsSnippetSuffix(sortText: SortText): SortText,
SortBelow(sortText: SortText): SortText,
};

export const enum CompletionSource {
Expand Down

0 comments on commit 411bc18

Please sign in to comment.