Merge branch 'master' into tupleTypes

microsoft · ahejlsberg · Sep 15, 2014 · Aug 11, 2014 · Aug 11, 2014 · Aug 13, 2014
commit b4cddc39033834a291cb241d55a0270098aaa452
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -3241,14 +3241,8 @@ module ts {
             return type;
         }
 
-        function getWidenedTypeOfArrayLiteral(type: Type): Type {
-            var elementType = (<TypeReference>type).typeArguments[0];
-            var widenedType = getWidenedType(elementType);
-            type = elementType !== widenedType ? createArrayType(widenedType) : type;
-            return type;
-        }
-
-        function getWidenedType(type: Type): Type {
+        /* If we are widening on a literal, then we may need to the 'node' parameter for reporting purposes */
+        function getWidenedType(type: Type, supressNoImplicitAnyErrors?: boolean): Type {
             if (type.flags & (TypeFlags.Undefined | TypeFlags.Null)) {
                 return anyType;
             }

diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -220,7 +220,7 @@ module ts {
         FirstFutureReservedWord = ImplementsKeyword,
         LastFutureReservedWord = YieldKeyword,
         FirstTypeNode = TypeReference,
-        LastTypeNode = ArrayType,
+        LastTypeNode = TupleType,
         FirstPunctuation = OpenBraceToken,
         LastPunctuation = CaretEqualsToken
     }