Update LKG

Author: mhegazy

lib/tsc.js

@@ -23597,7 +23597,7 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    function createGetSymbolWalker(getRestTypeOfSignature, getTypePredicateOfSignature, getReturnTypeOfSignature, getBaseTypes, resolveStructuredTypeMembers, getTypeOfSymbol, getResolvedSymbol, getIndexTypeOfStructuredType, getConstraintFromTypeParameter, getFirstIdentifier) {
+    function createGetSymbolWalker(getRestTypeOfSignature, getTypePredicateOfSignature, getReturnTypeOfSignature, getBaseTypes, resolveStructuredTypeMembers, getTypeOfSymbol, getResolvedSymbol, getIndexTypeOfStructuredType, getConstraintOfTypeParameter, getFirstIdentifier) {
         return getSymbolWalker;
         function getSymbolWalker(accept) {
             if (accept === void 0) { accept = function () { return true; }; }
@@ -23670,7 +23670,7 @@ var ts;
                 ts.forEach(type.typeArguments, visitType);
             }
             function visitTypeParameter(type) {
-                visitType(getConstraintFromTypeParameter(type));
+                visitType(getConstraintOfTypeParameter(type));
             }
             function visitUnionOrIntersectionType(type) {
                 ts.forEach(type.types, visitType);
@@ -23973,7 +23973,7 @@ var ts;
             getEmitResolver: getEmitResolver,
             getExportsOfModule: getExportsOfModuleAsArray,
             getExportsAndPropertiesOfModule: getExportsAndPropertiesOfModule,
-            getSymbolWalker: ts.createGetSymbolWalker(getRestTypeOfSignature, getTypePredicateOfSignature, getReturnTypeOfSignature, getBaseTypes, resolveStructuredTypeMembers, getTypeOfSymbol, getResolvedSymbol, getIndexTypeOfStructuredType, getConstraintFromTypeParameter, getFirstIdentifier),
+            getSymbolWalker: ts.createGetSymbolWalker(getRestTypeOfSignature, getTypePredicateOfSignature, getReturnTypeOfSignature, getBaseTypes, resolveStructuredTypeMembers, getTypeOfSymbol, getResolvedSymbol, getIndexTypeOfStructuredType, getConstraintOfTypeParameter, getFirstIdentifier),
             getAmbientModules: getAmbientModules,
             getAllAttributesTypeFromJsxOpeningLikeElement: function (nodeIn) {
                 var node = ts.getParseTreeNode(nodeIn, ts.isJsxOpeningLikeElement);
@@ -26710,7 +26710,7 @@ var ts;
                 return ts.createTypeParameterDeclaration(name, constraintNode, defaultParameterNode);
             }
             function typeParameterToDeclaration(type, context, constraint) {
-                if (constraint === void 0) { constraint = getConstraintFromTypeParameter(type); }
+                if (constraint === void 0) { constraint = getConstraintOfTypeParameter(type); }
                 var constraintNode = constraint && typeToTypeNodeHelper(constraint, context);
                 return typeParameterToDeclarationWithConstraint(type, context, constraintNode);
             }
@@ -27225,23 +27225,19 @@ var ts;
             return -1;
         }
         function hasType(target, propertyName) {
-            if (propertyName === 0) {
-                return !!getSymbolLinks(target).type;
-            }
-            if (propertyName === 2) {
-                return !!getSymbolLinks(target).declaredType;
-            }
-            if (propertyName === 1) {
-                return !!target.resolvedBaseConstructorType;
-            }
-            if (propertyName === 3) {
-                return !!target.resolvedReturnType;
-            }
-            if (propertyName === 4) {
-                var bc = target.immediateBaseConstraint;
-                return !!bc && bc !== circularConstraintType;
+            switch (propertyName) {
+                case 0:
+                    return !!getSymbolLinks(target).type;
+                case 2:
+                    return !!getSymbolLinks(target).declaredType;
+                case 1:
+                    return !!target.resolvedBaseConstructorType;
+                case 3:
+                    return !!target.resolvedReturnType;
+                case 4:
+                    return !!target.immediateBaseConstraint;
             }
-            return ts.Debug.fail("Unhandled TypeSystemPropertyName " + propertyName);
+            return ts.Debug.assertNever(propertyName);
         }
         function popTypeResolution() {
             resolutionTargets.pop();
@@ -29299,20 +29295,12 @@ var ts;
             }
             return undefined;
         }
-        function getBaseConstraintOfInstantiableNonPrimitiveUnionOrIntersection(type) {
+        function getBaseConstraintOfType(type) {
             if (type.flags & (14745600 | 786432)) {
                 var constraint = getResolvedBaseConstraint(type);
-                if (constraint !== noConstraintType && constraint !== circularConstraintType) {
-                    return constraint;
-                }
-            }
-        }
-        function getBaseConstraintOfType(type) {
-            var constraint = getBaseConstraintOfInstantiableNonPrimitiveUnionOrIntersection(type);
-            if (!constraint && type.flags & 1048576) {
-                return keyofConstraintType;
+                return constraint !== noConstraintType && constraint !== circularConstraintType ? constraint : undefined;
             }
-            return constraint;
+            return type.flags & 1048576 ? keyofConstraintType : undefined;
         }
         function getBaseConstraintOrType(type) {
             return getBaseConstraintOfType(type) || type;
@@ -29321,29 +29309,24 @@ var ts;
             return getResolvedBaseConstraint(type) !== circularConstraintType;
         }
         function getResolvedBaseConstraint(type) {
-            var circular;
-            if (!type.resolvedBaseConstraint) {
-                var constraint = getBaseConstraint(type);
-                type.resolvedBaseConstraint = circular ? circularConstraintType : getTypeWithThisArgument(constraint || noConstraintType, type);
+            return type.resolvedBaseConstraint ||
+                (type.resolvedBaseConstraint = getTypeWithThisArgument(getImmediateBaseConstraint(type), type));
+            function getImmediateBaseConstraint(t) {
+                if (!t.immediateBaseConstraint) {
+                    if (!pushTypeResolution(t, 4)) {
+                        return circularConstraintType;
+                    }
+                    var result = computeBaseConstraint(getSimplifiedType(t));
+                    if (!popTypeResolution()) {
+                        result = circularConstraintType;
+                    }
+                    t.immediateBaseConstraint = result || noConstraintType;
+                }
+                return t.immediateBaseConstraint;
             }
-            return type.resolvedBaseConstraint;
             function getBaseConstraint(t) {
-                if (t.immediateBaseConstraint) {
-                    return t.immediateBaseConstraint === noConstraintType ? undefined : t.immediateBaseConstraint;
-                }
-                if (!pushTypeResolution(t, 4)) {
-                    circular = true;
-                    t.immediateBaseConstraint = circularConstraintType;
-                    return undefined;
-                }
-                var result = computeBaseConstraint(getSimplifiedType(t));
-                if (!popTypeResolution()) {
-                    circular = true;
-                    t.immediateBaseConstraint = circularConstraintType;
-                    return undefined;
-                }
-                t.immediateBaseConstraint = !result ? noConstraintType : result;
-                return result;
+                var c = getImmediateBaseConstraint(t);
+                return c !== noConstraintType && c !== circularConstraintType ? c : undefined;
             }
             function computeBaseConstraint(t) {
                 if (t.flags & 65536) {
@@ -31107,7 +31090,7 @@ var ts;
                 return type.simplified = substituteIndexedMappedType(objectType, type);
             }
             if (objectType.flags & 65536) {
-                var constraint = getConstraintFromTypeParameter(objectType);
+                var constraint = getConstraintOfTypeParameter(objectType);
                 if (constraint && isGenericMappedType(constraint)) {
                     return type.simplified = substituteIndexedMappedType(constraint, type);
                 }
@@ -33569,7 +33552,7 @@ var ts;
             return false;
         }
         function isUnconstrainedTypeParameter(type) {
-            return type.flags & 65536 && !getConstraintFromTypeParameter(type);
+            return type.flags & 65536 && !getConstraintOfTypeParameter(type);
         }
         function isTypeReferenceWithGenericArguments(type) {
             return !!(ts.getObjectFlags(type) & 4) && ts.some(type.typeArguments, function (t) { return isUnconstrainedTypeParameter(t) || isTypeReferenceWithGenericArguments(t); });
@@ -37819,7 +37802,7 @@ var ts;
                     return false;
                 }
                 var thisType = getTypeFromTypeNode(thisParameter.type);
-                enclosingClass = ((thisType.flags & 65536) ? getConstraintFromTypeParameter(thisType) : thisType);
+                enclosingClass = ((thisType.flags & 65536) ? getConstraintOfTypeParameter(thisType) : thisType);
             }
             if (flags & 32) {
                 return true;
@@ -38940,7 +38923,7 @@ var ts;
                 typeArguments.pop();
             }
             while (typeArguments.length < typeParameters.length) {
-                typeArguments.push(getConstraintFromTypeParameter(typeParameters[typeArguments.length]) || getDefaultTypeArgumentType(ts.isInJavaScriptFile(node)));
+                typeArguments.push(getConstraintOfTypeParameter(typeParameters[typeArguments.length]) || getDefaultTypeArgumentType(ts.isInJavaScriptFile(node)));
             }
             var instantiated = createSignatureInstantiation(candidate, typeArguments);
             candidates[bestIndex] = instantiated;
@@ -43382,7 +43365,7 @@ var ts;
                         return false;
                     }
                     var sourceConstraint = source.constraint && getTypeFromTypeNode(source.constraint);
-                    var targetConstraint = getConstraintFromTypeParameter(target);
+                    var targetConstraint = getConstraintOfTypeParameter(target);
                     if (sourceConstraint) {
                         if (!targetConstraint || !isTypeIdenticalTo(sourceConstraint, targetConstraint)) {
                             return false;