From 4b5968eb6d8a64794b51d48fd67fd28e7cd34e28 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Tue, 14 May 2019 07:45:29 -0700
Subject: [PATCH] Revert change to substitution type simplification

---
 src/compiler/checker.ts | 7 ++++++-
 src/compiler/types.ts   | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 9a64dce125591..e37da1fd67860 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -10196,7 +10196,6 @@ namespace ts {
         function getSimplifiedType(type: Type, writing: boolean): Type {
             return type.flags & TypeFlags.IndexedAccess ? getSimplifiedIndexedAccessType(<IndexedAccessType>type, writing) :
                 type.flags & TypeFlags.Conditional ? getSimplifiedConditionalType(<ConditionalType>type, writing) :
-                type.flags & TypeFlags.Substitution ? writing ? (<SubstitutionType>type).typeVariable : (<SubstitutionType>type).substitute :
                 type;
         }
 
@@ -12432,6 +12431,12 @@ namespace ts {
                 if (isFreshLiteralType(target)) {
                     target = (<FreshableType>target).regularType;
                 }
+                if (source.flags & TypeFlags.Substitution) {
+                    source = (<SubstitutionType>source).substitute;
+                }
+                if (target.flags & TypeFlags.Substitution) {
+                    target = (<SubstitutionType>target).typeVariable;
+                }
                 if (source.flags & TypeFlags.Simplifiable) {
                     source = getSimplifiedType(source, /*writing*/ false);
                 }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 75fb702609b70..db1a62937e662 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -3967,7 +3967,7 @@ namespace ts {
         /* @internal */
         ObjectFlagsType = Nullable | Never | Object | Union | Intersection,
         /* @internal */
-        Simplifiable = IndexedAccess | Conditional | Substitution,
+        Simplifiable = IndexedAccess | Conditional,
         // 'Narrowable' types are types where narrowing actually narrows.
         // This *should* be every type other than null, undefined, void, and never
         Narrowable = Any | Unknown | StructuredOrInstantiable | StringLike | NumberLike | BigIntLike | BooleanLike | ESSymbol | UniqueESSymbol | NonPrimitive,