From da9feca0b00ad2fb59ca23a0cbe882066521f4bb Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Thu, 17 Jan 2019 14:38:04 -0800 Subject: [PATCH] Accept new baselines --- .../reference/errorMessagesIntersectionTypes02.errors.txt | 8 ++++---- .../reference/errorMessagesIntersectionTypes02.types | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/baselines/reference/errorMessagesIntersectionTypes02.errors.txt b/tests/baselines/reference/errorMessagesIntersectionTypes02.errors.txt index 6a9dd26706c..1225d3662cb 100644 --- a/tests/baselines/reference/errorMessagesIntersectionTypes02.errors.txt +++ b/tests/baselines/reference/errorMessagesIntersectionTypes02.errors.txt @@ -1,6 +1,6 @@ -tests/cases/compiler/errorMessagesIntersectionTypes02.ts(14,5): error TS2322: Type '{ fooProp: string; } & Bar' is not assignable to type 'FooBar'. +tests/cases/compiler/errorMessagesIntersectionTypes02.ts(14,5): error TS2322: Type '{ fooProp: "frizzlebizzle"; } & Bar' is not assignable to type 'FooBar'. Types of property 'fooProp' are incompatible. - Type 'string' is not assignable to type '"hello" | "world"'. + Type '"frizzlebizzle"' is not assignable to type '"hello" | "world"'. ==== tests/cases/compiler/errorMessagesIntersectionTypes02.ts (1 errors) ==== @@ -19,8 +19,8 @@ tests/cases/compiler/errorMessagesIntersectionTypes02.ts(14,5): error TS2322: Ty let fooBar: FooBar = mixBar({ ~~~~~~ -!!! error TS2322: Type '{ fooProp: string; } & Bar' is not assignable to type 'FooBar'. +!!! error TS2322: Type '{ fooProp: "frizzlebizzle"; } & Bar' is not assignable to type 'FooBar'. !!! error TS2322: Types of property 'fooProp' are incompatible. -!!! error TS2322: Type 'string' is not assignable to type '"hello" | "world"'. +!!! error TS2322: Type '"frizzlebizzle"' is not assignable to type '"hello" | "world"'. fooProp: "frizzlebizzle" }); \ No newline at end of file diff --git a/tests/baselines/reference/errorMessagesIntersectionTypes02.types b/tests/baselines/reference/errorMessagesIntersectionTypes02.types index ee21ee3ed91..f1aa28ca32e 100644 --- a/tests/baselines/reference/errorMessagesIntersectionTypes02.types +++ b/tests/baselines/reference/errorMessagesIntersectionTypes02.types @@ -18,12 +18,12 @@ declare function mixBar(obj: T): T & Bar; let fooBar: FooBar = mixBar({ >fooBar : FooBar ->mixBar({ fooProp: "frizzlebizzle"}) : { fooProp: string; } & Bar +>mixBar({ fooProp: "frizzlebizzle"}) : { fooProp: "frizzlebizzle"; } & Bar >mixBar : (obj: T) => T & Bar ->{ fooProp: "frizzlebizzle"} : { fooProp: string; } +>{ fooProp: "frizzlebizzle"} : { fooProp: "frizzlebizzle"; } fooProp: "frizzlebizzle" ->fooProp : string +>fooProp : "frizzlebizzle" >"frizzlebizzle" : "frizzlebizzle" });