Remove circular constraint suggestions

weswigham · weswigham · commit 72034e5f6966 · 2022-06-10T13:34:34.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -18793,8 +18793,12 @@ namespace ts {
                 }
                 reportRelationError(headMessage, source, target);
                 if (source.flags & TypeFlags.TypeParameter && source.symbol?.declarations?.[0] && !getConstraintOfType(source as TypeVariable)) {
-                    const targetConstraintString = typeToString(target, source.symbol.declarations[0]);
-                    associateRelatedInfo(createDiagnosticForNode(source.symbol.declarations[0], Diagnostics.This_type_parameter_might_need_an_extends_0_constraint, targetConstraintString));
+                    const syntheticparam = cloneTypeParameter(source as TypeParameter);
+                    syntheticparam.constraint = instantiateType(target, makeUnaryTypeMapper(source, syntheticparam));
+                    if (hasNonCircularBaseConstraint(syntheticparam)) {
+                        const targetConstraintString = typeToString(target, source.symbol.declarations[0]);
+                        associateRelatedInfo(createDiagnosticForNode(source.symbol.declarations[0], Diagnostics.This_type_parameter_might_need_an_extends_0_constraint, targetConstraintString));
+                    }
                 }
             }
 
diff --git a/tests/baselines/reference/conditionalTypes1.errors.txt b/tests/baselines/reference/conditionalTypes1.errors.txt
@@ -85,7 +85,6 @@ tests/cases/conformance/types/conditional/conditionalTypes1.ts(288,43): error TS
 !!! error TS2322: Type 'T' is not assignable to type 'NonNullable<T>'.
 !!! error TS2322:   Type 'T' is not assignable to type '{}'.
 !!! related TS2208 tests/cases/conformance/types/conditional/conditionalTypes1.ts:10:13: This type parameter might need an `extends {}` constraint.
