Default expected sortText to LocationPriority when verifying completions (#1264)

Author: Andarist

internal/fourslash/_scripts/failingTests.txt

@@ -96,12 +96,8 @@ TestCompletionsAfterKeywordsInBlock
 TestCompletionsAsserts
 TestCompletionsAtIncompleteObjectLiteralProperty
 TestCompletionsClassPropertiesAfterPrivateProperty
-TestCompletionsConditionalMember
 TestCompletionsECMAPrivateMemberTriggerCharacter
 TestCompletionsGeneratorFunctions
-TestCompletionsGenericIndexedAccess1
-TestCompletionsGenericIndexedAccess2
-TestCompletionsGenericIndexedAccess6
 TestCompletionsImportDefaultExportCrash1
 TestCompletionsImport_promoteTypeOnly2
 TestCompletionsImport_umdDefaultNoCrash2
@@ -119,8 +115,6 @@ TestCompletionsNamespaceName
 TestCompletionsNewTarget
 TestCompletionsNonExistentImport
 TestCompletionsObjectLiteralMethod6
-TestCompletionsObjectLiteralUnionStringMappingType
-TestCompletionsObjectLiteralUnionTemplateLiteralType
 TestCompletionsOptionalKindModifier
 TestCompletionsOptionalMethod
 TestCompletionsOverridingMethod1
@@ -139,7 +133,6 @@ TestCompletionsPaths_pathMapping
 TestCompletionsPaths_pathMapping_nonTrailingWildcard1
 TestCompletionsPaths_pathMapping_parentDirectory
 TestCompletionsPropertiesPriorities
-TestCompletionsPropertiesWithPromiseUnionType
 TestCompletionsRecommended_union
 TestCompletionsRedeclareModuleAsGlobal
 TestCompletionsSelfDeclaring1
@@ -149,7 +142,6 @@ TestCompletionsSymbolMembers
 TestCompletionsTriggerCharacter
 TestCompletionsUniqueSymbol1
 TestCompletionsWithDeprecatedTag3
-TestCompletionsWithOptionalPropertiesGenericPartial3
 TestCompletionsWithStringReplacementMode1
 TestGetJavaScriptCompletions1
 TestGetJavaScriptCompletions10

internal/fourslash/fourslash.go

@@ -466,14 +466,20 @@ func verifyCompletionsAreExactly(t *testing.T, prefix string, actual []*lsproto.
 func verifyCompletionItem(t *testing.T, prefix string, actual *lsproto.CompletionItem, expected *lsproto.CompletionItem) {
 	ignoreKind := cmp.FilterPath(
 		func(p cmp.Path) bool {
-			return p.Last().String() == ".Kind"
+			switch p.Last().String() {
+			case ".Kind", ".SortText":
+				return true
+			default:
+				return false
+			}
 		},
 		cmp.Ignore(),
 	)
 	assertDeepEqual(t, actual, expected, prefix, ignoreKind)
 	if expected.Kind != nil {
 		assertDeepEqual(t, actual.Kind, expected.Kind, prefix+" Kind mismatch")
 	}
+	assertDeepEqual(t, actual.SortText, core.OrElse(expected.SortText, ptrTo(string(ls.SortTextLocationPriority))), prefix+" SortText mismatch")
 }
 
 func getExpectedLabel(t *testing.T, item ExpectedCompletionItem) string {

internal/fourslash/tests/gen/completionsConditionalMember_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestCompletionsConditionalMember(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `declare function f<T extends string>(
   p: { a: T extends 'foo' ? { x: string } : { y: string } }

internal/fourslash/tests/gen/completionsGenericIndexedAccess1_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestCompletionsGenericIndexedAccess1(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `interface Sample {
   addBook: { name: string, year: number }

internal/fourslash/tests/gen/completionsGenericIndexedAccess2_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestCompletionsGenericIndexedAccess2(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `export type GetMethodsForType<T, G extends string> = { [K in keyof T]:
   T[K] extends () => any ? { name: K, group: G, } : T[K] extends (s: infer U) => any ? { name: K, group: G, payload: U } : never }[keyof T];

internal/fourslash/tests/gen/completionsGenericIndexedAccess6_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestCompletionsGenericIndexedAccess6(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @Filename: component.tsx
 interface CustomElements {

internal/fourslash/tests/gen/completionsObjectLiteralUnionStringMappingType_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestCompletionsObjectLiteralUnionStringMappingType(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `type UnionType = {
   key1: string;

internal/fourslash/tests/gen/completionsObjectLiteralUnionTemplateLiteralType_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestCompletionsObjectLiteralUnionTemplateLiteralType(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `type UnionType = {
   key1: string;

internal/fourslash/tests/gen/completionsPropertiesWithPromiseUnionType_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestCompletionsPropertiesWithPromiseUnionType(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @strict: true
 type MyType = {

internal/fourslash/tests/gen/completionsWithOptionalPropertiesGenericPartial3_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestCompletionsWithOptionalPropertiesGenericPartial3(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @strict: true
 interface Foo {