hmm

jakebailey · jakebailey · commit 80797b493429 · 2025-10-01T16:15:25.000-07:00
diff --git a/internal/fourslash/_scripts/failingTests.txt b/internal/fourslash/_scripts/failingTests.txt
@@ -9,14 +9,7 @@ TestCodeCompletionEscaping
 TestCommentsEnumsFourslash
 TestCommentsLinePreservation
 TestCommentsUnion
-TestCompletionAfterAtChar
-TestCompletionAfterBackslashFollowingString
-TestCompletionAfterBrace
-TestCompletionAfterDotDotDot
-TestCompletionAfterNewline
-TestCompletionAfterNewline2
 TestCompletionAfterQuestionDot
-TestCompletionAtCaseClause
 TestCompletionAutoInsertQuestionDot
 TestCompletionCloneQuestionToken
 TestCompletionEntryClassMembersWithInferredFunctionReturnType1
@@ -72,21 +65,16 @@ TestCompletionImportModuleSpecifierEndingTsxReact
 TestCompletionImportModuleSpecifierEndingUnsupportedExtension
 TestCompletionInChecks1
 TestCompletionInFunctionLikeBody_includesPrimitiveTypes
-TestCompletionInIncompleteCallExpression
 TestCompletionInJsDoc
 TestCompletionInNamedImportLocation
 TestCompletionInUncheckedJSFile
-TestCompletionListBuilderLocations_Modules
 TestCompletionListBuilderLocations_VariableDeclarations
-TestCompletionListDefaultTypeArgumentPositionTypeOnly
 TestCompletionListForDerivedType1
 TestCompletionListForTransitivelyExportedMembers04
 TestCompletionListFunctionExpression
 TestCompletionListInArrowFunctionInUnclosedCallSite01
 TestCompletionListInClassExpressionWithTypeParameter
 TestCompletionListInClassStaticBlocks
-TestCompletionListInComments3
-TestCompletionListInFunctionDeclaration
 TestCompletionListInImportClause01
 TestCompletionListInImportClause05
 TestCompletionListInImportClause06
@@ -97,7 +85,6 @@ TestCompletionListInNamedFunctionExpression1
 TestCompletionListInNamedFunctionExpressionWithShadowing
 TestCompletionListInScope
 TestCompletionListInTemplateLiteralParts1
-TestCompletionListInTypeParameterOfClassExpression1
 TestCompletionListInUnclosedCommaExpression01
 TestCompletionListInUnclosedCommaExpression02
 TestCompletionListInUnclosedFunction08
@@ -129,14 +116,8 @@ TestCompletionOfAwaitPromise6
 TestCompletionOfAwaitPromise7
 TestCompletionOfInterfaceAndVar
 TestCompletionPreferredSuggestions1
-TestCompletionPropertyShorthandForObjectLiteral2
-TestCompletionPropertyShorthandForObjectLiteral3
-TestCompletionPropertyShorthandForObjectLiteral4
-TestCompletionTypeAssertion
-TestCompletionTypeGuard
 TestCompletionWithConditionalOperatorMissingColon
 TestCompletionsAfterJSDoc
-TestCompletionsAtGenericTypeArguments
 TestCompletionsBeforeRestArg1
 TestCompletionsElementAccessNumeric
 TestCompletionsExportImport
@@ -149,8 +130,6 @@ TestCompletionsJSDocImportTagAttributesEmptyModuleSpecifier1
 TestCompletionsJSDocImportTagAttributesErrorModuleSpecifier1
 TestCompletionsJSDocImportTagEmptyModuleSpecifier1
 TestCompletionsJSDocNoCrash1
-TestCompletionsJSDocNoCrash2
-TestCompletionsJsdocParamTypeBeforeName
 TestCompletionsJsdocTypeTagCast
 TestCompletionsJsxAttributeInitializer2
 TestCompletionsLiteralFromInferenceWithinInferredType3
