From f7a80029a3a1ea0bfab2f2fbfcfbf38b7e50dfaf Mon Sep 17 00:00:00 2001
From: Justin Brown <justinbrown548@u.boisestate.edu>
Date: Thu, 16 Sep 2021 10:26:43 -0600
Subject: [PATCH] Fix for resolvedTrueType and resolvedFalseType of
 conditionType not resolved (#45838)

* Fix for Issue #45537

* tests/baselines/reference/* files updated
---
 src/compiler/types.ts                              | 4 ++--
 tests/baselines/reference/api/tsserverlibrary.d.ts | 4 ++--
 tests/baselines/reference/api/typescript.d.ts      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index ae1e7c16d00..f263c53a649 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -5616,8 +5616,8 @@ namespace ts {
         root: ConditionalRoot;
         checkType: Type;
         extendsType: Type;
-        resolvedTrueType: Type;
-        resolvedFalseType: Type;
+        resolvedTrueType?: Type;
+        resolvedFalseType?: Type;
         /* @internal */
         resolvedInferredTrueType?: Type; // The `trueType` instantiated with the `combinedMapper`, if present
         /* @internal */
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
index f23a441f98c..345ee175a1f 100644
--- a/tests/baselines/reference/api/tsserverlibrary.d.ts
+++ b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -2722,8 +2722,8 @@ declare namespace ts {
         root: ConditionalRoot;
         checkType: Type;
         extendsType: Type;
-        resolvedTrueType: Type;
-        resolvedFalseType: Type;
+        resolvedTrueType?: Type;
+        resolvedFalseType?: Type;
     }
     export interface TemplateLiteralType extends InstantiableType {
         texts: readonly string[];
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
index 8a9603b7b7c..dc6b0f2787f 100644
--- a/tests/baselines/reference/api/typescript.d.ts
+++ b/tests/baselines/reference/api/typescript.d.ts
@@ -2722,8 +2722,8 @@ declare namespace ts {
         root: ConditionalRoot;
         checkType: Type;
         extendsType: Type;
-        resolvedTrueType: Type;
-        resolvedFalseType: Type;
+        resolvedTrueType?: Type;
+        resolvedFalseType?: Type;
     }
     export interface TemplateLiteralType extends InstantiableType {
         texts: readonly string[];