From 3e6d40f3fee5a47fe3b1aa39ae3322db1d3e63ed Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Wed, 2 Dec 2015 15:41:37 -0800 Subject: [PATCH] Removing comment from test --- .../reference/unionTypeParameterInference.js | 7 +++- .../unionTypeParameterInference.symbols | 42 ++++++++++--------- .../unionTypeParameterInference.types | 4 +- .../compiler/unionTypeParameterInference.ts | 4 +- 4 files changed, 33 insertions(+), 24 deletions(-) diff --git a/tests/baselines/reference/unionTypeParameterInference.js b/tests/baselines/reference/unionTypeParameterInference.js index cc797c511c8..c96e809cd4d 100644 --- a/tests/baselines/reference/unionTypeParameterInference.js +++ b/tests/baselines/reference/unionTypeParameterInference.js @@ -1,14 +1,17 @@ //// [unionTypeParameterInference.ts] +// Regression test for #5861 + interface Foo { prop: T; } declare function lift(value: U | Foo): Foo; function unlift(value: U | Foo): U { - return lift(value).prop; // error TS2322: Type '{}' is not assignable to type 'U'. + return lift(value).prop; } //// [unionTypeParameterInference.js] +// Regression test for #5861 function unlift(value) { - return lift(value).prop; // error TS2322: Type '{}' is not assignable to type 'U'. + return lift(value).prop; } diff --git a/tests/baselines/reference/unionTypeParameterInference.symbols b/tests/baselines/reference/unionTypeParameterInference.symbols index ee540379284..f2dbaac31ff 100644 --- a/tests/baselines/reference/unionTypeParameterInference.symbols +++ b/tests/baselines/reference/unionTypeParameterInference.symbols @@ -1,33 +1,35 @@ === tests/cases/compiler/unionTypeParameterInference.ts === +// Regression test for #5861 + interface Foo { prop: T; } >Foo : Symbol(Foo, Decl(unionTypeParameterInference.ts, 0, 0)) ->T : Symbol(T, Decl(unionTypeParameterInference.ts, 0, 14)) ->prop : Symbol(prop, Decl(unionTypeParameterInference.ts, 0, 18)) ->T : Symbol(T, Decl(unionTypeParameterInference.ts, 0, 14)) +>T : Symbol(T, Decl(unionTypeParameterInference.ts, 2, 14)) +>prop : Symbol(prop, Decl(unionTypeParameterInference.ts, 2, 18)) +>T : Symbol(T, Decl(unionTypeParameterInference.ts, 2, 14)) declare function lift(value: U | Foo): Foo; ->lift : Symbol(lift, Decl(unionTypeParameterInference.ts, 0, 29)) ->U : Symbol(U, Decl(unionTypeParameterInference.ts, 2, 22)) ->value : Symbol(value, Decl(unionTypeParameterInference.ts, 2, 25)) ->U : Symbol(U, Decl(unionTypeParameterInference.ts, 2, 22)) +>lift : Symbol(lift, Decl(unionTypeParameterInference.ts, 2, 29)) +>U : Symbol(U, Decl(unionTypeParameterInference.ts, 4, 22)) +>value : Symbol(value, Decl(unionTypeParameterInference.ts, 4, 25)) +>U : Symbol(U, Decl(unionTypeParameterInference.ts, 4, 22)) >Foo : Symbol(Foo, Decl(unionTypeParameterInference.ts, 0, 0)) ->U : Symbol(U, Decl(unionTypeParameterInference.ts, 2, 22)) +>U : Symbol(U, Decl(unionTypeParameterInference.ts, 4, 22)) >Foo : Symbol(Foo, Decl(unionTypeParameterInference.ts, 0, 0)) ->U : Symbol(U, Decl(unionTypeParameterInference.ts, 2, 22)) +>U : Symbol(U, Decl(unionTypeParameterInference.ts, 4, 22)) function unlift(value: U | Foo): U { ->unlift : Symbol(unlift, Decl(unionTypeParameterInference.ts, 2, 52)) ->U : Symbol(U, Decl(unionTypeParameterInference.ts, 4, 16)) ->value : Symbol(value, Decl(unionTypeParameterInference.ts, 4, 19)) ->U : Symbol(U, Decl(unionTypeParameterInference.ts, 4, 16)) +>unlift : Symbol(unlift, Decl(unionTypeParameterInference.ts, 4, 52)) +>U : Symbol(U, Decl(unionTypeParameterInference.ts, 6, 16)) +>value : Symbol(value, Decl(unionTypeParameterInference.ts, 6, 19)) +>U : Symbol(U, Decl(unionTypeParameterInference.ts, 6, 16)) >Foo : Symbol(Foo, Decl(unionTypeParameterInference.ts, 0, 0)) ->U : Symbol(U, Decl(unionTypeParameterInference.ts, 4, 16)) ->U : Symbol(U, Decl(unionTypeParameterInference.ts, 4, 16)) +>U : Symbol(U, Decl(unionTypeParameterInference.ts, 6, 16)) +>U : Symbol(U, Decl(unionTypeParameterInference.ts, 6, 16)) - return lift(value).prop; // error TS2322: Type '{}' is not assignable to type 'U'. ->lift(value).prop : Symbol(Foo.prop, Decl(unionTypeParameterInference.ts, 0, 18)) ->lift : Symbol(lift, Decl(unionTypeParameterInference.ts, 0, 29)) ->value : Symbol(value, Decl(unionTypeParameterInference.ts, 4, 19)) ->prop : Symbol(Foo.prop, Decl(unionTypeParameterInference.ts, 0, 18)) + return lift(value).prop; +>lift(value).prop : Symbol(Foo.prop, Decl(unionTypeParameterInference.ts, 2, 18)) +>lift : Symbol(lift, Decl(unionTypeParameterInference.ts, 2, 29)) +>value : Symbol(value, Decl(unionTypeParameterInference.ts, 6, 19)) +>prop : Symbol(Foo.prop, Decl(unionTypeParameterInference.ts, 2, 18)) } diff --git a/tests/baselines/reference/unionTypeParameterInference.types b/tests/baselines/reference/unionTypeParameterInference.types index a4b6a09cf2c..54eaed90ecc 100644 --- a/tests/baselines/reference/unionTypeParameterInference.types +++ b/tests/baselines/reference/unionTypeParameterInference.types @@ -1,4 +1,6 @@ === tests/cases/compiler/unionTypeParameterInference.ts === +// Regression test for #5861 + interface Foo { prop: T; } >Foo : Foo >T : T @@ -24,7 +26,7 @@ function unlift(value: U | Foo): U { >U : U >U : U - return lift(value).prop; // error TS2322: Type '{}' is not assignable to type 'U'. + return lift(value).prop; >lift(value).prop : U >lift(value) : Foo >lift : (value: U | Foo) => Foo diff --git a/tests/cases/compiler/unionTypeParameterInference.ts b/tests/cases/compiler/unionTypeParameterInference.ts index 221b0891b98..79c4f3cc0e5 100644 --- a/tests/cases/compiler/unionTypeParameterInference.ts +++ b/tests/cases/compiler/unionTypeParameterInference.ts @@ -1,7 +1,9 @@ +// Regression test for #5861 + interface Foo { prop: T; } declare function lift(value: U | Foo): Foo; function unlift(value: U | Foo): U { - return lift(value).prop; // error TS2322: Type '{}' is not assignable to type 'U'. + return lift(value).prop; }