From 777a9c3d808da8faa655deef844f7f14e210831d Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Wed, 3 Nov 2021 21:22:09 +0000 Subject: [PATCH] Cherry-pick PR #46614 into release-4.5 Component commits: e77514a53b Add failing test. 3c0d51b3ed Check for type parameters on the original type when asking for the type argument constraint. e7c8095935 Update tests/cases/fourslash/stringLiteralTypeCompletionsInTypeArgForNonGeneric1.ts --- src/compiler/checker.ts | 3 ++- ...ingLiteralTypeCompletionsInTypeArgForNonGeneric1.ts | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 tests/cases/fourslash/stringLiteralTypeCompletionsInTypeArgForNonGeneric1.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 9d1bf23546c56..2e051e9774086 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -34730,7 +34730,8 @@ namespace ts { function getTypeArgumentConstraint(node: TypeNode): Type | undefined { const typeReferenceNode = tryCast(node.parent, isTypeReferenceType); if (!typeReferenceNode) return undefined; - const typeParameters = getTypeParametersForTypeReference(typeReferenceNode)!; // TODO: GH#18217 + const typeParameters = getTypeParametersForTypeReference(typeReferenceNode); + if (!typeParameters) return undefined; const constraint = getConstraintOfTypeParameter(typeParameters[typeReferenceNode.typeArguments!.indexOf(node)]); return constraint && instantiateType(constraint, createTypeMapper(typeParameters, getEffectiveTypeArguments(typeReferenceNode, typeParameters))); } diff --git a/tests/cases/fourslash/stringLiteralTypeCompletionsInTypeArgForNonGeneric1.ts b/tests/cases/fourslash/stringLiteralTypeCompletionsInTypeArgForNonGeneric1.ts new file mode 100644 index 0000000000000..7c1a11889a682 --- /dev/null +++ b/tests/cases/fourslash/stringLiteralTypeCompletionsInTypeArgForNonGeneric1.ts @@ -0,0 +1,10 @@ +/// + +////interface Foo {} +////type Bar = {}; +//// +////let x: Foo<"/*1*/">; +////let y: Bar<"/*2*/">; + +verify.completions({ marker: test.markers() }); +