From 4a78047af02607b84c71d6b22d243b7e9cbf46b3 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Sat, 24 Sep 2016 08:09:27 -0700 Subject: [PATCH] Accept new baselines --- tests/baselines/reference/arrayconcat.types | 2 +- .../bestCommonTypeOfConditionalExpressions2.types | 2 +- .../computedPropertyNamesContextualType6_ES5.types | 2 +- .../computedPropertyNamesContextualType6_ES6.types | 2 +- .../reference/conditionalExpression1.errors.txt | 8 ++++---- .../baselines/reference/conditionalExpressions2.types | 2 +- .../reference/declFileTypeAnnotationParenType.types | 2 +- .../functionWithMultipleReturnStatements.types | 10 +++++----- tests/baselines/reference/literalTypes2.types | 6 +++--- .../subtypesOfTypeParameterWithConstraints2.types | 4 ++-- tests/baselines/reference/underscoreTest1.types | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tests/baselines/reference/arrayconcat.types b/tests/baselines/reference/arrayconcat.types index 27724c63ab1..adbb1f7d021 100644 --- a/tests/baselines/reference/arrayconcat.types +++ b/tests/baselines/reference/arrayconcat.types @@ -46,7 +46,7 @@ class parser { >this : this >options : IOptions[] >sort : (compareFn?: (a: IOptions, b: IOptions) => number) => IOptions[] ->function(a, b) { var aName = a.name.toLowerCase(); var bName = b.name.toLowerCase(); if (aName > bName) { return 1; } else if (aName < bName) { return -1; } else { return 0; } } : (a: IOptions, b: IOptions) => 0 | 1 | -1 +>function(a, b) { var aName = a.name.toLowerCase(); var bName = b.name.toLowerCase(); if (aName > bName) { return 1; } else if (aName < bName) { return -1; } else { return 0; } } : (a: IOptions, b: IOptions) => 1 | -1 | 0 >a : IOptions >b : IOptions diff --git a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.types b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.types index ad09c274c9b..997f4ea5249 100644 --- a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.types +++ b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.types @@ -30,7 +30,7 @@ var derived2: Derived2; var r2 = true ? 1 : ''; >r2 : string | number ->true ? 1 : '' : "" | 1 +>true ? 1 : '' : 1 | "" >true : true >1 : 1 >'' : "" diff --git a/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.types b/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.types index 63651072644..91ad88c8ade 100644 --- a/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.types +++ b/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.types @@ -19,7 +19,7 @@ declare function foo(obj: I): T foo({ >foo({ p: "", 0: () => { }, ["hi" + "bye"]: true, [0 + 1]: 0, [+"hi"]: [0]}) : string | number | boolean | (() => void) | number[] >foo : (obj: I) => T ->{ p: "", 0: () => { }, ["hi" + "bye"]: true, [0 + 1]: 0, [+"hi"]: [0]} : { [x: string]: true | "" | 0 | (() => void) | number[]; [x: number]: 0 | (() => void) | number[]; 0: () => void; p: ""; } +>{ p: "", 0: () => { }, ["hi" + "bye"]: true, [0 + 1]: 0, [+"hi"]: [0]} : { [x: string]: true | "" | (() => void) | 0 | number[]; [x: number]: (() => void) | 0 | number[]; 0: () => void; p: ""; } p: "", >p : string diff --git a/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.types b/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.types index fa34f015a23..131e49dd173 100644 --- a/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.types +++ b/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.types @@ -19,7 +19,7 @@ declare function foo(obj: I): T foo({ >foo({ p: "", 0: () => { }, ["hi" + "bye"]: true, [0 + 1]: 0, [+"hi"]: [0]}) : string | number | boolean | (() => void) | number[] >foo : (obj: I) => T ->{ p: "", 0: () => { }, ["hi" + "bye"]: true, [0 + 1]: 0, [+"hi"]: [0]} : { [x: string]: true | "" | 0 | (() => void) | number[]; [x: number]: 0 | (() => void) | number[]; 0: () => void; p: ""; } +>{ p: "", 0: () => { }, ["hi" + "bye"]: true, [0 + 1]: 0, [+"hi"]: [0]} : { [x: string]: true | "" | (() => void) | 0 | number[]; [x: number]: (() => void) | 0 | number[]; 0: () => void; p: ""; } p: "", >p : string diff --git a/tests/baselines/reference/conditionalExpression1.errors.txt b/tests/baselines/reference/conditionalExpression1.errors.txt index 66af5336808..2b342129523 100644 --- a/tests/baselines/reference/conditionalExpression1.errors.txt +++ b/tests/baselines/reference/conditionalExpression1.errors.txt @@ -1,9 +1,9 @@ -tests/cases/compiler/conditionalExpression1.ts(1,5): error TS2322: Type '"" | 1' is not assignable to type 'boolean'. - Type '""' is not assignable to type 'boolean'. +tests/cases/compiler/conditionalExpression1.ts(1,5): error TS2322: Type '1 | ""' is not assignable to type 'boolean'. + Type '1' is not assignable to type 'boolean'. ==== tests/cases/compiler/conditionalExpression1.ts (1 errors) ==== var x: boolean = (true ? 1 : ""); // should be an error ~ -!!! error TS2322: Type '"" | 1' is not assignable to type 'boolean'. -!!! error TS2322: Type '""' is not assignable to type 'boolean'. \ No newline at end of file +!!! error TS2322: Type '1 | ""' is not assignable to type 'boolean'. +!!! error TS2322: Type '1' is not assignable to type 'boolean'. \ No newline at end of file diff --git a/tests/baselines/reference/conditionalExpressions2.types b/tests/baselines/reference/conditionalExpressions2.types index 0247b0f649d..c2b2e23e57b 100644 --- a/tests/baselines/reference/conditionalExpressions2.types +++ b/tests/baselines/reference/conditionalExpressions2.types @@ -16,7 +16,7 @@ var b = false ? undefined : 0; var c = false ? 1 : 0; >c : number ->false ? 1 : 0 : 0 | 1 +>false ? 1 : 0 : 1 | 0 >false : false >1 : 1 >0 : 0 diff --git a/tests/baselines/reference/declFileTypeAnnotationParenType.types b/tests/baselines/reference/declFileTypeAnnotationParenType.types index f3c8db5533a..1fd0b6ee5d9 100644 --- a/tests/baselines/reference/declFileTypeAnnotationParenType.types +++ b/tests/baselines/reference/declFileTypeAnnotationParenType.types @@ -25,7 +25,7 @@ var y = [() => new c()]; var k: (() => c) | string = (() => new c()) || ""; >k : string | (() => c) >c : c ->(() => new c()) || "" : "" | (() => c) +>(() => new c()) || "" : (() => c) | "" >(() => new c()) : () => c >() => new c() : () => c >new c() : c diff --git a/tests/baselines/reference/functionWithMultipleReturnStatements.types b/tests/baselines/reference/functionWithMultipleReturnStatements.types index 775ca52e1db..fec29e5a01b 100644 --- a/tests/baselines/reference/functionWithMultipleReturnStatements.types +++ b/tests/baselines/reference/functionWithMultipleReturnStatements.types @@ -4,7 +4,7 @@ // it is an error if there is no single BCT, these are error cases function f1() { ->f1 : () => "" | 1 +>f1 : () => 1 | "" if (true) { >true : true @@ -19,7 +19,7 @@ function f1() { } function f2() { ->f2 : () => "" | 1 | 2 +>f2 : () => 1 | "" | 2 if (true) { >true : true @@ -40,7 +40,7 @@ function f2() { } function f3() { ->f3 : () => "" | 1 +>f3 : () => 1 | "" try { return 1; @@ -55,7 +55,7 @@ function f3() { } function f4() { ->f4 : () => "" | 1 +>f4 : () => 1 | "" try { return 1; @@ -72,7 +72,7 @@ function f4() { } function f5() { ->f5 : () => "" | 1 +>f5 : () => 1 | "" return 1; >1 : 1 diff --git a/tests/baselines/reference/literalTypes2.types b/tests/baselines/reference/literalTypes2.types index ba12ada644b..716b016f64e 100644 --- a/tests/baselines/reference/literalTypes2.types +++ b/tests/baselines/reference/literalTypes2.types @@ -482,7 +482,7 @@ function f6() { const { c1 = true, c2 = 0, c3 = "foo" } = { c1: false, c2: 1, c3: "bar" }; >c1 : boolean >true : true ->c2 : 0 | 1 +>c2 : 1 | 0 >0 : 0 >c3 : "foo" | "bar" >"foo" : "foo" @@ -552,10 +552,10 @@ class C2 { >0 : 0 } bar() { ->bar : () => 0 | 1 +>bar : () => 1 | 0 return cond ? 0 : 1; ->cond ? 0 : 1 : 0 | 1 +>cond ? 0 : 1 : 1 | 0 >cond : boolean >0 : 0 >1 : 1 diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.types b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.types index 99aef9e95f6..23ac78ec013 100644 --- a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.types +++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.types @@ -259,14 +259,14 @@ function f6(x: T) { var r2 = true ? '' : x; // ok >r2 : string | T ->true ? '' : x : "" | T +>true ? '' : x : T | "" >true : true >'' : "" >x : T var r2 = true ? x : ''; // ok >r2 : string | T ->true ? x : '' : "" | T +>true ? x : '' : T | "" >true : true >x : T >'' : "" diff --git a/tests/baselines/reference/underscoreTest1.types b/tests/baselines/reference/underscoreTest1.types index d4898d43bed..97e064fb12c 100644 --- a/tests/baselines/reference/underscoreTest1.types +++ b/tests/baselines/reference/underscoreTest1.types @@ -512,7 +512,7 @@ _.compact([0, 1, false, 2, '', 3]); >_.compact : (list: T[]) => T[] >_ : Underscore.Static >compact : (list: T[]) => T[] ->[0, 1, false, 2, '', 3] : (false | "" | 0 | 1 | 2 | 3)[] +>[0, 1, false, 2, '', 3] : (false | 1 | 2 | 3 | 0 | "")[] >0 : 0 >1 : 1 >false : false