From 77bb4f89c0a4f07f69727c4b8bc3410b7c624cbe Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Fri, 25 May 2018 09:10:17 -0700
Subject: [PATCH] Accept new baselines

---
 tests/baselines/reference/api/tsserverlibrary.d.ts          | 6 +++---
 tests/baselines/reference/api/typescript.d.ts               | 6 +++---
 .../reference/nonPrimitiveUnionIntersection.errors.txt      | 6 ++----
 .../baselines/reference/nonPrimitiveUnionIntersection.types | 4 ++--
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
index 8999d3bfb09..aaad8781c96 100644
--- a/tests/baselines/reference/api/tsserverlibrary.d.ts
+++ b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -2150,7 +2150,7 @@ declare namespace ts {
         IndexedAccess = 1048576,
         Conditional = 2097152,
         Substitution = 4194304,
-        NonPrimitive = 134217728,
+        NonPrimitive = 8388608,
         Literal = 224,
         Unit = 13536,
         StringOrNumberLiteral = 96,
@@ -2168,8 +2168,8 @@ declare namespace ts {
         InstantiablePrimitive = 524288,
         Instantiable = 7897088,
         StructuredOrInstantiable = 8355840,
-        Narrowable = 142575359,
-        NotUnionOrUnit = 134283777
+        Narrowable = 16746239,
+        NotUnionOrUnit = 8454657
     }
     type DestructuringPattern = BindingPattern | ObjectLiteralExpression | ArrayLiteralExpression;
     interface Type {
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
index 643b5b27489..51bc3cc92db 100644
--- a/tests/baselines/reference/api/typescript.d.ts
+++ b/tests/baselines/reference/api/typescript.d.ts
@@ -2150,7 +2150,7 @@ declare namespace ts {
         IndexedAccess = 1048576,
         Conditional = 2097152,
         Substitution = 4194304,
-        NonPrimitive = 134217728,
+        NonPrimitive = 8388608,
         Literal = 224,
         Unit = 13536,
         StringOrNumberLiteral = 96,
@@ -2168,8 +2168,8 @@ declare namespace ts {
         InstantiablePrimitive = 524288,
         Instantiable = 7897088,
         StructuredOrInstantiable = 8355840,
-        Narrowable = 142575359,
-        NotUnionOrUnit = 134283777
+        Narrowable = 16746239,
+        NotUnionOrUnit = 8454657
     }
     type DestructuringPattern = BindingPattern | ObjectLiteralExpression | ArrayLiteralExpression;
     interface Type {
diff --git a/tests/baselines/reference/nonPrimitiveUnionIntersection.errors.txt b/tests/baselines/reference/nonPrimitiveUnionIntersection.errors.txt
index 5aad982dc20..57cfb137c7d 100644
--- a/tests/baselines/reference/nonPrimitiveUnionIntersection.errors.txt
+++ b/tests/baselines/reference/nonPrimitiveUnionIntersection.errors.txt
@@ -1,7 +1,6 @@
 tests/cases/conformance/types/nonPrimitive/nonPrimitiveUnionIntersection.ts(1,5): error TS2322: Type '""' is not assignable to type 'object & string'.
   Type '""' is not assignable to type 'object'.
-tests/cases/conformance/types/nonPrimitive/nonPrimitiveUnionIntersection.ts(3,5): error TS2322: Type '123' is not assignable to type 'object & {}'.
-  Type '123' is not assignable to type 'object'.
+tests/cases/conformance/types/nonPrimitive/nonPrimitiveUnionIntersection.ts(3,5): error TS2322: Type '123' is not assignable to type 'object'.
 tests/cases/conformance/types/nonPrimitive/nonPrimitiveUnionIntersection.ts(4,1): error TS2322: Type 'string' is not assignable to type 'object & string'.
   Type 'string' is not assignable to type 'object'.
 tests/cases/conformance/types/nonPrimitive/nonPrimitiveUnionIntersection.ts(8,38): error TS2322: Type '{ bar: string; }' is not assignable to type 'object & { err: string; }'.
@@ -16,8 +15,7 @@ tests/cases/conformance/types/nonPrimitive/nonPrimitiveUnionIntersection.ts(8,38
     var b: object | string = ""; // ok
     var c: object & {} = 123; // error
         ~
-!!! error TS2322: Type '123' is not assignable to type 'object & {}'.
-!!! error TS2322:   Type '123' is not assignable to type 'object'.
+!!! error TS2322: Type '123' is not assignable to type 'object'.
     a = b; // error
     ~
 !!! error TS2322: Type 'string' is not assignable to type 'object & string'.
diff --git a/tests/baselines/reference/nonPrimitiveUnionIntersection.types b/tests/baselines/reference/nonPrimitiveUnionIntersection.types
index 55a0b2a018c..4775d5ac8aa 100644
--- a/tests/baselines/reference/nonPrimitiveUnionIntersection.types
+++ b/tests/baselines/reference/nonPrimitiveUnionIntersection.types
@@ -8,7 +8,7 @@ var b: object | string = ""; // ok
 >"" : ""
 
 var c: object & {} = 123; // error
->c : object & {}
+>c : object
 >123 : 123
 
 a = b; // error
@@ -22,7 +22,7 @@ b = a; // ok
 >a : object & string
 
 const foo: object & {} = {bar: 'bar'}; // ok
->foo : object & {}
+>foo : object
 >{bar: 'bar'} : { bar: string; }
 >bar : string
 >'bar' : "bar"