@@ -177,14 +156,11 @@ TestCompletionsPaths_pathMapping_nonTrailingWildcard1
 TestCompletionsPaths_pathMapping_parentDirectory
 TestCompletionsRecommended_union
 TestCompletionsRedeclareModuleAsGlobal
-TestCompletionsSelfDeclaring2
 TestCompletionsStringsWithTriggerCharacter
 TestCompletionsSymbolMembers
 TestCompletionsTriggerCharacter
 TestCompletionsTuple
-TestCompletionsTypeAssertionKeywords
 TestCompletionsUniqueSymbol1
-TestCompletionsWritingSpreadArgument
 TestConstEnumQuickInfoAndCompletionList
 TestConstQuickInfoAndCompletionList
 TestContextuallyTypedFunctionExpressionGeneric1
@@ -259,7 +235,6 @@ TestJsDocFunctionSignatures12
 TestJsDocFunctionSignatures13
 TestJsDocFunctionSignatures7
 TestJsDocFunctionSignatures8
-TestJsDocFunctionTypeCompletionsNoCrash
 TestJsDocGenerics2
 TestJsDocInheritDoc
 TestJsDocPropertyDescription1
@@ -278,15 +253,10 @@ TestJsDocTagsWithHyphen
 TestJsQuickInfoGenerallyAcceptableSize
 TestJsRequireQuickInfo
 TestJsdocCallbackTag
-TestJsdocExtendsTagCompletion
-TestJsdocImplementsTagCompletion
 TestJsdocLink2
 TestJsdocLink3
 TestJsdocLink6
-TestJsdocPropertyTagCompletion
-TestJsdocSatisfiesTagCompletion1
 TestJsdocTemplatePrototypeCompletions
-TestJsdocTemplateTagCompletion
 TestJsdocThrowsTagCompletion
 TestJsdocTypedefTag
 TestJsdocTypedefTag2
@@ -303,7 +273,6 @@ TestNgProxy1
 TestNoQuickInfoForLabel
 TestNoQuickInfoInWhitespace
 TestNodeModulesImportCompletions1
-TestNonExistingImport
 TestNumericPropertyNames
 TestOverloadQuickInfo
 TestParameterWithDestructuring