-!!! related TS2208 tests/cases/conformance/types/conditional/conditionalTypes1.ts:10:13: This type parameter might need an `extends NonNullable<T>` constraint.
     }
     
     function f2<T extends string | undefined>(x: T, y: NonNullable<T>) {
diff --git a/tests/baselines/reference/conditionalTypes2.errors.txt b/tests/baselines/reference/conditionalTypes2.errors.txt
@@ -84,7 +84,6 @@ tests/cases/conformance/types/conditional/conditionalTypes2.ts(75,12): error TS2
 !!! error TS2322:                     Type 'keyof B' is not assignable to type 'number | "toString" | "charAt" | "charCodeAt" | "concat" | "indexOf" | "lastIndexOf" | "localeCompare" | "match" | "replace" | "search" | "slice" | "split" | "substring" | "toLowerCase" | "toLocaleLowerCase" | "toUpperCase" | "toLocaleUpperCase" | "trim" | "length" | "substr" | "valueOf"'.
 !!! error TS2322:                       Type 'string | number | symbol' is not assignable to type 'number | "toString" | "charAt" | "charCodeAt" | "concat" | "indexOf" | "lastIndexOf" | "localeCompare" | "match" | "replace" | "search" | "slice" | "split" | "substring" | "toLowerCase" | "toLocaleLowerCase" | "toUpperCase" | "toLocaleUpperCase" | "trim" | "length" | "substr" | "valueOf"'.
 !!! error TS2322:                         Type 'string' is not assignable to type 'number | "toString" | "charAt" | "charCodeAt" | "concat" | "indexOf" | "lastIndexOf" | "localeCompare" | "match" | "replace" | "search" | "slice" | "split" | "substring" | "toLowerCase" | "toLocaleLowerCase" | "toUpperCase" | "toLocaleUpperCase" | "trim" | "length" | "substr" | "valueOf"'.
-!!! related TS2208 tests/cases/conformance/types/conditional/conditionalTypes2.ts:23:13: This type parameter might need an `extends A extends string ? keyof A : A` constraint.
         b = a;  // Error
         ~
 !!! error TS2322: Type 'Invariant<A>' is not assignable to type 'Invariant<B>'.
diff --git a/tests/baselines/reference/deepComparisons.errors.txt b/tests/baselines/reference/deepComparisons.errors.txt
@@ -17,7 +17,6 @@ tests/cases/compiler/deepComparisons.ts(4,9): error TS2322: Type 'T[K1][K2]' is
         let v1: Extract<T, string> = 0 as any as T;  // Error
             ~~
 !!! error TS2322: Type 'T' is not assignable to type 'Extract<T, string>'.
-!!! related TS2208 tests/cases/compiler/deepComparisons.ts:1:13: This type parameter might need an `extends Extract<T, string>` constraint.
         let v2: Extract<T[K1], string> = 0 as any as T[K1];  // Error
             ~~
 !!! error TS2322: Type 'T[K1]' is not assignable to type 'Extract<T[K1], string>'.
diff --git a/tests/baselines/reference/flatArrayNoExcessiveStackDepth.errors.txt b/tests/baselines/reference/flatArrayNoExcessiveStackDepth.errors.txt
@@ -40,8 +40,5 @@ tests/cases/compiler/flatArrayNoExcessiveStackDepth.ts(20,5): error TS2322: Type
 !!! error TS2322:             Type 'InnerArr' is not assignable to type 'FlatArray<InnerArr, [-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20][D]>'.
 !!! error TS2322:               Type 'InnerArr' is not assignable to type '(InnerArr extends readonly (infer InnerArr)[] ? FlatArray<InnerArr, [-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20][[-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20][D]]> : InnerArr) & InnerArr'.
 !!! error TS2322:                 Type 'InnerArr' is not assignable to type 'InnerArr extends readonly (infer InnerArr)[] ? FlatArray<InnerArr, [-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20][[-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20][D]]> : InnerArr'.
-!!! related TS2208 /.ts/lib.es2019.array.d.ts:23:46: This type parameter might need an `extends InnerArr extends readonly (infer InnerArr)[] ? FlatArray<InnerArr, [-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20][[-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20][D]]> : InnerArr` constraint.
-!!! related TS2208 /.ts/lib.es2019.array.d.ts:23:46: This type parameter might need an `extends (InnerArr extends readonly (infer InnerArr)[] ? FlatArray<InnerArr, [-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20][[-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20][D]]> : InnerArr) & InnerArr` constraint.
-!!! related TS2208 /.ts/lib.es2019.array.d.ts:23:46: This type parameter might need an `extends FlatArray<InnerArr, [-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20][D]>` constraint.
     }
     
diff --git a/tests/baselines/reference/intersectionTypeInference.errors.txt b/tests/baselines/reference/intersectionTypeInference.errors.txt
@@ -17,14 +17,12 @@ tests/cases/conformance/types/intersection/intersectionTypeInference.ts(6,5): er
 !!! error TS2322:   Type 'T' is not assignable to type 'U'.
 !!! error TS2322:     'U' could be instantiated with an arbitrary type which could be unrelated to 'T'.
 !!! related TS2208 tests/cases/conformance/types/intersection/intersectionTypeInference.ts:1:17: This type parameter might need an `extends U` constraint.
-!!! related TS2208 tests/cases/conformance/types/intersection/intersectionTypeInference.ts:1:17: This type parameter might need an `extends T & U` constraint.
         result = obj2;  // Error
         ~~~~~~
 !!! error TS2322: Type 'U' is not assignable to type 'T & U'.
 !!! error TS2322:   Type 'U' is not assignable to type 'T'.
 !!! error TS2322:     'T' could be instantiated with an arbitrary type which could be unrelated to 'U'.
 !!! related TS2208 tests/cases/conformance/types/intersection/intersectionTypeInference.ts:1:20: This type parameter might need an `extends T` constraint.
-!!! related TS2208 tests/cases/conformance/types/intersection/intersectionTypeInference.ts:1:20: This type parameter might need an `extends T & U` constraint.
         return result;
     }
     
