From 86b0759b0963dd105df7b7717c28d044ef7f3fbc Mon Sep 17 00:00:00 2001
From: Ron Buckton <ron.buckton@microsoft.com>
Date: Wed, 15 Nov 2017 16:47:01 -0800
Subject: [PATCH] PR feedback

---
 src/compiler/checker.ts | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 5393e0a6cdb..8801502e091 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -10649,11 +10649,8 @@ namespace ts {
         }
 
         function getWidenedLiteralLikeTypeForContextualType(type: Type, contextualType: Type) {
-            if (!isLiteralContextualType(contextualType)) {
-                type = getWidenedLiteralType(type);
-            }
-            if (!isUniqueESSymbolContextualType(contextualType)) {
-                type = getWidenedUniqueESSymbolType(type);
+            if (!isLiteralLikeContextualType(contextualType)) {
+                type = getWidenedUniqueESSymbolType(getWidenedLiteralType(type));
             }
             return type;
         }
@@ -18838,27 +18835,23 @@ namespace ts {
                 isTypeAssertion(declaration.initializer) ? type : getWidenedLiteralType(type);
         }
 
-        function isLiteralContextualType(contextualType: Type) {
+        function isLiteralLikeContextualType(contextualType: Type) {
             if (contextualType) {
                 if (contextualType.flags & TypeFlags.TypeVariable) {
                     const constraint = getBaseConstraintOfType(contextualType) || emptyObjectType;
                     // If the type parameter is constrained to the base primitive type we're checking for,
                     // consider this a literal context. For example, given a type parameter 'T extends string',
                     // this causes us to infer string literal types for T.
-                    if (constraint.flags & (TypeFlags.String | TypeFlags.Number | TypeFlags.Boolean | TypeFlags.Enum)) {
+                    if (constraint.flags & (TypeFlags.String | TypeFlags.Number | TypeFlags.Boolean | TypeFlags.Enum | TypeFlags.UniqueESSymbol)) {
                         return true;
                     }
                     contextualType = constraint;
                 }
-                return maybeTypeOfKind(contextualType, (TypeFlags.Literal | TypeFlags.Index));
+                return maybeTypeOfKind(contextualType, (TypeFlags.Literal | TypeFlags.Index | TypeFlags.UniqueESSymbol));
             }
             return false;
         }
 
-        function isUniqueESSymbolContextualType(contextualType: Type) {
-            return contextualType ? maybeTypeOfKind(contextualType, TypeFlags.UniqueESSymbol) : false;
-        }
-
         function checkExpressionForMutableLocation(node: Expression, checkMode: CheckMode, contextualType?: Type): Type {
             if (arguments.length === 2) {
                 contextualType = getContextualType(node);