Handle blockedStringType (#1266)

Author: Andarist

internal/ast/nodeflags.go

@@ -43,8 +43,6 @@ const (
 	NodeFlagsJsonFile        NodeFlags = 1 << 25 // If node was parsed in a Json
 	NodeFlagsDeprecated      NodeFlags = 1 << 26 // If has '@deprecated' JSDoc tag
 
-	NodeFlagsSkipDirectInference NodeFlags = 1 << 27 // If the node should skip direct type inference.
-
 	NodeFlagsBlockScoped = NodeFlagsLet | NodeFlagsConst | NodeFlagsUsing
 	NodeFlagsConstant    = NodeFlagsConst | NodeFlagsUsing
 	NodeFlagsAwaitUsing  = NodeFlagsConst | NodeFlagsUsing // Variable declaration (NOTE: on a single node these flags would otherwise be mutually exclusive)

internal/checker/checker.go

@@ -7352,7 +7352,9 @@ func (c *Checker) checkExpressionWorker(node *ast.Node, checkMode CheckMode) *Ty
 	case ast.KindNullKeyword:
 		return c.nullWideningType
 	case ast.KindStringLiteral, ast.KindNoSubstitutionTemplateLiteral:
-		// !!! Handle blockedStringType
+		if c.isSkipDirectInferenceNode(node) {
+			return c.blockedStringType
+		}
 		return c.getFreshTypeOfLiteralType(c.getStringLiteralType(node.Text()))
 	case ast.KindNumericLiteral:
 		c.checkGrammarNumericLiteral(node.AsNumericLiteral())

internal/checker/services.go

@@ -585,28 +585,27 @@ func (c *Checker) getResolvedSignatureWorker(node *ast.Node, checkMode CheckMode
 }
 
 func (c *Checker) GetCandidateSignaturesForStringLiteralCompletions(call *ast.CallLikeExpression, editingArgument *ast.Node) []*Signature {
-	candidatesSet := collections.Set[*Signature]{}
-
 	// first, get candidates when inference is blocked from the source node.
 	candidates := runWithInferenceBlockedFromSourceNode(c, editingArgument, func() []*Signature {
 		_, blockedInferenceCandidates := c.getResolvedSignatureWorker(call, CheckModeNormal, 0)
 		return blockedInferenceCandidates
 	})
-	for _, candidate := range candidates {
-		candidatesSet.Add(candidate)
-	}
+	candidatesSet := collections.NewSetFromItems(candidates...)
 
 	// next, get candidates where the source node is considered for inference.
-	candidates = runWithoutResolvedSignatureCaching(c, editingArgument, func() []*Signature {
+	otherCandidates := runWithoutResolvedSignatureCaching(c, editingArgument, func() []*Signature {
 		_, inferenceCandidates := c.getResolvedSignatureWorker(call, CheckModeNormal, 0)
 		return inferenceCandidates
 	})
 
-	for _, candidate := range candidates {
-		candidatesSet.Add(candidate)
+	for _, candidate := range otherCandidates {
+		if candidatesSet.Has(candidate) {
+			continue
+		}
+		candidates = append(candidates, candidate)
 	}
 
-	return slices.Collect(maps.Keys(candidatesSet.Keys()))
+	return candidates
 }
 
 func (c *Checker) GetTypeParameterAtPosition(s *Signature, pos int) *Type {

internal/fourslash/_scripts/failingTests.txt

@@ -115,7 +115,6 @@ TestCompletionsJsPropertyAssignment
 TestCompletionsJsxAttribute2
 TestCompletionsKeyof
 TestCompletionsLiteralFromInferenceWithinInferredType3
-TestCompletionsLiteralMatchingGenericSignature
 TestCompletionsNamespaceName
 TestCompletionsNewTarget
 TestCompletionsNonExistentImport
@@ -237,11 +236,8 @@ TestPathCompletionsPackageJsonImportsWildcard9
 TestPathCompletionsTypesVersionsLocal
 TestPathCompletionsTypesVersionsWildcard2
 TestSatisfiesOperatorCompletion
-TestStringCompletionsFromGenericConditionalTypesUsingTemplateLiteralTypes
 TestStringCompletionsImportOrExportSpecifier
 TestStringCompletionsVsEscaping
-TestStringLiteralCompletionsForGenericConditionalTypesUsingTemplateLiteralTypes
-TestStringLiteralCompletionsInPositionTypedUsingRest
 TestStringLiteralTypeCompletionsInTypeArgForNonGeneric1
 TestTripleSlashRefPathCompletionAbsolutePaths
 TestTripleSlashRefPathCompletionContext

internal/fourslash/tests/gen/completionsLiteralMatchingGenericSignature_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestCompletionsLiteralMatchingGenericSignature(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @Filename: /a.tsx
 declare function bar1<P extends "" | "bar" | "baz">(p: P): void;

internal/fourslash/tests/gen/stringCompletionsFromGenericConditionalTypesUsingTemplateLiteralTypes_test.go

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

internal/fourslash/tests/gen/stringLiteralCompletionsForGenericConditionalTypesUsingTemplateLiteralTypes_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestStringLiteralCompletionsForGenericConditionalTypesUsingTemplateLiteralTypes(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = ` type PathOf<T, K extends string, P extends string = ""> =
    K extends ` + "`" + `${infer U}.${infer V}` + "`" + `

internal/fourslash/tests/gen/stringLiteralCompletionsInPositionTypedUsingRest_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestStringLiteralCompletionsInPositionTypedUsingRest(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `declare function pick<T extends object, K extends keyof T>(obj: T, ...keys: K[]): Pick<T, K>;
 declare function pick2<T extends object, K extends (keyof T)[]>(obj: T, ...keys: K): Pick<T, K[number]>;