Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Check for circular constraints in fillMissingTypeArguments (2) #29150

Closed
wants to merge 3 commits into from
Closed

Check for circular constraints in fillMissingTypeArguments (2) #29150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f88c2f
Proposed fix for issue 29114
EvgenyMuryshkin Dec 22, 2018
b2dc1b3
Add regression test
ahejlsberg Dec 25, 2018
ebb66df
Accept new baselines
ahejlsberg Dec 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7935,7 +7935,7 @@ namespace ts {
const baseDefaultType = getDefaultTypeArgumentType(isJavaScriptImplicitAny);
const circularityMapper = createTypeMapper(typeParameters!, map(typeParameters!, () => baseDefaultType));
for (let i = numTypeArguments; i < numTypeParameters; i++) {
result[i] = instantiateType(getConstraintFromTypeParameter(typeParameters![i]) || baseDefaultType, circularityMapper);
result[i] = instantiateType(getConstraintOfTypeParameter(typeParameters![i]) || baseDefaultType, circularityMapper);
}
for (let i = numTypeArguments; i < numTypeParameters; i++) {
const mapper = createTypeMapper(typeParameters!, result);
Expand Down
11 changes: 10 additions & 1 deletion tests/baselines/reference/typeArgumentDefaultUsesConstraintOnCircularDefault.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
tests/cases/compiler/typeArgumentDefaultUsesConstraintOnCircularDefault.ts(3,18): error TS2322: Type '{ foo: string; }' is not assignable to type 'Test<string>'.
Object literal may only specify known properties, and 'foo' does not exist in type 'Test<string>'.
tests/cases/compiler/typeArgumentDefaultUsesConstraintOnCircularDefault.ts(5,19): error TS2322: Type '{}' is not assignable to type 'string'.
tests/cases/compiler/typeArgumentDefaultUsesConstraintOnCircularDefault.ts(9,20): error TS2313: Type parameter 'T' has a circular constraint.


==== tests/cases/compiler/typeArgumentDefaultUsesConstraintOnCircularDefault.ts (2 errors) ====
==== tests/cases/compiler/typeArgumentDefaultUsesConstraintOnCircularDefault.ts (3 errors) ====
type Test<T extends string = T> = { value: T };

let zz: Test = { foo: "abc" }; // should error on comparison with Test<string>
Expand All @@ -15,4 +16,12 @@ tests/cases/compiler/typeArgumentDefaultUsesConstraintOnCircularDefault.ts(5,19)
~~~~~
!!! error TS2322: Type '{}' is not assignable to type 'string'.
!!! related TS6500 tests/cases/compiler/typeArgumentDefaultUsesConstraintOnCircularDefault.ts:1:37: The expected type comes from property 'value' which is declared here on type 'Test<string>'

// Simplified repro from #28873

class C1<T extends C1 = any> {} // Error, circular constraint
~~
!!! error TS2313: Type parameter 'T' has a circular constraint.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uhhhh. I don't think it's great for us to error here, TBH. That T should extend C1<any> is pretty clear.


class C2<T extends C2<any> = any> {}

17 changes: 17 additions & 0 deletions tests/baselines/reference/typeArgumentDefaultUsesConstraintOnCircularDefault.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,25 @@ type Test<T extends string = T> = { value: T };
let zz: Test = { foo: "abc" }; // should error on comparison with Test<string>

let zzy: Test = { value: {} }; // should error

// Simplified repro from #28873

class C1<T extends C1 = any> {} // Error, circular constraint

class C2<T extends C2<any> = any> {}


//// [typeArgumentDefaultUsesConstraintOnCircularDefault.js]
var zz = { foo: "abc" }; // should error on comparison with Test<string>
var zzy = { value: {} }; // should error
// Simplified repro from #28873
var C1 = /** @class */ (function () {
function C1() {
}
return C1;
}()); // Error, circular constraint
var C2 = /** @class */ (function () {
function C2() {
}
return C2;
}());
12 changes: 12 additions & 0 deletions tests/baselines/reference/typeArgumentDefaultUsesConstraintOnCircularDefault.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,15 @@ let zzy: Test = { value: {} }; // should error
>Test : Symbol(Test, Decl(typeArgumentDefaultUsesConstraintOnCircularDefault.ts, 0, 0))
>value : Symbol(value, Decl(typeArgumentDefaultUsesConstraintOnCircularDefault.ts, 4, 17))

// Simplified repro from #28873

class C1<T extends C1 = any> {} // Error, circular constraint
>C1 : Symbol(C1, Decl(typeArgumentDefaultUsesConstraintOnCircularDefault.ts, 4, 30))
>T : Symbol(T, Decl(typeArgumentDefaultUsesConstraintOnCircularDefault.ts, 8, 9))
>C1 : Symbol(C1, Decl(typeArgumentDefaultUsesConstraintOnCircularDefault.ts, 4, 30))

class C2<T extends C2<any> = any> {}
>C2 : Symbol(C2, Decl(typeArgumentDefaultUsesConstraintOnCircularDefault.ts, 8, 31))
>T : Symbol(T, Decl(typeArgumentDefaultUsesConstraintOnCircularDefault.ts, 10, 9))
>C2 : Symbol(C2, Decl(typeArgumentDefaultUsesConstraintOnCircularDefault.ts, 8, 31))

8 changes: 8 additions & 0 deletions tests/baselines/reference/typeArgumentDefaultUsesConstraintOnCircularDefault.types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,11 @@ let zzy: Test = { value: {} }; // should error
>value : {}
>{} : {}

// Simplified repro from #28873

class C1<T extends C1 = any> {} // Error, circular constraint
>C1 : C1<T>

class C2<T extends C2<any> = any> {}
>C2 : C2<T>

6 changes: 6 additions & 0 deletions tests/cases/compiler/typeArgumentDefaultUsesConstraintOnCircularDefault.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,9 @@ type Test<T extends string = T> = { value: T };
let zz: Test = { foo: "abc" }; // should error on comparison with Test<string>

let zzy: Test = { value: {} }; // should error

// Simplified repro from #28873

class C1<T extends C1 = any> {} // Error, circular constraint

class C2<T extends C2<any> = any> {}