diff --git a/internal/fourslash/fourslash.go b/internal/fourslash/fourslash.go
@@ -625,6 +625,26 @@ func (f *FourslashTest) verifyCompletionsItems(t *testing.T, prefix string, actu
 			t.Fatal(prefix + "Expected exact completion list but also specified 'unsorted'.")
 		}
 		if len(actual) != len(expected.Exact) {
+			actualNames := core.Map(actual, func(item *lsproto.CompletionItem) string {
+				return item.Label
+			})
+
+			expectedNames := core.Map(expected.Exact, func(item CompletionsExpectedItem) string {
+				return getExpectedLabel(t, item)
+			})
+
+			for _, name := range actualNames {
+				if !slices.Contains(expectedNames, name) {
+					t.Logf("%sUnexpected completion item: %s", prefix, name)
+				}
+			}
+
+			for _, name := range expectedNames {
+				if !slices.Contains(actualNames, name) {
+					t.Logf("%sMissing expected completion item: %s", prefix, name)
+				}
+			}
+
 			t.Fatalf(prefix+"Expected %d exact completion items but got %d: %s", len(expected.Exact), len(actual), cmp.Diff(actual, expected.Exact))
 		}
 		if len(actual) > 0 {
diff --git a/internal/fourslash/tests/gen/completionAfterAtChar_test.go b/internal/fourslash/tests/gen/completionAfterAtChar_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestCompletionAfterAtChar(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `@a/**/`
 	f := fourslash.NewFourslash(t, nil /*capabilities*/, content)
diff --git a/internal/fourslash/tests/gen/completionAfterBackslashFollowingString_test.go b/internal/fourslash/tests/gen/completionAfterBackslashFollowingString_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestCompletionAfterBackslashFollowingString(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `Harness.newLine = ""\n/**/`
 	f := fourslash.NewFourslash(t, nil /*capabilities*/, content)
diff --git a/internal/fourslash/tests/gen/completionAfterBrace_test.go b/internal/fourslash/tests/gen/completionAfterBrace_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestCompletionAfterBrace(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `
 }/**/
diff --git a/internal/fourslash/tests/gen/completionAfterDotDotDot_test.go b/internal/fourslash/tests/gen/completionAfterDotDotDot_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestCompletionAfterDotDotDot(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `.../**/`
 	f := fourslash.NewFourslash(t, nil /*capabilities*/, content)
diff --git a/internal/fourslash/tests/gen/completionAfterNewline2_test.go b/internal/fourslash/tests/gen/completionAfterNewline2_test.go
@@ -11,7 +11,7 @@ import (
 
 func TestCompletionAfterNewline2(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `let foo = 5 as const /*1*/
 /*2*/`
diff --git a/internal/fourslash/tests/gen/completionAfterNewline_test.go b/internal/fourslash/tests/gen/completionAfterNewline_test.go
@@ -11,7 +11,7 @@ import (
 
 func TestCompletionAfterNewline(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `let foo /*1*/
 /*2*/
diff --git a/internal/fourslash/tests/gen/completionAtCaseClause_test.go b/internal/fourslash/tests/gen/completionAtCaseClause_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestCompletionAtCaseClause(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `case /**/`
 	f := fourslash.NewFourslash(t, nil /*capabilities*/, content)
diff --git a/internal/fourslash/tests/gen/completionInIncompleteCallExpression_test.go b/internal/fourslash/tests/gen/completionInIncompleteCallExpression_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestCompletionInIncompleteCallExpression(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `var array = [1, 2, 4]
 function a4(x, y, z) { }
diff --git a/internal/fourslash/tests/gen/completionListBuilderLocations_Modules_test.go b/internal/fourslash/tests/gen/completionListBuilderLocations_Modules_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestCompletionListBuilderLocations_Modules(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `module A/*moduleName1*/
 module A./*moduleName2*/`
diff --git a/internal/fourslash/tests/gen/completionListDefaultTypeArgumentPositionTypeOnly_test.go b/internal/fourslash/tests/gen/completionListDefaultTypeArgumentPositionTypeOnly_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestCompletionListDefaultTypeArgumentPositionTypeOnly(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `const foo = "foo";
 function test1<T = /*1*/>() {}`
diff --git a/internal/fourslash/tests/gen/completionListInComments3_test.go b/internal/fourslash/tests/gen/completionListInComments3_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestCompletionListInComments3(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = ` /*{| "name": "1" |}
  /*  {| "name": "2" |}
diff --git a/internal/fourslash/tests/gen/completionListInFunctionDeclaration_test.go b/internal/fourslash/tests/gen/completionListInFunctionDeclaration_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestCompletionListInFunctionDeclaration(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `var a = 0;
 function foo(/**/`
diff --git a/internal/fourslash/tests/gen/completionListInTypeParameterOfClassExpression1_test.go b/internal/fourslash/tests/gen/completionListInTypeParameterOfClassExpression1_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestCompletionListInTypeParameterOfClassExpression1(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `var C0 = class D</*0*/
 var C1 = class D</*1*/T> {}
diff --git a/internal/fourslash/tests/gen/completionPropertyShorthandForObjectLiteral2_test.go b/internal/fourslash/tests/gen/completionPropertyShorthandForObjectLiteral2_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestCompletionPropertyShorthandForObjectLiteral2(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `const foo = 1;
 const bar = 2;
diff --git a/internal/fourslash/tests/gen/completionPropertyShorthandForObjectLiteral3_test.go b/internal/fourslash/tests/gen/completionPropertyShorthandForObjectLiteral3_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestCompletionPropertyShorthandForObjectLiteral3(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `const foo = 1;
 const bar = 2;
diff --git a/internal/fourslash/tests/gen/completionPropertyShorthandForObjectLiteral4_test.go b/internal/fourslash/tests/gen/completionPropertyShorthandForObjectLiteral4_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestCompletionPropertyShorthandForObjectLiteral4(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `const foo = 1;
 const bar = 2;
diff --git a/internal/fourslash/tests/gen/completionTypeAssertion_test.go b/internal/fourslash/tests/gen/completionTypeAssertion_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestCompletionTypeAssertion(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `var x = 'something'
 var y = this as/*1*/`
diff --git a/internal/fourslash/tests/gen/completionTypeGuard_test.go b/internal/fourslash/tests/gen/completionTypeGuard_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestCompletionTypeGuard(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `const x = "str";
 function assert1(condition: any, msg?: string): /*1*/ ;
diff --git a/internal/fourslash/tests/gen/completionsAtGenericTypeArguments_test.go b/internal/fourslash/tests/gen/completionsAtGenericTypeArguments_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestCompletionsAtGenericTypeArguments(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `class Foo<T1, T2> {}
 const foo = new Foo</*1*/, /*2*/,
diff --git a/internal/fourslash/tests/gen/completionsJSDocNoCrash2_test.go b/internal/fourslash/tests/gen/completionsJSDocNoCrash2_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestCompletionsJSDocNoCrash2(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @strict: true
 // @filename: index.ts
diff --git a/internal/fourslash/tests/gen/completionsJsdocParamTypeBeforeName_test.go b/internal/fourslash/tests/gen/completionsJsdocParamTypeBeforeName_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestCompletionsJsdocParamTypeBeforeName(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `/** @param /*name1*/ {/*type*/} /*name2*/ */
 function toString(obj) {}`
diff --git a/internal/fourslash/tests/gen/completionsSelfDeclaring2_test.go b/internal/fourslash/tests/gen/completionsSelfDeclaring2_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestCompletionsSelfDeclaring2(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `function f1<T>(x: T) {}
 f1({ abc/*1*/ });
diff --git a/internal/fourslash/tests/gen/completionsTypeAssertionKeywords_test.go b/internal/fourslash/tests/gen/completionsTypeAssertionKeywords_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestCompletionsTypeAssertionKeywords(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `const a = {
   b: 42 as /*0*/
diff --git a/internal/fourslash/tests/gen/completionsWritingSpreadArgument_test.go b/internal/fourslash/tests/gen/completionsWritingSpreadArgument_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestCompletionsWritingSpreadArgument(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `
 const [] = [Math.min(./*marker*/)]
diff --git a/internal/fourslash/tests/gen/jsDocFunctionTypeCompletionsNoCrash_test.go b/internal/fourslash/tests/gen/jsDocFunctionTypeCompletionsNoCrash_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestJsDocFunctionTypeCompletionsNoCrash(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `/**
  * @returns {function/**/(): string}
diff --git a/internal/fourslash/tests/gen/jsdocExtendsTagCompletion_test.go b/internal/fourslash/tests/gen/jsdocExtendsTagCompletion_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestJsdocExtendsTagCompletion(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `/** @extends {/**/} */
 class A {}`
diff --git a/internal/fourslash/tests/gen/jsdocImplementsTagCompletion_test.go b/internal/fourslash/tests/gen/jsdocImplementsTagCompletion_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestJsdocImplementsTagCompletion(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `/** @implements {/**/} */
 class A {}`
diff --git a/internal/fourslash/tests/gen/jsdocPropertyTagCompletion_test.go b/internal/fourslash/tests/gen/jsdocPropertyTagCompletion_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestJsdocPropertyTagCompletion(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `/**
  * @typedef {Object} Foo
diff --git a/internal/fourslash/tests/gen/jsdocSatisfiesTagCompletion1_test.go b/internal/fourslash/tests/gen/jsdocSatisfiesTagCompletion1_test.go
diff --git a/internal/fourslash/tests/gen/jsdocTemplateTagCompletion_test.go b/internal/fourslash/tests/gen/jsdocTemplateTagCompletion_test.go
diff --git a/internal/fourslash/tests/gen/nonExistingImport_test.go b/internal/fourslash/tests/gen/nonExistingImport_test.go
diff --git a/internal/fourslash/tests/util/util.go b/internal/fourslash/tests/util/util.go
