Completions fixes (#1404)

gabritto · web-flow · commit 256441c6b817 · 2025-07-15T18:25:31.000Z
diff --git a/internal/fourslash/_scripts/convertFourslash.mts b/internal/fourslash/_scripts/convertFourslash.mts
@@ -389,7 +389,7 @@ function parseVerifyCompletionArg(arg: ts.Expression): VerifyCompletionsCmd | un
                     return {
                         kind: "verifyCompletions",
                         marker: marker ? marker : "nil",
-                        args: undefined,
+                        args: "nil",
                     };
                 }
                 let expected: string;
@@ -787,7 +787,7 @@ interface VerifyCompletionsCmd {
     kind: "verifyCompletions";
     marker: string;
     isNewIdentifierLocation?: true;
-    args?: VerifyCompletionsArgs;
+    args?: VerifyCompletionsArgs | "nil";
 }
 
 interface VerifyCompletionsArgs {
@@ -824,13 +824,16 @@ interface EditCmd {
 type Cmd = VerifyCompletionsCmd | VerifyBaselineFindAllReferencesCmd | GoToCmd | EditCmd;
 
 function generateVerifyCompletions({ marker, args, isNewIdentifierLocation }: VerifyCompletionsCmd): string {
-    let expectedList = "nil";
-    if (args) {
+    let expectedList: string;
+    if (args === "nil") {
+        expectedList = "nil";
+    }
+    else {
         const expected = [];
-        if (args.includes) expected.push(`Includes: ${args.includes},`);
-        if (args.excludes) expected.push(`Excludes: ${args.excludes},`);
-        if (args.exact) expected.push(`Exact: ${args.exact},`);
-        if (args.unsorted) expected.push(`Unsorted: ${args.unsorted},`);
+        if (args?.includes) expected.push(`Includes: ${args.includes},`);
+        if (args?.excludes) expected.push(`Excludes: ${args.excludes},`);
+        if (args?.exact) expected.push(`Exact: ${args.exact},`);
+        if (args?.unsorted) expected.push(`Unsorted: ${args.unsorted},`);
         // !!! isIncomplete
         const commitCharacters = isNewIdentifierLocation ? "[]string{}" : "defaultCommitCharacters";
         expectedList = `&fourslash.CompletionsExpectedList{
diff --git a/internal/fourslash/_scripts/failingTests.txt b/internal/fourslash/_scripts/failingTests.txt
@@ -1,5 +1,4 @@
 TestAugmentedTypesClass1
-TestAutoImportsWithRootDirsAndRootedPath01
 TestClosedCommentsInConstructor
 TestCodeCompletionEscaping
 TestCompletionAfterQuestionDot
@@ -140,7 +139,6 @@ TestCompletionsECMAPrivateMember
 TestCompletionsECMAPrivateMemberTriggerCharacter
 TestCompletionsExportImport
 TestCompletionsGenericTypeWithMultipleBases1
-TestCompletionsImport_computedSymbolName
 TestCompletionsInRequire
 TestCompletionsInterfaceElement
 TestCompletionsJSDocImportTagAttributesEmptyModuleSpecifier1
@@ -160,7 +158,6 @@ TestCompletionsLiteralFromInferenceWithinInferredType3
 TestCompletionsLiterals
 TestCompletionsMergedDeclarations1
 TestCompletionsNamespaceMergedWithClass
-TestCompletionsNamespaceName
 TestCompletionsNewTarget
 TestCompletionsOptionalKindModifier
 TestCompletionsOptionalMethod
@@ -192,7 +189,6 @@ TestCompletionsTypeOnlyNamespace
 TestCompletionsUniqueSymbol1
 TestCompletionsWithDeprecatedTag5
 TestCompletionsWithDeprecatedTag6
-TestCompletionsWithDeprecatedTag9
 TestCompletionsWithStringReplacementMode1
 TestDoubleUnderscoreCompletions
 TestExportDefaultClass
@@ -223,15 +219,13 @@ TestGetJavaScriptCompletions19
 TestGetJavaScriptCompletions2
 TestGetJavaScriptCompletions20
 TestGetJavaScriptCompletions21
-TestGetJavaScriptCompletions22
 TestGetJavaScriptCompletions3
 TestGetJavaScriptCompletions4
 TestGetJavaScriptCompletions5
 TestGetJavaScriptCompletions8
 TestGetJavaScriptCompletions9
 TestGetJavaScriptGlobalCompletions1
 TestGetJavaScriptQuickInfo8
-TestGlobalThisCompletion
 TestImportCompletionsPackageJsonExportsSpecifierEndsInTs
 TestImportCompletionsPackageJsonExportsTrailingSlash1
 TestImportCompletionsPackageJsonImportsConditions1
@@ -270,7 +264,6 @@ TestJsdocImplementsTagCompletion
 TestJsdocImportTagCompletion1
 TestJsdocLink_findAllReferences1
 TestJsdocOverloadTagCompletion
-TestJsdocParamTagSpecialKeywords
 TestJsdocParameterNameCompletion
 TestJsdocPropTagCompletion
 TestJsdocPropertyTagCompletion
@@ -279,13 +272,10 @@ TestJsdocSatisfiesTagCompletion2
 TestJsdocTemplatePrototypeCompletions
 TestJsdocTemplateTagCompletion
 TestJsdocThrowsTagCompletion
-TestJsdocTypedefTag1
 TestJsdocTypedefTag2
 TestJsdocTypedefTagNamespace
 TestJsdocTypedefTagTypeExpressionCompletion
-TestJsxAriaLikeCompletions
 TestJsxFindAllReferencesOnRuntimeImportWithPaths1
-TestJsxQualifiedTagCompletion
 TestLocalGetReferences
 TestMemberCompletionOnTypeParameters
 TestMemberListErrorRecovery
@@ -356,7 +346,6 @@ TestReferencesIsAvailableThroughGlobalNoCrash
 TestSelfReferencedExternalModule
 TestStringCompletionsImportOrExportSpecifier
 TestStringCompletionsVsEscaping
-TestStringLiteralTypeCompletionsInTypeArgForNonGeneric1
 TestTripleSlashRefPathCompletionAbsolutePaths
 TestTripleSlashRefPathCompletionContext
 TestTripleSlashRefPathCompletionExtensionsAllowJSFalse
diff --git a/internal/fourslash/tests/gen/autoImportsWithRootDirsAndRootedPath01_test.go b/internal/fourslash/tests/gen/autoImportsWithRootDirsAndRootedPath01_test.go
@@ -9,7 +9,7 @@ import (
 
 func TestAutoImportsWithRootDirsAndRootedPath01(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @Filename: /dir/foo.ts
  export function foo() {}
@@ -25,5 +25,12 @@ func TestAutoImportsWithRootDirsAndRootedPath01(t *testing.T) {
 }`
 	f := fourslash.NewFourslash(t, nil /*capabilities*/, content)
 	f.GoToMarker(t, "$")
-	f.VerifyCompletions(t, nil, nil)
+	f.VerifyCompletions(t, nil, &fourslash.CompletionsExpectedList{
+		IsIncomplete: false,
+		ItemDefaults: &fourslash.CompletionsExpectedItemDefaults{
+			CommitCharacters: &defaultCommitCharacters,
+			EditRange:        ignored,
+		},
+		Items: &fourslash.CompletionsExpectedItems{},
+	})
 }
diff --git a/internal/fourslash/tests/gen/completionsImport_computedSymbolName_test.go b/internal/fourslash/tests/gen/completionsImport_computedSymbolName_test.go
@@ -9,7 +9,7 @@ import (
 
 func TestCompletionsImport_computedSymbolName(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @Filename: /home/src/workspaces/project/tsconfig.json
 { "compilerOptions": { "module": "commonjs" } }
@@ -38,7 +38,21 @@ declare module "process" {
 // @Filename: /home/src/workspaces/project/index.ts
 I/**/`
 	f := fourslash.NewFourslash(t, nil /*capabilities*/, content)
-	f.VerifyCompletions(t, "", nil)
+	f.VerifyCompletions(t, "", &fourslash.CompletionsExpectedList{
+		IsIncomplete: false,
+		ItemDefaults: &fourslash.CompletionsExpectedItemDefaults{
+			CommitCharacters: &defaultCommitCharacters,
+			EditRange:        ignored,
+		},
+		Items: &fourslash.CompletionsExpectedItems{},
+	})
 	f.Insert(t, "N")
-	f.VerifyCompletions(t, "", nil)
+	f.VerifyCompletions(t, "", &fourslash.CompletionsExpectedList{
+		IsIncomplete: false,
+		ItemDefaults: &fourslash.CompletionsExpectedItemDefaults{
+			CommitCharacters: &defaultCommitCharacters,
+			EditRange:        ignored,
+		},
+		Items: &fourslash.CompletionsExpectedItems{},
+	})
 }
diff --git a/internal/fourslash/tests/gen/completionsNamespaceName_test.go b/internal/fourslash/tests/gen/completionsNamespaceName_test.go
@@ -9,7 +9,7 @@ import (
 
 func TestCompletionsNamespaceName(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `{ namespace /*0*/ }
 namespace N/*1*/ {}
@@ -20,7 +20,14 @@ namespace N1.M/*3*/ {}
 namespace N2.M {}
 namespace N2.M/*4*/`
 	f := fourslash.NewFourslash(t, nil /*capabilities*/, content)
-	f.VerifyCompletions(t, []string{"0", "1"}, nil)
+	f.VerifyCompletions(t, []string{"0", "1"}, &fourslash.CompletionsExpectedList{
+		IsIncomplete: false,
+		ItemDefaults: &fourslash.CompletionsExpectedItemDefaults{
+			CommitCharacters: &[]string{},
+			EditRange:        ignored,
+		},
+		Items: &fourslash.CompletionsExpectedItems{},
+	})
 	f.VerifyCompletions(t, "2", &fourslash.CompletionsExpectedList{
 		IsIncomplete: false,
 		ItemDefaults: &fourslash.CompletionsExpectedItemDefaults{
diff --git a/internal/fourslash/tests/gen/completionsWithDeprecatedTag9_test.go b/internal/fourslash/tests/gen/completionsWithDeprecatedTag9_test.go
@@ -11,7 +11,7 @@ import (
 
 func TestCompletionsWithDeprecatedTag9(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @lib: dom
 // @allowJs: true
@@ -42,5 +42,12 @@ class Foo {
 			},
 		},
 	})
-	f.VerifyCompletions(t, nil, nil)
+	f.VerifyCompletions(t, nil, &fourslash.CompletionsExpectedList{
+		IsIncomplete: false,
+		ItemDefaults: &fourslash.CompletionsExpectedItemDefaults{
+			CommitCharacters: &defaultCommitCharacters,
+			EditRange:        ignored,
+		},
+		Items: &fourslash.CompletionsExpectedItems{},
+	})
 }
diff --git a/internal/fourslash/tests/gen/getJavaScriptCompletions22_test.go b/internal/fourslash/tests/gen/getJavaScriptCompletions22_test.go
@@ -9,7 +9,7 @@ import (
 
 func TestGetJavaScriptCompletions22(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @allowNonTsExtensions: true
 // @Filename: file.js
diff --git a/internal/fourslash/tests/gen/globalThisCompletion_test.go b/internal/fourslash/tests/gen/globalThisCompletion_test.go
@@ -9,7 +9,7 @@ import (
 
 func TestGlobalThisCompletion(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @allowJs: true
 // @target: esnext
@@ -22,5 +22,12 @@ func TestGlobalThisCompletion(t *testing.T) {
 declare var foo: typeof globalThis;`
 	f := fourslash.NewFourslash(t, nil /*capabilities*/, content)
 	f.GoToMarker(t, "")
-	f.VerifyCompletions(t, "", nil)
+	f.VerifyCompletions(t, "", &fourslash.CompletionsExpectedList{
+		IsIncomplete: false,
+		ItemDefaults: &fourslash.CompletionsExpectedItemDefaults{
+			CommitCharacters: &defaultCommitCharacters,
+			EditRange:        ignored,
+		},
+		Items: &fourslash.CompletionsExpectedItems{},
+	})
 }
diff --git a/internal/fourslash/tests/gen/jsdocParamTagSpecialKeywords_test.go b/internal/fourslash/tests/gen/jsdocParamTagSpecialKeywords_test.go
@@ -9,7 +9,7 @@ import (
 
 func TestJsdocParamTagSpecialKeywords(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @allowNonTsExtensions: true
 // @Filename: test.js
diff --git a/internal/fourslash/tests/gen/jsdocTypedefTag1_test.go b/internal/fourslash/tests/gen/jsdocTypedefTag1_test.go
@@ -9,7 +9,7 @@ import (
 
 func TestJsdocTypedefTag1(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @allowNonTsExtensions: true
 // @Filename: jsdocCompletion_typedef.js
diff --git a/internal/fourslash/tests/gen/jsxAriaLikeCompletions_test.go b/internal/fourslash/tests/gen/jsxAriaLikeCompletions_test.go
@@ -11,7 +11,7 @@ import (
 
 func TestJsxAriaLikeCompletions(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `//@Filename: file.tsx
 declare var React: any;
diff --git a/internal/fourslash/tests/gen/jsxQualifiedTagCompletion_test.go b/internal/fourslash/tests/gen/jsxQualifiedTagCompletion_test.go
@@ -9,7 +9,7 @@ import (
 
 func TestJsxQualifiedTagCompletion(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `//@Filename: file.tsx
  declare var React: any;
diff --git a/internal/fourslash/tests/gen/stringLiteralTypeCompletionsInTypeArgForNonGeneric1_test.go b/internal/fourslash/tests/gen/stringLiteralTypeCompletionsInTypeArgForNonGeneric1_test.go
@@ -9,13 +9,20 @@ import (
 
 func TestStringLiteralTypeCompletionsInTypeArgForNonGeneric1(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `interface Foo {}
 type Bar = {};
 
 let x: Foo<"/*1*/">;
 let y: Bar<"/*2*/">;`
 	f := fourslash.NewFourslash(t, nil /*capabilities*/, content)
-	f.VerifyCompletions(t, f.Markers(), nil)
+	f.VerifyCompletions(t, f.Markers(), &fourslash.CompletionsExpectedList{
+		IsIncomplete: false,
+		ItemDefaults: &fourslash.CompletionsExpectedItemDefaults{
+			CommitCharacters: &defaultCommitCharacters,
+			EditRange:        ignored,
+		},
+		Items: &fourslash.CompletionsExpectedItems{},
+	})
 }
diff --git a/internal/ls/completions.go b/internal/ls/completions.go
@@ -3665,7 +3665,10 @@ func setMemberDeclaredBySpreadAssignment(declaration *ast.Node, members *collect
 	if symbol != nil {
 		t = typeChecker.GetTypeOfSymbolAtLocation(symbol, expression)
 	}
-	properties := t.AsStructuredType().Properties()
+	var properties []*ast.Symbol
+	if t != nil {
+		properties = t.AsStructuredType().Properties()
+	}
 	for _, property := range properties {
 		members.Add(property.Name)
 	}
@@ -4051,7 +4054,7 @@ func (l *LanguageService) getJsxClosingTagCompletion(
 	// the completion list at "1" and "2" will contain "MainComponent.Child" with a replacement span of closing tag name
 	hasClosingAngleBracket := findChildOfKind(jsxClosingElement, ast.KindGreaterThanToken, file) != nil
 	tagName := jsxClosingElement.Parent.AsJsxElement().OpeningElement.TagName()
-	closingTag := tagName.Text()
+	closingTag := scanner.GetTextOfNode(tagName)
 	fullClosingTag := closingTag + core.IfElse(hasClosingAngleBracket, "", ">")
 	optionalReplacementSpan := l.createLspRangeFromNode(jsxClosingElement.TagName(), file)
 	defaultCommitCharacters := getDefaultCommitCharacters(false /*isNewIdentifierLocation*/)
diff --git a/internal/testutil/harnessutil/harnessutil.go b/internal/testutil/harnessutil/harnessutil.go