diff --git a/tests/baselines/reference/recursiveConditionalTypes.errors.txt b/tests/baselines/reference/recursiveConditionalTypes.errors.txt
@@ -57,7 +57,6 @@ tests/cases/compiler/recursiveConditionalTypes.ts(169,5): error TS2322: Type 'nu
         ta = tx;  // Error
         ~~
 !!! error TS2322: Type 'T' is not assignable to type '__Awaited<T>'.
-!!! related TS2208 tests/cases/compiler/recursiveConditionalTypes.ts:18:14: This type parameter might need an `extends __Awaited<T>` constraint.
         tx = ta;  // Error
         ~~
 !!! error TS2322: Type '__Awaited<T>' is not assignable to type 'T'.
diff --git a/tests/baselines/reference/tsxNotUsingApparentTypeOfSFC.errors.txt b/tests/baselines/reference/tsxNotUsingApparentTypeOfSFC.errors.txt
@@ -46,7 +46,6 @@ tests/cases/compiler/tsxNotUsingApparentTypeOfSFC.tsx(18,14): error TS2769: No o
 !!! error TS2322: Type 'P' is not assignable to type 'IntrinsicAttributes & P'.
 !!! error TS2322:   Type 'P' is not assignable to type 'IntrinsicAttributes'.
 !!! related TS2208 tests/cases/compiler/tsxNotUsingApparentTypeOfSFC.tsx:5:15: This type parameter might need an `extends JSX.IntrinsicAttributes` constraint.
-!!! related TS2208 tests/cases/compiler/tsxNotUsingApparentTypeOfSFC.tsx:5:15: This type parameter might need an `extends JSX.IntrinsicAttributes & P` constraint.
         let q = <MyComponent {...wrappedProps} /> // should work
                  ~~~~~~~~~~~
 !!! error TS2769: No overload matches this call.

Original file line number	Diff line number	Diff line change
`@@ -18793,8 +18793,12 @@ namespace ts {`
`18793`	`18793`	`}`
`18794`	`18794`	`reportRelationError(headMessage, source, target);`
`18795`	`18795`	`if (source.flags & TypeFlags.TypeParameter && source.symbol?.declarations?.[0] && !getConstraintOfType(source as TypeVariable)) {`
`18796`		`- const targetConstraintString = typeToString(target, source.symbol.declarations[0]);`
`18797`		`- associateRelatedInfo(createDiagnosticForNode(source.symbol.declarations[0], Diagnostics.This_type_parameter_might_need_an_extends_0_constraint, targetConstraintString));`
	`18796`	`+ const syntheticparam = cloneTypeParameter(source as TypeParameter);`
	`18797`	`+ syntheticparam.constraint = instantiateType(target, makeUnaryTypeMapper(source, syntheticparam));`
	`18798`	`+ if (hasNonCircularBaseConstraint(syntheticparam)) {`
	`18799`	`+ const targetConstraintString = typeToString(target, source.symbol.declarations[0]);`
	`18800`	`+ associateRelatedInfo(createDiagnosticForNode(source.symbol.declarations[0], Diagnostics.This_type_parameter_might_need_an_extends_0_constraint, targetConstraintString));`
	`18801`	`+ }`
`18798`	`18802`	`}`
`18799`	`18803`	`}`
`18800`	`18804`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,6 @@ tests/cases/conformance/types/conditional/conditionalTypes1.ts(288,43): error TS`
`85`	`85`	`!!! error TS2322: Type 'T' is not assignable to type 'NonNullable<T>'.`
`86`	`86`	`!!! error TS2322: Type 'T' is not assignable to type '{}'.`
`87`	`87`	!!! related TS2208 tests/cases/conformance/types/conditional/conditionalTypes1.ts:10:13: This type parameter might need an `extends {}` constraint.
`88`		-!!! related TS2208 tests/cases/conformance/types/conditional/conditionalTypes1.ts:10:13: This type parameter might need an `extends NonNullable<T>` constraint.
`89`	`88`	`}`
`90`	`89`
`91`	`90`	`function f2<T extends string \| undefined>(x: T, y: NonNullable<T>) {`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,6 @@ tests/cases/conformance/types/conditional/conditionalTypes2.ts(75,12): error TS2`
`84`	`84`	`!!! error TS2322: Type 'keyof B' is not assignable to type 'number \| "toString" \| "charAt" \| "charCodeAt" \| "concat" \| "indexOf" \| "lastIndexOf" \| "localeCompare" \| "match" \| "replace" \| "search" \| "slice" \| "split" \| "substring" \| "toLowerCase" \| "toLocaleLowerCase" \| "toUpperCase" \| "toLocaleUpperCase" \| "trim" \| "length" \| "substr" \| "valueOf"'.`
`85`	`85`	`!!! error TS2322: Type 'string \| number \| symbol' is not assignable to type 'number \| "toString" \| "charAt" \| "charCodeAt" \| "concat" \| "indexOf" \| "lastIndexOf" \| "localeCompare" \| "match" \| "replace" \| "search" \| "slice" \| "split" \| "substring" \| "toLowerCase" \| "toLocaleLowerCase" \| "toUpperCase" \| "toLocaleUpperCase" \| "trim" \| "length" \| "substr" \| "valueOf"'.`
`86`	`86`	`!!! error TS2322: Type 'string' is not assignable to type 'number \| "toString" \| "charAt" \| "charCodeAt" \| "concat" \| "indexOf" \| "lastIndexOf" \| "localeCompare" \| "match" \| "replace" \| "search" \| "slice" \| "split" \| "substring" \| "toLowerCase" \| "toLocaleLowerCase" \| "toUpperCase" \| "toLocaleUpperCase" \| "trim" \| "length" \| "substr" \| "valueOf"'.`
`87`		-!!! related TS2208 tests/cases/conformance/types/conditional/conditionalTypes2.ts:23:13: This type parameter might need an `extends A extends string ? keyof A : A` constraint.
`88`	`87`	`b = a; // Error`
`89`	`88`	`~`
`90`	`89`	`!!! error TS2322: Type 'Invariant<A>' is not assignable to type 'Invariant<B>'.`
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,5 @@ tests/cases/compiler/flatArrayNoExcessiveStackDepth.ts(20,5): error TS2322: Type`
`40`	`40`	`!!! error TS2322: Type 'InnerArr' is not assignable to type 'FlatArray<InnerArr, [-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20][D]>'.`
`41`	`41`	`!!! error TS2322: Type 'InnerArr' is not assignable to type '(InnerArr extends readonly (infer InnerArr)[] ? FlatArray<InnerArr, [-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20][[-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20][D]]> : InnerArr) & InnerArr'.`
`42`	`42`	`!!! error TS2322: Type 'InnerArr' is not assignable to type 'InnerArr extends readonly (infer InnerArr)[] ? FlatArray<InnerArr, [-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20][[-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20][D]]> : InnerArr'.`
`43`		-!!! related TS2208 /.ts/lib.es2019.array.d.ts:23:46: This type parameter might need an `extends InnerArr extends readonly (infer InnerArr)[] ? FlatArray<InnerArr, [-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20][[-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20][D]]> : InnerArr` constraint.
`44`		-!!! related TS2208 /.ts/lib.es2019.array.d.ts:23:46: This type parameter might need an `extends (InnerArr extends readonly (infer InnerArr)[] ? FlatArray<InnerArr, [-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20][[-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20][D]]> : InnerArr) & InnerArr` constraint.
`45`		-!!! related TS2208 /.ts/lib.es2019.array.d.ts:23:46: This type parameter might need an `extends FlatArray<InnerArr, [-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20][D]>` constraint.
`46`	`43`	`}`
`47`	`44`