diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index 145cdb5dc70..fe52e26ddd1 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -50,12 +50,13 @@ module ts {
     }
 
     /**
-     * Returns false if any of the following are true:
-     *   1. declaration has no name
-     *   2. declaration has a literal name (not computed)
-     *   3. declaration has a computed property name that is a known symbol
+     * A declaration has a dynamic name if both of the following are true:
+     *   1. The declaration has a computed property name
+     *   2. The computed name is *not* expressed as Symbol.<name>, where name
+     *      is a property of the Symbol constructor that denotes a built in
+     *      Symbol.
      */
-    export function hasComputedNameButNotSymbol(declaration: Declaration): boolean {
+    export function hasDynamicName(declaration: Declaration): boolean {
         return declaration.name && declaration.name.kind === SyntaxKind.ComputedPropertyName;
     }
 
@@ -96,7 +97,7 @@ module ts {
                 if (node.kind === SyntaxKind.ModuleDeclaration && node.name.kind === SyntaxKind.StringLiteral) {
                     return '"' + (<LiteralExpression>node.name).text + '"';
                 }
-                Debug.assert(!hasComputedNameButNotSymbol(node));
+                Debug.assert(!hasDynamicName(node));
                 return (<Identifier | LiteralExpression>node.name).text;
             }
             switch (node.kind) {
@@ -118,11 +119,7 @@ module ts {
         }
 
         function declareSymbol(symbols: SymbolTable, parent: Symbol, node: Declaration, includes: SymbolFlags, excludes: SymbolFlags): Symbol {
-            // Nodes with computed property names will not get symbols, because the type checker
-            // does not make properties for them.
-            if (hasComputedNameButNotSymbol(node)) {
-                return undefined;
-            }
+            Debug.assert(!hasDynamicName(node));
 
             var name = getDeclarationName(node);
             if (name !== undefined) {
@@ -395,14 +392,14 @@ module ts {
                     break;
                 case SyntaxKind.PropertyDeclaration:
                 case SyntaxKind.PropertySignature:
-                    bindDeclaration(<Declaration>node, SymbolFlags.Property | ((<PropertyDeclaration>node).questionToken ? SymbolFlags.Optional : 0), SymbolFlags.PropertyExcludes, /*isBlockScopeContainer*/ false);
+                    bindPropertyOrMethodOrAccessor(<Declaration>node, SymbolFlags.Property | ((<PropertyDeclaration>node).questionToken ? SymbolFlags.Optional : 0), SymbolFlags.PropertyExcludes, /*isBlockScopeContainer*/ false);
                     break;
                 case SyntaxKind.PropertyAssignment:
                 case SyntaxKind.ShorthandPropertyAssignment:
-                    bindDeclaration(<Declaration>node, SymbolFlags.Property, SymbolFlags.PropertyExcludes, /*isBlockScopeContainer*/ false);
+                    bindPropertyOrMethodOrAccessor(<Declaration>node, SymbolFlags.Property, SymbolFlags.PropertyExcludes, /*isBlockScopeContainer*/ false);
                     break;
                 case SyntaxKind.EnumMember:
-                    bindDeclaration(<Declaration>node, SymbolFlags.EnumMember, SymbolFlags.EnumMemberExcludes, /*isBlockScopeContainer*/ false);
+                    bindPropertyOrMethodOrAccessor(<Declaration>node, SymbolFlags.EnumMember, SymbolFlags.EnumMemberExcludes, /*isBlockScopeContainer*/ false);
                     break;
                 case SyntaxKind.CallSignature:
                 case SyntaxKind.ConstructSignature:
@@ -415,7 +412,7 @@ module ts {
                     // as other properties in the object literal.  So we use SymbolFlags.PropertyExcludes
                     // so that it will conflict with any other object literal members with the same
                     // name.
-                    bindDeclaration(<Declaration>node, SymbolFlags.Method | ((<MethodDeclaration>node).questionToken ? SymbolFlags.Optional : 0),
+                    bindPropertyOrMethodOrAccessor(<Declaration>node, SymbolFlags.Method | ((<MethodDeclaration>node).questionToken ? SymbolFlags.Optional : 0),
                         isObjectLiteralMethod(node) ? SymbolFlags.PropertyExcludes : SymbolFlags.MethodExcludes, /*isBlockScopeContainer*/ true);
                     break;
                 case SyntaxKind.FunctionDeclaration:
@@ -425,10 +422,10 @@ module ts {
                     bindDeclaration(<Declaration>node, SymbolFlags.Constructor, /*symbolExcludes:*/ 0, /*isBlockScopeContainer:*/ true);
                     break;
                 case SyntaxKind.GetAccessor:
-                    bindDeclaration(<Declaration>node, SymbolFlags.GetAccessor, SymbolFlags.GetAccessorExcludes, /*isBlockScopeContainer*/ true);
+                    bindPropertyOrMethodOrAccessor(<Declaration>node, SymbolFlags.GetAccessor, SymbolFlags.GetAccessorExcludes, /*isBlockScopeContainer*/ true);
                     break;
                 case SyntaxKind.SetAccessor:
-                    bindDeclaration(<Declaration>node, SymbolFlags.SetAccessor, SymbolFlags.SetAccessorExcludes, /*isBlockScopeContainer*/ true);
+                    bindPropertyOrMethodOrAccessor(<Declaration>node, SymbolFlags.SetAccessor, SymbolFlags.SetAccessorExcludes, /*isBlockScopeContainer*/ true);
                     break;
 
                 case SyntaxKind.FunctionType:
@@ -510,5 +507,14 @@ module ts {
                 declareSymbol(classDeclaration.symbol.members, classDeclaration.symbol, node, SymbolFlags.Property, SymbolFlags.PropertyExcludes);
             }
         }
+
+        function bindPropertyOrMethodOrAccessor(node: Declaration, symbolKind: SymbolFlags, symbolExcludes: SymbolFlags, isBlockScopeContainer: boolean) {
+            if (hasDynamicName(node)) {
+                bindAnonymousDeclaration(node, symbolKind, "__computed", isBlockScopeContainer);
+            }
+            else {
+                bindDeclaration(node, symbolKind, symbolExcludes, isBlockScopeContainer);
+            }
+        }
     }
 }
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 1e84c78fce1..75b2a7a16ab 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -66,8 +66,8 @@ module ts {
         var numberType = createIntrinsicType(TypeFlags.Number, "number");
         var booleanType = createIntrinsicType(TypeFlags.Boolean, "boolean");
         var voidType = createIntrinsicType(TypeFlags.Void, "void");
-        var undefinedType = createIntrinsicType(TypeFlags.Undefined | TypeFlags.Unwidened, "undefined");
-        var nullType = createIntrinsicType(TypeFlags.Null | TypeFlags.Unwidened, "null");
+        var undefinedType = createIntrinsicType(TypeFlags.Undefined | TypeFlags.ContainsUndefinedOrNull, "undefined");
+        var nullType = createIntrinsicType(TypeFlags.Null | TypeFlags.ContainsUndefinedOrNull, "null");
         var unknownType = createIntrinsicType(TypeFlags.Any, "unknown");
         var resolvingType = createIntrinsicType(TypeFlags.Any, "__resolving__");
 
@@ -107,6 +107,21 @@ module ts {
         var diagnostics: Diagnostic[] = [];
         var diagnosticsModified: boolean = false;
 
+        var primitiveTypeInfo: Map<{ type: Type; flags: TypeFlags }> = {
+            "string": {
+                type: stringType,
+                flags: TypeFlags.StringLike
+            },
+            "number": {
+                type: numberType,
+                flags: TypeFlags.NumberLike
+            },
+            "boolean": {
+                type: booleanType,
+                flags: TypeFlags.Boolean
+            }
+        };
+
         function addDiagnostic(diagnostic: Diagnostic) {
             diagnostics.push(diagnostic);
             diagnosticsModified = true;
@@ -337,6 +352,25 @@ module ts {
                             break loop;
                         }
                         break;
+
+                    // It is not legal to reference a class's own type parameters from a computed property name that
+                    // belongs to the class. For example:
+                    //
+                    //   function foo<T>() { return '' }
+                    //   class C<T> { // <-- Class's own type parameter T
+                    //       [foo<T>()]() { } // <-- Reference to T from class's own computed property
+                    //   }
+                    //
+                    case SyntaxKind.ComputedPropertyName:
+                        var grandparent = location.parent.parent;
+                        if (grandparent.kind === SyntaxKind.ClassDeclaration || grandparent.kind === SyntaxKind.InterfaceDeclaration) {
+                            // A reference to this grandparent's type parameters would be an error
+                            if (result = getSymbol(getSymbolOfNode(grandparent).members, name, meaning & SymbolFlags.Type)) {
+                                error(errorLocation, Diagnostics.A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type);
+                                return undefined;
+                            }
+                        }
+                        break;
                     case SyntaxKind.MethodDeclaration:
                     case SyntaxKind.MethodSignature:
                     case SyntaxKind.Constructor:
@@ -1660,7 +1694,7 @@ module ts {
                 // Use type of the specified property, or otherwise, for a numeric name, the type of the numeric index signature,
                 // or otherwise the type of the string index signature.
                 var type = getTypeOfPropertyOfType(parentType, name.text) ||
-                    isNumericName(name.text) && getIndexTypeOfType(parentType, IndexKind.Number) ||
+                    isNumericLiteralName(name.text) && getIndexTypeOfType(parentType, IndexKind.Number) ||
                     getIndexTypeOfType(parentType, IndexKind.String);
                 if (!type) {
                     error(name, Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(parentType), declarationNameToString(name));
@@ -1706,7 +1740,7 @@ module ts {
             if (declaration.kind === SyntaxKind.Parameter) {
                 var func = <FunctionLikeDeclaration>declaration.parent;
                 // For a parameter of a set accessor, use the type of the get accessor if one is present
-                if (func.kind === SyntaxKind.SetAccessor && !hasComputedNameButNotSymbol(func)) {
+                if (func.kind === SyntaxKind.SetAccessor && !hasDynamicName(func)) {
                     var getter = <AccessorDeclaration>getDeclarationOfKind(declaration.parent.symbol, SyntaxKind.GetAccessor);
                     if (getter) {
                         return getReturnTypeOfSignature(getSignatureFromDeclaration(getter));
@@ -2622,7 +2656,7 @@ module ts {
                 else {
                     // TypeScript 1.0 spec (April 2014):
                     // If only one accessor includes a type annotation, the other behaves as if it had the same type annotation.
-                    if (declaration.kind === SyntaxKind.GetAccessor && !hasComputedNameButNotSymbol(declaration)) {
+                    if (declaration.kind === SyntaxKind.GetAccessor && !hasDynamicName(declaration)) {
                         var setter = <AccessorDeclaration>getDeclarationOfKind(declaration.symbol, SyntaxKind.SetAccessor);
                         returnType = getAnnotatedAccessorType(setter);
                     }
@@ -2807,15 +2841,22 @@ module ts {
             }
         }
 
-        function getUnwidenedFlagOfTypes(types: Type[]): TypeFlags {
-            return forEach(types, t => t.flags & TypeFlags.Unwidened) || 0;
+        // This function is used to propagate widening flags when creating new object types references and union types.
+        // It is only necessary to do so if a constituent type might be the undefined type, the null type, or the type
+        // of an object literal (since those types have widening related information we need to track).
+        function getWideningFlagsOfTypes(types: Type[]): TypeFlags {
+            var result: TypeFlags = 0;
+            for (var i = 0; i < types.length; i++) {
+                result |= types[i].flags;
+            }
+            return result & TypeFlags.RequiresWidening;
         }
 
         function createTypeReference(target: GenericType, typeArguments: Type[]): TypeReference {
             var id = getTypeListId(typeArguments);
             var type = target.instantiations[id];
             if (!type) {
-                var flags = TypeFlags.Reference | getUnwidenedFlagOfTypes(typeArguments);
+                var flags = TypeFlags.Reference | getWideningFlagsOfTypes(typeArguments);
                 type = target.instantiations[id] = <TypeReference>createObjectType(flags, target.symbol);
                 type.target = target;
                 type.typeArguments = typeArguments;
@@ -3076,7 +3117,7 @@ module ts {
             var id = getTypeListId(sortedTypes);
             var type = unionTypes[id];
             if (!type) {
-                type = unionTypes[id] = <UnionType>createObjectType(TypeFlags.Union | getUnwidenedFlagOfTypes(sortedTypes));
+                type = unionTypes[id] = <UnionType>createObjectType(TypeFlags.Union | getWideningFlagsOfTypes(sortedTypes));
                 type.types = sortedTypes;
             }
             return type;
@@ -3692,12 +3733,13 @@ module ts {
                 }
                 var result = Ternary.True;
                 var properties = getPropertiesOfObjectType(target);
+                var requireOptionalProperties = relation === subtypeRelation && !(source.flags & TypeFlags.ObjectLiteral);
                 for (var i = 0; i < properties.length; i++) {
                     var targetProp = properties[i];
                     var sourceProp = getPropertyOfType(source, targetProp.name);
                     if (sourceProp !== targetProp) {
                         if (!sourceProp) {
-                            if (relation === subtypeRelation || !(targetProp.flags & SymbolFlags.Optional)) {
+                            if (!(targetProp.flags & SymbolFlags.Optional) || requireOptionalProperties) {
                                 if (reportErrors) {
                                     reportError(Diagnostics.Property_0_is_missing_in_type_1, symbolToString(targetProp), typeToString(source));
                                 }
@@ -4088,10 +4130,6 @@ module ts {
                 errorMessageChainHead);
         }
 
-        function isTypeOfObjectLiteral(type: Type): boolean {
-            return (type.flags & TypeFlags.Anonymous) && type.symbol && (type.symbol.flags & SymbolFlags.ObjectLiteral) ? true : false;
-        }
-
         function isArrayType(type: Type): boolean {
             return type.flags & TypeFlags.Reference && (<TypeReference>type).target === globalArrayType;
         }
@@ -4104,13 +4142,18 @@ module ts {
             var properties = getPropertiesOfObjectType(type);
             var members: SymbolTable = {};
             forEach(properties, p => {
-                var symbol = <TransientSymbol>createSymbol(p.flags | SymbolFlags.Transient, p.name);
-                symbol.declarations = p.declarations;
-                symbol.parent = p.parent;
-                symbol.type = getWidenedType(getTypeOfSymbol(p));
-                symbol.target = p;
-                if (p.valueDeclaration) symbol.valueDeclaration = p.valueDeclaration;
-                members[symbol.name] = symbol;
+                var propType = getTypeOfSymbol(p);
+                var widenedType = getWidenedType(propType);
+                if (propType !== widenedType) {
+                    var symbol = <TransientSymbol>createSymbol(p.flags | SymbolFlags.Transient, p.name);
+                    symbol.declarations = p.declarations;
+                    symbol.parent = p.parent;
+                    symbol.type = widenedType;
+                    symbol.target = p;
+                    if (p.valueDeclaration) symbol.valueDeclaration = p.valueDeclaration;
+                    p = symbol;
+                }
+                members[p.name] = p;
             });
             var stringIndexType = getIndexTypeOfType(type, IndexKind.String);
             var numberIndexType = getIndexTypeOfType(type, IndexKind.Number);
@@ -4120,16 +4163,16 @@ module ts {
         }
 
         function getWidenedType(type: Type): Type {
-            if (type.flags & TypeFlags.Unwidened) {
+            if (type.flags & TypeFlags.RequiresWidening) {
                 if (type.flags & (TypeFlags.Undefined | TypeFlags.Null)) {
                     return anyType;
                 }
+                if (type.flags & TypeFlags.ObjectLiteral) {
+                    return getWidenedTypeOfObjectLiteral(type);
+                }
                 if (type.flags & TypeFlags.Union) {
                     return getUnionType(map((<UnionType>type).types, getWidenedType));
                 }
-                if (isTypeOfObjectLiteral(type)) {
-                    return getWidenedTypeOfObjectLiteral(type);
-                }
                 if (isArrayType(type)) {
                     return createArrayType(getWidenedType((<TypeReference>type).typeArguments[0]));
                 }
@@ -4150,11 +4193,11 @@ module ts {
             if (isArrayType(type)) {
                 return reportWideningErrorsInType((<TypeReference>type).typeArguments[0]);
             }
-            if (isTypeOfObjectLiteral(type)) {
+            if (type.flags & TypeFlags.ObjectLiteral) {
                 var errorReported = false;
                 forEach(getPropertiesOfObjectType(type), p => {
                     var t = getTypeOfSymbol(p);
-                    if (t.flags & TypeFlags.Unwidened) {
+                    if (t.flags & TypeFlags.ContainsUndefinedOrNull) {
                         if (!reportWideningErrorsInType(t)) {
                             error(p.valueDeclaration, Diagnostics.Object_literal_s_property_0_implicitly_has_an_1_type, p.name, typeToString(getWidenedType(t)));
                         }
@@ -4198,7 +4241,7 @@ module ts {
         }
 
         function reportErrorsFromWidening(declaration: Declaration, type: Type) {
-            if (produceDiagnostics && compilerOptions.noImplicitAny && type.flags & TypeFlags.Unwidened) {
+            if (produceDiagnostics && compilerOptions.noImplicitAny && type.flags & TypeFlags.ContainsUndefinedOrNull) {
                 // Report implicit any error within type if possible, otherwise report error on declaration
                 if (!reportWideningErrorsInType(type)) {
                     reportImplicitAnyError(declaration, type);
@@ -4454,12 +4497,17 @@ module ts {
             Debug.fail("should not get here");
         }
 
-        // Remove one or more primitive types from a union type
-        function subtractPrimitiveTypes(type: Type, subtractMask: TypeFlags): Type {
+        // For a union type, remove all constituent types that are of the given type kind (when isOfTypeKind is true)
+        // or not of the given type kind (when isOfTypeKind is false)
+        function removeTypesFromUnionType(type: Type, typeKind: TypeFlags, isOfTypeKind: boolean): Type {
             if (type.flags & TypeFlags.Union) {
                 var types = (<UnionType>type).types;
-                if (forEach(types, t => t.flags & subtractMask)) {
-                    return getUnionType(filter(types, t => !(t.flags & subtractMask)));
+                if (forEach(types, t => !!(t.flags & typeKind) === isOfTypeKind)) {
+                    // Above we checked if we have anything to remove, now use the opposite test to do the removal
+                    var narrowedType = getUnionType(filter(types, t => !(t.flags & typeKind) === isOfTypeKind));
+                    if (narrowedType !== emptyObjectType) {
+                        return narrowedType;
+                    }
                 }
             }
             return type;
@@ -4635,8 +4683,8 @@ module ts {
                             // Stop at the first containing function or module declaration
                             break loop;
                     }
-                    // Use narrowed type if it is a subtype and construct contains no assignments to variable
-                    if (narrowedType !== type && isTypeSubtypeOf(narrowedType, type)) {
+                    // Use narrowed type if construct contains no assignments to variable
+                    if (narrowedType !== type) {
                         if (isVariableAssignedWithin(symbol, node)) {
                             break;
                         }
@@ -4656,20 +4704,30 @@ module ts {
                 if (left.expression.kind !== SyntaxKind.Identifier || getResolvedSymbol(<Identifier>left.expression) !== symbol) {
                     return type;
                 }
-                var t = right.text;
-                var checkType: Type = t === "string" ? stringType : t === "number" ? numberType : t === "boolean" ? booleanType : emptyObjectType;
+                var typeInfo = primitiveTypeInfo[right.text];
                 if (expr.operator === SyntaxKind.ExclamationEqualsEqualsToken) {
                     assumeTrue = !assumeTrue;
                 }
                 if (assumeTrue) {
-                    // The assumed result is true. If check was for a primitive type, that type is the narrowed type. Otherwise we can
-                    // remove the primitive types from the narrowed type.
-                    return checkType === emptyObjectType ? subtractPrimitiveTypes(type, TypeFlags.String | TypeFlags.Number | TypeFlags.Boolean) : checkType;
+                    // Assumed result is true. If check was not for a primitive type, remove all primitive types
+                    if (!typeInfo) {
+                        return removeTypesFromUnionType(type, /*typeKind*/ TypeFlags.StringLike | TypeFlags.NumberLike | TypeFlags.Boolean, /*isOfTypeKind*/ true);
+                    }
+                    // Check was for a primitive type, return that primitive type if it is a subtype
+                    if (isTypeSubtypeOf(typeInfo.type, type)) {
+                        return typeInfo.type;
+                    }
+                    // Otherwise, remove all types that aren't of the primitive type kind. This can happen when the type is
+                    // union of enum types and other types.
+                    return removeTypesFromUnionType(type, /*typeKind*/ typeInfo.flags, /*isOfTypeKind*/ false);
                 }
                 else {
-                    // The assumed result is false. If check was for a primitive type we can remove that type from the narrowed type.
+                    // Assumed result is false. If check was for a primitive type, remove that primitive type
+                    if (typeInfo) {
+                        return removeTypesFromUnionType(type, /*typeKind*/ typeInfo.flags, /*isOfTypeKind*/ true);
+                    }
                     // Otherwise we don't have enough information to do anything.
-                    return checkType === emptyObjectType ? type : subtractPrimitiveTypes(type, checkType.flags);
+                    return type;
                 }
             }
 
@@ -4730,7 +4788,8 @@ module ts {
                 return type;
             }
 
-            // Narrow the given type based on the given expression having the assumed boolean value
+            // Narrow the given type based on the given expression having the assumed boolean value. The returned type
+            // will be a subtype or the same type as the argument.
             function narrowType(type: Type, expr: Expression, assumeTrue: boolean): Type {
                 switch (expr.kind) {
                     case SyntaxKind.ParenthesizedExpression:
@@ -4759,6 +4818,7 @@ module ts {
                 return type;
             }
         }
+
         /*Transitively mark all linked imports as referenced*/
         function markLinkedImportsAsReferenced(node: ImportDeclaration): void {
             var nodeLinks = getNodeLinks(node);
@@ -4855,6 +4915,9 @@ module ts {
                         // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
                     }
                     break;
+                case SyntaxKind.ComputedPropertyName:
+                    error(node, Diagnostics.this_cannot_be_referenced_in_a_computed_property_name);
+                    break;
             }
 
             if (needToCaptureLexicalThis) {
@@ -4869,26 +4932,6 @@ module ts {
             return anyType;
         }
 
-        function getSuperContainer(node: Node): Node {
-            while (true) {
-                node = node.parent;
-                if (!node) return node;
-                switch (node.kind) {
-                    case SyntaxKind.FunctionDeclaration:
-                    case SyntaxKind.FunctionExpression:
-                    case SyntaxKind.ArrowFunction:
-                    case SyntaxKind.PropertyDeclaration:
-                    case SyntaxKind.PropertySignature:
-                    case SyntaxKind.MethodDeclaration:
-                    case SyntaxKind.MethodSignature:
-                    case SyntaxKind.Constructor:
-                    case SyntaxKind.GetAccessor:
-                    case SyntaxKind.SetAccessor:
-                        return node;
-                }
-            }
-        }
-
         function isInConstructorArgumentInitializer(node: Node, constructorDecl: Node): boolean {
             for (var n = node; n && n !== constructorDecl; n = n.parent) {
                 if (n.kind === SyntaxKind.Parameter) {
@@ -4912,7 +4955,7 @@ module ts {
                 return unknownType;
             }
 
-            var container = getSuperContainer(node);
+            var container = getSuperContainer(node, /*includeFunctions*/ true);
 
             if (container) {
                 var canUseSuperExpression = false;
@@ -4930,7 +4973,7 @@ module ts {
                     // super property access might appear in arrow functions with arbitrary deep nesting
                     var needToCaptureLexicalThis = false;
                     while (container && container.kind === SyntaxKind.ArrowFunction) {
-                        container = getSuperContainer(container);
+                        container = getSuperContainer(container, /*includeFunctions*/ true);
                         needToCaptureLexicalThis = true;
                     }
 
@@ -4985,7 +5028,10 @@ module ts {
                 }
             }
 
-            if (isCallExpression) {
+            if (container.kind === SyntaxKind.ComputedPropertyName) {
+                error(node, Diagnostics.super_cannot_be_referenced_in_a_computed_property_name);
+            }
+            else if (isCallExpression) {
                 error(node, Diagnostics.Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors);
             }
             else {
@@ -5167,13 +5213,22 @@ module ts {
         function getContextualTypeForObjectLiteralElement(element: ObjectLiteralElement) {
             var objectLiteral = <ObjectLiteralExpression>element.parent;
             var type = getContextualType(objectLiteral);
-            // TODO(jfreeman): Handle this case for computed names and symbols
-            var name = (<Identifier>element.name).text;
-            if (type && name) {
-                return getTypeOfPropertyOfContextualType(type, name) ||
-                    isNumericName(name) && getIndexTypeOfContextualType(type, IndexKind.Number) ||
+            if (type) {
+                if (!hasDynamicName(element)) {
+                    // For a (non-symbol) computed property, there is no reason to look up the name
+                    // in the type. It will just be "__computed", which does not appear in any
+                    // SymbolTable.
+                    var symbolName = getSymbolOfNode(element).name;
+                    var propertyType = getTypeOfPropertyOfContextualType(type, symbolName);
+                    if (propertyType) {
+                        return propertyType;
+                    }
+                }
+                
+                return isNumericName(element.name) && getIndexTypeOfContextualType(type, IndexKind.Number) ||
                     getIndexTypeOfContextualType(type, IndexKind.String);
             }
+
             return undefined;
         }
 
@@ -5372,7 +5427,17 @@ module ts {
             return createArrayType(getUnionType(elementTypes));
         }
 
-        function isNumericName(name: string) {
+        function isNumericName(name: DeclarationName): boolean {
+            return name.kind === SyntaxKind.ComputedPropertyName ? isNumericComputedName(<ComputedPropertyName>name) : isNumericLiteralName((<Identifier>name).text);
+        }
+
+        function isNumericComputedName(name: ComputedPropertyName): boolean {
+            // It seems odd to consider an expression of type Any to result in a numeric name,
+            // but this behavior is consistent with checkIndexedAccess
+            return isTypeOfKind(checkComputedPropertyName(name), TypeFlags.Any | TypeFlags.NumberLike);
+        }
+
+        function isNumericLiteralName(name: string) {
             // The intent of numeric names is that
             //     - they are names with text in a numeric form, and that
             //     - setting properties/indexing with them is always equivalent to doing so with the numeric literal 'numLit',
@@ -5397,84 +5462,101 @@ module ts {
             return (+name).toString() === name;
         }
 
+        function checkComputedPropertyName(node: ComputedPropertyName): Type {
+            var links = getNodeLinks(node.expression);
+            if (!links.resolvedType) {
+                links.resolvedType = checkExpression(node.expression);
+
+                // This will allow types number, string, or any. It will also allow enums, the unknown
+                // type, and any union of these types (like string | number).
+                if (!isTypeOfKind(links.resolvedType, TypeFlags.Any | TypeFlags.NumberLike | TypeFlags.StringLike)) {
+                    error(node, Diagnostics.A_computed_property_name_must_be_of_type_string_number_or_any);
+                }
+            }
+
+            return links.resolvedType;
+        }
+
         function checkObjectLiteral(node: ObjectLiteralExpression, contextualMapper?: TypeMapper): Type {
             // Grammar checking
             checkGrammarObjectLiteralExpression(node);
 
-            var members = node.symbol.members;
-            var properties: SymbolTable = {};
+            var propertiesTable: SymbolTable = {};
+            var propertiesArray: Symbol[] = [];
             var contextualType = getContextualType(node);
             var typeFlags: TypeFlags;
 
-            for (var id in members) {
-                if (hasProperty(members, id)) {
-                    var member = members[id];
-                    if (member.flags & SymbolFlags.Property || isObjectLiteralMethod(member.declarations[0])) {
-                        var memberDecl = <ObjectLiteralElement>member.declarations[0];
-                        if (memberDecl.kind === SyntaxKind.PropertyAssignment) {
-                            var type = checkExpression((<PropertyAssignment>memberDecl).initializer, contextualMapper);
-                        }
-                        else if (memberDecl.kind === SyntaxKind.MethodDeclaration) {
-                            var type = checkObjectLiteralMethod(<MethodDeclaration>memberDecl, contextualMapper);
-                        }
-                        else {
-                            Debug.assert(memberDecl.kind === SyntaxKind.ShorthandPropertyAssignment);
-                            var type = memberDecl.name.kind === SyntaxKind.ComputedPropertyName
-                                ? unknownType
-                                : checkExpression(<Identifier>memberDecl.name, contextualMapper);
-                        }
-                        typeFlags |= type.flags;
-                        var prop = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | member.flags, member.name);
-                        prop.declarations = member.declarations;
-                        prop.parent = member.parent;
-                        if (member.valueDeclaration) {
-                            prop.valueDeclaration = member.valueDeclaration;
-                        }
-
-                        prop.type = type;
-                        prop.target = member;
-                        member = prop;
+            for (var i = 0; i < node.properties.length; i++) {
+                var memberDecl = node.properties[i];
+                var member = memberDecl.symbol;
+                if (memberDecl.kind === SyntaxKind.PropertyAssignment ||
+                    memberDecl.kind === SyntaxKind.ShorthandPropertyAssignment ||
+                    isObjectLiteralMethod(memberDecl)) {
+                    if (memberDecl.kind === SyntaxKind.PropertyAssignment) {
+                        var type = checkPropertyAssignment(<PropertyAssignment>memberDecl, contextualMapper);
+                    }
+                    else if (memberDecl.kind === SyntaxKind.MethodDeclaration) {
+                        var type = checkObjectLiteralMethod(<MethodDeclaration>memberDecl, contextualMapper);
                     }
                     else {
-                        // TypeScript 1.0 spec (April 2014)
-                        // A get accessor declaration is processed in the same manner as 
-                        // an ordinary function declaration(section 6.1) with no parameters.
-                        // A set accessor declaration is processed in the same manner 
-                        // as an ordinary function declaration with a single parameter and a Void return type.
-                        var getAccessor = <AccessorDeclaration>getDeclarationOfKind(member, SyntaxKind.GetAccessor);
-                        if (getAccessor) {
-                            checkAccessorDeclaration(getAccessor);
-                        }
-
-                        var setAccessor = <AccessorDeclaration>getDeclarationOfKind(member, SyntaxKind.SetAccessor);
-                        if (setAccessor) {
-                            checkAccessorDeclaration(setAccessor);
-                        }
+                        Debug.assert(memberDecl.kind === SyntaxKind.ShorthandPropertyAssignment);
+                        var type = memberDecl.name.kind === SyntaxKind.ComputedPropertyName
+                            ? unknownType
+                            : checkExpression(<Identifier>memberDecl.name, contextualMapper);
                     }
-                    properties[member.name] = member;
+                    typeFlags |= type.flags;
+                    var prop = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | member.flags, member.name);
+                    prop.declarations = member.declarations;
+                    prop.parent = member.parent;
+                    if (member.valueDeclaration) {
+                        prop.valueDeclaration = member.valueDeclaration;
+                    }
+
+                    prop.type = type;
+                    prop.target = member;
+                    member = prop;
                 }
+                else {
+                    // TypeScript 1.0 spec (April 2014)
+                    // A get accessor declaration is processed in the same manner as 
+                    // an ordinary function declaration(section 6.1) with no parameters.
+                    // A set accessor declaration is processed in the same manner 
+                    // as an ordinary function declaration with a single parameter and a Void return type.
+                    Debug.assert(memberDecl.kind === SyntaxKind.GetAccessor || memberDecl.kind === SyntaxKind.SetAccessor);
+                    checkAccessorDeclaration(<AccessorDeclaration>memberDecl);
+                }
+
+                if (!hasDynamicName(memberDecl)) {
+                    propertiesTable[member.name] = member;
+                }
+                propertiesArray.push(member);
             }
 
             var stringIndexType = getIndexType(IndexKind.String);
             var numberIndexType = getIndexType(IndexKind.Number);
-            var result = createAnonymousType(node.symbol, properties, emptyArray, emptyArray, stringIndexType, numberIndexType);
-            result.flags |= (typeFlags & TypeFlags.Unwidened);
+            var result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexType, numberIndexType);
+            result.flags |= TypeFlags.ObjectLiteral | TypeFlags.ContainsObjectLiteral | (typeFlags & TypeFlags.ContainsUndefinedOrNull);
             return result;
 
             function getIndexType(kind: IndexKind) {
                 if (contextualType && contextualTypeHasIndexSignature(contextualType, kind)) {
                     var propTypes: Type[] = [];
-                    for (var id in properties) {
-                        if (hasProperty(properties, id)) {
-                            if (kind === IndexKind.String || isNumericName(id)) {
-                                var type = getTypeOfSymbol(properties[id]);
-                                if (!contains(propTypes, type)) {
-                                    propTypes.push(type);
-                                }
+                    for (var i = 0; i < propertiesArray.length; i++) {
+                        var propertyDecl = node.properties[i];
+                        if (kind === IndexKind.String || isNumericName(propertyDecl.name)) {
+                            // Do not call getSymbolOfNode(propertyDecl), as that will get the
+                            // original symbol for the node. We actually want to get the symbol
+                            // created by checkObjectLiteral, since that will be appropriately
+                            // contextually typed and resolved.
+                            var type = getTypeOfSymbol(propertiesArray[i]);
+                            if (!contains(propTypes, type)) {
+                                propTypes.push(type);
                             }
                         }
                     }
-                    return propTypes.length ? getUnionType(propTypes) : undefinedType;
+                    var result = propTypes.length ? getUnionType(propTypes) : undefinedType;
+                    typeFlags |= result.flags;
+                    return result;
                 }
                 return undefined;
             }
@@ -6738,7 +6820,7 @@ module ts {
             // and the right operand to be of type Any or a subtype of the 'Function' interface type. 
             // The result is always of the Boolean primitive type.
             // NOTE: do not raise error if leftType is unknown as related error was already reported
-            if (!isTypeOfKind(leftType, TypeFlags.Any | TypeFlags.ObjectType | TypeFlags.TypeParameter)) {
+            if (isTypeOfKind(leftType, TypeFlags.Primitive)) {
                 error(node.left, Diagnostics.The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter);
             }
             // NOTE: do not raise error if right is unknown as related error was already reported
@@ -6771,7 +6853,7 @@ module ts {
                     var name = <Identifier>(<PropertyAssignment>p).name;
                     var type = sourceType.flags & TypeFlags.Any ? sourceType :
                         getTypeOfPropertyOfType(sourceType, name.text) ||
-                        isNumericName(name.text) && getIndexTypeOfType(sourceType, IndexKind.Number) ||
+                        isNumericLiteralName(name.text) && getIndexTypeOfType(sourceType, IndexKind.Number) ||
                         getIndexTypeOfType(sourceType, IndexKind.String);
                     if (type) {
                         checkDestructuringAssignment((<PropertyAssignment>p).initializer || name, type);
@@ -7052,10 +7134,22 @@ module ts {
             return links.resolvedType;
         }
 
+        function checkPropertyAssignment(node: PropertyAssignment, contextualMapper?: TypeMapper): Type {
+            if (hasDynamicName(node)) {
+                checkComputedPropertyName(<ComputedPropertyName>node.name);
+            }
+
+            return checkExpression((<PropertyAssignment>node).initializer, contextualMapper);
+        }
+
         function checkObjectLiteralMethod(node: MethodDeclaration, contextualMapper?: TypeMapper): Type {
             // Grammar checking
             checkGrammarMethod(node);
 
+            if (hasDynamicName(node)) {
+                checkComputedPropertyName(<ComputedPropertyName>node.name);
+            }
+
             var uninstantiatedType = checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper);
             return instantiateTypeWithSingleGenericCallSignature(node, uninstantiatedType, contextualMapper);
         }
@@ -7426,7 +7520,7 @@ module ts {
                     }
                 }
 
-                if (!hasComputedNameButNotSymbol(node)) {
+                if (!hasDynamicName(node)) {
                     // TypeScript 1.0 spec (April 2014): 8.4.3
                     // Accessors for the same member name must specify the same accessibility.
                     var otherKind = node.kind === SyntaxKind.GetAccessor ? SyntaxKind.SetAccessor : SyntaxKind.GetAccessor;
@@ -7446,9 +7540,9 @@ module ts {
                             }
                         }
                     }
-
-                    checkAndStoreTypeOfAccessors(getSymbolOfNode(node));
                 }
+
+                checkAndStoreTypeOfAccessors(getSymbolOfNode(node));
             }
 
             checkFunctionLikeDeclaration(node);
@@ -7864,7 +7958,12 @@ module ts {
         function checkFunctionLikeDeclaration(node: FunctionLikeDeclaration): void {
             checkSignatureDeclaration(node);
 
-            if (!hasComputedNameButNotSymbol(node)) {
+            if (hasDynamicName(node)) {
+                // This check will account for methods in class/interface declarations,
+                // as well as accessors in classes/object literals
+                checkComputedPropertyName(<ComputedPropertyName>node.name);
+            }
+            else {
                 // first we want to check the local symbol that contain this declaration
                 // - if node.localSymbol !== undefined - this is current declaration is exported and localSymbol points to the local symbol
                 // - if node.localSymbol === undefined - this node is non-exported so we can just pick the result of getSymbolOfNode
@@ -8093,7 +8192,8 @@ module ts {
         function checkVariableLikeDeclaration(node: VariableLikeDeclaration) {
             checkSourceElement(node.type);
             // For a computed property, just check the initializer and exit
-            if (hasComputedNameButNotSymbol(node)) {
+            if (hasDynamicName(node)) {
+                checkComputedPropertyName(<ComputedPropertyName>node.name);
                 if (node.initializer) {
                     checkExpressionCached(node.initializer);
                 }
@@ -8436,45 +8536,7 @@ module ts {
             if (node.finallyBlock) checkBlock(node.finallyBlock);
         }
 
-        function checkIndexConstraints(type: Type) { 
-
-            function checkIndexConstraintForProperty(prop: Symbol, propertyType: Type, indexDeclaration: Declaration, indexType: Type, indexKind: IndexKind): void {
-                if (!indexType) {
-                    return;
-                }
-
-                // index is numeric and property name is not valid numeric literal
-                if (indexKind === IndexKind.Number && !isNumericName(prop.name)) {
-                    return;
-                }
-
-                // perform property check if property or indexer is declared in 'type'
-                // this allows to rule out cases when both property and indexer are inherited from the base class
-                var errorNode: Node;
-                if (prop.parent === type.symbol) {
-                    errorNode = prop.valueDeclaration;
-                }
-                else if (indexDeclaration) {
-                    errorNode = indexDeclaration;
-                }
-
-                else if (type.flags & TypeFlags.Interface) {
-                    // for interfaces property and indexer might be inherited from different bases
-                    // check if any base class already has both property and indexer.
-                    // check should be performed only if 'type' is the first type that brings property\indexer together
-                    var someBaseClassHasBothPropertyAndIndexer = forEach((<InterfaceType>type).baseTypes, base => getPropertyOfObjectType(base, prop.name) && getIndexTypeOfType(base, indexKind));
-                    errorNode = someBaseClassHasBothPropertyAndIndexer ? undefined : type.symbol.declarations[0];
-                }
-
-                if (errorNode && !isTypeAssignableTo(propertyType, indexType)) {
-                    var errorMessage =
-                        indexKind === IndexKind.String
-                        ? Diagnostics.Property_0_of_type_1_is_not_assignable_to_string_index_type_2
-                        : Diagnostics.Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2;
-                    error(errorNode, errorMessage, symbolToString(prop), typeToString(propertyType), typeToString(indexType));
-                }
-            }
-
+        function checkIndexConstraints(type: Type) {
             var declaredNumberIndexer = getIndexDeclarationOfSymbol(type.symbol, IndexKind.Number);
             var declaredStringIndexer = getIndexDeclarationOfSymbol(type.symbol, IndexKind.String);
 
@@ -8484,9 +8546,24 @@ module ts {
             if (stringIndexType || numberIndexType) {
                 forEach(getPropertiesOfObjectType(type), prop => {
                     var propType = getTypeOfSymbol(prop);
-                    checkIndexConstraintForProperty(prop, propType, declaredStringIndexer, stringIndexType, IndexKind.String);
-                    checkIndexConstraintForProperty(prop, propType, declaredNumberIndexer, numberIndexType, IndexKind.Number);
+                    checkIndexConstraintForProperty(prop, propType, type, declaredStringIndexer, stringIndexType, IndexKind.String);
+                    checkIndexConstraintForProperty(prop, propType, type, declaredNumberIndexer, numberIndexType, IndexKind.Number);
                 });
+
+                if (type.flags & TypeFlags.Class && type.symbol.valueDeclaration.kind === SyntaxKind.ClassDeclaration) {
+                    var classDeclaration = <ClassDeclaration>type.symbol.valueDeclaration;
+                    for (var i = 0; i < classDeclaration.members.length; i++) {
+                        var member = classDeclaration.members[i];
+                        // Only process instance properties with computed names here.
+                        // Static properties cannot be in conflict with indexers,
+                        // and properties with literal names were already checked.
+                        if (!(member.flags & NodeFlags.Static) && hasDynamicName(member)) {
+                            var propType = getTypeOfSymbol(member.symbol);
+                            checkIndexConstraintForProperty(member.symbol, propType, type, declaredStringIndexer, stringIndexType, IndexKind.String);
+                            checkIndexConstraintForProperty(member.symbol, propType, type, declaredNumberIndexer, numberIndexType, IndexKind.Number); 
+                        }
+                    }
+                }
             }
 
             var errorNode: Node;
@@ -8503,9 +8580,51 @@ module ts {
                 error(errorNode, Diagnostics.Numeric_index_type_0_is_not_assignable_to_string_index_type_1,
                     typeToString(numberIndexType), typeToString(stringIndexType));
             }
+
+            function checkIndexConstraintForProperty(
+                prop: Symbol,
+                propertyType: Type,
+                containingType: Type,
+                indexDeclaration: Declaration,
+                indexType: Type,
+                indexKind: IndexKind): void {
+
+                if (!indexType) {
+                    return;
+                }
+
+                // index is numeric and property name is not valid numeric literal
+                if (indexKind === IndexKind.Number && !isNumericName(prop.valueDeclaration.name)) {
+                    return;
+                }
+
+                // perform property check if property or indexer is declared in 'type'
+                // this allows to rule out cases when both property and indexer are inherited from the base class
+                var errorNode: Node;
+                if (prop.valueDeclaration.name.kind === SyntaxKind.ComputedPropertyName || prop.parent === containingType.symbol) {
+                    errorNode = prop.valueDeclaration;
+                }
+                else if (indexDeclaration) {
+                    errorNode = indexDeclaration;
+                }
+                else if (containingType.flags & TypeFlags.Interface) {
+                    // for interfaces property and indexer might be inherited from different bases
+                    // check if any base class already has both property and indexer.
+                    // check should be performed only if 'type' is the first type that brings property\indexer together
+                    var someBaseClassHasBothPropertyAndIndexer = forEach((<InterfaceType>containingType).baseTypes, base => getPropertyOfObjectType(base, prop.name) && getIndexTypeOfType(base, indexKind));
+                    errorNode = someBaseClassHasBothPropertyAndIndexer ? undefined : containingType.symbol.declarations[0];
+                }
+
+                if (errorNode && !isTypeAssignableTo(propertyType, indexType)) {
+                    var errorMessage =
+                        indexKind === IndexKind.String
+                            ? Diagnostics.Property_0_of_type_1_is_not_assignable_to_string_index_type_2
+                            : Diagnostics.Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2;
+                    error(errorNode, errorMessage, symbolToString(prop), typeToString(propertyType), typeToString(indexType));
+                }
+            }
         }
 
-        // TODO(jfreeman): Decide what to do for computed properties
         function checkTypeNameIsReserved(name: DeclarationName, message: DiagnosticMessage): void {
             // TS 1.0 spec (April 2014): 3.6.1
             // The predefined type keywords are reserved and cannot be used as names of user defined types.
@@ -8799,8 +8918,7 @@ module ts {
                 var enumIsConst = isConst(node);
 
                 forEach(node.members, member => {
-                    // TODO(jfreeman): Check that it is not a computed name
-                    if(isNumericName((<Identifier>member.name).text)) {
+                    if (member.name.kind !== SyntaxKind.ComputedPropertyName && isNumericLiteralName((<Identifier>member.name).text)) {
                         error(member.name, Diagnostics.An_enum_member_cannot_have_a_numeric_name);
                     }
                     var initializer = member.initializer;
@@ -9990,8 +10108,8 @@ module ts {
             if (symbol && (symbol.flags & SymbolFlags.EnumMember)) {
                 var declaration = symbol.valueDeclaration;
                 var constantValue: number;
-                if (declaration.kind === SyntaxKind.EnumMember && (constantValue = getNodeLinks(declaration).enumMemberValue) !== undefined) {
-                    return constantValue;
+                if (declaration.kind === SyntaxKind.EnumMember) {
+                    return getEnumMemberValue(<EnumMember>declaration);
                 }
             }
 
@@ -10427,22 +10545,18 @@ module ts {
             return false;
         }
 
-        function checkGrammarComputedPropertyName(node: Node): void {
+        function checkGrammarComputedPropertyName(node: Node): boolean {
             // If node is not a computedPropertyName, just skip the grammar checking
             if (node.kind !== SyntaxKind.ComputedPropertyName) {
-                return;
+                return false;
             }
-            // Since computed properties are not supported in the type checker, disallow them in TypeScript 1.4
-            // Once full support is added, remove this error.
-            grammarErrorOnNode(node, Diagnostics.Computed_property_names_are_not_currently_supported);
-            return;
 
             var computedPropertyName = <ComputedPropertyName>node;
             if (languageVersion < ScriptTarget.ES6) {
-                grammarErrorOnNode(node, Diagnostics.Computed_property_names_are_only_available_when_targeting_ECMAScript_6_and_higher);
+                return grammarErrorOnNode(node, Diagnostics.Computed_property_names_are_only_available_when_targeting_ECMAScript_6_and_higher);
             }
             else if (computedPropertyName.expression.kind === SyntaxKind.BinaryExpression && (<BinaryExpression>computedPropertyName.expression).operator === SyntaxKind.CommaToken) {
-                grammarErrorOnNode(computedPropertyName.expression, Diagnostics.A_comma_expression_is_not_allowed_in_a_computed_property_name);
+                return grammarErrorOnNode(computedPropertyName.expression, Diagnostics.A_comma_expression_is_not_allowed_in_a_computed_property_name);
             }
         }
 
diff --git a/src/compiler/diagnosticInformationMap.generated.ts b/src/compiler/diagnosticInformationMap.generated.ts
index 64511ad8072..f333520733e 100644
--- a/src/compiler/diagnosticInformationMap.generated.ts
+++ b/src/compiler/diagnosticInformationMap.generated.ts
@@ -299,6 +299,10 @@ module ts {
         Type_0_is_not_an_array_type: { code: 2461, category: DiagnosticCategory.Error, key: "Type '{0}' is not an array type." },
         A_rest_element_must_be_last_in_an_array_destructuring_pattern: { code: 2462, category: DiagnosticCategory.Error, key: "A rest element must be last in an array destructuring pattern" },
         A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature: { code: 2463, category: DiagnosticCategory.Error, key: "A binding pattern parameter cannot be optional in an implementation signature." },
+        A_computed_property_name_must_be_of_type_string_number_or_any: { code: 2464, category: DiagnosticCategory.Error, key: "A computed property name must be of type 'string', 'number', or 'any'." },
+        this_cannot_be_referenced_in_a_computed_property_name: { code: 2465, category: DiagnosticCategory.Error, key: "'this' cannot be referenced in a computed property name." },
+        super_cannot_be_referenced_in_a_computed_property_name: { code: 2466, category: DiagnosticCategory.Error, key: "'super' cannot be referenced in a computed property name." },
+        A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type: { code: 2466, category: DiagnosticCategory.Error, key: "A computed property name cannot reference a type parameter from its containing type." },
         Import_declaration_0_is_using_private_name_1: { code: 4000, category: DiagnosticCategory.Error, key: "Import declaration '{0}' is using private name '{1}'." },
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: DiagnosticCategory.Error, key: "Type parameter '{0}' of exported class has or is using private name '{1}'." },
         Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4004, category: DiagnosticCategory.Error, key: "Type parameter '{0}' of exported interface has or is using private name '{1}'." },
@@ -448,6 +452,5 @@ module ts {
         You_cannot_rename_this_element: { code: 8000, category: DiagnosticCategory.Error, key: "You cannot rename this element." },
         yield_expressions_are_not_currently_supported: { code: 9000, category: DiagnosticCategory.Error, key: "'yield' expressions are not currently supported.", isEarly: true },
         Generators_are_not_currently_supported: { code: 9001, category: DiagnosticCategory.Error, key: "Generators are not currently supported.", isEarly: true },
-        Computed_property_names_are_not_currently_supported: { code: 9002, category: DiagnosticCategory.Error, key: "Computed property names are not currently supported.", isEarly: true },
     };
 }
\ No newline at end of file
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 6c33fa42013..49ee8eebcd9 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -675,7 +675,7 @@
     },
     "A parameter property may not be a binding pattern.": {
         "category": "Error",
-        "code":  1187
+        "code": 1187
     },
 
     "Duplicate identifier '{0}'.": {
@@ -1288,7 +1288,23 @@
     },
     "A binding pattern parameter cannot be optional in an implementation signature.": {
         "category": "Error",
-        "code":  2463
+        "code": 2463
+    },
+    "A computed property name must be of type 'string', 'number', or 'any'.": {
+        "category": "Error",
+        "code": 2464
+    },
+    "'this' cannot be referenced in a computed property name.": {
+        "category": "Error",
+        "code": 2465
+    },
+    "'super' cannot be referenced in a computed property name.": {
+        "category": "Error",
+        "code": 2466
+    },
+    "A computed property name cannot reference a type parameter from its containing type.": {
+        "category": "Error",
+        "code": 2466
     },
 
     "Import declaration '{0}' is using private name '{1}'.": {
@@ -1892,10 +1908,5 @@
         "category": "Error",
         "code": 9001,
         "isEarly":  true
-    },
-    "Computed property names are not currently supported.": {
-        "category": "Error",
-        "code": 9002,
-        "isEarly":  true
     }
 }
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 36741ab6cb0..945ff3e15ae 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -932,6 +932,10 @@ module ts {
         }
 
         function emitPropertyDeclaration(node: Declaration) {
+            if (hasDynamicName(node)) {
+                return;
+            }
+
             emitJsDocComments(node);
             emitClassMemberDeclarationFlags(node);
             emitVariableDeclaration(<VariableDeclaration>node);
@@ -939,11 +943,13 @@ module ts {
             writeLine();
         }
 
-        // TODO(jfreeman): Factor out common part of property definition, but treat name differently
         function emitVariableDeclaration(node: VariableDeclaration) {
             // If we are emitting property it isn't moduleElement and hence we already know it needs to be emitted
             // so there is no check needed to see if declaration is visible
             if (node.kind !== SyntaxKind.VariableDeclaration || resolver.isDeclarationVisible(node)) {
+                // If this node is a computed name, it can only be a symbol, because we've already skipped
+                // it if it's not a well known symbol. In that case, the text of the name will be exactly
+                // what we want, namely the name expression enclosed in brackets.
                 writeTextOfNode(currentSourceFile, node.name);
                 // If optional property emit ?
                 if ((node.kind === SyntaxKind.PropertyDeclaration || node.kind === SyntaxKind.PropertySignature) && hasQuestionToken(node)) {
@@ -1030,6 +1036,10 @@ module ts {
         }
 
         function emitAccessorDeclaration(node: AccessorDeclaration) {
+            if (hasDynamicName(node)) {
+                return;
+            }
+            
             var accessors = getAllAccessorDeclarations(<ClassDeclaration>node.parent, node);
             if (node === accessors.firstAccessor) {
                 emitJsDocComments(accessors.getAccessor);
@@ -1107,6 +1117,10 @@ module ts {
         }
 
         function emitFunctionDeclaration(node: FunctionLikeDeclaration) {
+            if (hasDynamicName(node)) {
+                return;
+            }
+
             // If we are emitting Method/Constructor it isn't moduleElement and hence already determined to be emitting
             // so no need to verify if the declaration is visible
             if ((node.kind !== SyntaxKind.FunctionDeclaration || resolver.isDeclarationVisible(node)) &&
@@ -1723,7 +1737,14 @@ module ts {
                         if (scopeName) {
                             var parentIndex = getSourceMapNameIndex();
                             if (parentIndex !== -1) {
-                                scopeName = sourceMapData.sourceMapNames[parentIndex] + "." + scopeName;
+                                // Child scopes are always shown with a dot (even if they have no name),
+                                // unless it is a computed property. Then it is shown with brackets,
+                                // but the brackets are included in the name.
+                                var name = (<Declaration>node).name;
+                                if (!name || name.kind !== SyntaxKind.ComputedPropertyName) {
+                                    scopeName = "." + scopeName;
+                                }
+                                scopeName = sourceMapData.sourceMapNames[parentIndex] + scopeName;
                             }
 
                             scopeNameIndex = getProperty(sourceMapNameIndexMap, scopeName);
@@ -1751,8 +1772,11 @@ module ts {
                         node.kind === SyntaxKind.EnumDeclaration) {
                         // Declaration and has associated name use it
                         if ((<Declaration>node).name) {
-                            // TODO(jfreeman): Ask shkamat about what this name should be for source maps
-                            scopeName = (<Identifier>(<Declaration>node).name).text;
+                            var name = (<Declaration>node).name;
+                            // For computed property names, the text will include the brackets
+                            scopeName = name.kind === SyntaxKind.ComputedPropertyName
+                                ? getTextOfNode(name)
+                                : (<Identifier>(<Declaration>node).name).text;
                         }
                         recordScopeNameStart(scopeName);
                     }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index b8c842641d7..9e86d59104b 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -1266,29 +1266,33 @@ module ts {
     }
 
     export const enum TypeFlags {
-        Any                 = 0x00000001,
-        String              = 0x00000002,
-        Number              = 0x00000004,
-        Boolean             = 0x00000008,
-        Void                = 0x00000010,
-        Undefined           = 0x00000020,
-        Null                = 0x00000040,
-        Enum                = 0x00000080,  // Enum type
-        StringLiteral       = 0x00000100,  // String literal type
-        TypeParameter       = 0x00000200,  // Type parameter
-        Class               = 0x00000400,  // Class
-        Interface           = 0x00000800,  // Interface
-        Reference           = 0x00001000,  // Generic type reference
-        Tuple               = 0x00002000,  // Tuple
-        Union               = 0x00004000,  // Union
-        Anonymous           = 0x00008000,  // Anonymous
-        FromSignature       = 0x00010000,  // Created for signature assignment check
-        Unwidened           = 0x00020000,  // Unwidened type (is or contains Undefined or Null type)
+        Any                     = 0x00000001,
+        String                  = 0x00000002,
+        Number                  = 0x00000004,
+        Boolean                 = 0x00000008,
+        Void                    = 0x00000010,
+        Undefined               = 0x00000020,
+        Null                    = 0x00000040,
+        Enum                    = 0x00000080,  // Enum type
+        StringLiteral           = 0x00000100,  // String literal type
+        TypeParameter           = 0x00000200,  // Type parameter
+        Class                   = 0x00000400,  // Class
+        Interface               = 0x00000800,  // Interface
+        Reference               = 0x00001000,  // Generic type reference
+        Tuple                   = 0x00002000,  // Tuple
+        Union                   = 0x00004000,  // Union
+        Anonymous               = 0x00008000,  // Anonymous
+        FromSignature           = 0x00010000,  // Created for signature assignment check
+        ObjectLiteral           = 0x00020000,  // Originates in an object literal
+        ContainsUndefinedOrNull = 0x00040000,  // Type is or contains Undefined or Null type
+        ContainsObjectLiteral   = 0x00080000,  // Type is or contains object literal type
 
         Intrinsic = Any | String | Number | Boolean | Void | Undefined | Null,
+        Primitive = String | Number | Boolean | Void | Undefined | Null | StringLiteral | Enum,
         StringLike = String | StringLiteral,
         NumberLike = Number | Enum,
         ObjectType = Class | Interface | Reference | Tuple | Anonymous,
+        RequiresWidening = ContainsUndefinedOrNull | ContainsObjectLiteral
     }
 
     // Properties common to all types
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 7494ec9f6cb..6c894ad7d9c 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -399,6 +399,21 @@ module ts {
                 return undefined;
             }
             switch (node.kind) {
+                case SyntaxKind.ComputedPropertyName:
+                    // If the grandparent node is an object literal (as opposed to a class),
+                    // then the computed property is not a 'this' container.
+                    // A computed property name in a class needs to be a this container
+                    // so that we can error on it.
+                    if (node.parent.parent.kind === SyntaxKind.ClassDeclaration) {
+                        return node;
+                    }
+                    // If this is a computed property, then the parent should not
+                    // make it a this container. The parent might be a property
+                    // in an object literal, like a method or accessor. But in order for
+                    // such a parent to be a this container, the reference must be in
+                    // the *body* of the container.
+                    node = node.parent;
+                    break;
                 case SyntaxKind.ArrowFunction:
                     if (!includeArrowFunctions) {
                         continue;
@@ -421,13 +436,32 @@ module ts {
         }
     }
 
-    export function getSuperContainer(node: Node): Node {
+    export function getSuperContainer(node: Node, includeFunctions: boolean): Node {
         while (true) {
             node = node.parent;
-            if (!node) {
-                return undefined;
-            }
+            if (!node) return node;
             switch (node.kind) {
+                case SyntaxKind.ComputedPropertyName:
+                    // If the grandparent node is an object literal (as opposed to a class),
+                    // then the computed property is not a 'super' container.
+                    // A computed property name in a class needs to be a super container
+                    // so that we can error on it.
+                    if (node.parent.parent.kind === SyntaxKind.ClassDeclaration) {
+                        return node;
+                    }
+                    // If this is a computed property, then the parent should not
+                    // make it a super container. The parent might be a property
+                    // in an object literal, like a method or accessor. But in order for
+                    // such a parent to be a super container, the reference must be in
+                    // the *body* of the container.
+                    node = node.parent;
+                    break;
+                case SyntaxKind.FunctionDeclaration:
+                case SyntaxKind.FunctionExpression:
+                case SyntaxKind.ArrowFunction:
+                    if (!includeFunctions) {
+                        continue;
+                    }
                 case SyntaxKind.PropertyDeclaration:
                 case SyntaxKind.PropertySignature:
                 case SyntaxKind.MethodDeclaration:
@@ -527,6 +561,8 @@ module ts {
                         return node === (<TypeAssertion>parent).expression;
                     case SyntaxKind.TemplateSpan:
                         return node === (<TemplateSpan>parent).expression;
+                    case SyntaxKind.ComputedPropertyName:
+                        return node === (<ComputedPropertyName>parent).expression;
                     default:
                         if (isExpression(parent)) {
                             return true;
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index cfc83af76e5..512248197a4 100644
--- a/src/harness/fourslash.ts
+++ b/src/harness/fourslash.ts
@@ -548,6 +548,18 @@ module FourSlash {
             }
         }
 
+        public verifyGetEmitOutputForCurrentFile(expected: string): void {
+            var emit = this.languageService.getEmitOutput(this.activeFile.fileName);
+            if (emit.outputFiles.length !== 1) {
+                throw new Error("Expected exactly one output from emit of " + this.activeFile.fileName);
+            }
+            this.taoInvalidReason = 'verifyGetEmitOutputForCurrentFile impossible';
+            var actual = emit.outputFiles[0].text;
+            if (actual !== expected) {
+                this.raiseError("Expected emit output to be '" + expected + "', but got '" + actual + "'");
+            }
+        }
+
         public verifyMemberListContains(symbol: string, text?: string, documentation?: string, kind?: string) {
             this.scenarioActions.push('<ShowCompletionList />');
             this.scenarioActions.push('<VerifyCompletionContainsItem ItemName="' + symbol + '"/>');
diff --git a/src/services/services.ts b/src/services/services.ts
index 84e5e7fefa5..2a1fe59d23a 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -59,7 +59,7 @@ module ts {
         isOpen: boolean;
         version: string;
         scriptSnapshot: IScriptSnapshot;
-
+        nameTable: Map<string>;
         getNamedDeclarations(): Declaration[];
     }
 
@@ -335,36 +335,44 @@ module ts {
             var paramTag = "@param";
             var jsDocCommentParts: SymbolDisplayPart[] = [];
 
-            ts.forEach(declarations, declaration => {
-                var sourceFileOfDeclaration = getSourceFileOfNode(declaration);
-                // If it is parameter - try and get the jsDoc comment with @param tag from function declaration's jsDoc comments
-                if (canUseParsedParamTagComments && declaration.kind === SyntaxKind.Parameter) {
-                    ts.forEach(getJsDocCommentTextRange(declaration.parent, sourceFileOfDeclaration), jsDocCommentTextRange => {
-                        var cleanedParamJsDocComment = getCleanedParamJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration);
-                        if (cleanedParamJsDocComment) {
-                            jsDocCommentParts.push.apply(jsDocCommentParts, cleanedParamJsDocComment);
-                        }
-                    });
+            ts.forEach(declarations, (declaration, indexOfDeclaration) => {
+                // Make sure we are collecting doc comment from declaration once,
+                // In case of union property there might be same declaration multiple times 
+                // which only varies in type parameter
+                // Eg. var a: Array<string> | Array<number>; a.length
+                // The property length will have two declarations of property length coming 
+                // from Array<T> - Array<string> and Array<number>
+                if (indexOf(declarations, declaration) === indexOfDeclaration) {
+                    var sourceFileOfDeclaration = getSourceFileOfNode(declaration);
+                    // If it is parameter - try and get the jsDoc comment with @param tag from function declaration's jsDoc comments
+                    if (canUseParsedParamTagComments && declaration.kind === SyntaxKind.Parameter) {
+                        ts.forEach(getJsDocCommentTextRange(declaration.parent, sourceFileOfDeclaration), jsDocCommentTextRange => {
+                            var cleanedParamJsDocComment = getCleanedParamJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration);
+                            if (cleanedParamJsDocComment) {
+                                jsDocCommentParts.push.apply(jsDocCommentParts, cleanedParamJsDocComment);
+                            }
+                        });
+                    }
+
+                    // If this is left side of dotted module declaration, there is no doc comments associated with this node
+                    if (declaration.kind === SyntaxKind.ModuleDeclaration && (<ModuleDeclaration>declaration).body.kind === SyntaxKind.ModuleDeclaration) {
+                        return;
+                    }
+
+                    // If this is dotted module name, get the doc comments from the parent
+                    while (declaration.kind === SyntaxKind.ModuleDeclaration && declaration.parent.kind === SyntaxKind.ModuleDeclaration) {
+                        declaration = <ModuleDeclaration>declaration.parent;
+                    } 
+
+                    // Get the cleaned js doc comment text from the declaration
+                    ts.forEach(getJsDocCommentTextRange(
+                        declaration.kind === SyntaxKind.VariableDeclaration ? declaration.parent.parent : declaration, sourceFileOfDeclaration), jsDocCommentTextRange => {
+                            var cleanedJsDocComment = getCleanedJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration);
+                            if (cleanedJsDocComment) {
+                                jsDocCommentParts.push.apply(jsDocCommentParts, cleanedJsDocComment);
+                            }
+                        });
                 }
-
-                // If this is left side of dotted module declaration, there is no doc comments associated with this node
-                if (declaration.kind === SyntaxKind.ModuleDeclaration && (<ModuleDeclaration>declaration).body.kind === SyntaxKind.ModuleDeclaration) {
-                    return;
-                }
-
-                // If this is dotted module name, get the doc comments from the parent
-                while (declaration.kind === SyntaxKind.ModuleDeclaration && declaration.parent.kind === SyntaxKind.ModuleDeclaration) {
-                    declaration = <ModuleDeclaration>declaration.parent;
-                } 
-
-                // Get the cleaned js doc comment text from the declaration
-                ts.forEach(getJsDocCommentTextRange(
-                    declaration.kind === SyntaxKind.VariableDeclaration ? declaration.parent.parent : declaration, sourceFileOfDeclaration), jsDocCommentTextRange => {
-                        var cleanedJsDocComment = getCleanedJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration);
-                        if (cleanedJsDocComment) {
-                            jsDocCommentParts.push.apply(jsDocCommentParts, cleanedJsDocComment);
-                        }
-                    });
             });
 
             return jsDocCommentParts;
@@ -750,6 +758,7 @@ module ts {
         public isOpen: boolean;
         public languageVersion: ScriptTarget;
         public identifiers: Map<string>;
+        public nameTable: Map<string>;
 
         private namedDeclarations: Declaration[];
 
@@ -1546,6 +1555,8 @@ module ts {
     export function createLanguageServiceSourceFile(filename: string, scriptSnapshot: IScriptSnapshot, scriptTarget: ScriptTarget, version: string, isOpen: boolean, setNodeParents: boolean): SourceFile {
         var sourceFile = createSourceFile(filename, scriptSnapshot.getText(0, scriptSnapshot.getLength()), scriptTarget, setNodeParents);
         setSourceFileFields(sourceFile, scriptSnapshot, version, isOpen);
+        // after full parsing we can use table with interned strings as name table
+        sourceFile.nameTable = sourceFile.identifiers;
         return sourceFile;
     }
 
@@ -1577,6 +1588,9 @@ module ts {
                 if (!disableIncrementalParsing) {
                     var newSourceFile = sourceFile.update(scriptSnapshot.getText(0, scriptSnapshot.getLength()), textChangeRange);
                     setSourceFileFields(newSourceFile, scriptSnapshot, version, isOpen);
+                    // after incremental parsing nameTable might not be up-to-date
+                    // drop it so it can be lazily recreated later
+                    newSourceFile.nameTable = undefined;
                     return newSourceFile;
                 }
             }
@@ -3235,7 +3249,7 @@ module ts {
 
             if (node.kind === SyntaxKind.Identifier || node.kind === SyntaxKind.ThisKeyword || node.kind === SyntaxKind.SuperKeyword ||
                 isLiteralNameOfPropertyDeclarationOrIndexAccess(node) || isNameOfExternalModuleImportOrDeclaration(node)) {
-                return getReferencesForNode(node, [sourceFile], /*findInStrings:*/ false, /*findInComments:*/ false);
+                return getReferencesForNode(node, [sourceFile], /*searchOnlyInCurrentFile*/ true, /*findInStrings:*/ false, /*findInComments:*/ false);
             }
 
             switch (node.kind) {
@@ -3788,10 +3802,31 @@ module ts {
             }
 
             Debug.assert(node.kind === SyntaxKind.Identifier || node.kind === SyntaxKind.NumericLiteral || node.kind === SyntaxKind.StringLiteral);
-            return getReferencesForNode(node, program.getSourceFiles(), findInStrings, findInComments);
+            return getReferencesForNode(node, program.getSourceFiles(), /*searchOnlyInCurrentFile*/ false, findInStrings, findInComments);
         }
 
-        function getReferencesForNode(node: Node, sourceFiles: SourceFile[], findInStrings: boolean, findInComments: boolean): ReferenceEntry[] {
+        function initializeNameTable(sourceFile: SourceFile): void {
+            var nameTable: Map<string> = {};
+
+            walk(sourceFile);
+            sourceFile.nameTable = nameTable;
+
+            function walk(node: Node) {
+                switch (node.kind) {
+                    case SyntaxKind.Identifier:
+                        nameTable[(<Identifier>node).text] = (<Identifier>node).text;
+                        break;
+                    case SyntaxKind.StringLiteral:
+                    case SyntaxKind.NumericLiteral:
+                        nameTable[(<LiteralExpression>node).text] = (<LiteralExpression>node).text;
+                        break;
+                    default:
+                        forEachChild(node, walk);
+                }
+            } 
+        }
+
+        function getReferencesForNode(node: Node, sourceFiles: SourceFile[], searchOnlyInCurrentFile: boolean, findInStrings: boolean, findInComments: boolean): ReferenceEntry[] {
             // Labels
             if (isLabelName(node)) {
                 if (isJumpStatementTarget(node)) {
@@ -3847,15 +3882,28 @@ module ts {
                 getReferencesInNode(scope, symbol, declaredName, node, searchMeaning, findInStrings, findInComments, result);
             }
             else {
-                var internedName = getInternedName(symbol, declarations)
-                forEach(sourceFiles, sourceFile => {
-                    cancellationToken.throwIfCancellationRequested();
+                if (searchOnlyInCurrentFile) {
+                    Debug.assert(sourceFiles.length === 1);
+                    result = [];
+                    getReferencesInNode(sourceFiles[0], symbol, declaredName, node, searchMeaning, findInStrings, findInComments, result);
+                }
+                else {
+                    var internedName = getInternedName(symbol, declarations)
+                    forEach(sourceFiles, sourceFile => {
+                        cancellationToken.throwIfCancellationRequested();
 
-                    if (lookUp(sourceFile.identifiers, internedName)) {
-                        result = result || [];
-                        getReferencesInNode(sourceFile, symbol, declaredName, node, searchMeaning, findInStrings, findInComments, result);
-                    }
-                });
+                        if (!sourceFile.nameTable) {
+                            initializeNameTable(sourceFile)
+                        }
+
+                        Debug.assert(sourceFile.nameTable !== undefined);
+
+                        if (lookUp(sourceFile.nameTable, internedName)) {
+                            result = result || [];
+                            getReferencesInNode(sourceFile, symbol, declaredName, node, searchMeaning, findInStrings, findInComments, result);
+                        }
+                    });
+                }
             }
 
             return result;
@@ -3903,7 +3951,8 @@ module ts {
                 }
 
                 // if this symbol is visible from its parent container, e.g. exported, then bail out
-                if (symbol.parent) {
+                // if symbol correspond to the union property - bail out
+                if (symbol.parent || (symbol.getFlags() & SymbolFlags.UnionProperty)) {
                     return undefined;
                 }
 
@@ -4114,7 +4163,7 @@ module ts {
             }
 
             function getReferencesForSuperKeyword(superKeyword: Node): ReferenceEntry[] {
-                var searchSpaceNode = getSuperContainer(superKeyword);
+                var searchSpaceNode = getSuperContainer(superKeyword, /*includeFunctions*/ false);
                 if (!searchSpaceNode) {
                     return undefined;
                 }
@@ -4149,7 +4198,7 @@ module ts {
                         return;
                     }
 
-                    var container = getSuperContainer(node);
+                    var container = getSuperContainer(node, /*includeFunctions*/ false);
 
                     // If we have a 'super' container, we must have an enclosing class.
                     // Now make sure the owning class is the same as the search-space
@@ -4191,6 +4240,8 @@ module ts {
                     case SyntaxKind.FunctionDeclaration:
                     case SyntaxKind.FunctionExpression:
                         break;
+                    // Computed properties in classes are not handled here because references to this are illegal,
+                    // so there is no point finding references to them.
                     default:
                         return undefined;
                 }
diff --git a/tests/baselines/reference/FunctionDeclaration8_es6.errors.txt b/tests/baselines/reference/FunctionDeclaration8_es6.errors.txt
index 08d151203c9..2c8d034649e 100644
--- a/tests/baselines/reference/FunctionDeclaration8_es6.errors.txt
+++ b/tests/baselines/reference/FunctionDeclaration8_es6.errors.txt
@@ -1,7 +1,13 @@
-tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration8_es6.ts(1,11): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration8_es6.ts(1,11): error TS1167: Computed property names are only available when targeting ECMAScript 6 and higher.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration8_es6.ts(1,12): error TS2304: Cannot find name 'yield'.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration8_es6.ts(1,20): error TS2304: Cannot find name 'foo'.
 
 
-==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration8_es6.ts (1 errors) ====
+==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration8_es6.ts (3 errors) ====
     var v = { [yield]: foo }
               ~~~~~~~
-!!! error TS9002: Computed property names are not currently supported.
\ No newline at end of file
+!!! error TS1167: Computed property names are only available when targeting ECMAScript 6 and higher.
+               ~~~~~
+!!! error TS2304: Cannot find name 'yield'.
+                       ~~~
+!!! error TS2304: Cannot find name 'foo'.
\ No newline at end of file
diff --git a/tests/baselines/reference/FunctionDeclaration9_es6.errors.txt b/tests/baselines/reference/FunctionDeclaration9_es6.errors.txt
index 8333eceb267..ef744681fa1 100644
--- a/tests/baselines/reference/FunctionDeclaration9_es6.errors.txt
+++ b/tests/baselines/reference/FunctionDeclaration9_es6.errors.txt
@@ -1,12 +1,15 @@
 tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration9_es6.ts(1,10): error TS9001: Generators are not currently supported.
-tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration9_es6.ts(2,13): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration9_es6.ts(2,13): error TS1167: Computed property names are only available when targeting ECMAScript 6 and higher.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration9_es6.ts(2,14): error TS9000: 'yield' expressions are not currently supported.
 
 
-==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration9_es6.ts (2 errors) ====
+==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration9_es6.ts (3 errors) ====
     function * foo() {
              ~
 !!! error TS9001: Generators are not currently supported.
       var v = { [yield]: foo }
                 ~~~~~~~
-!!! error TS9002: Computed property names are not currently supported.
+!!! error TS1167: Computed property names are only available when targeting ECMAScript 6 and higher.
+                 ~~~~~
+!!! error TS9000: 'yield' expressions are not currently supported.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/FunctionPropertyAssignments5_es6.errors.txt b/tests/baselines/reference/FunctionPropertyAssignments5_es6.errors.txt
index eff0c79d827..c8c356a57ad 100644
--- a/tests/baselines/reference/FunctionPropertyAssignments5_es6.errors.txt
+++ b/tests/baselines/reference/FunctionPropertyAssignments5_es6.errors.txt
@@ -1,7 +1,13 @@
-tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments5_es6.ts(1,12): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments5_es6.ts(1,11): error TS9001: Generators are not currently supported.
+tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments5_es6.ts(1,12): error TS1167: Computed property names are only available when targeting ECMAScript 6 and higher.
+tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments5_es6.ts(1,13): error TS2304: Cannot find name 'foo'.
 
 
-==== tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments5_es6.ts (1 errors) ====
+==== tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments5_es6.ts (3 errors) ====
     var v = { *[foo()]() { } }
+              ~
+!!! error TS9001: Generators are not currently supported.
                ~~~~~~~
-!!! error TS9002: Computed property names are not currently supported.
\ No newline at end of file
+!!! error TS1167: Computed property names are only available when targeting ECMAScript 6 and higher.
+                ~~~
+!!! error TS2304: Cannot find name 'foo'.
\ No newline at end of file
diff --git a/tests/baselines/reference/MemberFunctionDeclaration3_es6.errors.txt b/tests/baselines/reference/MemberFunctionDeclaration3_es6.errors.txt
index b43e266e2a5..826c1d7fd75 100644
--- a/tests/baselines/reference/MemberFunctionDeclaration3_es6.errors.txt
+++ b/tests/baselines/reference/MemberFunctionDeclaration3_es6.errors.txt
@@ -1,9 +1,12 @@
 tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration3_es6.ts(2,4): error TS9001: Generators are not currently supported.
+tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration3_es6.ts(2,6): error TS2304: Cannot find name 'foo'.
 
 
-==== tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration3_es6.ts (1 errors) ====
+==== tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration3_es6.ts (2 errors) ====
     class C {
        *[foo]() { }
        ~
 !!! error TS9001: Generators are not currently supported.
+         ~~~
+!!! error TS2304: Cannot find name 'foo'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/TypeGuardWithEnumUnion.js b/tests/baselines/reference/TypeGuardWithEnumUnion.js
new file mode 100644
index 00000000000..f582c70857a
--- /dev/null
+++ b/tests/baselines/reference/TypeGuardWithEnumUnion.js
@@ -0,0 +1,77 @@
+//// [TypeGuardWithEnumUnion.ts]
+enum Color { R, G, B }
+
+function f1(x: Color | string) {
+    if (typeof x === "number") {
+        var y = x;
+        var y: Color;
+    }
+    else {
+        var z = x;
+        var z: string;
+    }
+}
+
+function f2(x: Color | string | string[]) {
+    if (typeof x === "object") {
+        var y = x;
+        var y: string[];
+    }
+    if (typeof x === "number") {
+        var z = x;
+        var z: Color;
+    }
+    else {
+        var w = x;
+        var w: string | string[];
+    }
+    if (typeof x === "string") {
+        var a = x;
+        var a: string;
+    }
+    else {
+        var b = x;
+        var b: Color | string[];
+    }
+}
+
+
+//// [TypeGuardWithEnumUnion.js]
+var Color;
+(function (Color) {
+    Color[Color["R"] = 0] = "R";
+    Color[Color["G"] = 1] = "G";
+    Color[Color["B"] = 2] = "B";
+})(Color || (Color = {}));
+function f1(x) {
+    if (typeof x === "number") {
+        var y = x;
+        var y;
+    }
+    else {
+        var z = x;
+        var z;
+    }
+}
+function f2(x) {
+    if (typeof x === "object") {
+        var y = x;
+        var y;
+    }
+    if (typeof x === "number") {
+        var z = x;
+        var z;
+    }
+    else {
+        var w = x;
+        var w;
+    }
+    if (typeof x === "string") {
+        var a = x;
+        var a;
+    }
+    else {
+        var b = x;
+        var b;
+    }
+}
diff --git a/tests/baselines/reference/TypeGuardWithEnumUnion.types b/tests/baselines/reference/TypeGuardWithEnumUnion.types
new file mode 100644
index 00000000000..9296e0ad04e
--- /dev/null
+++ b/tests/baselines/reference/TypeGuardWithEnumUnion.types
@@ -0,0 +1,96 @@
+=== tests/cases/conformance/expressions/typeGuards/TypeGuardWithEnumUnion.ts ===
+enum Color { R, G, B }
+>Color : Color
+>R : Color
+>G : Color
+>B : Color
+
+function f1(x: Color | string) {
+>f1 : (x: string | Color) => void
+>x : string | Color
+>Color : Color
+
+    if (typeof x === "number") {
+>typeof x === "number" : boolean
+>typeof x : string
+>x : string | Color
+
+        var y = x;
+>y : Color
+>x : Color
+
+        var y: Color;
+>y : Color
+>Color : Color
+    }
+    else {
+        var z = x;
+>z : string
+>x : string
+
+        var z: string;
+>z : string
+    }
+}
+
+function f2(x: Color | string | string[]) {
+>f2 : (x: string | string[] | Color) => void
+>x : string | string[] | Color
+>Color : Color
+
+    if (typeof x === "object") {
+>typeof x === "object" : boolean
+>typeof x : string
+>x : string | string[] | Color
+
+        var y = x;
+>y : string[]
+>x : string[]
+
+        var y: string[];
+>y : string[]
+    }
+    if (typeof x === "number") {
+>typeof x === "number" : boolean
+>typeof x : string
+>x : string | string[] | Color
+
+        var z = x;
+>z : Color
+>x : Color
+
+        var z: Color;
+>z : Color
+>Color : Color
+    }
+    else {
+        var w = x;
+>w : string | string[]
+>x : string | string[]
+
+        var w: string | string[];
+>w : string | string[]
+    }
+    if (typeof x === "string") {
+>typeof x === "string" : boolean
+>typeof x : string
+>x : string | string[] | Color
+
+        var a = x;
+>a : string
+>x : string
+
+        var a: string;
+>a : string
+    }
+    else {
+        var b = x;
+>b : string[] | Color
+>x : string[] | Color
+
+        var b: Color | string[];
+>b : string[] | Color
+>Color : Color
+    }
+}
+
diff --git a/tests/baselines/reference/arrayCast.errors.txt b/tests/baselines/reference/arrayCast.errors.txt
index 53be1c903a3..10562cc57e4 100644
--- a/tests/baselines/reference/arrayCast.errors.txt
+++ b/tests/baselines/reference/arrayCast.errors.txt
@@ -1,5 +1,6 @@
 tests/cases/compiler/arrayCast.ts(3,1): error TS2352: Neither type '{ foo: string; }[]' nor type '{ id: number; }[]' is assignable to the other.
   Type '{ foo: string; }' is not assignable to type '{ id: number; }'.
+    Property 'id' is missing in type '{ foo: string; }'.
 
 
 ==== tests/cases/compiler/arrayCast.ts (1 errors) ====
@@ -9,6 +10,7 @@ tests/cases/compiler/arrayCast.ts(3,1): error TS2352: Neither type '{ foo: strin
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2352: Neither type '{ foo: string; }[]' nor type '{ id: number; }[]' is assignable to the other.
 !!! error TS2352:   Type '{ foo: string; }' is not assignable to type '{ id: number; }'.
+!!! error TS2352:     Property 'id' is missing in type '{ foo: string; }'.
     
     // Should succeed, as the {} element causes the type of the array to be {}[]
     <{ id: number; }[]>[{ foo: "s" }, {}]; 
\ No newline at end of file
diff --git a/tests/baselines/reference/complicatedPrivacy.errors.txt b/tests/baselines/reference/complicatedPrivacy.errors.txt
index fd47927f883..5aa399d1d84 100644
--- a/tests/baselines/reference/complicatedPrivacy.errors.txt
+++ b/tests/baselines/reference/complicatedPrivacy.errors.txt
@@ -1,8 +1,9 @@
 tests/cases/compiler/complicatedPrivacy.ts(24,38): error TS1005: ';' expected.
+tests/cases/compiler/complicatedPrivacy.ts(35,6): error TS2304: Cannot find name 'number'.
 tests/cases/compiler/complicatedPrivacy.ts(73,49): error TS2305: Module 'mglo5' has no exported member 'i6'.
 
 
-==== tests/cases/compiler/complicatedPrivacy.ts (2 errors) ====
+==== tests/cases/compiler/complicatedPrivacy.ts (3 errors) ====
     module m1 {
         export module m2 {
     
@@ -39,7 +40,9 @@ tests/cases/compiler/complicatedPrivacy.ts(73,49): error TS2305: Module 'mglo5'
     
         export function f4(arg1: 
         {
-        [number]: C1;
+        [number]: C1; // Used to be indexer, now it is a computed property
+         ~~~~~~
+!!! error TS2304: Cannot find name 'number'.
         }) {
         }
     
diff --git a/tests/baselines/reference/computedPropertyNames1.errors.txt b/tests/baselines/reference/computedPropertyNames1.errors.txt
deleted file mode 100644
index 02abbcd6b2d..00000000000
--- a/tests/baselines/reference/computedPropertyNames1.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames1.ts(2,9): error TS9002: Computed property names are not currently supported.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames1.ts(3,9): error TS9002: Computed property names are not currently supported.
-
-
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames1.ts (2 errors) ====
-    var v = {
-        get [0 + 1]() { return 0 },
-            ~~~~~~~
-!!! error TS9002: Computed property names are not currently supported.
-        set [0 + 1](v: string) { } //No error
-            ~~~~~~~
-!!! error TS9002: Computed property names are not currently supported.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames1.js b/tests/baselines/reference/computedPropertyNames1.js
new file mode 100644
index 00000000000..8f3e448d698
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames1.js
@@ -0,0 +1,14 @@
+//// [computedPropertyNames1.ts]
+var v = {
+    get [0 + 1]() { return 0 },
+    set [0 + 1](v: string) { } //No error
+}
+
+//// [computedPropertyNames1.js]
+var v = {
+    get [0 + 1]() {
+        return 0;
+    },
+    set [0 + 1](v) {
+    } //No error
+};
diff --git a/tests/baselines/reference/computedPropertyNames1.types b/tests/baselines/reference/computedPropertyNames1.types
new file mode 100644
index 00000000000..b44aa3c69d0
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames1.types
@@ -0,0 +1,12 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames1.ts ===
+var v = {
+>v : {}
+>{    get [0 + 1]() { return 0 },    set [0 + 1](v: string) { } //No error} : {}
+
+    get [0 + 1]() { return 0 },
+>0 + 1 : number
+
+    set [0 + 1](v: string) { } //No error
+>0 + 1 : number
+>v : string
+}
diff --git a/tests/baselines/reference/computedPropertyNames10.js b/tests/baselines/reference/computedPropertyNames10.js
new file mode 100644
index 00000000000..138cbd7a4b2
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames10.js
@@ -0,0 +1,46 @@
+//// [computedPropertyNames10.ts]
+var s: string;
+var n: number;
+var a: any;
+var v = {
+    [s]() { },
+    [n]() { },
+    [s + s]() { },
+    [s + n]() { },
+    [+s]() { },
+    [""]() { },
+    [0]() { },
+    [a]() { },
+    [<any>true]() { },
+    [`hello bye`]() { },
+    [`hello ${a} bye`]() { }
+}
+
+//// [computedPropertyNames10.js]
+var s;
+var n;
+var a;
+var v = {
+    [s]() {
+    },
+    [n]() {
+    },
+    [s + s]() {
+    },
+    [s + n]() {
+    },
+    [+s]() {
+    },
+    [""]() {
+    },
+    [0]() {
+    },
+    [a]() {
+    },
+    [true]() {
+    },
+    [`hello bye`]() {
+    },
+    [`hello ${a} bye`]() {
+    }
+};
diff --git a/tests/baselines/reference/computedPropertyNames10.types b/tests/baselines/reference/computedPropertyNames10.types
new file mode 100644
index 00000000000..29bf6c43bef
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames10.types
@@ -0,0 +1,46 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames10.ts ===
+var s: string;
+>s : string
+
+var n: number;
+>n : number
+
+var a: any;
+>a : any
+
+var v = {
+>v : {}
+>{    [s]() { },    [n]() { },    [s + s]() { },    [s + n]() { },    [+s]() { },    [""]() { },    [0]() { },    [a]() { },    [<any>true]() { },    [`hello bye`]() { },    [`hello ${a} bye`]() { }} : {}
+
+    [s]() { },
+>s : string
+
+    [n]() { },
+>n : number
+
+    [s + s]() { },
+>s + s : string
+>s : string
+>s : string
+
+    [s + n]() { },
+>s + n : string
+>s : string
+>n : number
+
+    [+s]() { },
+>+s : number
+>s : string
+
+    [""]() { },
+    [0]() { },
+    [a]() { },
+>a : any
+
+    [<any>true]() { },
+><any>true : any
+
+    [`hello bye`]() { },
+    [`hello ${a} bye`]() { }
+>a : any
+}
diff --git a/tests/baselines/reference/computedPropertyNames11.js b/tests/baselines/reference/computedPropertyNames11.js
new file mode 100644
index 00000000000..d82a7c4e512
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames11.js
@@ -0,0 +1,52 @@
+//// [computedPropertyNames11.ts]
+var s: string;
+var n: number;
+var a: any;
+var v = {
+    get [s]() { return 0; },
+    set [n](v) { },
+    get [s + s]() { return 0; },
+    set [s + n](v) { },
+    get [+s]() { return 0; },
+    set [""](v) { },
+    get [0]() { return 0; },
+    set [a](v) { },
+    get [<any>true]() { return 0; },
+    set [`hello bye`](v) { },
+    get [`hello ${a} bye`]() { return 0; }
+}
+
+//// [computedPropertyNames11.js]
+var s;
+var n;
+var a;
+var v = {
+    get [s]() {
+        return 0;
+    },
+    set [n](v) {
+    },
+    get [s + s]() {
+        return 0;
+    },
+    set [s + n](v) {
+    },
+    get [+s]() {
+        return 0;
+    },
+    set [""](v) {
+    },
+    get [0]() {
+        return 0;
+    },
+    set [a](v) {
+    },
+    get [true]() {
+        return 0;
+    },
+    set [`hello bye`](v) {
+    },
+    get [`hello ${a} bye`]() {
+        return 0;
+    }
+};
diff --git a/tests/baselines/reference/computedPropertyNames11.types b/tests/baselines/reference/computedPropertyNames11.types
new file mode 100644
index 00000000000..ee0796320d6
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames11.types
@@ -0,0 +1,53 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames11.ts ===
+var s: string;
+>s : string
+
+var n: number;
+>n : number
+
+var a: any;
+>a : any
+
+var v = {
+>v : {}
+>{    get [s]() { return 0; },    set [n](v) { },    get [s + s]() { return 0; },    set [s + n](v) { },    get [+s]() { return 0; },    set [""](v) { },    get [0]() { return 0; },    set [a](v) { },    get [<any>true]() { return 0; },    set [`hello bye`](v) { },    get [`hello ${a} bye`]() { return 0; }} : {}
+
+    get [s]() { return 0; },
+>s : string
+
+    set [n](v) { },
+>n : number
+>v : any
+
+    get [s + s]() { return 0; },
+>s + s : string
+>s : string
+>s : string
+
+    set [s + n](v) { },
+>s + n : string
+>s : string
+>n : number
+>v : any
+
+    get [+s]() { return 0; },
+>+s : number
+>s : string
+
+    set [""](v) { },
+>v : any
+
+    get [0]() { return 0; },
+    set [a](v) { },
+>a : any
+>v : any
+
+    get [<any>true]() { return 0; },
+><any>true : any
+
+    set [`hello bye`](v) { },
+>v : any
+
+    get [`hello ${a} bye`]() { return 0; }
+>a : any
+}
diff --git a/tests/baselines/reference/computedPropertyNames12.errors.txt b/tests/baselines/reference/computedPropertyNames12.errors.txt
new file mode 100644
index 00000000000..56774fe8dae
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames12.errors.txt
@@ -0,0 +1,52 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames12.ts(5,5): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames12.ts(6,5): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames12.ts(7,12): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames12.ts(8,5): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames12.ts(9,5): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames12.ts(10,12): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames12.ts(11,5): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames12.ts(12,5): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames12.ts(13,12): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames12.ts(14,5): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames12.ts(15,12): error TS1166: Computed property names are not allowed in class property declarations.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames12.ts (11 errors) ====
+    var s: string;
+    var n: number;
+    var a: any;
+    class C {
+        [s]: number;
+        ~~~
+!!! error TS1166: Computed property names are not allowed in class property declarations.
+        [n] = n;
+        ~~~
+!!! error TS1166: Computed property names are not allowed in class property declarations.
+        static [s + s]: string;
+               ~~~~~~~
+!!! error TS1166: Computed property names are not allowed in class property declarations.
+        [s + n] = 2;
+        ~~~~~~~
+!!! error TS1166: Computed property names are not allowed in class property declarations.
+        [+s]: typeof s;
+        ~~~~
+!!! error TS1166: Computed property names are not allowed in class property declarations.
+        static [""]: number;
+               ~~~~
+!!! error TS1166: Computed property names are not allowed in class property declarations.
+        [0]: number;
+        ~~~
+!!! error TS1166: Computed property names are not allowed in class property declarations.
+        [a]: number;
+        ~~~
+!!! error TS1166: Computed property names are not allowed in class property declarations.
+        static [<any>true]: number;
+               ~~~~~~~~~~~
+!!! error TS1166: Computed property names are not allowed in class property declarations.
+        [`hello bye`] = 0;
+        ~~~~~~~~~~~~~
+!!! error TS1166: Computed property names are not allowed in class property declarations.
+        static [`hello ${a} bye`] = 0
+               ~~~~~~~~~~~~~~~~~~
+!!! error TS1166: Computed property names are not allowed in class property declarations.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames13.js b/tests/baselines/reference/computedPropertyNames13.js
new file mode 100644
index 00000000000..ea531a9c644
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames13.js
@@ -0,0 +1,49 @@
+//// [computedPropertyNames13.ts]
+var s: string;
+var n: number;
+var a: any;
+class C {
+    [s]() {}
+    [n]() { }
+    static [s + s]() { }
+    [s + n]() { }
+    [+s]() { }
+    static [""]() { }
+    [0]() { }
+    [a]() { }
+    static [<any>true]() { }
+    [`hello bye`]() { }
+    static [`hello ${a} bye`]() { }
+}
+
+//// [computedPropertyNames13.js]
+var s;
+var n;
+var a;
+var C = (function () {
+    function C() {
+    }
+    C.prototype[s] = function () {
+    };
+    C.prototype[n] = function () {
+    };
+    C[s + s] = function () {
+    };
+    C.prototype[s + n] = function () {
+    };
+    C.prototype[+s] = function () {
+    };
+    C[""] = function () {
+    };
+    C.prototype[0] = function () {
+    };
+    C.prototype[a] = function () {
+    };
+    C[true] = function () {
+    };
+    C.prototype[`hello bye`] = function () {
+    };
+    C[`hello ${a} bye`] = function () {
+    };
+    return C;
+})();
diff --git a/tests/baselines/reference/computedPropertyNames13.types b/tests/baselines/reference/computedPropertyNames13.types
new file mode 100644
index 00000000000..4f267f2e893
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames13.types
@@ -0,0 +1,45 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames13.ts ===
+var s: string;
+>s : string
+
+var n: number;
+>n : number
+
+var a: any;
+>a : any
+
+class C {
+>C : C
+
+    [s]() {}
+>s : string
+
+    [n]() { }
+>n : number
+
+    static [s + s]() { }
+>s + s : string
+>s : string
+>s : string
+
+    [s + n]() { }
+>s + n : string
+>s : string
+>n : number
+
+    [+s]() { }
+>+s : number
+>s : string
+
+    static [""]() { }
+    [0]() { }
+    [a]() { }
+>a : any
+
+    static [<any>true]() { }
+><any>true : any
+
+    [`hello bye`]() { }
+    static [`hello ${a} bye`]() { }
+>a : any
+}
diff --git a/tests/baselines/reference/computedPropertyNames14.errors.txt b/tests/baselines/reference/computedPropertyNames14.errors.txt
new file mode 100644
index 00000000000..1cf5b1445f2
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames14.errors.txt
@@ -0,0 +1,30 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames14.ts(3,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames14.ts(4,12): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames14.ts(5,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames14.ts(6,12): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames14.ts(7,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames14.ts(8,12): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames14.ts (6 errors) ====
+    var b: boolean;
+    class C {
+        [b]() {}
+        ~~~
+!!! error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+        static [true]() { }
+               ~~~~~~
+!!! error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+        [[]]() { }
+        ~~~~
+!!! error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+        static [{}]() { }
+               ~~~~
+!!! error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+        [undefined]() { }
+        ~~~~~~~~~~~
+!!! error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+        static [null]() { }
+               ~~~~~~
+!!! error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames14.js b/tests/baselines/reference/computedPropertyNames14.js
new file mode 100644
index 00000000000..aa551795da6
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames14.js
@@ -0,0 +1,30 @@
+//// [computedPropertyNames14.ts]
+var b: boolean;
+class C {
+    [b]() {}
+    static [true]() { }
+    [[]]() { }
+    static [{}]() { }
+    [undefined]() { }
+    static [null]() { }
+}
+
+//// [computedPropertyNames14.js]
+var b;
+var C = (function () {
+    function C() {
+    }
+    C.prototype[b] = function () {
+    };
+    C[true] = function () {
+    };
+    C.prototype[[]] = function () {
+    };
+    C[{}] = function () {
+    };
+    C.prototype[undefined] = function () {
+    };
+    C[null] = function () {
+    };
+    return C;
+})();
diff --git a/tests/baselines/reference/computedPropertyNames15.errors.txt b/tests/baselines/reference/computedPropertyNames15.errors.txt
new file mode 100644
index 00000000000..0e759668a95
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames15.errors.txt
@@ -0,0 +1,17 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames15.ts(6,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames15.ts(7,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames15.ts (2 errors) ====
+    var p1: number | string;
+    var p2: number | number[];
+    var p3: string | boolean;
+    class C {
+        [p1]() { }
+        [p2]() { }
+        ~~~~
+!!! error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+        [p3]() { }
+        ~~~~
+!!! error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames15.js b/tests/baselines/reference/computedPropertyNames15.js
new file mode 100644
index 00000000000..1b506bbeb90
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames15.js
@@ -0,0 +1,25 @@
+//// [computedPropertyNames15.ts]
+var p1: number | string;
+var p2: number | number[];
+var p3: string | boolean;
+class C {
+    [p1]() { }
+    [p2]() { }
+    [p3]() { }
+}
+
+//// [computedPropertyNames15.js]
+var p1;
+var p2;
+var p3;
+var C = (function () {
+    function C() {
+    }
+    C.prototype[p1] = function () {
+    };
+    C.prototype[p2] = function () {
+    };
+    C.prototype[p3] = function () {
+    };
+    return C;
+})();
diff --git a/tests/baselines/reference/computedPropertyNames16.js b/tests/baselines/reference/computedPropertyNames16.js
new file mode 100644
index 00000000000..295deb9ee82
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames16.js
@@ -0,0 +1,99 @@
+//// [computedPropertyNames16.ts]
+var s: string;
+var n: number;
+var a: any;
+class C {
+    get [s]() { return 0;}
+    set [n](v) { }
+    static get [s + s]() { return 0; }
+    set [s + n](v) { }
+    get [+s]() { return 0; }
+    static set [""](v) { }
+    get [0]() { return 0; }
+    set [a](v) { }
+    static get [<any>true]() { return 0; }
+    set [`hello bye`](v) { }
+    get [`hello ${a} bye`]() { return 0; }
+}
+
+//// [computedPropertyNames16.js]
+var s;
+var n;
+var a;
+var C = (function () {
+    function C() {
+    }
+    Object.defineProperty(C.prototype, s, {
+        get: function () {
+            return 0;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C.prototype, n, {
+        set: function (v) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C, s + s, {
+        get: function () {
+            return 0;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C.prototype, s + n, {
+        set: function (v) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C.prototype, +s, {
+        get: function () {
+            return 0;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C, "", {
+        set: function (v) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C.prototype, 0, {
+        get: function () {
+            return 0;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C.prototype, a, {
+        set: function (v) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C, true, {
+        get: function () {
+            return 0;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C.prototype, `hello bye`, {
+        set: function (v) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C.prototype, `hello ${a} bye`, {
+        get: function () {
+            return 0;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return C;
+})();
diff --git a/tests/baselines/reference/computedPropertyNames16.types b/tests/baselines/reference/computedPropertyNames16.types
new file mode 100644
index 00000000000..ccfa7996066
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames16.types
@@ -0,0 +1,52 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames16.ts ===
+var s: string;
+>s : string
+
+var n: number;
+>n : number
+
+var a: any;
+>a : any
+
+class C {
+>C : C
+
+    get [s]() { return 0;}
+>s : string
+
+    set [n](v) { }
+>n : number
+>v : any
+
+    static get [s + s]() { return 0; }
+>s + s : string
+>s : string
+>s : string
+
+    set [s + n](v) { }
+>s + n : string
+>s : string
+>n : number
+>v : any
+
+    get [+s]() { return 0; }
+>+s : number
+>s : string
+
+    static set [""](v) { }
+>v : any
+
+    get [0]() { return 0; }
+    set [a](v) { }
+>a : any
+>v : any
+
+    static get [<any>true]() { return 0; }
+><any>true : any
+
+    set [`hello bye`](v) { }
+>v : any
+
+    get [`hello ${a} bye`]() { return 0; }
+>a : any
+}
diff --git a/tests/baselines/reference/computedPropertyNames17.errors.txt b/tests/baselines/reference/computedPropertyNames17.errors.txt
new file mode 100644
index 00000000000..b236ae3245e
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames17.errors.txt
@@ -0,0 +1,30 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames17.ts(3,9): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames17.ts(4,16): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames17.ts(5,9): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames17.ts(6,9): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames17.ts(7,16): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames17.ts(8,9): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames17.ts (6 errors) ====
+    var b: boolean;
+    class C {
+        get [b]() { return 0;}
+            ~~~
+!!! error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+        static set [true](v) { }
+                   ~~~~~~
+!!! error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+        get [[]]() { return 0; }
+            ~~~~
+!!! error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+        set [{}](v) { }
+            ~~~~
+!!! error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+        static get [undefined]() { return 0; }
+                   ~~~~~~~~~~~
+!!! error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+        set [null](v) { }
+            ~~~~~~
+!!! error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames17.js b/tests/baselines/reference/computedPropertyNames17.js
new file mode 100644
index 00000000000..5a55dbf7e1b
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames17.js
@@ -0,0 +1,57 @@
+//// [computedPropertyNames17.ts]
+var b: boolean;
+class C {
+    get [b]() { return 0;}
+    static set [true](v) { }
+    get [[]]() { return 0; }
+    set [{}](v) { }
+    static get [undefined]() { return 0; }
+    set [null](v) { }
+}
+
+//// [computedPropertyNames17.js]
+var b;
+var C = (function () {
+    function C() {
+    }
+    Object.defineProperty(C.prototype, b, {
+        get: function () {
+            return 0;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C, true, {
+        set: function (v) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C.prototype, [], {
+        get: function () {
+            return 0;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C.prototype, {}, {
+        set: function (v) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C, undefined, {
+        get: function () {
+            return 0;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C.prototype, null, {
+        set: function (v) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return C;
+})();
diff --git a/tests/baselines/reference/computedPropertyNames18.js b/tests/baselines/reference/computedPropertyNames18.js
new file mode 100644
index 00000000000..af2d68b3095
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames18.js
@@ -0,0 +1,13 @@
+//// [computedPropertyNames18.ts]
+function foo() {
+    var obj = {
+        [this.bar]: 0
+    }
+}
+
+//// [computedPropertyNames18.js]
+function foo() {
+    var obj = {
+        [this.bar]: 0
+    };
+}
diff --git a/tests/baselines/reference/computedPropertyNames18.types b/tests/baselines/reference/computedPropertyNames18.types
new file mode 100644
index 00000000000..0976e5fc3ca
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames18.types
@@ -0,0 +1,14 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames18.ts ===
+function foo() {
+>foo : () => void
+
+    var obj = {
+>obj : {}
+>{        [this.bar]: 0    } : {}
+
+        [this.bar]: 0
+>this.bar : any
+>this : any
+>bar : any
+    }
+}
diff --git a/tests/baselines/reference/computedPropertyNames19.errors.txt b/tests/baselines/reference/computedPropertyNames19.errors.txt
new file mode 100644
index 00000000000..2037008992f
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames19.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames19.ts(3,10): error TS2331: 'this' cannot be referenced in a module body.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames19.ts (1 errors) ====
+    module M {
+        var obj = {
+            [this.bar]: 0
+             ~~~~
+!!! error TS2331: 'this' cannot be referenced in a module body.
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames19.js b/tests/baselines/reference/computedPropertyNames19.js
new file mode 100644
index 00000000000..3fd2f99eea6
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames19.js
@@ -0,0 +1,14 @@
+//// [computedPropertyNames19.ts]
+module M {
+    var obj = {
+        [this.bar]: 0
+    }
+}
+
+//// [computedPropertyNames19.js]
+var M;
+(function (M) {
+    var obj = {
+        [this.bar]: 0
+    };
+})(M || (M = {}));
diff --git a/tests/baselines/reference/computedPropertyNames2.errors.txt b/tests/baselines/reference/computedPropertyNames2.errors.txt
index 3dd4ac01d5f..d0fd1de4576 100644
--- a/tests/baselines/reference/computedPropertyNames2.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames2.errors.txt
@@ -1,37 +1,19 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames2.ts(4,5): error TS9002: Computed property names are not currently supported.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames2.ts(5,12): error TS9002: Computed property names are not currently supported.
 tests/cases/conformance/es6/computedProperties/computedPropertyNames2.ts(6,9): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames2.ts(6,9): error TS9002: Computed property names are not currently supported.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames2.ts(7,9): error TS9002: Computed property names are not currently supported.
 tests/cases/conformance/es6/computedProperties/computedPropertyNames2.ts(8,16): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames2.ts(8,16): error TS9002: Computed property names are not currently supported.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames2.ts(9,16): error TS9002: Computed property names are not currently supported.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames2.ts (8 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames2.ts (2 errors) ====
     var methodName = "method";
     var accessorName = "accessor";
     class C {
         [methodName]() { }
-        ~~~~~~~~~~~~
-!!! error TS9002: Computed property names are not currently supported.
         static [methodName]() { }
-               ~~~~~~~~~~~~
-!!! error TS9002: Computed property names are not currently supported.
         get [accessorName]() { }
             ~~~~~~~~~~~~~~
 !!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
-            ~~~~~~~~~~~~~~
-!!! error TS9002: Computed property names are not currently supported.
         set [accessorName](v) { }
-            ~~~~~~~~~~~~~~
-!!! error TS9002: Computed property names are not currently supported.
         static get [accessorName]() { }
                    ~~~~~~~~~~~~~~
 !!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
-                   ~~~~~~~~~~~~~~
-!!! error TS9002: Computed property names are not currently supported.
         static set [accessorName](v) { }
-                   ~~~~~~~~~~~~~~
-!!! error TS9002: Computed property names are not currently supported.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames2.js b/tests/baselines/reference/computedPropertyNames2.js
new file mode 100644
index 00000000000..78d53ef94fc
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames2.js
@@ -0,0 +1,48 @@
+//// [computedPropertyNames2.ts]
+var methodName = "method";
+var accessorName = "accessor";
+class C {
+    [methodName]() { }
+    static [methodName]() { }
+    get [accessorName]() { }
+    set [accessorName](v) { }
+    static get [accessorName]() { }
+    static set [accessorName](v) { }
+}
+
+//// [computedPropertyNames2.js]
+var methodName = "method";
+var accessorName = "accessor";
+var C = (function () {
+    function C() {
+    }
+    C.prototype[methodName] = function () {
+    };
+    C[methodName] = function () {
+    };
+    Object.defineProperty(C.prototype, accessorName, {
+        get: function () {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C.prototype, accessorName, {
+        set: function (v) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C, accessorName, {
+        get: function () {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C, accessorName, {
+        set: function (v) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return C;
+})();
diff --git a/tests/baselines/reference/computedPropertyNames20.js b/tests/baselines/reference/computedPropertyNames20.js
new file mode 100644
index 00000000000..2a1edf06142
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames20.js
@@ -0,0 +1,9 @@
+//// [computedPropertyNames20.ts]
+var obj = {
+    [this.bar]: 0
+}
+
+//// [computedPropertyNames20.js]
+var obj = {
+    [this.bar]: 0
+};
diff --git a/tests/baselines/reference/computedPropertyNames20.types b/tests/baselines/reference/computedPropertyNames20.types
new file mode 100644
index 00000000000..abd1b203e87
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames20.types
@@ -0,0 +1,10 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames20.ts ===
+var obj = {
+>obj : {}
+>{    [this.bar]: 0} : {}
+
+    [this.bar]: 0
+>this.bar : any
+>this : any
+>bar : any
+}
diff --git a/tests/baselines/reference/computedPropertyNames21.errors.txt b/tests/baselines/reference/computedPropertyNames21.errors.txt
new file mode 100644
index 00000000000..a44c8d60ee8
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames21.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames21.ts(5,6): error TS2465: 'this' cannot be referenced in a computed property name.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames21.ts (1 errors) ====
+    class C {
+        bar() {
+            return 0;
+        }
+        [this.bar()]() { }
+         ~~~~
+!!! error TS2465: 'this' cannot be referenced in a computed property name.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames21.js b/tests/baselines/reference/computedPropertyNames21.js
new file mode 100644
index 00000000000..250d9142aa5
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames21.js
@@ -0,0 +1,19 @@
+//// [computedPropertyNames21.ts]
+class C {
+    bar() {
+        return 0;
+    }
+    [this.bar()]() { }
+}
+
+//// [computedPropertyNames21.js]
+var C = (function () {
+    function C() {
+    }
+    C.prototype.bar = function () {
+        return 0;
+    };
+    C.prototype[this.bar()] = function () {
+    };
+    return C;
+})();
diff --git a/tests/baselines/reference/computedPropertyNames22.js b/tests/baselines/reference/computedPropertyNames22.js
new file mode 100644
index 00000000000..b42946536d0
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames22.js
@@ -0,0 +1,23 @@
+//// [computedPropertyNames22.ts]
+class C {
+    bar() {
+        var obj = {
+            [this.bar()]() { }
+        };
+        return 0;
+    }
+}
+
+//// [computedPropertyNames22.js]
+var C = (function () {
+    function C() {
+    }
+    C.prototype.bar = function () {
+        var obj = {
+            [this.bar()]() {
+            }
+        };
+        return 0;
+    };
+    return C;
+})();
diff --git a/tests/baselines/reference/computedPropertyNames22.types b/tests/baselines/reference/computedPropertyNames22.types
new file mode 100644
index 00000000000..d23546192c0
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames22.types
@@ -0,0 +1,21 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames22.ts ===
+class C {
+>C : C
+
+    bar() {
+>bar : () => number
+
+        var obj = {
+>obj : {}
+>{            [this.bar()]() { }        } : {}
+
+            [this.bar()]() { }
+>this.bar() : number
+>this.bar : () => number
+>this : C
+>bar : () => number
+
+        };
+        return 0;
+    }
+}
diff --git a/tests/baselines/reference/computedPropertyNames23.errors.txt b/tests/baselines/reference/computedPropertyNames23.errors.txt
new file mode 100644
index 00000000000..0846ba4d6c6
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames23.errors.txt
@@ -0,0 +1,14 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames23.ts(6,12): error TS2465: 'this' cannot be referenced in a computed property name.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames23.ts (1 errors) ====
+    class C {
+        bar() {
+            return 0;
+        }
+        [
+            { [this.bar()]: 1 }[0]
+               ~~~~
+!!! error TS2465: 'this' cannot be referenced in a computed property name.
+        ]() { }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames23.js b/tests/baselines/reference/computedPropertyNames23.js
new file mode 100644
index 00000000000..9d71ef34c1e
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames23.js
@@ -0,0 +1,21 @@
+//// [computedPropertyNames23.ts]
+class C {
+    bar() {
+        return 0;
+    }
+    [
+        { [this.bar()]: 1 }[0]
+    ]() { }
+}
+
+//// [computedPropertyNames23.js]
+var C = (function () {
+    function C() {
+    }
+    C.prototype.bar = function () {
+        return 0;
+    };
+    C.prototype[{ [this.bar()]: 1 }[0]] = function () {
+    };
+    return C;
+})();
diff --git a/tests/baselines/reference/computedPropertyNames24.errors.txt b/tests/baselines/reference/computedPropertyNames24.errors.txt
new file mode 100644
index 00000000000..938fb64b82e
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames24.errors.txt
@@ -0,0 +1,16 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames24.ts(9,6): error TS2466: 'super' cannot be referenced in a computed property name.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames24.ts (1 errors) ====
+    class Base {
+        bar() {
+            return 0;
+        }
+    }
+    class C extends Base {
+        // Gets emitted as super, not _super, which is consistent with
+        // use of super in static properties initializers.
+        [super.bar()]() { }
+         ~~~~~
+!!! error TS2466: 'super' cannot be referenced in a computed property name.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames24.js b/tests/baselines/reference/computedPropertyNames24.js
new file mode 100644
index 00000000000..2ef2826ee22
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames24.js
@@ -0,0 +1,38 @@
+//// [computedPropertyNames24.ts]
+class Base {
+    bar() {
+        return 0;
+    }
+}
+class C extends Base {
+    // Gets emitted as super, not _super, which is consistent with
+    // use of super in static properties initializers.
+    [super.bar()]() { }
+}
+
+//// [computedPropertyNames24.js]
+var __extends = this.__extends || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    __.prototype = b.prototype;
+    d.prototype = new __();
+};
+var Base = (function () {
+    function Base() {
+    }
+    Base.prototype.bar = function () {
+        return 0;
+    };
+    return Base;
+})();
+var C = (function (_super) {
+    __extends(C, _super);
+    function C() {
+        _super.apply(this, arguments);
+    }
+    // Gets emitted as super, not _super, which is consistent with
+    // use of super in static properties initializers.
+    C.prototype[super.bar.call(this)] = function () {
+    };
+    return C;
+})(Base);
diff --git a/tests/baselines/reference/computedPropertyNames25.js b/tests/baselines/reference/computedPropertyNames25.js
new file mode 100644
index 00000000000..a15fcb217e7
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames25.js
@@ -0,0 +1,44 @@
+//// [computedPropertyNames25.ts]
+class Base {
+    bar() {
+        return 0;
+    }
+}
+class C extends Base {
+    foo() {
+        var obj = {
+            [super.bar()]() { }
+        };
+        return 0;
+    }
+}
+
+//// [computedPropertyNames25.js]
+var __extends = this.__extends || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    __.prototype = b.prototype;
+    d.prototype = new __();
+};
+var Base = (function () {
+    function Base() {
+    }
+    Base.prototype.bar = function () {
+        return 0;
+    };
+    return Base;
+})();
+var C = (function (_super) {
+    __extends(C, _super);
+    function C() {
+        _super.apply(this, arguments);
+    }
+    C.prototype.foo = function () {
+        var obj = {
+            [_super.prototype.bar.call(this)]() {
+            }
+        };
+        return 0;
+    };
+    return C;
+})(Base);
diff --git a/tests/baselines/reference/computedPropertyNames25.types b/tests/baselines/reference/computedPropertyNames25.types
new file mode 100644
index 00000000000..d8567dc86ad
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames25.types
@@ -0,0 +1,31 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames25.ts ===
+class Base {
+>Base : Base
+
+    bar() {
+>bar : () => number
+
+        return 0;
+    }
+}
+class C extends Base {
+>C : C
+>Base : Base
+
+    foo() {
+>foo : () => number
+
+        var obj = {
+>obj : {}
+>{            [super.bar()]() { }        } : {}
+
+            [super.bar()]() { }
+>super.bar() : number
+>super.bar : () => number
+>super : Base
+>bar : () => number
+
+        };
+        return 0;
+    }
+}
diff --git a/tests/baselines/reference/computedPropertyNames26.errors.txt b/tests/baselines/reference/computedPropertyNames26.errors.txt
new file mode 100644
index 00000000000..bbe51c6a0c8
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames26.errors.txt
@@ -0,0 +1,18 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames26.ts(10,12): error TS2466: 'super' cannot be referenced in a computed property name.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames26.ts (1 errors) ====
+    class Base {
+        bar() {
+            return 0;
+        }
+    }
+    class C extends Base {
+        // Gets emitted as super, not _super, which is consistent with
+        // use of super in static properties initializers.
+        [
+            { [super.bar()]: 1 }[0]
+               ~~~~~
+!!! error TS2466: 'super' cannot be referenced in a computed property name.
+        ]() { }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames26.js b/tests/baselines/reference/computedPropertyNames26.js
new file mode 100644
index 00000000000..96760fc279c
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames26.js
@@ -0,0 +1,40 @@
+//// [computedPropertyNames26.ts]
+class Base {
+    bar() {
+        return 0;
+    }
+}
+class C extends Base {
+    // Gets emitted as super, not _super, which is consistent with
+    // use of super in static properties initializers.
+    [
+        { [super.bar()]: 1 }[0]
+    ]() { }
+}
+
+//// [computedPropertyNames26.js]
+var __extends = this.__extends || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    __.prototype = b.prototype;
+    d.prototype = new __();
+};
+var Base = (function () {
+    function Base() {
+    }
+    Base.prototype.bar = function () {
+        return 0;
+    };
+    return Base;
+})();
+var C = (function (_super) {
+    __extends(C, _super);
+    function C() {
+        _super.apply(this, arguments);
+    }
+    // Gets emitted as super, not _super, which is consistent with
+    // use of super in static properties initializers.
+    C.prototype[{ [super.bar.call(this)]: 1 }[0]] = function () {
+    };
+    return C;
+})(Base);
diff --git a/tests/baselines/reference/computedPropertyNames27.errors.txt b/tests/baselines/reference/computedPropertyNames27.errors.txt
new file mode 100644
index 00000000000..c2872197363
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames27.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames27.ts(4,7): error TS2466: 'super' cannot be referenced in a computed property name.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames27.ts (1 errors) ====
+    class Base {
+    }
+    class C extends Base {
+        [(super(), "prop")]() { }
+          ~~~~~
+!!! error TS2466: 'super' cannot be referenced in a computed property name.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames27.js b/tests/baselines/reference/computedPropertyNames27.js
new file mode 100644
index 00000000000..71db977e9b6
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames27.js
@@ -0,0 +1,28 @@
+//// [computedPropertyNames27.ts]
+class Base {
+}
+class C extends Base {
+    [(super(), "prop")]() { }
+}
+
+//// [computedPropertyNames27.js]
+var __extends = this.__extends || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    __.prototype = b.prototype;
+    d.prototype = new __();
+};
+var Base = (function () {
+    function Base() {
+    }
+    return Base;
+})();
+var C = (function (_super) {
+    __extends(C, _super);
+    function C() {
+        _super.apply(this, arguments);
+    }
+    C.prototype[(_super.call(this), "prop")] = function () {
+    };
+    return C;
+})(Base);
diff --git a/tests/baselines/reference/computedPropertyNames28.js b/tests/baselines/reference/computedPropertyNames28.js
new file mode 100644
index 00000000000..96c7cd082f1
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames28.js
@@ -0,0 +1,35 @@
+//// [computedPropertyNames28.ts]
+class Base {
+}
+class C extends Base {
+    constructor() {
+        super();
+        var obj = {
+            [(super(), "prop")]() { }
+        };
+    }
+}
+
+//// [computedPropertyNames28.js]
+var __extends = this.__extends || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    __.prototype = b.prototype;
+    d.prototype = new __();
+};
+var Base = (function () {
+    function Base() {
+    }
+    return Base;
+})();
+var C = (function (_super) {
+    __extends(C, _super);
+    function C() {
+        _super.call(this);
+        var obj = {
+            [(_super.call(this), "prop")]() {
+            }
+        };
+    }
+    return C;
+})(Base);
diff --git a/tests/baselines/reference/computedPropertyNames28.types b/tests/baselines/reference/computedPropertyNames28.types
new file mode 100644
index 00000000000..2adf52f8c5f
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames28.types
@@ -0,0 +1,26 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames28.ts ===
+class Base {
+>Base : Base
+}
+class C extends Base {
+>C : C
+>Base : Base
+
+    constructor() {
+        super();
+>super() : void
+>super : typeof Base
+
+        var obj = {
+>obj : {}
+>{            [(super(), "prop")]() { }        } : {}
+
+            [(super(), "prop")]() { }
+>(super(), "prop") : string
+>super(), "prop" : string
+>super() : void
+>super : typeof Base
+
+        };
+    }
+}
diff --git a/tests/baselines/reference/computedPropertyNames29.js b/tests/baselines/reference/computedPropertyNames29.js
new file mode 100644
index 00000000000..dc45746c63c
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames29.js
@@ -0,0 +1,28 @@
+//// [computedPropertyNames29.ts]
+class C {
+    bar() {
+        () => {
+            var obj = {
+                [this.bar()]() { } // needs capture
+            };
+        }
+        return 0;
+    }
+}
+
+//// [computedPropertyNames29.js]
+var C = (function () {
+    function C() {
+    }
+    C.prototype.bar = function () {
+        var _this = this;
+        (function () {
+            var obj = {
+                [_this.bar()]() {
+                } // needs capture
+            };
+        });
+        return 0;
+    };
+    return C;
+})();
diff --git a/tests/baselines/reference/computedPropertyNames29.types b/tests/baselines/reference/computedPropertyNames29.types
new file mode 100644
index 00000000000..ed4db5862e9
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames29.types
@@ -0,0 +1,25 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames29.ts ===
+class C {
+>C : C
+
+    bar() {
+>bar : () => number
+
+        () => {
+>() => {            var obj = {                [this.bar()]() { } // needs capture            };        } : () => void
+
+            var obj = {
+>obj : {}
+>{                [this.bar()]() { } // needs capture            } : {}
+
+                [this.bar()]() { } // needs capture
+>this.bar() : number
+>this.bar : () => number
+>this : C
+>bar : () => number
+
+            };
+        }
+        return 0;
+    }
+}
diff --git a/tests/baselines/reference/computedPropertyNames3.errors.txt b/tests/baselines/reference/computedPropertyNames3.errors.txt
index 084a1f8889f..080bff1ab9a 100644
--- a/tests/baselines/reference/computedPropertyNames3.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames3.errors.txt
@@ -1,36 +1,30 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames3.ts(3,5): error TS9002: Computed property names are not currently supported.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames3.ts(4,12): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames3.ts(4,12): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
 tests/cases/conformance/es6/computedProperties/computedPropertyNames3.ts(5,9): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames3.ts(5,9): error TS9002: Computed property names are not currently supported.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames3.ts(6,9): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames3.ts(5,9): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames3.ts(6,9): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
 tests/cases/conformance/es6/computedProperties/computedPropertyNames3.ts(7,16): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames3.ts(7,16): error TS9002: Computed property names are not currently supported.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames3.ts(8,16): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames3.ts(7,16): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames3.ts (8 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames3.ts (6 errors) ====
     var id;
     class C {
         [0 + 1]() { }
-        ~~~~~~~
-!!! error TS9002: Computed property names are not currently supported.
         static [() => { }]() { }
                ~~~~~~~~~~~
-!!! error TS9002: Computed property names are not currently supported.
+!!! error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
         get [delete id]() { }
             ~~~~~~~~~~~
 !!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
             ~~~~~~~~~~~
-!!! error TS9002: Computed property names are not currently supported.
+!!! error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
         set [[0, 1]](v) { }
             ~~~~~~~~
-!!! error TS9002: Computed property names are not currently supported.
+!!! error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
         static get [<String>""]() { }
                    ~~~~~~~~~~~~
 !!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
                    ~~~~~~~~~~~~
-!!! error TS9002: Computed property names are not currently supported.
+!!! error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
         static set [id.toString()](v) { }
-                   ~~~~~~~~~~~~~~~
-!!! error TS9002: Computed property names are not currently supported.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames3.js b/tests/baselines/reference/computedPropertyNames3.js
new file mode 100644
index 00000000000..fbd76bf48fc
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames3.js
@@ -0,0 +1,47 @@
+//// [computedPropertyNames3.ts]
+var id;
+class C {
+    [0 + 1]() { }
+    static [() => { }]() { }
+    get [delete id]() { }
+    set [[0, 1]](v) { }
+    static get [<String>""]() { }
+    static set [id.toString()](v) { }
+}
+
+//// [computedPropertyNames3.js]
+var id;
+var C = (function () {
+    function C() {
+    }
+    C.prototype[0 + 1] = function () {
+    };
+    C[function () {
+    }] = function () {
+    };
+    Object.defineProperty(C.prototype, delete id, {
+        get: function () {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C.prototype, [0, 1], {
+        set: function (v) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C, "", {
+        get: function () {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C, id.toString(), {
+        set: function (v) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return C;
+})();
diff --git a/tests/baselines/reference/computedPropertyNames30.errors.txt b/tests/baselines/reference/computedPropertyNames30.errors.txt
new file mode 100644
index 00000000000..f7b6411f867
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames30.errors.txt
@@ -0,0 +1,21 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames30.ts(11,19): error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames30.ts (1 errors) ====
+    class Base {
+    }
+    class C extends Base {
+        constructor() {
+            super();
+            () => {
+                var obj = {
+                    // Ideally, we would capture this. But the reference is
+                    // illegal, and not capturing this is consistent with
+                    //treatment of other similar violations.
+                    [(super(), "prop")]() { }
+                      ~~~~~
+!!! error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors
+                };
+            }
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames30.js b/tests/baselines/reference/computedPropertyNames30.js
new file mode 100644
index 00000000000..c10ba51316d
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames30.js
@@ -0,0 +1,45 @@
+//// [computedPropertyNames30.ts]
+class Base {
+}
+class C extends Base {
+    constructor() {
+        super();
+        () => {
+            var obj = {
+                // Ideally, we would capture this. But the reference is
+                // illegal, and not capturing this is consistent with
+                //treatment of other similar violations.
+                [(super(), "prop")]() { }
+            };
+        }
+    }
+}
+
+//// [computedPropertyNames30.js]
+var __extends = this.__extends || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    __.prototype = b.prototype;
+    d.prototype = new __();
+};
+var Base = (function () {
+    function Base() {
+    }
+    return Base;
+})();
+var C = (function (_super) {
+    __extends(C, _super);
+    function C() {
+        _super.call(this);
+        (function () {
+            var obj = {
+                // Ideally, we would capture this. But the reference is
+                // illegal, and not capturing this is consistent with
+                //treatment of other similar violations.
+                [(_super.call(this), "prop")]() {
+                }
+            };
+        });
+    }
+    return C;
+})(Base);
diff --git a/tests/baselines/reference/computedPropertyNames31.js b/tests/baselines/reference/computedPropertyNames31.js
new file mode 100644
index 00000000000..bf75ac2be74
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames31.js
@@ -0,0 +1,49 @@
+//// [computedPropertyNames31.ts]
+class Base {
+    bar() {
+        return 0;
+    }
+}
+class C extends Base {
+    foo() {
+        () => {
+            var obj = {
+                [super.bar()]() { } // needs capture
+            };
+        }
+        return 0;
+    }
+}
+
+//// [computedPropertyNames31.js]
+var __extends = this.__extends || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    __.prototype = b.prototype;
+    d.prototype = new __();
+};
+var Base = (function () {
+    function Base() {
+    }
+    Base.prototype.bar = function () {
+        return 0;
+    };
+    return Base;
+})();
+var C = (function (_super) {
+    __extends(C, _super);
+    function C() {
+        _super.apply(this, arguments);
+    }
+    C.prototype.foo = function () {
+        var _this = this;
+        (function () {
+            var obj = {
+                [_super.prototype.bar.call(_this)]() {
+                } // needs capture
+            };
+        });
+        return 0;
+    };
+    return C;
+})(Base);
diff --git a/tests/baselines/reference/computedPropertyNames31.types b/tests/baselines/reference/computedPropertyNames31.types
new file mode 100644
index 00000000000..90e73bc3dcb
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames31.types
@@ -0,0 +1,35 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames31.ts ===
+class Base {
+>Base : Base
+
+    bar() {
+>bar : () => number
+
+        return 0;
+    }
+}
+class C extends Base {
+>C : C
+>Base : Base
+
+    foo() {
+>foo : () => number
+
+        () => {
+>() => {            var obj = {                [super.bar()]() { } // needs capture            };        } : () => void
+
+            var obj = {
+>obj : {}
+>{                [super.bar()]() { } // needs capture            } : {}
+
+                [super.bar()]() { } // needs capture
+>super.bar() : number
+>super.bar : () => number
+>super : Base
+>bar : () => number
+
+            };
+        }
+        return 0;
+    }
+}
diff --git a/tests/baselines/reference/computedPropertyNames32.errors.txt b/tests/baselines/reference/computedPropertyNames32.errors.txt
new file mode 100644
index 00000000000..e2f08c79fc9
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames32.errors.txt
@@ -0,0 +1,13 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames32.ts(6,10): error TS2466: A computed property name cannot reference a type parameter from its containing type.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames32.ts (1 errors) ====
+    function foo<T>() { return '' }
+    class C<T> {
+        bar() {
+            return 0;
+        }
+        [foo<T>()]() { }
+             ~
+!!! error TS2466: A computed property name cannot reference a type parameter from its containing type.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames32.js b/tests/baselines/reference/computedPropertyNames32.js
new file mode 100644
index 00000000000..d3e98681369
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames32.js
@@ -0,0 +1,23 @@
+//// [computedPropertyNames32.ts]
+function foo<T>() { return '' }
+class C<T> {
+    bar() {
+        return 0;
+    }
+    [foo<T>()]() { }
+}
+
+//// [computedPropertyNames32.js]
+function foo() {
+    return '';
+}
+var C = (function () {
+    function C() {
+    }
+    C.prototype.bar = function () {
+        return 0;
+    };
+    C.prototype[foo()] = function () {
+    };
+    return C;
+})();
diff --git a/tests/baselines/reference/computedPropertyNames33.js b/tests/baselines/reference/computedPropertyNames33.js
new file mode 100644
index 00000000000..554ec315897
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames33.js
@@ -0,0 +1,27 @@
+//// [computedPropertyNames33.ts]
+function foo<T>() { return '' }
+class C<T> {
+    bar() {
+        var obj = {
+            [foo<T>()]() { }
+        };
+        return 0;
+    }
+}
+
+//// [computedPropertyNames33.js]
+function foo() {
+    return '';
+}
+var C = (function () {
+    function C() {
+    }
+    C.prototype.bar = function () {
+        var obj = {
+            [foo()]() {
+            }
+        };
+        return 0;
+    };
+    return C;
+})();
diff --git a/tests/baselines/reference/computedPropertyNames33.types b/tests/baselines/reference/computedPropertyNames33.types
new file mode 100644
index 00000000000..8cbe8e93ef2
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames33.types
@@ -0,0 +1,25 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames33.ts ===
+function foo<T>() { return '' }
+>foo : <T>() => string
+>T : T
+
+class C<T> {
+>C : C<T>
+>T : T
+
+    bar() {
+>bar : () => number
+
+        var obj = {
+>obj : {}
+>{            [foo<T>()]() { }        } : {}
+
+            [foo<T>()]() { }
+>foo<T>() : string
+>foo : <T>() => string
+>T : T
+
+        };
+        return 0;
+    }
+}
diff --git a/tests/baselines/reference/computedPropertyNames34.errors.txt b/tests/baselines/reference/computedPropertyNames34.errors.txt
new file mode 100644
index 00000000000..c6d4a9aa4eb
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames34.errors.txt
@@ -0,0 +1,15 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames34.ts(5,18): error TS2302: Static members cannot reference class type parameters.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames34.ts (1 errors) ====
+    function foo<T>() { return '' }
+    class C<T> {
+        static bar() {
+            var obj = {
+                [foo<T>()]() { }
+                     ~
+!!! error TS2302: Static members cannot reference class type parameters.
+            };
+            return 0;
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames34.js b/tests/baselines/reference/computedPropertyNames34.js
new file mode 100644
index 00000000000..f1d774139b1
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames34.js
@@ -0,0 +1,27 @@
+//// [computedPropertyNames34.ts]
+function foo<T>() { return '' }
+class C<T> {
+    static bar() {
+        var obj = {
+            [foo<T>()]() { }
+        };
+        return 0;
+    }
+}
+
+//// [computedPropertyNames34.js]
+function foo() {
+    return '';
+}
+var C = (function () {
+    function C() {
+    }
+    C.bar = function () {
+        var obj = {
+            [foo()]() {
+            }
+        };
+        return 0;
+    };
+    return C;
+})();
diff --git a/tests/baselines/reference/computedPropertyNames35.errors.txt b/tests/baselines/reference/computedPropertyNames35.errors.txt
new file mode 100644
index 00000000000..01c4614e84a
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames35.errors.txt
@@ -0,0 +1,14 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames35.ts(4,5): error TS1169: Computed property names are not allowed in interfaces.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames35.ts(4,10): error TS2466: A computed property name cannot reference a type parameter from its containing type.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames35.ts (2 errors) ====
+    function foo<T>() { return '' }
+    interface I<T> {
+        bar(): string;
+        [foo<T>()](): void;
+        ~~~~~~~~~~
+!!! error TS1169: Computed property names are not allowed in interfaces.
+             ~
+!!! error TS2466: A computed property name cannot reference a type parameter from its containing type.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames36.errors.txt b/tests/baselines/reference/computedPropertyNames36.errors.txt
new file mode 100644
index 00000000000..a473ebfba8e
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames36.errors.txt
@@ -0,0 +1,16 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames36.ts(8,5): error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames36.ts (1 errors) ====
+    class Foo { x }
+    class Foo2 { x; y }
+    
+    class C {
+        [s: string]: Foo2;
+    
+        // Computed properties
+        get ["get1"]() { return new Foo }
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
+        set ["set1"](p: Foo2) { }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames36.js b/tests/baselines/reference/computedPropertyNames36.js
new file mode 100644
index 00000000000..7c731014d1e
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames36.js
@@ -0,0 +1,42 @@
+//// [computedPropertyNames36.ts]
+class Foo { x }
+class Foo2 { x; y }
+
+class C {
+    [s: string]: Foo2;
+
+    // Computed properties
+    get ["get1"]() { return new Foo }
+    set ["set1"](p: Foo2) { }
+}
+
+//// [computedPropertyNames36.js]
+var Foo = (function () {
+    function Foo() {
+    }
+    return Foo;
+})();
+var Foo2 = (function () {
+    function Foo2() {
+    }
+    return Foo2;
+})();
+var C = (function () {
+    function C() {
+    }
+    Object.defineProperty(C.prototype, "get1", {
+        // Computed properties
+        get: function () {
+            return new Foo;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C.prototype, "set1", {
+        set: function (p) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return C;
+})();
diff --git a/tests/baselines/reference/computedPropertyNames37.js b/tests/baselines/reference/computedPropertyNames37.js
new file mode 100644
index 00000000000..fb4c32909d5
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames37.js
@@ -0,0 +1,42 @@
+//// [computedPropertyNames37.ts]
+class Foo { x }
+class Foo2 { x; y }
+
+class C {
+    [s: number]: Foo2;
+
+    // Computed properties
+    get ["get1"]() { return new Foo }
+    set ["set1"](p: Foo2) { }
+}
+
+//// [computedPropertyNames37.js]
+var Foo = (function () {
+    function Foo() {
+    }
+    return Foo;
+})();
+var Foo2 = (function () {
+    function Foo2() {
+    }
+    return Foo2;
+})();
+var C = (function () {
+    function C() {
+    }
+    Object.defineProperty(C.prototype, "get1", {
+        // Computed properties
+        get: function () {
+            return new Foo;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C.prototype, "set1", {
+        set: function (p) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return C;
+})();
diff --git a/tests/baselines/reference/computedPropertyNames37.types b/tests/baselines/reference/computedPropertyNames37.types
new file mode 100644
index 00000000000..b50e0590b79
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames37.types
@@ -0,0 +1,26 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames37.ts ===
+class Foo { x }
+>Foo : Foo
+>x : any
+
+class Foo2 { x; y }
+>Foo2 : Foo2
+>x : any
+>y : any
+
+class C {
+>C : C
+
+    [s: number]: Foo2;
+>s : number
+>Foo2 : Foo2
+
+    // Computed properties
+    get ["get1"]() { return new Foo }
+>new Foo : Foo
+>Foo : typeof Foo
+
+    set ["set1"](p: Foo2) { }
+>p : Foo2
+>Foo2 : Foo2
+}
diff --git a/tests/baselines/reference/computedPropertyNames38.errors.txt b/tests/baselines/reference/computedPropertyNames38.errors.txt
new file mode 100644
index 00000000000..fc5f31f1329
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames38.errors.txt
@@ -0,0 +1,16 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames38.ts(8,5): error TS2411: Property '[1 << 6]' of type 'Foo' is not assignable to string index type 'Foo2'.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames38.ts (1 errors) ====
+    class Foo { x }
+    class Foo2 { x; y }
+    
+    class C {
+        [s: string]: Foo2;
+    
+        // Computed properties
+        get [1 << 6]() { return new Foo }
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2411: Property '[1 << 6]' of type 'Foo' is not assignable to string index type 'Foo2'.
+        set [1 << 6](p: Foo2) { }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames38.js b/tests/baselines/reference/computedPropertyNames38.js
new file mode 100644
index 00000000000..922244bfecf
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames38.js
@@ -0,0 +1,42 @@
+//// [computedPropertyNames38.ts]
+class Foo { x }
+class Foo2 { x; y }
+
+class C {
+    [s: string]: Foo2;
+
+    // Computed properties
+    get [1 << 6]() { return new Foo }
+    set [1 << 6](p: Foo2) { }
+}
+
+//// [computedPropertyNames38.js]
+var Foo = (function () {
+    function Foo() {
+    }
+    return Foo;
+})();
+var Foo2 = (function () {
+    function Foo2() {
+    }
+    return Foo2;
+})();
+var C = (function () {
+    function C() {
+    }
+    Object.defineProperty(C.prototype, 1 << 6, {
+        // Computed properties
+        get: function () {
+            return new Foo;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C.prototype, 1 << 6, {
+        set: function (p) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return C;
+})();
diff --git a/tests/baselines/reference/computedPropertyNames39.errors.txt b/tests/baselines/reference/computedPropertyNames39.errors.txt
new file mode 100644
index 00000000000..573ef726241
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames39.errors.txt
@@ -0,0 +1,16 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames39.ts(8,5): error TS2412: Property '[1 << 6]' of type 'Foo' is not assignable to numeric index type 'Foo2'.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames39.ts (1 errors) ====
+    class Foo { x }
+    class Foo2 { x; y }
+    
+    class C {
+        [s: number]: Foo2;
+    
+        // Computed properties
+        get [1 << 6]() { return new Foo }
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2412: Property '[1 << 6]' of type 'Foo' is not assignable to numeric index type 'Foo2'.
+        set [1 << 6](p: Foo2) { }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames39.js b/tests/baselines/reference/computedPropertyNames39.js
new file mode 100644
index 00000000000..62621f4e754
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames39.js
@@ -0,0 +1,42 @@
+//// [computedPropertyNames39.ts]
+class Foo { x }
+class Foo2 { x; y }
+
+class C {
+    [s: number]: Foo2;
+
+    // Computed properties
+    get [1 << 6]() { return new Foo }
+    set [1 << 6](p: Foo2) { }
+}
+
+//// [computedPropertyNames39.js]
+var Foo = (function () {
+    function Foo() {
+    }
+    return Foo;
+})();
+var Foo2 = (function () {
+    function Foo2() {
+    }
+    return Foo2;
+})();
+var C = (function () {
+    function C() {
+    }
+    Object.defineProperty(C.prototype, 1 << 6, {
+        // Computed properties
+        get: function () {
+            return new Foo;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C.prototype, 1 << 6, {
+        set: function (p) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return C;
+})();
diff --git a/tests/baselines/reference/computedPropertyNames4.js b/tests/baselines/reference/computedPropertyNames4.js
new file mode 100644
index 00000000000..5acb6d957da
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames4.js
@@ -0,0 +1,35 @@
+//// [computedPropertyNames4.ts]
+var s: string;
+var n: number;
+var a: any;
+var v = {
+    [s]: 0,
+    [n]: n,
+    [s + s]: 1,
+    [s + n]: 2,
+    [+s]: s,
+    [""]: 0,
+    [0]: 0,
+    [a]: 1,
+    [<any>true]: 0,
+    [`hello bye`]: 0,
+    [`hello ${a} bye`]: 0
+}
+
+//// [computedPropertyNames4.js]
+var s;
+var n;
+var a;
+var v = {
+    [s]: 0,
+    [n]: n,
+    [s + s]: 1,
+    [s + n]: 2,
+    [+s]: s,
+    [""]: 0,
+    [0]: 0,
+    [a]: 1,
+    [true]: 0,
+    [`hello bye`]: 0,
+    [`hello ${a} bye`]: 0
+};
diff --git a/tests/baselines/reference/computedPropertyNames4.types b/tests/baselines/reference/computedPropertyNames4.types
new file mode 100644
index 00000000000..968cc86b598
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames4.types
@@ -0,0 +1,48 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames4.ts ===
+var s: string;
+>s : string
+
+var n: number;
+>n : number
+
+var a: any;
+>a : any
+
+var v = {
+>v : {}
+>{    [s]: 0,    [n]: n,    [s + s]: 1,    [s + n]: 2,    [+s]: s,    [""]: 0,    [0]: 0,    [a]: 1,    [<any>true]: 0,    [`hello bye`]: 0,    [`hello ${a} bye`]: 0} : {}
+
+    [s]: 0,
+>s : string
+
+    [n]: n,
+>n : number
+>n : number
+
+    [s + s]: 1,
+>s + s : string
+>s : string
+>s : string
+
+    [s + n]: 2,
+>s + n : string
+>s : string
+>n : number
+
+    [+s]: s,
+>+s : number
+>s : string
+>s : string
+
+    [""]: 0,
+    [0]: 0,
+    [a]: 1,
+>a : any
+
+    [<any>true]: 0,
+><any>true : any
+
+    [`hello bye`]: 0,
+    [`hello ${a} bye`]: 0
+>a : any
+}
diff --git a/tests/baselines/reference/computedPropertyNames40.errors.txt b/tests/baselines/reference/computedPropertyNames40.errors.txt
new file mode 100644
index 00000000000..c5bda4ed999
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames40.errors.txt
@@ -0,0 +1,16 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames40.ts(8,5): error TS2411: Property '[""]' of type '() => Foo' is not assignable to string index type '() => Foo2'.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames40.ts (1 errors) ====
+    class Foo { x }
+    class Foo2 { x; y }
+    
+    class C {
+        [s: string]: () => Foo2;
+    
+        // Computed properties
+        [""]() { return new Foo }
+        ~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2411: Property '[""]' of type '() => Foo' is not assignable to string index type '() => Foo2'.
+        [""]() { return new Foo2 }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames40.js b/tests/baselines/reference/computedPropertyNames40.js
new file mode 100644
index 00000000000..1c9b5d3bfa8
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames40.js
@@ -0,0 +1,35 @@
+//// [computedPropertyNames40.ts]
+class Foo { x }
+class Foo2 { x; y }
+
+class C {
+    [s: string]: () => Foo2;
+
+    // Computed properties
+    [""]() { return new Foo }
+    [""]() { return new Foo2 }
+}
+
+//// [computedPropertyNames40.js]
+var Foo = (function () {
+    function Foo() {
+    }
+    return Foo;
+})();
+var Foo2 = (function () {
+    function Foo2() {
+    }
+    return Foo2;
+})();
+var C = (function () {
+    function C() {
+    }
+    // Computed properties
+    C.prototype[""] = function () {
+        return new Foo;
+    };
+    C.prototype[""] = function () {
+        return new Foo2;
+    };
+    return C;
+})();
diff --git a/tests/baselines/reference/computedPropertyNames41.js b/tests/baselines/reference/computedPropertyNames41.js
new file mode 100644
index 00000000000..34fe2d33df7
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames41.js
@@ -0,0 +1,31 @@
+//// [computedPropertyNames41.ts]
+class Foo { x }
+class Foo2 { x; y }
+
+class C {
+    [s: string]: () => Foo2;
+
+    // Computed properties
+    static [""]() { return new Foo }
+}
+
+//// [computedPropertyNames41.js]
+var Foo = (function () {
+    function Foo() {
+    }
+    return Foo;
+})();
+var Foo2 = (function () {
+    function Foo2() {
+    }
+    return Foo2;
+})();
+var C = (function () {
+    function C() {
+    }
+    // Computed properties
+    C[""] = function () {
+        return new Foo;
+    };
+    return C;
+})();
diff --git a/tests/baselines/reference/computedPropertyNames41.types b/tests/baselines/reference/computedPropertyNames41.types
new file mode 100644
index 00000000000..1fb0af282ca
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames41.types
@@ -0,0 +1,22 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames41.ts ===
+class Foo { x }
+>Foo : Foo
+>x : any
+
+class Foo2 { x; y }
+>Foo2 : Foo2
+>x : any
+>y : any
+
+class C {
+>C : C
+
+    [s: string]: () => Foo2;
+>s : string
+>Foo2 : Foo2
+
+    // Computed properties
+    static [""]() { return new Foo }
+>new Foo : Foo
+>Foo : typeof Foo
+}
diff --git a/tests/baselines/reference/computedPropertyNames42.errors.txt b/tests/baselines/reference/computedPropertyNames42.errors.txt
new file mode 100644
index 00000000000..059b3117a43
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames42.errors.txt
@@ -0,0 +1,18 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames42.ts(8,5): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames42.ts(8,5): error TS2411: Property '[""]' of type 'Foo' is not assignable to string index type 'Foo2'.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames42.ts (2 errors) ====
+    class Foo { x }
+    class Foo2 { x; y }
+    
+    class C {
+        [s: string]: Foo2;
+    
+        // Computed properties
+        [""]: Foo;
+        ~~~~
+!!! error TS1166: Computed property names are not allowed in class property declarations.
+        ~~~~~~~~~~
+!!! error TS2411: Property '[""]' of type 'Foo' is not assignable to string index type 'Foo2'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames43.errors.txt b/tests/baselines/reference/computedPropertyNames43.errors.txt
new file mode 100644
index 00000000000..d38dcca9216
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames43.errors.txt
@@ -0,0 +1,18 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames43.ts(10,5): error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames43.ts (1 errors) ====
+    class Foo { x }
+    class Foo2 { x; y }
+    
+    class C {
+        [s: string]: Foo2;
+    }
+    
+    class D extends C {
+        // Computed properties
+        get ["get1"]() { return new Foo }
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
+        set ["set1"](p: Foo2) { }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames43.js b/tests/baselines/reference/computedPropertyNames43.js
new file mode 100644
index 00000000000..22ac7774439
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames43.js
@@ -0,0 +1,57 @@
+//// [computedPropertyNames43.ts]
+class Foo { x }
+class Foo2 { x; y }
+
+class C {
+    [s: string]: Foo2;
+}
+
+class D extends C {
+    // Computed properties
+    get ["get1"]() { return new Foo }
+    set ["set1"](p: Foo2) { }
+}
+
+//// [computedPropertyNames43.js]
+var __extends = this.__extends || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    __.prototype = b.prototype;
+    d.prototype = new __();
+};
+var Foo = (function () {
+    function Foo() {
+    }
+    return Foo;
+})();
+var Foo2 = (function () {
+    function Foo2() {
+    }
+    return Foo2;
+})();
+var C = (function () {
+    function C() {
+    }
+    return C;
+})();
+var D = (function (_super) {
+    __extends(D, _super);
+    function D() {
+        _super.apply(this, arguments);
+    }
+    Object.defineProperty(D.prototype, "get1", {
+        // Computed properties
+        get: function () {
+            return new Foo;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(D.prototype, "set1", {
+        set: function (p) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return D;
+})(C);
diff --git a/tests/baselines/reference/computedPropertyNames44.errors.txt b/tests/baselines/reference/computedPropertyNames44.errors.txt
new file mode 100644
index 00000000000..bf1de6687e1
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames44.errors.txt
@@ -0,0 +1,20 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames44.ts(6,5): error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames44.ts(10,5): error TS2411: Property '["set1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames44.ts (2 errors) ====
+    class Foo { x }
+    class Foo2 { x; y }
+    
+    class C {
+        [s: string]: Foo2;
+        get ["get1"]() { return new Foo }
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
+    }
+    
+    class D extends C {
+        set ["set1"](p: Foo) { }
+        ~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2411: Property '["set1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames44.js b/tests/baselines/reference/computedPropertyNames44.js
new file mode 100644
index 00000000000..c91a52e8199
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames44.js
@@ -0,0 +1,55 @@
+//// [computedPropertyNames44.ts]
+class Foo { x }
+class Foo2 { x; y }
+
+class C {
+    [s: string]: Foo2;
+    get ["get1"]() { return new Foo }
+}
+
+class D extends C {
+    set ["set1"](p: Foo) { }
+}
+
+//// [computedPropertyNames44.js]
+var __extends = this.__extends || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    __.prototype = b.prototype;
+    d.prototype = new __();
+};
+var Foo = (function () {
+    function Foo() {
+    }
+    return Foo;
+})();
+var Foo2 = (function () {
+    function Foo2() {
+    }
+    return Foo2;
+})();
+var C = (function () {
+    function C() {
+    }
+    Object.defineProperty(C.prototype, "get1", {
+        get: function () {
+            return new Foo;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return C;
+})();
+var D = (function (_super) {
+    __extends(D, _super);
+    function D() {
+        _super.apply(this, arguments);
+    }
+    Object.defineProperty(D.prototype, "set1", {
+        set: function (p) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return D;
+})(C);
diff --git a/tests/baselines/reference/computedPropertyNames45.errors.txt b/tests/baselines/reference/computedPropertyNames45.errors.txt
new file mode 100644
index 00000000000..7ad29340b25
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames45.errors.txt
@@ -0,0 +1,18 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames45.ts(11,5): error TS2411: Property '["set1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames45.ts (1 errors) ====
+    class Foo { x }
+    class Foo2 { x; y }
+    
+    class C {
+        get ["get1"]() { return new Foo }
+    }
+    
+    class D extends C {
+        // No error when the indexer is in a class more derived than the computed property
+        [s: string]: Foo2;
+        set ["set1"](p: Foo) { }
+        ~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2411: Property '["set1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames45.js b/tests/baselines/reference/computedPropertyNames45.js
new file mode 100644
index 00000000000..7ec3c165e12
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames45.js
@@ -0,0 +1,56 @@
+//// [computedPropertyNames45.ts]
+class Foo { x }
+class Foo2 { x; y }
+
+class C {
+    get ["get1"]() { return new Foo }
+}
+
+class D extends C {
+    // No error when the indexer is in a class more derived than the computed property
+    [s: string]: Foo2;
+    set ["set1"](p: Foo) { }
+}
+
+//// [computedPropertyNames45.js]
+var __extends = this.__extends || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    __.prototype = b.prototype;
+    d.prototype = new __();
+};
+var Foo = (function () {
+    function Foo() {
+    }
+    return Foo;
+})();
+var Foo2 = (function () {
+    function Foo2() {
+    }
+    return Foo2;
+})();
+var C = (function () {
+    function C() {
+    }
+    Object.defineProperty(C.prototype, "get1", {
+        get: function () {
+            return new Foo;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return C;
+})();
+var D = (function (_super) {
+    __extends(D, _super);
+    function D() {
+        _super.apply(this, arguments);
+    }
+    Object.defineProperty(D.prototype, "set1", {
+        set: function (p) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return D;
+})(C);
diff --git a/tests/baselines/reference/computedPropertyNames46.js b/tests/baselines/reference/computedPropertyNames46.js
new file mode 100644
index 00000000000..e2ef2b2e729
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames46.js
@@ -0,0 +1,9 @@
+//// [computedPropertyNames46.ts]
+var o = {
+    ["" || 0]: 0
+};
+
+//// [computedPropertyNames46.js]
+var o = {
+    ["" || 0]: 0
+};
diff --git a/tests/baselines/reference/computedPropertyNames46.types b/tests/baselines/reference/computedPropertyNames46.types
new file mode 100644
index 00000000000..cf8585828f4
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames46.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames46.ts ===
+var o = {
+>o : {}
+>{    ["" || 0]: 0} : {}
+
+    ["" || 0]: 0
+>"" || 0 : string | number
+
+};
diff --git a/tests/baselines/reference/computedPropertyNames47.js b/tests/baselines/reference/computedPropertyNames47.js
new file mode 100644
index 00000000000..88e28e54239
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames47.js
@@ -0,0 +1,19 @@
+//// [computedPropertyNames47.ts]
+enum E1 { x }
+enum E2 { x }
+var o = {
+    [E1.x || E2.x]: 0
+};
+
+//// [computedPropertyNames47.js]
+var E1;
+(function (E1) {
+    E1[E1["x"] = 0] = "x";
+})(E1 || (E1 = {}));
+var E2;
+(function (E2) {
+    E2[E2["x"] = 0] = "x";
+})(E2 || (E2 = {}));
+var o = {
+    [0 /* x */ || 0 /* x */]: 0
+};
diff --git a/tests/baselines/reference/computedPropertyNames47.types b/tests/baselines/reference/computedPropertyNames47.types
new file mode 100644
index 00000000000..20d7ab1d31e
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames47.types
@@ -0,0 +1,23 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames47.ts ===
+enum E1 { x }
+>E1 : E1
+>x : E1
+
+enum E2 { x }
+>E2 : E2
+>x : E2
+
+var o = {
+>o : {}
+>{    [E1.x || E2.x]: 0} : {}
+
+    [E1.x || E2.x]: 0
+>E1.x || E2.x : E1 | E2
+>E1.x : E1
+>E1 : typeof E1
+>x : E1
+>E2.x : E2
+>E2 : typeof E2
+>x : E2
+
+};
diff --git a/tests/baselines/reference/computedPropertyNames48.js b/tests/baselines/reference/computedPropertyNames48.js
new file mode 100644
index 00000000000..9f8e0442ebe
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames48.js
@@ -0,0 +1,34 @@
+//// [computedPropertyNames48.ts]
+declare function extractIndexer<T>(p: { [n: number]: T }): T;
+
+enum E { x }
+
+var a: any;
+
+extractIndexer({
+    [a]: ""
+}); // Should return string
+
+extractIndexer({
+    [E.x]: ""
+}); // Should return string
+
+extractIndexer({
+    ["" || 0]: ""
+}); // Should return any (widened form of undefined)
+
+//// [computedPropertyNames48.js]
+var E;
+(function (E) {
+    E[E["x"] = 0] = "x";
+})(E || (E = {}));
+var a;
+extractIndexer({
+    [a]: ""
+}); // Should return string
+extractIndexer({
+    [0 /* x */]: ""
+}); // Should return string
+extractIndexer({
+    ["" || 0]: ""
+}); // Should return any (widened form of undefined)
diff --git a/tests/baselines/reference/computedPropertyNames48.types b/tests/baselines/reference/computedPropertyNames48.types
new file mode 100644
index 00000000000..78755d5d5d7
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames48.types
@@ -0,0 +1,47 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames48.ts ===
+declare function extractIndexer<T>(p: { [n: number]: T }): T;
+>extractIndexer : <T>(p: { [n: number]: T; }) => T
+>T : T
+>p : { [n: number]: T; }
+>n : number
+>T : T
+>T : T
+
+enum E { x }
+>E : E
+>x : E
+
+var a: any;
+>a : any
+
+extractIndexer({
+>extractIndexer({    [a]: ""}) : string
+>extractIndexer : <T>(p: { [n: number]: T; }) => T
+>{    [a]: ""} : { [x: number]: string; }
+
+    [a]: ""
+>a : any
+
+}); // Should return string
+
+extractIndexer({
+>extractIndexer({    [E.x]: ""}) : string
+>extractIndexer : <T>(p: { [n: number]: T; }) => T
+>{    [E.x]: ""} : { [x: number]: string; }
+
+    [E.x]: ""
+>E.x : E
+>E : typeof E
+>x : E
+
+}); // Should return string
+
+extractIndexer({
+>extractIndexer({    ["" || 0]: ""}) : any
+>extractIndexer : <T>(p: { [n: number]: T; }) => T
+>{    ["" || 0]: ""} : { [x: number]: undefined; }
+
+    ["" || 0]: ""
+>"" || 0 : string | number
+
+}); // Should return any (widened form of undefined)
diff --git a/tests/baselines/reference/computedPropertyNames5.errors.txt b/tests/baselines/reference/computedPropertyNames5.errors.txt
new file mode 100644
index 00000000000..2b8cf5503b8
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames5.errors.txt
@@ -0,0 +1,30 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames5.ts(3,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames5.ts(4,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames5.ts(5,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames5.ts(6,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames5.ts(7,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames5.ts(8,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames5.ts (6 errors) ====
+    var b: boolean;
+    var v = {
+        [b]: 0,
+        ~~~
+!!! error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+        [true]: 1,
+        ~~~~~~
+!!! error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+        [[]]: 0,
+        ~~~~
+!!! error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+        [{}]: 0,
+        ~~~~
+!!! error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+        [undefined]: undefined,
+        ~~~~~~~~~~~
+!!! error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+        [null]: null
+        ~~~~~~
+!!! error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames5.js b/tests/baselines/reference/computedPropertyNames5.js
new file mode 100644
index 00000000000..d0158da6400
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames5.js
@@ -0,0 +1,21 @@
+//// [computedPropertyNames5.ts]
+var b: boolean;
+var v = {
+    [b]: 0,
+    [true]: 1,
+    [[]]: 0,
+    [{}]: 0,
+    [undefined]: undefined,
+    [null]: null
+}
+
+//// [computedPropertyNames5.js]
+var b;
+var v = {
+    [b]: 0,
+    [true]: 1,
+    [[]]: 0,
+    [{}]: 0,
+    [undefined]: undefined,
+    [null]: null
+};
diff --git a/tests/baselines/reference/computedPropertyNames6.errors.txt b/tests/baselines/reference/computedPropertyNames6.errors.txt
new file mode 100644
index 00000000000..57798e9f6b6
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames6.errors.txt
@@ -0,0 +1,17 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames6.ts(6,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames6.ts(7,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames6.ts (2 errors) ====
+    var p1: number | string;
+    var p2: number | number[];
+    var p3: string | boolean;
+    var v = {
+        [p1]: 0,
+        [p2]: 1,
+        ~~~~
+!!! error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+        [p3]: 2
+        ~~~~
+!!! error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames6.js b/tests/baselines/reference/computedPropertyNames6.js
new file mode 100644
index 00000000000..e131ef4417f
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames6.js
@@ -0,0 +1,19 @@
+//// [computedPropertyNames6.ts]
+var p1: number | string;
+var p2: number | number[];
+var p3: string | boolean;
+var v = {
+    [p1]: 0,
+    [p2]: 1,
+    [p3]: 2
+}
+
+//// [computedPropertyNames6.js]
+var p1;
+var p2;
+var p3;
+var v = {
+    [p1]: 0,
+    [p2]: 1,
+    [p3]: 2
+};
diff --git a/tests/baselines/reference/computedPropertyNames7.js b/tests/baselines/reference/computedPropertyNames7.js
new file mode 100644
index 00000000000..075b149522b
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames7.js
@@ -0,0 +1,16 @@
+//// [computedPropertyNames7.ts]
+enum E {
+    member
+}
+var v = {
+    [E.member]: 0
+}
+
+//// [computedPropertyNames7.js]
+var E;
+(function (E) {
+    E[E["member"] = 0] = "member";
+})(E || (E = {}));
+var v = {
+    [0 /* member */]: 0
+};
diff --git a/tests/baselines/reference/computedPropertyNames7.types b/tests/baselines/reference/computedPropertyNames7.types
new file mode 100644
index 00000000000..0b5f26614fc
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames7.types
@@ -0,0 +1,16 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames7.ts ===
+enum E {
+>E : E
+
+    member
+>member : E
+}
+var v = {
+>v : {}
+>{    [E.member]: 0} : {}
+
+    [E.member]: 0
+>E.member : E
+>E : typeof E
+>member : E
+}
diff --git a/tests/baselines/reference/computedPropertyNames8.errors.txt b/tests/baselines/reference/computedPropertyNames8.errors.txt
new file mode 100644
index 00000000000..515af1f4fc4
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames8.errors.txt
@@ -0,0 +1,17 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames8.ts(5,9): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames8.ts(6,9): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames8.ts (2 errors) ====
+    function f<T, U extends string>() {
+        var t: T;
+        var u: U;
+        var v = {
+            [t]: 0,
+            ~~~
+!!! error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+            [u]: 1
+            ~~~
+!!! error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+        };
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames8.js b/tests/baselines/reference/computedPropertyNames8.js
new file mode 100644
index 00000000000..44a21d79a1c
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames8.js
@@ -0,0 +1,19 @@
+//// [computedPropertyNames8.ts]
+function f<T, U extends string>() {
+    var t: T;
+    var u: U;
+    var v = {
+        [t]: 0,
+        [u]: 1
+    };
+}
+
+//// [computedPropertyNames8.js]
+function f() {
+    var t;
+    var u;
+    var v = {
+        [t]: 0,
+        [u]: 1
+    };
+}
diff --git a/tests/baselines/reference/computedPropertyNames9.errors.txt b/tests/baselines/reference/computedPropertyNames9.errors.txt
new file mode 100644
index 00000000000..d87576f1f77
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames9.errors.txt
@@ -0,0 +1,16 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames9.ts(9,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames9.ts (1 errors) ====
+    function f(s: string): string;
+    function f(n: number): number;
+    function f<T>(x: T): T;
+    function f(x): any { }
+    
+    var v = {
+        [f("")]: 0,
+        [f(0)]: 0,
+        [f(true)]: 0
+        ~~~~~~~~~
+!!! error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames9.js b/tests/baselines/reference/computedPropertyNames9.js
new file mode 100644
index 00000000000..ede8bb3012b
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames9.js
@@ -0,0 +1,20 @@
+//// [computedPropertyNames9.ts]
+function f(s: string): string;
+function f(n: number): number;
+function f<T>(x: T): T;
+function f(x): any { }
+
+var v = {
+    [f("")]: 0,
+    [f(0)]: 0,
+    [f(true)]: 0
+}
+
+//// [computedPropertyNames9.js]
+function f(x) {
+}
+var v = {
+    [f("")]: 0,
+    [f(0)]: 0,
+    [f(true)]: 0
+};
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType1.js b/tests/baselines/reference/computedPropertyNamesContextualType1.js
new file mode 100644
index 00000000000..d7704c8c377
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesContextualType1.js
@@ -0,0 +1,18 @@
+//// [computedPropertyNamesContextualType1.ts]
+interface I {
+    [s: string]: (x: string) => number;
+    [s: number]: (x: any) => number; // Doesn't get hit
+}
+
+var o: I = {
+    ["" + 0](y) { return y.length; },
+    ["" + 1]: y => y.length
+}
+
+//// [computedPropertyNamesContextualType1.js]
+var o = {
+    ["" + 0](y) {
+        return y.length;
+    },
+    ["" + 1]: function (y) { return y.length; }
+};
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType1.types b/tests/baselines/reference/computedPropertyNamesContextualType1.types
new file mode 100644
index 00000000000..1697542fba6
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesContextualType1.types
@@ -0,0 +1,33 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType1.ts ===
+interface I {
+>I : I
+
+    [s: string]: (x: string) => number;
+>s : string
+>x : string
+
+    [s: number]: (x: any) => number; // Doesn't get hit
+>s : number
+>x : any
+}
+
+var o: I = {
+>o : I
+>I : I
+>{    ["" + 0](y) { return y.length; },    ["" + 1]: y => y.length} : { [x: string]: (y: string) => number; [x: number]: undefined; }
+
+    ["" + 0](y) { return y.length; },
+>"" + 0 : string
+>y : string
+>y.length : number
+>y : string
+>length : number
+
+    ["" + 1]: y => y.length
+>"" + 1 : string
+>y => y.length : (y: string) => number
+>y : string
+>y.length : number
+>y : string
+>length : number
+}
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType10.errors.txt b/tests/baselines/reference/computedPropertyNamesContextualType10.errors.txt
new file mode 100644
index 00000000000..5e9fbe7b45b
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesContextualType10.errors.txt
@@ -0,0 +1,20 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType10.ts(5,5): error TS2322: Type '{ [x: number]: string | number; }' is not assignable to type 'I'.
+  Index signatures are incompatible.
+    Type 'string | number' is not assignable to type 'boolean'.
+      Type 'string' is not assignable to type 'boolean'.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType10.ts (1 errors) ====
+    interface I {
+        [s: number]: boolean;
+    }
+    
+    var o: I = {
+        ~
+!!! error TS2322: Type '{ [x: number]: string | number; }' is not assignable to type 'I'.
+!!! error TS2322:   Index signatures are incompatible.
+!!! error TS2322:     Type 'string | number' is not assignable to type 'boolean'.
+!!! error TS2322:       Type 'string' is not assignable to type 'boolean'.
+        [+"foo"]: "",
+        [+"bar"]: 0
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType10.js b/tests/baselines/reference/computedPropertyNamesContextualType10.js
new file mode 100644
index 00000000000..125a014852e
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesContextualType10.js
@@ -0,0 +1,15 @@
+//// [computedPropertyNamesContextualType10.ts]
+interface I {
+    [s: number]: boolean;
+}
+
+var o: I = {
+    [+"foo"]: "",
+    [+"bar"]: 0
+}
+
+//// [computedPropertyNamesContextualType10.js]
+var o = {
+    [+"foo"]: "",
+    [+"bar"]: 0
+};
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType2.js b/tests/baselines/reference/computedPropertyNamesContextualType2.js
new file mode 100644
index 00000000000..7b9f98402f5
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesContextualType2.js
@@ -0,0 +1,18 @@
+//// [computedPropertyNamesContextualType2.ts]
+interface I {
+    [s: string]: (x: any) => number; // Doesn't get hit
+    [s: number]: (x: string) => number;
+}
+
+var o: I = {
+    [+"foo"](y) { return y.length; },
+    [+"bar"]: y => y.length
+}
+
+//// [computedPropertyNamesContextualType2.js]
+var o = {
+    [+"foo"](y) {
+        return y.length;
+    },
+    [+"bar"]: function (y) { return y.length; }
+};
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType2.types b/tests/baselines/reference/computedPropertyNamesContextualType2.types
new file mode 100644
index 00000000000..408fd6a5062
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesContextualType2.types
@@ -0,0 +1,33 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType2.ts ===
+interface I {
+>I : I
+
+    [s: string]: (x: any) => number; // Doesn't get hit
+>s : string
+>x : any
+
+    [s: number]: (x: string) => number;
+>s : number
+>x : string
+}
+
+var o: I = {
+>o : I
+>I : I
+>{    [+"foo"](y) { return y.length; },    [+"bar"]: y => y.length} : { [x: string]: (y: string) => number; [x: number]: (y: string) => number; }
+
+    [+"foo"](y) { return y.length; },
+>+"foo" : number
+>y : string
+>y.length : number
+>y : string
+>length : number
+
+    [+"bar"]: y => y.length
+>+"bar" : number
+>y => y.length : (y: string) => number
+>y : string
+>y.length : number
+>y : string
+>length : number
+}
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType3.js b/tests/baselines/reference/computedPropertyNamesContextualType3.js
new file mode 100644
index 00000000000..f5b2c71bc18
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesContextualType3.js
@@ -0,0 +1,17 @@
+//// [computedPropertyNamesContextualType3.ts]
+interface I {
+    [s: string]: (x: string) => number;
+}
+
+var o: I = {
+    [+"foo"](y) { return y.length; },
+    [+"bar"]: y => y.length
+}
+
+//// [computedPropertyNamesContextualType3.js]
+var o = {
+    [+"foo"](y) {
+        return y.length;
+    },
+    [+"bar"]: function (y) { return y.length; }
+};
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType3.types b/tests/baselines/reference/computedPropertyNamesContextualType3.types
new file mode 100644
index 00000000000..a1a36c1b7e9
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesContextualType3.types
@@ -0,0 +1,29 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType3.ts ===
+interface I {
+>I : I
+
+    [s: string]: (x: string) => number;
+>s : string
+>x : string
+}
+
+var o: I = {
+>o : I
+>I : I
+>{    [+"foo"](y) { return y.length; },    [+"bar"]: y => y.length} : { [x: string]: (y: string) => number; }
+
+    [+"foo"](y) { return y.length; },
+>+"foo" : number
+>y : string
+>y.length : number
+>y : string
+>length : number
+
+    [+"bar"]: y => y.length
+>+"bar" : number
+>y => y.length : (y: string) => number
+>y : string
+>y.length : number
+>y : string
+>length : number
+}
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType4.js b/tests/baselines/reference/computedPropertyNamesContextualType4.js
new file mode 100644
index 00000000000..6ddd22baf6e
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesContextualType4.js
@@ -0,0 +1,16 @@
+//// [computedPropertyNamesContextualType4.ts]
+interface I {
+    [s: string]: any;
+    [s: number]: any;
+}
+
+var o: I = {
+    [""+"foo"]: "",
+    [""+"bar"]: 0
+}
+
+//// [computedPropertyNamesContextualType4.js]
+var o = {
+    ["" + "foo"]: "",
+    ["" + "bar"]: 0
+};
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType4.types b/tests/baselines/reference/computedPropertyNamesContextualType4.types
new file mode 100644
index 00000000000..d22f56f24fe
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesContextualType4.types
@@ -0,0 +1,22 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType4.ts ===
+interface I {
+>I : I
+
+    [s: string]: any;
+>s : string
+
+    [s: number]: any;
+>s : number
+}
+
+var o: I = {
+>o : I
+>I : I
+>{    [""+"foo"]: "",    [""+"bar"]: 0} : { [x: string]: string | number; [x: number]: undefined; }
+
+    [""+"foo"]: "",
+>""+"foo" : string
+
+    [""+"bar"]: 0
+>""+"bar" : string
+}
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType5.js b/tests/baselines/reference/computedPropertyNamesContextualType5.js
new file mode 100644
index 00000000000..f2bd79644a0
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesContextualType5.js
@@ -0,0 +1,16 @@
+//// [computedPropertyNamesContextualType5.ts]
+interface I {
+    [s: string]: any;
+    [s: number]: any;
+}
+
+var o: I = {
+    [+"foo"]: "",
+    [+"bar"]: 0
+}
+
+//// [computedPropertyNamesContextualType5.js]
+var o = {
+    [+"foo"]: "",
+    [+"bar"]: 0
+};
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType5.types b/tests/baselines/reference/computedPropertyNamesContextualType5.types
new file mode 100644
index 00000000000..12c3332acfa
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesContextualType5.types
@@ -0,0 +1,22 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType5.ts ===
+interface I {
+>I : I
+
+    [s: string]: any;
+>s : string
+
+    [s: number]: any;
+>s : number
+}
+
+var o: I = {
+>o : I
+>I : I
+>{    [+"foo"]: "",    [+"bar"]: 0} : { [x: string]: string | number; [x: number]: string | number; }
+
+    [+"foo"]: "",
+>+"foo" : number
+
+    [+"bar"]: 0
+>+"bar" : number
+}
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType6.js b/tests/baselines/reference/computedPropertyNamesContextualType6.js
new file mode 100644
index 00000000000..5d0cc149b2c
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesContextualType6.js
@@ -0,0 +1,24 @@
+//// [computedPropertyNamesContextualType6.ts]
+interface I<T> {
+    [s: string]: T;
+}
+
+declare function foo<T>(obj: I<T>): T
+
+foo({
+    p: "",
+    0: () => { },
+    ["hi" + "bye"]: true,
+    [0 + 1]: 0,
+    [+"hi"]: [0]
+});
+
+//// [computedPropertyNamesContextualType6.js]
+foo({
+    p: "",
+    0: function () {
+    },
+    ["hi" + "bye"]: true,
+    [0 + 1]: 0,
+    [+"hi"]: [0]
+});
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType6.types b/tests/baselines/reference/computedPropertyNamesContextualType6.types
new file mode 100644
index 00000000000..acbae75ad4c
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesContextualType6.types
@@ -0,0 +1,40 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType6.ts ===
+interface I<T> {
+>I : I<T>
+>T : T
+
+    [s: string]: T;
+>s : string
+>T : T
+}
+
+declare function foo<T>(obj: I<T>): T
+>foo : <T>(obj: I<T>) => T
+>T : T
+>obj : I<T>
+>I : I<T>
+>T : T
+>T : T
+
+foo({
+>foo({    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]}) : string | number | boolean | number[] | (() => void)
+>foo : <T>(obj: I<T>) => T
+>{    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]} : { [x: string]: string | number | boolean | number[] | (() => void); 0: () => void; p: string; }
+
+    p: "",
+>p : string
+
+    0: () => { },
+>() => { } : () => void
+
+    ["hi" + "bye"]: true,
+>"hi" + "bye" : string
+
+    [0 + 1]: 0,
+>0 + 1 : number
+
+    [+"hi"]: [0]
+>+"hi" : number
+>[0] : number[]
+
+});
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType7.js b/tests/baselines/reference/computedPropertyNamesContextualType7.js
new file mode 100644
index 00000000000..74030be6f2a
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesContextualType7.js
@@ -0,0 +1,24 @@
+//// [computedPropertyNamesContextualType7.ts]
+interface I<T> {
+    [s: number]: T;
+}
+
+declare function foo<T>(obj: I<T>): T
+
+foo({
+    p: "",
+    0: () => { },
+    ["hi" + "bye"]: true,
+    [0 + 1]: 0,
+    [+"hi"]: [0]
+});
+
+//// [computedPropertyNamesContextualType7.js]
+foo({
+    p: "",
+    0: function () {
+    },
+    ["hi" + "bye"]: true,
+    [0 + 1]: 0,
+    [+"hi"]: [0]
+});
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType7.types b/tests/baselines/reference/computedPropertyNamesContextualType7.types
new file mode 100644
index 00000000000..da059d490b0
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesContextualType7.types
@@ -0,0 +1,40 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType7.ts ===
+interface I<T> {
+>I : I<T>
+>T : T
+
+    [s: number]: T;
+>s : number
+>T : T
+}
+
+declare function foo<T>(obj: I<T>): T
+>foo : <T>(obj: I<T>) => T
+>T : T
+>obj : I<T>
+>I : I<T>
+>T : T
+>T : T
+
+foo({
+>foo({    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]}) : number | number[] | (() => void)
+>foo : <T>(obj: I<T>) => T
+>{    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]} : { [x: number]: number | number[] | (() => void); 0: () => void; p: string; }
+
+    p: "",
+>p : string
+
+    0: () => { },
+>() => { } : () => void
+
+    ["hi" + "bye"]: true,
+>"hi" + "bye" : string
+
+    [0 + 1]: 0,
+>0 + 1 : number
+
+    [+"hi"]: [0]
+>+"hi" : number
+>[0] : number[]
+
+});
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType8.errors.txt b/tests/baselines/reference/computedPropertyNamesContextualType8.errors.txt
new file mode 100644
index 00000000000..07b55b799e4
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesContextualType8.errors.txt
@@ -0,0 +1,21 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType8.ts(6,5): error TS2322: Type '{ [x: string]: string | number; [x: number]: undefined; }' is not assignable to type 'I'.
+  Index signatures are incompatible.
+    Type 'string | number' is not assignable to type 'boolean'.
+      Type 'string' is not assignable to type 'boolean'.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType8.ts (1 errors) ====
+    interface I {
+        [s: string]: boolean;
+        [s: number]: boolean;
+    }
+    
+    var o: I = {
+        ~
+!!! error TS2322: Type '{ [x: string]: string | number; [x: number]: undefined; }' is not assignable to type 'I'.
+!!! error TS2322:   Index signatures are incompatible.
+!!! error TS2322:     Type 'string | number' is not assignable to type 'boolean'.
+!!! error TS2322:       Type 'string' is not assignable to type 'boolean'.
+        [""+"foo"]: "",
+        [""+"bar"]: 0
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType8.js b/tests/baselines/reference/computedPropertyNamesContextualType8.js
new file mode 100644
index 00000000000..d98538c40c1
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesContextualType8.js
@@ -0,0 +1,16 @@
+//// [computedPropertyNamesContextualType8.ts]
+interface I {
+    [s: string]: boolean;
+    [s: number]: boolean;
+}
+
+var o: I = {
+    [""+"foo"]: "",
+    [""+"bar"]: 0
+}
+
+//// [computedPropertyNamesContextualType8.js]
+var o = {
+    ["" + "foo"]: "",
+    ["" + "bar"]: 0
+};
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType9.errors.txt b/tests/baselines/reference/computedPropertyNamesContextualType9.errors.txt
new file mode 100644
index 00000000000..6a1d9316fd7
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesContextualType9.errors.txt
@@ -0,0 +1,21 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType9.ts(6,5): error TS2322: Type '{ [x: string]: string | number; [x: number]: string | number; }' is not assignable to type 'I'.
+  Index signatures are incompatible.
+    Type 'string | number' is not assignable to type 'boolean'.
+      Type 'string' is not assignable to type 'boolean'.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType9.ts (1 errors) ====
+    interface I {
+        [s: string]: boolean;
+        [s: number]: boolean;
+    }
+    
+    var o: I = {
+        ~
+!!! error TS2322: Type '{ [x: string]: string | number; [x: number]: string | number; }' is not assignable to type 'I'.
+!!! error TS2322:   Index signatures are incompatible.
+!!! error TS2322:     Type 'string | number' is not assignable to type 'boolean'.
+!!! error TS2322:       Type 'string' is not assignable to type 'boolean'.
+        [+"foo"]: "",
+        [+"bar"]: 0
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType9.js b/tests/baselines/reference/computedPropertyNamesContextualType9.js
new file mode 100644
index 00000000000..ed8791a51e0
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesContextualType9.js
@@ -0,0 +1,16 @@
+//// [computedPropertyNamesContextualType9.ts]
+interface I {
+    [s: string]: boolean;
+    [s: number]: boolean;
+}
+
+var o: I = {
+    [+"foo"]: "",
+    [+"bar"]: 0
+}
+
+//// [computedPropertyNamesContextualType9.js]
+var o = {
+    [+"foo"]: "",
+    [+"bar"]: 0
+};
diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit1.js b/tests/baselines/reference/computedPropertyNamesDeclarationEmit1.js
new file mode 100644
index 00000000000..bc8b5d0e910
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit1.js
@@ -0,0 +1,33 @@
+//// [computedPropertyNamesDeclarationEmit1.ts]
+class C {
+    ["" + ""]() { }
+    get ["" + ""]() { return 0; }
+    set ["" + ""](x) { }
+}
+
+//// [computedPropertyNamesDeclarationEmit1.js]
+var C = (function () {
+    function C() {
+    }
+    C.prototype["" + ""] = function () {
+    };
+    Object.defineProperty(C.prototype, "" + "", {
+        get: function () {
+            return 0;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C.prototype, "" + "", {
+        set: function (x) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return C;
+})();
+
+
+//// [computedPropertyNamesDeclarationEmit1.d.ts]
+declare class C {
+}
diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit1.types b/tests/baselines/reference/computedPropertyNamesDeclarationEmit1.types
new file mode 100644
index 00000000000..e8e184a652e
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit1.types
@@ -0,0 +1,14 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit1.ts ===
+class C {
+>C : C
+
+    ["" + ""]() { }
+>"" + "" : string
+
+    get ["" + ""]() { return 0; }
+>"" + "" : string
+
+    set ["" + ""](x) { }
+>"" + "" : string
+>x : any
+}
diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit2.js b/tests/baselines/reference/computedPropertyNamesDeclarationEmit2.js
new file mode 100644
index 00000000000..647f3fab135
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit2.js
@@ -0,0 +1,33 @@
+//// [computedPropertyNamesDeclarationEmit2.ts]
+class C {
+    static ["" + ""]() { }
+    static get ["" + ""]() { return 0; }
+    static set ["" + ""](x) { }
+}
+
+//// [computedPropertyNamesDeclarationEmit2.js]
+var C = (function () {
+    function C() {
+    }
+    C["" + ""] = function () {
+    };
+    Object.defineProperty(C, "" + "", {
+        get: function () {
+            return 0;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C, "" + "", {
+        set: function (x) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return C;
+})();
+
+
+//// [computedPropertyNamesDeclarationEmit2.d.ts]
+declare class C {
+}
diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit2.types b/tests/baselines/reference/computedPropertyNamesDeclarationEmit2.types
new file mode 100644
index 00000000000..df1da17abea
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit2.types
@@ -0,0 +1,14 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit2.ts ===
+class C {
+>C : C
+
+    static ["" + ""]() { }
+>"" + "" : string
+
+    static get ["" + ""]() { return 0; }
+>"" + "" : string
+
+    static set ["" + ""](x) { }
+>"" + "" : string
+>x : any
+}
diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit3.errors.txt b/tests/baselines/reference/computedPropertyNamesDeclarationEmit3.errors.txt
new file mode 100644
index 00000000000..69ff2b9e452
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit3.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit3.ts(2,5): error TS1169: Computed property names are not allowed in interfaces.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit3.ts (1 errors) ====
+    interface I {
+        ["" + ""](): void;
+        ~~~~~~~~~
+!!! error TS1169: Computed property names are not allowed in interfaces.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit4.errors.txt b/tests/baselines/reference/computedPropertyNamesDeclarationEmit4.errors.txt
new file mode 100644
index 00000000000..53eb057f8a1
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit4.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit4.ts(2,5): error TS1170: Computed property names are not allowed in type literals.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit4.ts (1 errors) ====
+    var v: {
+        ["" + ""](): void;
+        ~~~~~~~~~
+!!! error TS1170: Computed property names are not allowed in type literals.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit5.js b/tests/baselines/reference/computedPropertyNamesDeclarationEmit5.js
new file mode 100644
index 00000000000..d7ac3319eca
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit5.js
@@ -0,0 +1,23 @@
+//// [computedPropertyNamesDeclarationEmit5.ts]
+var v = {
+    ["" + ""]: 0,
+    ["" + ""]() { },
+    get ["" + ""]() { return 0; },
+    set ["" + ""](x) { }
+}
+
+//// [computedPropertyNamesDeclarationEmit5.js]
+var v = {
+    ["" + ""]: 0,
+    ["" + ""]() {
+    },
+    get ["" + ""]() {
+        return 0;
+    },
+    set ["" + ""](x) {
+    }
+};
+
+
+//// [computedPropertyNamesDeclarationEmit5.d.ts]
+declare var v: {};
diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit5.types b/tests/baselines/reference/computedPropertyNamesDeclarationEmit5.types
new file mode 100644
index 00000000000..c63d6d0d5c3
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit5.types
@@ -0,0 +1,18 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit5.ts ===
+var v = {
+>v : {}
+>{    ["" + ""]: 0,    ["" + ""]() { },    get ["" + ""]() { return 0; },    set ["" + ""](x) { }} : {}
+
+    ["" + ""]: 0,
+>"" + "" : string
+
+    ["" + ""]() { },
+>"" + "" : string
+
+    get ["" + ""]() { return 0; },
+>"" + "" : string
+
+    set ["" + ""](x) { }
+>"" + "" : string
+>x : any
+}
diff --git a/tests/baselines/reference/computedPropertyNamesOnOverloads.errors.txt b/tests/baselines/reference/computedPropertyNamesOnOverloads.errors.txt
index 6329ab39f0f..b3c2957a13f 100644
--- a/tests/baselines/reference/computedPropertyNamesOnOverloads.errors.txt
+++ b/tests/baselines/reference/computedPropertyNamesOnOverloads.errors.txt
@@ -1,9 +1,8 @@
 tests/cases/conformance/es6/computedProperties/computedPropertyNamesOnOverloads.ts(4,5): error TS1168: Computed property names are not allowed in method overloads.
 tests/cases/conformance/es6/computedProperties/computedPropertyNamesOnOverloads.ts(5,5): error TS1168: Computed property names are not allowed in method overloads.
-tests/cases/conformance/es6/computedProperties/computedPropertyNamesOnOverloads.ts(6,5): error TS9002: Computed property names are not currently supported.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNamesOnOverloads.ts (3 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNamesOnOverloads.ts (2 errors) ====
     var methodName = "method";
     var accessorName = "accessor";
     class C {
@@ -14,6 +13,4 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNamesOnOverloads.
         ~~~~~~~~~~~~
 !!! error TS1168: Computed property names are not allowed in method overloads.
         [methodName](v?: string) { }
-        ~~~~~~~~~~~~
-!!! error TS9002: Computed property names are not currently supported.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap1.js b/tests/baselines/reference/computedPropertyNamesSourceMap1.js
new file mode 100644
index 00000000000..b65e3f0ce5b
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesSourceMap1.js
@@ -0,0 +1,17 @@
+//// [computedPropertyNamesSourceMap1.ts]
+class C {
+    ["hello"]() {
+        debugger;
+    }
+}
+
+//// [computedPropertyNamesSourceMap1.js]
+var C = (function () {
+    function C() {
+    }
+    C.prototype["hello"] = function () {
+        debugger;
+    };
+    return C;
+})();
+//# sourceMappingURL=computedPropertyNamesSourceMap1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap1.js.map b/tests/baselines/reference/computedPropertyNamesSourceMap1.js.map
new file mode 100644
index 00000000000..5833df72f7f
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesSourceMap1.js.map
@@ -0,0 +1,2 @@
+//// [computedPropertyNamesSourceMap1.js.map]
+{"version":3,"file":"computedPropertyNamesSourceMap1.js","sourceRoot":"","sources":["computedPropertyNamesSourceMap1.ts"],"names":["C","C.constructor","C[\"hello\"]"],"mappings":"AAAA,IAAM,CAAC;IAAPA,SAAMA,CAACA;IAIPC,CAACA;IAHGD,YAACA,OAAOA,CAACA,GAATA;QACIE,QAAQA,CAACA;IACbA,CAACA;IACLF,QAACA;AAADA,CAACA,AAJD,IAIC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap1.sourcemap.txt b/tests/baselines/reference/computedPropertyNamesSourceMap1.sourcemap.txt
new file mode 100644
index 00000000000..e806eee1aa7
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesSourceMap1.sourcemap.txt
@@ -0,0 +1,114 @@
+===================================================================
+JsFile: computedPropertyNamesSourceMap1.js
+mapUrl: computedPropertyNamesSourceMap1.js.map
+sourceRoot: 
+sources: computedPropertyNamesSourceMap1.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/conformance/es6/computedProperties/computedPropertyNamesSourceMap1.js
+sourceFile:computedPropertyNamesSourceMap1.ts
+-------------------------------------------------------------------
+>>>var C = (function () {
+1 >
+2 >^^^^
+3 >    ^
+4 >     ^^^^^^^^^^^^^^->
+1 >
+2 >class 
+3 >    C
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 5) Source(1, 7) + SourceIndex(0)
+3 >Emitted(1, 6) Source(1, 8) + SourceIndex(0)
+---
+>>>    function C() {
+1->^^^^
+2 >    ^^^^^^^^^
+3 >             ^
+1->
+2 >    class 
+3 >             C
+1->Emitted(2, 5) Source(1, 1) + SourceIndex(0) name (C)
+2 >Emitted(2, 14) Source(1, 7) + SourceIndex(0) name (C)
+3 >Emitted(2, 15) Source(1, 8) + SourceIndex(0) name (C)
+---
+>>>    }
+1 >^^^^
+2 >    ^
+3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 > {
+  >    ["hello"]() {
+  >        debugger;
+  >    }
+  >
+2 >    }
+1 >Emitted(3, 5) Source(5, 1) + SourceIndex(0) name (C.constructor)
+2 >Emitted(3, 6) Source(5, 2) + SourceIndex(0) name (C.constructor)
+---
+>>>    C.prototype["hello"] = function () {
+1->^^^^
+2 >    ^^^^^^^^^^^^
+3 >                ^^^^^^^
+4 >                       ^
+5 >                        ^^^
+1->
+2 >    [
+3 >                "hello"
+4 >                       ]
+5 >                        
+1->Emitted(4, 5) Source(2, 5) + SourceIndex(0) name (C)
+2 >Emitted(4, 17) Source(2, 6) + SourceIndex(0) name (C)
+3 >Emitted(4, 24) Source(2, 13) + SourceIndex(0) name (C)
+4 >Emitted(4, 25) Source(2, 14) + SourceIndex(0) name (C)
+5 >Emitted(4, 28) Source(2, 5) + SourceIndex(0) name (C)
+---
+>>>        debugger;
+1 >^^^^^^^^
+2 >        ^^^^^^^^
+3 >                ^
+1 >["hello"]() {
+  >        
+2 >        debugger
+3 >                ;
+1 >Emitted(5, 9) Source(3, 9) + SourceIndex(0) name (C["hello"])
+2 >Emitted(5, 17) Source(3, 17) + SourceIndex(0) name (C["hello"])
+3 >Emitted(5, 18) Source(3, 18) + SourceIndex(0) name (C["hello"])
+---
+>>>    };
+1 >^^^^
+2 >    ^
+3 >     ^^^^^^^^^->
+1 >
+  >    
+2 >    }
+1 >Emitted(6, 5) Source(4, 5) + SourceIndex(0) name (C["hello"])
+2 >Emitted(6, 6) Source(4, 6) + SourceIndex(0) name (C["hello"])
+---
+>>>    return C;
+1->^^^^
+2 >    ^^^^^^^^
+1->
+  >
+2 >    }
+1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (C)
+2 >Emitted(7, 13) Source(5, 2) + SourceIndex(0) name (C)
+---
+>>>})();
+1 >
+2 >^
+3 > 
+4 > ^^^^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >}
+3 > 
+4 > class C {
+  >     ["hello"]() {
+  >         debugger;
+  >     }
+  > }
+1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (C)
+2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (C)
+3 >Emitted(8, 2) Source(1, 1) + SourceIndex(0)
+4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=computedPropertyNamesSourceMap1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap1.types b/tests/baselines/reference/computedPropertyNamesSourceMap1.types
new file mode 100644
index 00000000000..54a2a9f19d0
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesSourceMap1.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNamesSourceMap1.ts ===
+class C {
+>C : C
+
+    ["hello"]() {
+        debugger;
+    }
+}
diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap2.js b/tests/baselines/reference/computedPropertyNamesSourceMap2.js
new file mode 100644
index 00000000000..d967cb0d468
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesSourceMap2.js
@@ -0,0 +1,14 @@
+//// [computedPropertyNamesSourceMap2.ts]
+var v = {
+    ["hello"]() {
+        debugger;
+    }
+}
+
+//// [computedPropertyNamesSourceMap2.js]
+var v = {
+    ["hello"]() {
+        debugger;
+    }
+};
+//# sourceMappingURL=computedPropertyNamesSourceMap2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap2.js.map b/tests/baselines/reference/computedPropertyNamesSourceMap2.js.map
new file mode 100644
index 00000000000..6c485c24f6f
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesSourceMap2.js.map
@@ -0,0 +1,2 @@
+//// [computedPropertyNamesSourceMap2.js.map]
+{"version":3,"file":"computedPropertyNamesSourceMap2.js","sourceRoot":"","sources":["computedPropertyNamesSourceMap2.ts"],"names":["[\"hello\"]"],"mappings":"AAAA,IAAI,CAAC,GAAG;IACJ,CAAC,OAAO,CAAC;QACLA,QAAQA,CAACA;IACbA,CAACA;CACJ,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap2.sourcemap.txt b/tests/baselines/reference/computedPropertyNamesSourceMap2.sourcemap.txt
new file mode 100644
index 00000000000..29f11b95e1f
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesSourceMap2.sourcemap.txt
@@ -0,0 +1,73 @@
+===================================================================
+JsFile: computedPropertyNamesSourceMap2.js
+mapUrl: computedPropertyNamesSourceMap2.js.map
+sourceRoot: 
+sources: computedPropertyNamesSourceMap2.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/conformance/es6/computedProperties/computedPropertyNamesSourceMap2.js
+sourceFile:computedPropertyNamesSourceMap2.ts
+-------------------------------------------------------------------
+>>>var v = {
+1 >
+2 >^^^^
+3 >    ^
+4 >     ^^^
+5 >        ^^^^^^^^^^->
+1 >
+2 >var 
+3 >    v
+4 >      = 
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 5) Source(1, 5) + SourceIndex(0)
+3 >Emitted(1, 6) Source(1, 6) + SourceIndex(0)
+4 >Emitted(1, 9) Source(1, 9) + SourceIndex(0)
+---
+>>>    ["hello"]() {
+1->^^^^
+2 >    ^
+3 >     ^^^^^^^
+4 >            ^
+5 >             ^^^^^->
+1->{
+  >    
+2 >    [
+3 >     "hello"
+4 >            ]
+1->Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+2 >Emitted(2, 6) Source(2, 6) + SourceIndex(0)
+3 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+4 >Emitted(2, 14) Source(2, 14) + SourceIndex(0)
+---
+>>>        debugger;
+1->^^^^^^^^
+2 >        ^^^^^^^^
+3 >                ^
+1->() {
+  >        
+2 >        debugger
+3 >                ;
+1->Emitted(3, 9) Source(3, 9) + SourceIndex(0) name (["hello"])
+2 >Emitted(3, 17) Source(3, 17) + SourceIndex(0) name (["hello"])
+3 >Emitted(3, 18) Source(3, 18) + SourceIndex(0) name (["hello"])
+---
+>>>    }
+1 >^^^^
+2 >    ^
+1 >
+  >    
+2 >    }
+1 >Emitted(4, 5) Source(4, 5) + SourceIndex(0) name (["hello"])
+2 >Emitted(4, 6) Source(4, 6) + SourceIndex(0) name (["hello"])
+---
+>>>};
+1 >^
+2 > ^
+3 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >}
+2 > 
+1 >Emitted(5, 2) Source(5, 2) + SourceIndex(0)
+2 >Emitted(5, 3) Source(5, 2) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=computedPropertyNamesSourceMap2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap2.types b/tests/baselines/reference/computedPropertyNamesSourceMap2.types
new file mode 100644
index 00000000000..972259eb3e2
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNamesSourceMap2.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNamesSourceMap2.ts ===
+var v = {
+>v : {}
+>{    ["hello"]() {        debugger;    }} : {}
+
+    ["hello"]() {
+        debugger;
+    }
+}
diff --git a/tests/baselines/reference/giant.errors.txt b/tests/baselines/reference/giant.errors.txt
index fbe05bbfc79..e8c574d2115 100644
--- a/tests/baselines/reference/giant.errors.txt
+++ b/tests/baselines/reference/giant.errors.txt
@@ -17,6 +17,7 @@ tests/cases/compiler/giant.ts(35,12): error TS2300: Duplicate identifier 'tgF'.
 tests/cases/compiler/giant.ts(36,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/giant.ts(36,16): error TS2300: Duplicate identifier 'tgF'.
 tests/cases/compiler/giant.ts(61,5): error TS1169: Computed property names are not allowed in interfaces.
+tests/cases/compiler/giant.ts(61,6): error TS2304: Cannot find name 'p'.
 tests/cases/compiler/giant.ts(62,5): error TS1021: An index signature must have a type annotation.
 tests/cases/compiler/giant.ts(63,6): error TS1096: An index signature must have exactly one parameter.
 tests/cases/compiler/giant.ts(76,5): error TS2386: Overload signatures must all be optional or required.
@@ -39,6 +40,7 @@ tests/cases/compiler/giant.ts(99,16): error TS2300: Duplicate identifier 'tgF'.
 tests/cases/compiler/giant.ts(100,20): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/giant.ts(100,20): error TS2300: Duplicate identifier 'tgF'.
 tests/cases/compiler/giant.ts(125,9): error TS1169: Computed property names are not allowed in interfaces.
+tests/cases/compiler/giant.ts(125,10): error TS2304: Cannot find name 'p'.
 tests/cases/compiler/giant.ts(126,9): error TS1021: An index signature must have a type annotation.
 tests/cases/compiler/giant.ts(127,10): error TS1096: An index signature must have exactly one parameter.
 tests/cases/compiler/giant.ts(140,9): error TS2386: Overload signatures must all be optional or required.
@@ -62,6 +64,7 @@ tests/cases/compiler/giant.ts(178,16): error TS2300: Duplicate identifier 'tgF'.
 tests/cases/compiler/giant.ts(179,20): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/giant.ts(179,20): error TS2300: Duplicate identifier 'tgF'.
 tests/cases/compiler/giant.ts(204,9): error TS1169: Computed property names are not allowed in interfaces.
+tests/cases/compiler/giant.ts(204,10): error TS2304: Cannot find name 'p'.
 tests/cases/compiler/giant.ts(205,9): error TS1021: An index signature must have a type annotation.
 tests/cases/compiler/giant.ts(206,10): error TS1096: An index signature must have exactly one parameter.
 tests/cases/compiler/giant.ts(219,9): error TS2386: Overload signatures must all be optional or required.
@@ -117,6 +120,7 @@ tests/cases/compiler/giant.ts(293,12): error TS2300: Duplicate identifier 'tgF'.
 tests/cases/compiler/giant.ts(294,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/giant.ts(294,16): error TS2300: Duplicate identifier 'tgF'.
 tests/cases/compiler/giant.ts(319,5): error TS1169: Computed property names are not allowed in interfaces.
+tests/cases/compiler/giant.ts(319,6): error TS2304: Cannot find name 'p'.
 tests/cases/compiler/giant.ts(320,5): error TS1021: An index signature must have a type annotation.
 tests/cases/compiler/giant.ts(321,6): error TS1096: An index signature must have exactly one parameter.
 tests/cases/compiler/giant.ts(334,5): error TS2386: Overload signatures must all be optional or required.
@@ -139,6 +143,7 @@ tests/cases/compiler/giant.ts(357,16): error TS2300: Duplicate identifier 'tgF'.
 tests/cases/compiler/giant.ts(358,20): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/giant.ts(358,20): error TS2300: Duplicate identifier 'tgF'.
 tests/cases/compiler/giant.ts(383,9): error TS1169: Computed property names are not allowed in interfaces.
+tests/cases/compiler/giant.ts(383,10): error TS2304: Cannot find name 'p'.
 tests/cases/compiler/giant.ts(384,9): error TS1021: An index signature must have a type annotation.
 tests/cases/compiler/giant.ts(385,10): error TS1096: An index signature must have exactly one parameter.
 tests/cases/compiler/giant.ts(398,9): error TS2386: Overload signatures must all be optional or required.
@@ -162,6 +167,7 @@ tests/cases/compiler/giant.ts(436,16): error TS2300: Duplicate identifier 'tgF'.
 tests/cases/compiler/giant.ts(437,20): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/giant.ts(437,20): error TS2300: Duplicate identifier 'tgF'.
 tests/cases/compiler/giant.ts(462,9): error TS1169: Computed property names are not allowed in interfaces.
+tests/cases/compiler/giant.ts(462,10): error TS2304: Cannot find name 'p'.
 tests/cases/compiler/giant.ts(463,9): error TS1021: An index signature must have a type annotation.
 tests/cases/compiler/giant.ts(464,10): error TS1096: An index signature must have exactly one parameter.
 tests/cases/compiler/giant.ts(477,9): error TS2386: Overload signatures must all be optional or required.
@@ -233,6 +239,7 @@ tests/cases/compiler/giant.ts(558,24): error TS1184: An implementation cannot be
 tests/cases/compiler/giant.ts(561,21): error TS1184: An implementation cannot be declared in ambient contexts.
 tests/cases/compiler/giant.ts(563,21): error TS1184: An implementation cannot be declared in ambient contexts.
 tests/cases/compiler/giant.ts(587,9): error TS1169: Computed property names are not allowed in interfaces.
+tests/cases/compiler/giant.ts(587,10): error TS2304: Cannot find name 'p'.
 tests/cases/compiler/giant.ts(588,9): error TS1021: An index signature must have a type annotation.
 tests/cases/compiler/giant.ts(589,10): error TS1096: An index signature must have exactly one parameter.
 tests/cases/compiler/giant.ts(602,9): error TS2386: Overload signatures must all be optional or required.
@@ -249,6 +256,7 @@ tests/cases/compiler/giant.ts(623,24): error TS1184: An implementation cannot be
 tests/cases/compiler/giant.ts(626,21): error TS1184: An implementation cannot be declared in ambient contexts.
 tests/cases/compiler/giant.ts(628,21): error TS1184: An implementation cannot be declared in ambient contexts.
 tests/cases/compiler/giant.ts(653,9): error TS1169: Computed property names are not allowed in interfaces.
+tests/cases/compiler/giant.ts(653,10): error TS2304: Cannot find name 'p'.
 tests/cases/compiler/giant.ts(654,9): error TS1021: An index signature must have a type annotation.
 tests/cases/compiler/giant.ts(655,10): error TS1096: An index signature must have exactly one parameter.
 tests/cases/compiler/giant.ts(668,9): error TS2386: Overload signatures must all be optional or required.
@@ -257,7 +265,7 @@ tests/cases/compiler/giant.ts(672,25): error TS1036: Statements are not allowed
 tests/cases/compiler/giant.ts(676,30): error TS1184: An implementation cannot be declared in ambient contexts.
 
 
-==== tests/cases/compiler/giant.ts (257 errors) ====
+==== tests/cases/compiler/giant.ts (265 errors) ====
     
     /*
         Prefixes
@@ -357,6 +365,8 @@ tests/cases/compiler/giant.ts(676,30): error TS1184: An implementation cannot be
         [p];
         ~~~
 !!! error TS1169: Computed property names are not allowed in interfaces.
+         ~
+!!! error TS2304: Cannot find name 'p'.
         [p1: string];
         ~~~~~~~~~~~~~
 !!! error TS1021: An index signature must have a type annotation.
@@ -465,6 +475,8 @@ tests/cases/compiler/giant.ts(676,30): error TS1184: An implementation cannot be
             [p];
             ~~~
 !!! error TS1169: Computed property names are not allowed in interfaces.
+             ~
+!!! error TS2304: Cannot find name 'p'.
             [p1: string];
             ~~~~~~~~~~~~~
 !!! error TS1021: An index signature must have a type annotation.
@@ -590,6 +602,8 @@ tests/cases/compiler/giant.ts(676,30): error TS1184: An implementation cannot be
             [p];
             ~~~
 !!! error TS1169: Computed property names are not allowed in interfaces.
+             ~
+!!! error TS2304: Cannot find name 'p'.
             [p1: string];
             ~~~~~~~~~~~~~
 !!! error TS1021: An index signature must have a type annotation.
@@ -815,6 +829,8 @@ tests/cases/compiler/giant.ts(676,30): error TS1184: An implementation cannot be
         [p];
         ~~~
 !!! error TS1169: Computed property names are not allowed in interfaces.
+         ~
+!!! error TS2304: Cannot find name 'p'.
         [p1: string];
         ~~~~~~~~~~~~~
 !!! error TS1021: An index signature must have a type annotation.
@@ -923,6 +939,8 @@ tests/cases/compiler/giant.ts(676,30): error TS1184: An implementation cannot be
             [p];
             ~~~
 !!! error TS1169: Computed property names are not allowed in interfaces.
+             ~
+!!! error TS2304: Cannot find name 'p'.
             [p1: string];
             ~~~~~~~~~~~~~
 !!! error TS1021: An index signature must have a type annotation.
@@ -1048,6 +1066,8 @@ tests/cases/compiler/giant.ts(676,30): error TS1184: An implementation cannot be
             [p];
             ~~~
 !!! error TS1169: Computed property names are not allowed in interfaces.
+             ~
+!!! error TS2304: Cannot find name 'p'.
             [p1: string];
             ~~~~~~~~~~~~~
 !!! error TS1021: An index signature must have a type annotation.
@@ -1315,6 +1335,8 @@ tests/cases/compiler/giant.ts(676,30): error TS1184: An implementation cannot be
             [p];
             ~~~
 !!! error TS1169: Computed property names are not allowed in interfaces.
+             ~
+!!! error TS2304: Cannot find name 'p'.
             [p1: string];
             ~~~~~~~~~~~~~
 !!! error TS1021: An index signature must have a type annotation.
@@ -1413,6 +1435,8 @@ tests/cases/compiler/giant.ts(676,30): error TS1184: An implementation cannot be
             [p];
             ~~~
 !!! error TS1169: Computed property names are not allowed in interfaces.
+             ~
+!!! error TS2304: Cannot find name 'p'.
             [p1: string];
             ~~~~~~~~~~~~~
 !!! error TS1021: An index signature must have a type annotation.
diff --git a/tests/baselines/reference/indexSignatureMustHaveTypeAnnotation.errors.txt b/tests/baselines/reference/indexSignatureMustHaveTypeAnnotation.errors.txt
index 294282d1e9e..82e96bf3846 100644
--- a/tests/baselines/reference/indexSignatureMustHaveTypeAnnotation.errors.txt
+++ b/tests/baselines/reference/indexSignatureMustHaveTypeAnnotation.errors.txt
@@ -1,23 +1,31 @@
-tests/cases/compiler/indexSignatureMustHaveTypeAnnotation.ts(2,5): error TS1169: Computed property names are not allowed in interfaces.
-tests/cases/compiler/indexSignatureMustHaveTypeAnnotation.ts(3,5): error TS1021: An index signature must have a type annotation.
-tests/cases/compiler/indexSignatureMustHaveTypeAnnotation.ts(7,5): error TS1166: Computed property names are not allowed in class property declarations.
-tests/cases/compiler/indexSignatureMustHaveTypeAnnotation.ts(12,5): error TS1021: An index signature must have a type annotation.
+tests/cases/compiler/indexSignatureMustHaveTypeAnnotation.ts(3,5): error TS1169: Computed property names are not allowed in interfaces.
+tests/cases/compiler/indexSignatureMustHaveTypeAnnotation.ts(3,6): error TS2304: Cannot find name 'x'.
+tests/cases/compiler/indexSignatureMustHaveTypeAnnotation.ts(4,5): error TS1021: An index signature must have a type annotation.
+tests/cases/compiler/indexSignatureMustHaveTypeAnnotation.ts(9,5): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/compiler/indexSignatureMustHaveTypeAnnotation.ts(9,6): error TS2304: Cannot find name 'x'.
+tests/cases/compiler/indexSignatureMustHaveTypeAnnotation.ts(14,5): error TS1021: An index signature must have a type annotation.
 
 
-==== tests/cases/compiler/indexSignatureMustHaveTypeAnnotation.ts (4 errors) ====
+==== tests/cases/compiler/indexSignatureMustHaveTypeAnnotation.ts (6 errors) ====
     interface I {
+        // Used to be indexer, now it is a computed property
         [x]: string;
         ~~~
 !!! error TS1169: Computed property names are not allowed in interfaces.
+         ~
+!!! error TS2304: Cannot find name 'x'.
         [x: string];
         ~~~~~~~~~~~~
 !!! error TS1021: An index signature must have a type annotation.
     }
     
     class C {
+        // Used to be indexer, now it is a computed property
         [x]: string
         ~~~
 !!! error TS1166: Computed property names are not allowed in class property declarations.
+         ~
+!!! error TS2304: Cannot find name 'x'.
         
     }
     
diff --git a/tests/baselines/reference/indexSignatureWithInitializer.errors.txt b/tests/baselines/reference/indexSignatureWithInitializer.errors.txt
index 6fb708a3b80..d6f547a25cb 100644
--- a/tests/baselines/reference/indexSignatureWithInitializer.errors.txt
+++ b/tests/baselines/reference/indexSignatureWithInitializer.errors.txt
@@ -1,16 +1,23 @@
-tests/cases/compiler/indexSignatureWithInitializer.ts(2,5): error TS1169: Computed property names are not allowed in interfaces.
-tests/cases/compiler/indexSignatureWithInitializer.ts(6,5): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/compiler/indexSignatureWithInitializer.ts(3,5): error TS1169: Computed property names are not allowed in interfaces.
+tests/cases/compiler/indexSignatureWithInitializer.ts(3,6): error TS2304: Cannot find name 'x'.
+tests/cases/compiler/indexSignatureWithInitializer.ts(7,5): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/compiler/indexSignatureWithInitializer.ts(7,6): error TS2304: Cannot find name 'x'.
 
 
-==== tests/cases/compiler/indexSignatureWithInitializer.ts (2 errors) ====
+==== tests/cases/compiler/indexSignatureWithInitializer.ts (4 errors) ====
+    // These used to be indexers, now they are computed properties
     interface I {
         [x = '']: string;
         ~~~~~~~~
 !!! error TS1169: Computed property names are not allowed in interfaces.
+         ~
+!!! error TS2304: Cannot find name 'x'.
     }
     
     class C {
         [x = 0]: string
         ~~~~~~~
 !!! error TS1166: Computed property names are not allowed in class property declarations.
+         ~
+!!! error TS2304: Cannot find name 'x'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/indexWithoutParamType2.errors.txt b/tests/baselines/reference/indexWithoutParamType2.errors.txt
index 41527d0859f..468368b5f23 100644
--- a/tests/baselines/reference/indexWithoutParamType2.errors.txt
+++ b/tests/baselines/reference/indexWithoutParamType2.errors.txt
@@ -1,9 +1,13 @@
-tests/cases/compiler/indexWithoutParamType2.ts(2,5): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/compiler/indexWithoutParamType2.ts(3,5): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/compiler/indexWithoutParamType2.ts(3,6): error TS2304: Cannot find name 'x'.
 
 
-==== tests/cases/compiler/indexWithoutParamType2.ts (1 errors) ====
+==== tests/cases/compiler/indexWithoutParamType2.ts (2 errors) ====
     class C {
+        // Used to be indexer, now it is a computed property
         [x]: string
         ~~~
 !!! error TS1166: Computed property names are not allowed in class property declarations.
+         ~
+!!! error TS2304: Cannot find name 'x'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/indexer2.errors.txt b/tests/baselines/reference/indexer2.errors.txt
deleted file mode 100644
index 28020a570ed..00000000000
--- a/tests/baselines/reference/indexer2.errors.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-tests/cases/compiler/indexer2.ts(6,25): error TS2352: Neither type '{ [x: number]: undefined; }' nor type 'IDirectChildrenMap' is assignable to the other.
-  Types of property 'hasOwnProperty' are incompatible.
-    Type '(v: string) => boolean' is not assignable to type '(objectId: number) => boolean'.
-      Types of parameters 'v' and 'objectId' are incompatible.
-        Type 'string' is not assignable to type 'number'.
-
-
-==== tests/cases/compiler/indexer2.ts (1 errors) ====
-    interface IHeapObjectProperty {}
-    interface IDirectChildrenMap { 
-            hasOwnProperty(objectId: number) : boolean; 
-            [objectId: number] : IHeapObjectProperty[]; 
-    }    
-    var directChildrenMap = <IDirectChildrenMap>{}; 
-                            ~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2352: Neither type '{ [x: number]: undefined; }' nor type 'IDirectChildrenMap' is assignable to the other.
-!!! error TS2352:   Types of property 'hasOwnProperty' are incompatible.
-!!! error TS2352:     Type '(v: string) => boolean' is not assignable to type '(objectId: number) => boolean'.
-!!! error TS2352:       Types of parameters 'v' and 'objectId' are incompatible.
-!!! error TS2352:         Type 'string' is not assignable to type 'number'.
\ No newline at end of file
diff --git a/tests/baselines/reference/indexer2.types b/tests/baselines/reference/indexer2.types
new file mode 100644
index 00000000000..7f1ccd41cb5
--- /dev/null
+++ b/tests/baselines/reference/indexer2.types
@@ -0,0 +1,21 @@
+=== tests/cases/compiler/indexer2.ts ===
+interface IHeapObjectProperty {}
+>IHeapObjectProperty : IHeapObjectProperty
+
+interface IDirectChildrenMap { 
+>IDirectChildrenMap : IDirectChildrenMap
+
+        hasOwnProperty(objectId: number) : boolean; 
+>hasOwnProperty : (objectId: number) => boolean
+>objectId : number
+
+        [objectId: number] : IHeapObjectProperty[]; 
+>objectId : number
+>IHeapObjectProperty : IHeapObjectProperty
+}    
+var directChildrenMap = <IDirectChildrenMap>{}; 
+>directChildrenMap : IDirectChildrenMap
+><IDirectChildrenMap>{} : IDirectChildrenMap
+>IDirectChildrenMap : IDirectChildrenMap
+>{} : { [x: number]: undefined; }
+
diff --git a/tests/baselines/reference/indexer2A.errors.txt b/tests/baselines/reference/indexer2A.errors.txt
index f2314c5b49b..adf90fb743f 100644
--- a/tests/baselines/reference/indexer2A.errors.txt
+++ b/tests/baselines/reference/indexer2A.errors.txt
@@ -1,12 +1,7 @@
 tests/cases/compiler/indexer2A.ts(4,5): error TS2391: Function implementation is missing or not immediately following the declaration.
-tests/cases/compiler/indexer2A.ts(7,25): error TS2352: Neither type '{ [x: number]: undefined; }' nor type 'IDirectChildrenMap' is assignable to the other.
-  Types of property 'hasOwnProperty' are incompatible.
-    Type '(v: string) => boolean' is not assignable to type '(objectId: number) => boolean'.
-      Types of parameters 'v' and 'objectId' are incompatible.
-        Type 'string' is not assignable to type 'number'.
 
 
-==== tests/cases/compiler/indexer2A.ts (2 errors) ====
+==== tests/cases/compiler/indexer2A.ts (1 errors) ====
     class IHeapObjectProperty { }
     class IDirectChildrenMap {
         // Decided to enforce a semicolon after declarations
@@ -15,10 +10,4 @@ tests/cases/compiler/indexer2A.ts(7,25): error TS2352: Neither type '{ [x: numbe
 !!! error TS2391: Function implementation is missing or not immediately following the declaration.
         [objectId: number]: IHeapObjectProperty[]
     }
-    var directChildrenMap = <IDirectChildrenMap>{}; 
-                            ~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2352: Neither type '{ [x: number]: undefined; }' nor type 'IDirectChildrenMap' is assignable to the other.
-!!! error TS2352:   Types of property 'hasOwnProperty' are incompatible.
-!!! error TS2352:     Type '(v: string) => boolean' is not assignable to type '(objectId: number) => boolean'.
-!!! error TS2352:       Types of parameters 'v' and 'objectId' are incompatible.
-!!! error TS2352:         Type 'string' is not assignable to type 'number'.
\ No newline at end of file
+    var directChildrenMap = <IDirectChildrenMap>{}; 
\ No newline at end of file
diff --git a/tests/baselines/reference/instanceofOperatorWithLHSIsObject.js b/tests/baselines/reference/instanceofOperatorWithLHSIsObject.js
index 5ccf195cd88..c687027ae9b 100644
--- a/tests/baselines/reference/instanceofOperatorWithLHSIsObject.js
+++ b/tests/baselines/reference/instanceofOperatorWithLHSIsObject.js
@@ -7,10 +7,13 @@ var x2: Function;
 var a: {};
 var b: Object;
 var c: C;
+var d: string | C;
 
 var r1 = a instanceof x1;
 var r2 = b instanceof x2;
-var r3 = c instanceof x1;
+var r3 = c instanceof x1;
+var r4 = d instanceof x1;
+
 
 //// [instanceofOperatorWithLHSIsObject.js]
 var C = (function () {
@@ -23,6 +26,8 @@ var x2;
 var a;
 var b;
 var c;
+var d;
 var r1 = a instanceof x1;
 var r2 = b instanceof x2;
 var r3 = c instanceof x1;
+var r4 = d instanceof x1;
diff --git a/tests/baselines/reference/instanceofOperatorWithLHSIsObject.types b/tests/baselines/reference/instanceofOperatorWithLHSIsObject.types
index 26aea98028e..9962a23dced 100644
--- a/tests/baselines/reference/instanceofOperatorWithLHSIsObject.types
+++ b/tests/baselines/reference/instanceofOperatorWithLHSIsObject.types
@@ -20,6 +20,10 @@ var c: C;
 >c : C
 >C : C
 
+var d: string | C;
+>d : string | C
+>C : C
+
 var r1 = a instanceof x1;
 >r1 : boolean
 >a instanceof x1 : boolean
@@ -38,3 +42,9 @@ var r3 = c instanceof x1;
 >c : C
 >x1 : any
 
+var r4 = d instanceof x1;
+>r4 : boolean
+>d instanceof x1 : boolean
+>d : string | C
+>x1 : any
+
diff --git a/tests/baselines/reference/intTypeCheck.errors.txt b/tests/baselines/reference/intTypeCheck.errors.txt
index 5f7c213a916..bd8b2048045 100644
--- a/tests/baselines/reference/intTypeCheck.errors.txt
+++ b/tests/baselines/reference/intTypeCheck.errors.txt
@@ -1,91 +1,93 @@
-tests/cases/compiler/intTypeCheck.ts(83,5): error TS2386: Overload signatures must all be optional or required.
-tests/cases/compiler/intTypeCheck.ts(97,5): error TS2322: Type 'Object' is not assignable to type 'i1'.
+tests/cases/compiler/intTypeCheck.ts(35,6): error TS2304: Cannot find name 'p'.
+tests/cases/compiler/intTypeCheck.ts(71,6): error TS2304: Cannot find name 'p'.
+tests/cases/compiler/intTypeCheck.ts(85,5): error TS2386: Overload signatures must all be optional or required.
+tests/cases/compiler/intTypeCheck.ts(99,5): error TS2322: Type 'Object' is not assignable to type 'i1'.
   Property 'p' is missing in type 'Object'.
-tests/cases/compiler/intTypeCheck.ts(98,16): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-tests/cases/compiler/intTypeCheck.ts(99,5): error TS2322: Type 'Base' is not assignable to type 'i1'.
+tests/cases/compiler/intTypeCheck.ts(100,16): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
+tests/cases/compiler/intTypeCheck.ts(101,5): error TS2322: Type 'Base' is not assignable to type 'i1'.
   Property 'p' is missing in type 'Base'.
-tests/cases/compiler/intTypeCheck.ts(101,5): error TS2322: Type '() => void' is not assignable to type 'i1'.
+tests/cases/compiler/intTypeCheck.ts(103,5): error TS2322: Type '() => void' is not assignable to type 'i1'.
   Property 'p' is missing in type '() => void'.
-tests/cases/compiler/intTypeCheck.ts(104,5): error TS2322: Type 'boolean' is not assignable to type 'i1'.
+tests/cases/compiler/intTypeCheck.ts(106,5): error TS2322: Type 'boolean' is not assignable to type 'i1'.
   Property 'p' is missing in type 'Boolean'.
-tests/cases/compiler/intTypeCheck.ts(104,20): error TS1109: Expression expected.
-tests/cases/compiler/intTypeCheck.ts(104,21): error TS2304: Cannot find name 'i1'.
-tests/cases/compiler/intTypeCheck.ts(105,17): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-tests/cases/compiler/intTypeCheck.ts(110,5): error TS2322: Type '{}' is not assignable to type 'i2'.
-tests/cases/compiler/intTypeCheck.ts(111,5): error TS2322: Type 'Object' is not assignable to type 'i2'.
-tests/cases/compiler/intTypeCheck.ts(112,17): error TS2350: Only a void function can be called with the 'new' keyword.
-tests/cases/compiler/intTypeCheck.ts(113,5): error TS2322: Type 'Base' is not assignable to type 'i2'.
-tests/cases/compiler/intTypeCheck.ts(118,5): error TS2322: Type 'boolean' is not assignable to type 'i2'.
-tests/cases/compiler/intTypeCheck.ts(118,21): error TS1109: Expression expected.
-tests/cases/compiler/intTypeCheck.ts(118,22): error TS2304: Cannot find name 'i2'.
-tests/cases/compiler/intTypeCheck.ts(119,17): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-tests/cases/compiler/intTypeCheck.ts(124,5): error TS2322: Type '{}' is not assignable to type 'i3'.
-tests/cases/compiler/intTypeCheck.ts(125,5): error TS2322: Type 'Object' is not assignable to type 'i3'.
-tests/cases/compiler/intTypeCheck.ts(127,5): error TS2322: Type 'Base' is not assignable to type 'i3'.
-tests/cases/compiler/intTypeCheck.ts(129,5): error TS2322: Type '() => void' is not assignable to type 'i3'.
-tests/cases/compiler/intTypeCheck.ts(132,5): error TS2322: Type 'boolean' is not assignable to type 'i3'.
-tests/cases/compiler/intTypeCheck.ts(132,21): error TS1109: Expression expected.
-tests/cases/compiler/intTypeCheck.ts(132,22): error TS2304: Cannot find name 'i3'.
-tests/cases/compiler/intTypeCheck.ts(133,17): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-tests/cases/compiler/intTypeCheck.ts(139,5): error TS2322: Type 'Object' is not assignable to type 'i4'.
+tests/cases/compiler/intTypeCheck.ts(106,20): error TS1109: Expression expected.
+tests/cases/compiler/intTypeCheck.ts(106,21): error TS2304: Cannot find name 'i1'.
+tests/cases/compiler/intTypeCheck.ts(107,17): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
+tests/cases/compiler/intTypeCheck.ts(112,5): error TS2322: Type '{}' is not assignable to type 'i2'.
+tests/cases/compiler/intTypeCheck.ts(113,5): error TS2322: Type 'Object' is not assignable to type 'i2'.
+tests/cases/compiler/intTypeCheck.ts(114,17): error TS2350: Only a void function can be called with the 'new' keyword.
+tests/cases/compiler/intTypeCheck.ts(115,5): error TS2322: Type 'Base' is not assignable to type 'i2'.
+tests/cases/compiler/intTypeCheck.ts(120,5): error TS2322: Type 'boolean' is not assignable to type 'i2'.
+tests/cases/compiler/intTypeCheck.ts(120,21): error TS1109: Expression expected.
+tests/cases/compiler/intTypeCheck.ts(120,22): error TS2304: Cannot find name 'i2'.
+tests/cases/compiler/intTypeCheck.ts(121,17): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
+tests/cases/compiler/intTypeCheck.ts(126,5): error TS2322: Type '{}' is not assignable to type 'i3'.
+tests/cases/compiler/intTypeCheck.ts(127,5): error TS2322: Type 'Object' is not assignable to type 'i3'.
+tests/cases/compiler/intTypeCheck.ts(129,5): error TS2322: Type 'Base' is not assignable to type 'i3'.
+tests/cases/compiler/intTypeCheck.ts(131,5): error TS2322: Type '() => void' is not assignable to type 'i3'.
+tests/cases/compiler/intTypeCheck.ts(134,5): error TS2322: Type 'boolean' is not assignable to type 'i3'.
+tests/cases/compiler/intTypeCheck.ts(134,21): error TS1109: Expression expected.
+tests/cases/compiler/intTypeCheck.ts(134,22): error TS2304: Cannot find name 'i3'.
+tests/cases/compiler/intTypeCheck.ts(135,17): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
+tests/cases/compiler/intTypeCheck.ts(141,5): error TS2322: Type 'Object' is not assignable to type 'i4'.
   Index signature is missing in type 'Object'.
-tests/cases/compiler/intTypeCheck.ts(140,17): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-tests/cases/compiler/intTypeCheck.ts(141,5): error TS2322: Type 'Base' is not assignable to type 'i4'.
+tests/cases/compiler/intTypeCheck.ts(142,17): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
+tests/cases/compiler/intTypeCheck.ts(143,5): error TS2322: Type 'Base' is not assignable to type 'i4'.
   Index signature is missing in type 'Base'.
-tests/cases/compiler/intTypeCheck.ts(143,5): error TS2322: Type '() => void' is not assignable to type 'i4'.
+tests/cases/compiler/intTypeCheck.ts(145,5): error TS2322: Type '() => void' is not assignable to type 'i4'.
   Index signature is missing in type '() => void'.
-tests/cases/compiler/intTypeCheck.ts(146,5): error TS2322: Type 'boolean' is not assignable to type 'i4'.
+tests/cases/compiler/intTypeCheck.ts(148,5): error TS2322: Type 'boolean' is not assignable to type 'i4'.
   Index signature is missing in type 'Boolean'.
-tests/cases/compiler/intTypeCheck.ts(146,21): error TS1109: Expression expected.
-tests/cases/compiler/intTypeCheck.ts(146,22): error TS2304: Cannot find name 'i4'.
-tests/cases/compiler/intTypeCheck.ts(147,17): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-tests/cases/compiler/intTypeCheck.ts(152,5): error TS2322: Type '{}' is not assignable to type 'i5'.
+tests/cases/compiler/intTypeCheck.ts(148,21): error TS1109: Expression expected.
+tests/cases/compiler/intTypeCheck.ts(148,22): error TS2304: Cannot find name 'i4'.
+tests/cases/compiler/intTypeCheck.ts(149,17): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
+tests/cases/compiler/intTypeCheck.ts(154,5): error TS2322: Type '{}' is not assignable to type 'i5'.
   Property 'p' is missing in type '{}'.
-tests/cases/compiler/intTypeCheck.ts(153,5): error TS2322: Type 'Object' is not assignable to type 'i5'.
+tests/cases/compiler/intTypeCheck.ts(155,5): error TS2322: Type 'Object' is not assignable to type 'i5'.
   Property 'p' is missing in type 'Object'.
-tests/cases/compiler/intTypeCheck.ts(154,17): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-tests/cases/compiler/intTypeCheck.ts(155,5): error TS2322: Type 'Base' is not assignable to type 'i5'.
+tests/cases/compiler/intTypeCheck.ts(156,17): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
+tests/cases/compiler/intTypeCheck.ts(157,5): error TS2322: Type 'Base' is not assignable to type 'i5'.
   Property 'p' is missing in type 'Base'.
-tests/cases/compiler/intTypeCheck.ts(157,5): error TS2322: Type '() => void' is not assignable to type 'i5'.
+tests/cases/compiler/intTypeCheck.ts(159,5): error TS2322: Type '() => void' is not assignable to type 'i5'.
   Property 'p' is missing in type '() => void'.
-tests/cases/compiler/intTypeCheck.ts(160,5): error TS2322: Type 'boolean' is not assignable to type 'i5'.
+tests/cases/compiler/intTypeCheck.ts(162,5): error TS2322: Type 'boolean' is not assignable to type 'i5'.
   Property 'p' is missing in type 'Boolean'.
-tests/cases/compiler/intTypeCheck.ts(160,21): error TS1109: Expression expected.
-tests/cases/compiler/intTypeCheck.ts(160,22): error TS2304: Cannot find name 'i5'.
-tests/cases/compiler/intTypeCheck.ts(161,17): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-tests/cases/compiler/intTypeCheck.ts(166,5): error TS2322: Type '{}' is not assignable to type 'i6'.
-tests/cases/compiler/intTypeCheck.ts(167,5): error TS2322: Type 'Object' is not assignable to type 'i6'.
-tests/cases/compiler/intTypeCheck.ts(168,17): error TS2350: Only a void function can be called with the 'new' keyword.
-tests/cases/compiler/intTypeCheck.ts(169,5): error TS2322: Type 'Base' is not assignable to type 'i6'.
-tests/cases/compiler/intTypeCheck.ts(171,5): error TS2322: Type '() => void' is not assignable to type 'i6'.
+tests/cases/compiler/intTypeCheck.ts(162,21): error TS1109: Expression expected.
+tests/cases/compiler/intTypeCheck.ts(162,22): error TS2304: Cannot find name 'i5'.
+tests/cases/compiler/intTypeCheck.ts(163,17): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
+tests/cases/compiler/intTypeCheck.ts(168,5): error TS2322: Type '{}' is not assignable to type 'i6'.
+tests/cases/compiler/intTypeCheck.ts(169,5): error TS2322: Type 'Object' is not assignable to type 'i6'.
+tests/cases/compiler/intTypeCheck.ts(170,17): error TS2350: Only a void function can be called with the 'new' keyword.
+tests/cases/compiler/intTypeCheck.ts(171,5): error TS2322: Type 'Base' is not assignable to type 'i6'.
+tests/cases/compiler/intTypeCheck.ts(173,5): error TS2322: Type '() => void' is not assignable to type 'i6'.
   Type 'void' is not assignable to type 'number'.
-tests/cases/compiler/intTypeCheck.ts(174,5): error TS2322: Type 'boolean' is not assignable to type 'i6'.
-tests/cases/compiler/intTypeCheck.ts(174,21): error TS1109: Expression expected.
-tests/cases/compiler/intTypeCheck.ts(174,22): error TS2304: Cannot find name 'i6'.
-tests/cases/compiler/intTypeCheck.ts(175,17): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-tests/cases/compiler/intTypeCheck.ts(180,5): error TS2322: Type '{}' is not assignable to type 'i7'.
-tests/cases/compiler/intTypeCheck.ts(181,5): error TS2322: Type 'Object' is not assignable to type 'i7'.
-tests/cases/compiler/intTypeCheck.ts(183,17): error TS2352: Neither type 'Base' nor type 'i7' is assignable to the other.
-tests/cases/compiler/intTypeCheck.ts(185,5): error TS2322: Type '() => void' is not assignable to type 'i7'.
-tests/cases/compiler/intTypeCheck.ts(188,5): error TS2322: Type 'boolean' is not assignable to type 'i7'.
-tests/cases/compiler/intTypeCheck.ts(188,21): error TS1109: Expression expected.
-tests/cases/compiler/intTypeCheck.ts(188,22): error TS2304: Cannot find name 'i7'.
-tests/cases/compiler/intTypeCheck.ts(189,17): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-tests/cases/compiler/intTypeCheck.ts(195,5): error TS2322: Type 'Object' is not assignable to type 'i8'.
+tests/cases/compiler/intTypeCheck.ts(176,5): error TS2322: Type 'boolean' is not assignable to type 'i6'.
+tests/cases/compiler/intTypeCheck.ts(176,21): error TS1109: Expression expected.
+tests/cases/compiler/intTypeCheck.ts(176,22): error TS2304: Cannot find name 'i6'.
+tests/cases/compiler/intTypeCheck.ts(177,17): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
+tests/cases/compiler/intTypeCheck.ts(182,5): error TS2322: Type '{}' is not assignable to type 'i7'.
+tests/cases/compiler/intTypeCheck.ts(183,5): error TS2322: Type 'Object' is not assignable to type 'i7'.
+tests/cases/compiler/intTypeCheck.ts(185,17): error TS2352: Neither type 'Base' nor type 'i7' is assignable to the other.
+tests/cases/compiler/intTypeCheck.ts(187,5): error TS2322: Type '() => void' is not assignable to type 'i7'.
+tests/cases/compiler/intTypeCheck.ts(190,5): error TS2322: Type 'boolean' is not assignable to type 'i7'.
+tests/cases/compiler/intTypeCheck.ts(190,21): error TS1109: Expression expected.
+tests/cases/compiler/intTypeCheck.ts(190,22): error TS2304: Cannot find name 'i7'.
+tests/cases/compiler/intTypeCheck.ts(191,17): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
+tests/cases/compiler/intTypeCheck.ts(197,5): error TS2322: Type 'Object' is not assignable to type 'i8'.
   Index signature is missing in type 'Object'.
-tests/cases/compiler/intTypeCheck.ts(196,17): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-tests/cases/compiler/intTypeCheck.ts(197,5): error TS2322: Type 'Base' is not assignable to type 'i8'.
+tests/cases/compiler/intTypeCheck.ts(198,17): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
+tests/cases/compiler/intTypeCheck.ts(199,5): error TS2322: Type 'Base' is not assignable to type 'i8'.
   Index signature is missing in type 'Base'.
-tests/cases/compiler/intTypeCheck.ts(199,5): error TS2322: Type '() => void' is not assignable to type 'i8'.
+tests/cases/compiler/intTypeCheck.ts(201,5): error TS2322: Type '() => void' is not assignable to type 'i8'.
   Index signature is missing in type '() => void'.
-tests/cases/compiler/intTypeCheck.ts(202,5): error TS2322: Type 'boolean' is not assignable to type 'i8'.
+tests/cases/compiler/intTypeCheck.ts(204,5): error TS2322: Type 'boolean' is not assignable to type 'i8'.
   Index signature is missing in type 'Boolean'.
-tests/cases/compiler/intTypeCheck.ts(202,21): error TS1109: Expression expected.
-tests/cases/compiler/intTypeCheck.ts(202,22): error TS2304: Cannot find name 'i8'.
-tests/cases/compiler/intTypeCheck.ts(203,17): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
+tests/cases/compiler/intTypeCheck.ts(204,21): error TS1109: Expression expected.
+tests/cases/compiler/intTypeCheck.ts(204,22): error TS2304: Cannot find name 'i8'.
+tests/cases/compiler/intTypeCheck.ts(205,17): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
 
 
-==== tests/cases/compiler/intTypeCheck.ts (67 errors) ====
+==== tests/cases/compiler/intTypeCheck.ts (69 errors) ====
     interface i1 {
         //Property Signatures
         p;
@@ -119,8 +121,11 @@ tests/cases/compiler/intTypeCheck.ts(203,17): error TS2351: Cannot use 'new' wit
         new (p6: string, ...p7: any[]);
     }
     interface i4 {
-        //Index Signatures
+        // Used to be indexer, now it is a computed property
         [p];
+         ~
+!!! error TS2304: Cannot find name 'p'.
+        //Index Signatures
         [p1: string];
         [p2: string, p3: number];
     }
@@ -153,9 +158,12 @@ tests/cases/compiler/intTypeCheck.ts(203,17): error TS2351: Cannot use 'new' wit
         new (...p3: any[]);
         new (p4: string, p5?: string);
         new (p6: string, ...p7: any[]);
-    
-        //Index Signatures
+        
+        // Used to be indexer, now it is a computed property
         [p];
+         ~
+!!! error TS2304: Cannot find name 'p'.
+        //Index Signatures
         [p1: string];
         [p2: string, p3: number];
     
diff --git a/tests/baselines/reference/lastPropertyInLiteralWins.errors.txt b/tests/baselines/reference/lastPropertyInLiteralWins.errors.txt
index 4bf5521d24d..d503f59c602 100644
--- a/tests/baselines/reference/lastPropertyInLiteralWins.errors.txt
+++ b/tests/baselines/reference/lastPropertyInLiteralWins.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/compiler/lastPropertyInLiteralWins.ts(8,5): error TS2300: Duplicate identifier 'thunk'.
-tests/cases/compiler/lastPropertyInLiteralWins.ts(9,5): error TS2300: Duplicate identifier 'thunk'.
-tests/cases/compiler/lastPropertyInLiteralWins.ts(12,6): error TS2345: Argument of type '{ thunk: (num: number) => void; }' is not assignable to parameter of type 'Thing'.
+tests/cases/compiler/lastPropertyInLiteralWins.ts(7,6): error TS2345: Argument of type '{ thunk: (num: number) => void; }' is not assignable to parameter of type 'Thing'.
   Types of property 'thunk' are incompatible.
     Type '(num: number) => void' is not assignable to type '(str: string) => void'.
+tests/cases/compiler/lastPropertyInLiteralWins.ts(8,5): error TS2300: Duplicate identifier 'thunk'.
+tests/cases/compiler/lastPropertyInLiteralWins.ts(9,5): error TS2300: Duplicate identifier 'thunk'.
 tests/cases/compiler/lastPropertyInLiteralWins.ts(13,5): error TS2300: Duplicate identifier 'thunk'.
 tests/cases/compiler/lastPropertyInLiteralWins.ts(14,5): error TS2300: Duplicate identifier 'thunk'.
 
@@ -15,21 +15,12 @@ tests/cases/compiler/lastPropertyInLiteralWins.ts(14,5): error TS2300: Duplicate
         thing.thunk("str");
     }
     test({ // Should error, as last one wins, and is wrong type
+         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         thunk: (str: string) => {},
-        ~~~~~
-!!! error TS2300: Duplicate identifier 'thunk'.
-        thunk: (num: number) => {}
-        ~~~~~
-!!! error TS2300: Duplicate identifier 'thunk'.
-    });
-    
-    test({ // Should be OK.  Last 'thunk' is of correct type
-         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        thunk: (num: number) => {},
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         ~~~~~
 !!! error TS2300: Duplicate identifier 'thunk'.
-        thunk: (str: string) => {}
+        thunk: (num: number) => {}
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         ~~~~~
 !!! error TS2300: Duplicate identifier 'thunk'.
@@ -38,4 +29,13 @@ tests/cases/compiler/lastPropertyInLiteralWins.ts(14,5): error TS2300: Duplicate
 !!! error TS2345: Argument of type '{ thunk: (num: number) => void; }' is not assignable to parameter of type 'Thing'.
 !!! error TS2345:   Types of property 'thunk' are incompatible.
 !!! error TS2345:     Type '(num: number) => void' is not assignable to type '(str: string) => void'.
+    
+    test({ // Should be OK.  Last 'thunk' is of correct type
+        thunk: (num: number) => {},
+        ~~~~~
+!!! error TS2300: Duplicate identifier 'thunk'.
+        thunk: (str: string) => {}
+        ~~~~~
+!!! error TS2300: Duplicate identifier 'thunk'.
+    });
     
\ No newline at end of file
diff --git a/tests/baselines/reference/memberOverride.errors.txt b/tests/baselines/reference/memberOverride.errors.txt
index 0fd0fb57e67..b4974e69e53 100644
--- a/tests/baselines/reference/memberOverride.errors.txt
+++ b/tests/baselines/reference/memberOverride.errors.txt
@@ -1,9 +1,8 @@
 tests/cases/compiler/memberOverride.ts(4,5): error TS2300: Duplicate identifier 'a'.
 tests/cases/compiler/memberOverride.ts(5,5): error TS2300: Duplicate identifier 'a'.
-tests/cases/compiler/memberOverride.ts(8,5): error TS2322: Type 'string' is not assignable to type 'number'.
 
 
-==== tests/cases/compiler/memberOverride.ts (3 errors) ====
+==== tests/cases/compiler/memberOverride.ts (2 errors) ====
     // An object initialiser accepts the first definition for the same property with a different type signature
     // Should compile, since the second declaration of a overrides the first
     var x = {
@@ -15,6 +14,4 @@ tests/cases/compiler/memberOverride.ts(8,5): error TS2322: Type 'string' is not
 !!! error TS2300: Duplicate identifier 'a'.
     }
     
-    var n: number = x.a;
-        ~
-!!! error TS2322: Type 'string' is not assignable to type 'number'.
\ No newline at end of file
+    var n: number = x.a;
\ No newline at end of file
diff --git a/tests/baselines/reference/objectLiteralContextualTyping.js b/tests/baselines/reference/objectLiteralContextualTyping.js
new file mode 100644
index 00000000000..48686042754
--- /dev/null
+++ b/tests/baselines/reference/objectLiteralContextualTyping.js
@@ -0,0 +1,41 @@
+//// [objectLiteralContextualTyping.ts]
+// Tests related to #1774
+
+interface Item {
+    name: string;
+    description?: string;
+}
+
+declare function foo(item: Item): string;
+declare function foo(item: any): number;
+
+var x = foo({ name: "Sprocket" });
+var x: string;
+
+var y = foo({ name: "Sprocket", description: "Bumpy wheel" });
+var y: string;
+
+var z = foo({ name: "Sprocket", description: false });
+var z: number;
+
+var w = foo({ a: 10 });
+var w: number;
+
+declare function bar<T>(param: { x?: T }): T;
+
+var b = bar({});
+var b: {};
+
+
+//// [objectLiteralContextualTyping.js]
+// Tests related to #1774
+var x = foo({ name: "Sprocket" });
+var x;
+var y = foo({ name: "Sprocket", description: "Bumpy wheel" });
+var y;
+var z = foo({ name: "Sprocket", description: false });
+var z;
+var w = foo({ a: 10 });
+var w;
+var b = bar({});
+var b;
diff --git a/tests/baselines/reference/objectLiteralContextualTyping.types b/tests/baselines/reference/objectLiteralContextualTyping.types
new file mode 100644
index 00000000000..32c9e91b2c7
--- /dev/null
+++ b/tests/baselines/reference/objectLiteralContextualTyping.types
@@ -0,0 +1,81 @@
+=== tests/cases/conformance/expressions/contextualTyping/objectLiteralContextualTyping.ts ===
+// Tests related to #1774
+
+interface Item {
+>Item : Item
+
+    name: string;
+>name : string
+
+    description?: string;
+>description : string
+}
+
+declare function foo(item: Item): string;
+>foo : { (item: Item): string; (item: any): number; }
+>item : Item
+>Item : Item
+
+declare function foo(item: any): number;
+>foo : { (item: Item): string; (item: any): number; }
+>item : any
+
+var x = foo({ name: "Sprocket" });
+>x : string
+>foo({ name: "Sprocket" }) : string
+>foo : { (item: Item): string; (item: any): number; }
+>{ name: "Sprocket" } : { name: string; }
+>name : string
+
+var x: string;
+>x : string
+
+var y = foo({ name: "Sprocket", description: "Bumpy wheel" });
+>y : string
+>foo({ name: "Sprocket", description: "Bumpy wheel" }) : string
+>foo : { (item: Item): string; (item: any): number; }
+>{ name: "Sprocket", description: "Bumpy wheel" } : { name: string; description: string; }
+>name : string
+>description : string
+
+var y: string;
+>y : string
+
+var z = foo({ name: "Sprocket", description: false });
+>z : number
+>foo({ name: "Sprocket", description: false }) : number
+>foo : { (item: Item): string; (item: any): number; }
+>{ name: "Sprocket", description: false } : { name: string; description: boolean; }
+>name : string
+>description : boolean
+
+var z: number;
+>z : number
+
+var w = foo({ a: 10 });
+>w : number
+>foo({ a: 10 }) : number
+>foo : { (item: Item): string; (item: any): number; }
+>{ a: 10 } : { a: number; }
+>a : number
+
+var w: number;
+>w : number
+
+declare function bar<T>(param: { x?: T }): T;
+>bar : <T>(param: { x?: T; }) => T
+>T : T
+>param : { x?: T; }
+>x : T
+>T : T
+>T : T
+
+var b = bar({});
+>b : {}
+>bar({}) : {}
+>bar : <T>(param: { x?: T; }) => T
+>{} : {}
+
+var b: {};
+>b : {}
+
diff --git a/tests/baselines/reference/objectLiteralIndexerNoImplicitAny.js b/tests/baselines/reference/objectLiteralIndexerNoImplicitAny.js
new file mode 100644
index 00000000000..2cbb76b200d
--- /dev/null
+++ b/tests/baselines/reference/objectLiteralIndexerNoImplicitAny.js
@@ -0,0 +1,13 @@
+//// [objectLiteralIndexerNoImplicitAny.ts]
+interface I {
+    [s: string]: any;
+}
+
+var x: I = {
+    p: null
+}
+
+//// [objectLiteralIndexerNoImplicitAny.js]
+var x = {
+    p: null
+};
diff --git a/tests/baselines/reference/objectLiteralIndexerNoImplicitAny.types b/tests/baselines/reference/objectLiteralIndexerNoImplicitAny.types
new file mode 100644
index 00000000000..14bcc6f5b62
--- /dev/null
+++ b/tests/baselines/reference/objectLiteralIndexerNoImplicitAny.types
@@ -0,0 +1,16 @@
+=== tests/cases/compiler/objectLiteralIndexerNoImplicitAny.ts ===
+interface I {
+>I : I
+
+    [s: string]: any;
+>s : string
+}
+
+var x: I = {
+>x : I
+>I : I
+>{    p: null} : { [x: string]: null; p: null; }
+
+    p: null
+>p : null
+}
diff --git a/tests/baselines/reference/parserComputedPropertyName1.errors.txt b/tests/baselines/reference/parserComputedPropertyName1.errors.txt
index 508d06a915c..2258051a46e 100644
--- a/tests/baselines/reference/parserComputedPropertyName1.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName1.errors.txt
@@ -1,7 +1,10 @@
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName1.ts(1,12): error TS2304: Cannot find name 'e'.
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName1.ts(1,15): error TS1005: ':' expected.
 
 
-==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName1.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName1.ts (2 errors) ====
     var v = { [e] };
+               ~
+!!! error TS2304: Cannot find name 'e'.
                   ~
 !!! error TS1005: ':' expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName10.errors.txt b/tests/baselines/reference/parserComputedPropertyName10.errors.txt
index 704c37ebf45..061e2c40c2d 100644
--- a/tests/baselines/reference/parserComputedPropertyName10.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName10.errors.txt
@@ -1,9 +1,12 @@
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName10.ts(2,4): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName10.ts(2,5): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName10.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName10.ts (2 errors) ====
     class C {
        [e] = 1
        ~~~
 !!! error TS1166: Computed property names are not allowed in class property declarations.
+        ~
+!!! error TS2304: Cannot find name 'e'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName11.errors.txt b/tests/baselines/reference/parserComputedPropertyName11.errors.txt
index f47aa75031d..65748f72b24 100644
--- a/tests/baselines/reference/parserComputedPropertyName11.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName11.errors.txt
@@ -1,9 +1,12 @@
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName11.ts(2,4): error TS1168: Computed property names are not allowed in method overloads.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName11.ts(2,5): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName11.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName11.ts (2 errors) ====
     class C {
        [e]();
        ~~~
 !!! error TS1168: Computed property names are not allowed in method overloads.
+        ~
+!!! error TS2304: Cannot find name 'e'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName12.errors.txt b/tests/baselines/reference/parserComputedPropertyName12.errors.txt
index c028275369d..46baacf402d 100644
--- a/tests/baselines/reference/parserComputedPropertyName12.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName12.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName12.ts(2,4): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName12.ts(2,5): error TS2304: Cannot find name 'e'.
 
 
 ==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName12.ts (1 errors) ====
     class C {
        [e]() { }
-       ~~~
-!!! error TS9002: Computed property names are not currently supported.
+        ~
+!!! error TS2304: Cannot find name 'e'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName12.js b/tests/baselines/reference/parserComputedPropertyName12.js
new file mode 100644
index 00000000000..96e62b626e7
--- /dev/null
+++ b/tests/baselines/reference/parserComputedPropertyName12.js
@@ -0,0 +1,13 @@
+//// [parserComputedPropertyName12.ts]
+class C {
+   [e]() { }
+}
+
+//// [parserComputedPropertyName12.js]
+var C = (function () {
+    function C() {
+    }
+    C.prototype[e] = function () {
+    };
+    return C;
+})();
diff --git a/tests/baselines/reference/parserComputedPropertyName13.errors.txt b/tests/baselines/reference/parserComputedPropertyName13.errors.txt
index 33ef5f9141a..b209f3c7d01 100644
--- a/tests/baselines/reference/parserComputedPropertyName13.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName13.errors.txt
@@ -1,7 +1,10 @@
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName13.ts(1,10): error TS1170: Computed property names are not allowed in type literals.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName13.ts(1,11): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName13.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName13.ts (2 errors) ====
     var v: { [e]: number };
              ~~~
-!!! error TS1170: Computed property names are not allowed in type literals.
\ No newline at end of file
+!!! error TS1170: Computed property names are not allowed in type literals.
+              ~
+!!! error TS2304: Cannot find name 'e'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName14.errors.txt b/tests/baselines/reference/parserComputedPropertyName14.errors.txt
index d2f7ad34ed9..6ac2d276a80 100644
--- a/tests/baselines/reference/parserComputedPropertyName14.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName14.errors.txt
@@ -1,7 +1,10 @@
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName14.ts(1,10): error TS1170: Computed property names are not allowed in type literals.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName14.ts(1,11): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName14.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName14.ts (2 errors) ====
     var v: { [e](): number };
              ~~~
-!!! error TS1170: Computed property names are not allowed in type literals.
\ No newline at end of file
+!!! error TS1170: Computed property names are not allowed in type literals.
+              ~
+!!! error TS2304: Cannot find name 'e'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName15.errors.txt b/tests/baselines/reference/parserComputedPropertyName15.errors.txt
index b09ddb73112..f66e5930c26 100644
--- a/tests/baselines/reference/parserComputedPropertyName15.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName15.errors.txt
@@ -1,7 +1,10 @@
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName15.ts(1,31): error TS1170: Computed property names are not allowed in type literals.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName15.ts(1,32): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName15.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName15.ts (2 errors) ====
     var v: { [e: number]: string; [e]: number };
                                   ~~~
-!!! error TS1170: Computed property names are not allowed in type literals.
\ No newline at end of file
+!!! error TS1170: Computed property names are not allowed in type literals.
+                                   ~
+!!! error TS2304: Cannot find name 'e'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName17.errors.txt b/tests/baselines/reference/parserComputedPropertyName17.errors.txt
index f8b1a4866e8..d8b43ada527 100644
--- a/tests/baselines/reference/parserComputedPropertyName17.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName17.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName17.ts(1,15): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName17.ts(1,16): error TS2304: Cannot find name 'e'.
 
 
 ==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName17.ts (1 errors) ====
     var v = { set [e](v) { } }
-                  ~~~
-!!! error TS9002: Computed property names are not currently supported.
\ No newline at end of file
+                   ~
+!!! error TS2304: Cannot find name 'e'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName17.js b/tests/baselines/reference/parserComputedPropertyName17.js
new file mode 100644
index 00000000000..98d61ab8bca
--- /dev/null
+++ b/tests/baselines/reference/parserComputedPropertyName17.js
@@ -0,0 +1,6 @@
+//// [parserComputedPropertyName17.ts]
+var v = { set [e](v) { } }
+
+//// [parserComputedPropertyName17.js]
+var v = { set [e](v) {
+} };
diff --git a/tests/baselines/reference/parserComputedPropertyName18.errors.txt b/tests/baselines/reference/parserComputedPropertyName18.errors.txt
index 72833dda837..f7485a127cb 100644
--- a/tests/baselines/reference/parserComputedPropertyName18.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName18.errors.txt
@@ -1,7 +1,10 @@
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName18.ts(1,10): error TS1170: Computed property names are not allowed in type literals.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName18.ts(1,11): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName18.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName18.ts (2 errors) ====
     var v: { [e]?(): number };
              ~~~
-!!! error TS1170: Computed property names are not allowed in type literals.
\ No newline at end of file
+!!! error TS1170: Computed property names are not allowed in type literals.
+              ~
+!!! error TS2304: Cannot find name 'e'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName19.errors.txt b/tests/baselines/reference/parserComputedPropertyName19.errors.txt
index 22dbfff3c61..65c22ff36c3 100644
--- a/tests/baselines/reference/parserComputedPropertyName19.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName19.errors.txt
@@ -1,7 +1,10 @@
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName19.ts(1,10): error TS1170: Computed property names are not allowed in type literals.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName19.ts(1,11): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName19.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName19.ts (2 errors) ====
     var v: { [e]? };
              ~~~
-!!! error TS1170: Computed property names are not allowed in type literals.
\ No newline at end of file
+!!! error TS1170: Computed property names are not allowed in type literals.
+              ~
+!!! error TS2304: Cannot find name 'e'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName2.errors.txt b/tests/baselines/reference/parserComputedPropertyName2.errors.txt
index 9eb6cdd6004..864c7adf1b5 100644
--- a/tests/baselines/reference/parserComputedPropertyName2.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName2.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName2.ts(1,11): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName2.ts(1,12): error TS2304: Cannot find name 'e'.
 
 
 ==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName2.ts (1 errors) ====
     var v = { [e]: 1 };
-              ~~~
-!!! error TS9002: Computed property names are not currently supported.
\ No newline at end of file
+               ~
+!!! error TS2304: Cannot find name 'e'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName2.js b/tests/baselines/reference/parserComputedPropertyName2.js
new file mode 100644
index 00000000000..f3c41f963f5
--- /dev/null
+++ b/tests/baselines/reference/parserComputedPropertyName2.js
@@ -0,0 +1,5 @@
+//// [parserComputedPropertyName2.ts]
+var v = { [e]: 1 };
+
+//// [parserComputedPropertyName2.js]
+var v = { [e]: 1 };
diff --git a/tests/baselines/reference/parserComputedPropertyName20.errors.txt b/tests/baselines/reference/parserComputedPropertyName20.errors.txt
index 36a7e2d4866..d65dfede1d2 100644
--- a/tests/baselines/reference/parserComputedPropertyName20.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName20.errors.txt
@@ -1,9 +1,12 @@
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName20.ts(2,5): error TS1169: Computed property names are not allowed in interfaces.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName20.ts(2,6): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName20.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName20.ts (2 errors) ====
     interface I {
         [e](): number 
         ~~~
 !!! error TS1169: Computed property names are not allowed in interfaces.
+         ~
+!!! error TS2304: Cannot find name 'e'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName21.errors.txt b/tests/baselines/reference/parserComputedPropertyName21.errors.txt
index 5850de24b76..5a9738a23a6 100644
--- a/tests/baselines/reference/parserComputedPropertyName21.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName21.errors.txt
@@ -1,9 +1,12 @@
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName21.ts(2,5): error TS1169: Computed property names are not allowed in interfaces.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName21.ts(2,6): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName21.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName21.ts (2 errors) ====
     interface I {
         [e]: number 
         ~~~
 !!! error TS1169: Computed property names are not allowed in interfaces.
+         ~
+!!! error TS2304: Cannot find name 'e'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName22.errors.txt b/tests/baselines/reference/parserComputedPropertyName22.errors.txt
index 5149c937108..ce20dd0c587 100644
--- a/tests/baselines/reference/parserComputedPropertyName22.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName22.errors.txt
@@ -1,9 +1,12 @@
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName22.ts(2,5): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName22.ts(2,6): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName22.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName22.ts (2 errors) ====
     declare class C {
         [e]: number 
         ~~~
 !!! error TS1166: Computed property names are not allowed in class property declarations.
+         ~
+!!! error TS2304: Cannot find name 'e'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName23.errors.txt b/tests/baselines/reference/parserComputedPropertyName23.errors.txt
index 2018032ef94..8c95992253c 100644
--- a/tests/baselines/reference/parserComputedPropertyName23.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName23.errors.txt
@@ -1,9 +1,12 @@
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName23.ts(2,9): error TS1086: An accessor cannot be declared in an ambient context.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName23.ts(2,10): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName23.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName23.ts (2 errors) ====
     declare class C {
         get [e](): number 
             ~~~
 !!! error TS1086: An accessor cannot be declared in an ambient context.
+             ~
+!!! error TS2304: Cannot find name 'e'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName24.errors.txt b/tests/baselines/reference/parserComputedPropertyName24.errors.txt
index fa7280a93e7..29bcb05ea0f 100644
--- a/tests/baselines/reference/parserComputedPropertyName24.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName24.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName24.ts(2,9): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName24.ts(2,10): error TS2304: Cannot find name 'e'.
 
 
 ==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName24.ts (1 errors) ====
     class C {
         set [e](v) { }
-            ~~~
-!!! error TS9002: Computed property names are not currently supported.
+             ~
+!!! error TS2304: Cannot find name 'e'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName24.js b/tests/baselines/reference/parserComputedPropertyName24.js
new file mode 100644
index 00000000000..0b9467fb26d
--- /dev/null
+++ b/tests/baselines/reference/parserComputedPropertyName24.js
@@ -0,0 +1,17 @@
+//// [parserComputedPropertyName24.ts]
+class C {
+    set [e](v) { }
+}
+
+//// [parserComputedPropertyName24.js]
+var C = (function () {
+    function C() {
+    }
+    Object.defineProperty(C.prototype, e, {
+        set: function (v) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return C;
+})();
diff --git a/tests/baselines/reference/parserComputedPropertyName25.errors.txt b/tests/baselines/reference/parserComputedPropertyName25.errors.txt
index c8dd6b3bc7c..8d26c8afdb7 100644
--- a/tests/baselines/reference/parserComputedPropertyName25.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName25.errors.txt
@@ -1,13 +1,16 @@
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName25.ts(3,5): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName25.ts(3,6): error TS2304: Cannot find name 'e'.
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName25.ts(4,6): error TS2304: Cannot find name 'e2'.
 
 
-==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName25.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName25.ts (3 errors) ====
     class C {
         // No ASI
         [e] = 0
         ~~~
 !!! error TS1166: Computed property names are not allowed in class property declarations.
+         ~
+!!! error TS2304: Cannot find name 'e'.
         [e2] = 1
          ~~
 !!! error TS2304: Cannot find name 'e2'.
diff --git a/tests/baselines/reference/parserComputedPropertyName27.errors.txt b/tests/baselines/reference/parserComputedPropertyName27.errors.txt
index 7c8e30bf25d..3792cf0eccd 100644
--- a/tests/baselines/reference/parserComputedPropertyName27.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName27.errors.txt
@@ -1,11 +1,14 @@
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName27.ts(3,6): error TS2304: Cannot find name 'e'.
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName27.ts(4,6): error TS2304: Cannot find name 'e2'.
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName27.ts(4,9): error TS1005: ';' expected.
 
 
-==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName27.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName27.ts (3 errors) ====
     class C {
         // No ASI
         [e]: number = 0
+         ~
+!!! error TS2304: Cannot find name 'e'.
         [e2]: number
          ~~
 !!! error TS2304: Cannot find name 'e2'.
diff --git a/tests/baselines/reference/parserComputedPropertyName28.errors.txt b/tests/baselines/reference/parserComputedPropertyName28.errors.txt
index bc32f34c151..c522ec031eb 100644
--- a/tests/baselines/reference/parserComputedPropertyName28.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName28.errors.txt
@@ -1,13 +1,19 @@
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName28.ts(2,5): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName28.ts(2,6): error TS2304: Cannot find name 'e'.
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName28.ts(3,5): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName28.ts(3,6): error TS2304: Cannot find name 'e2'.
 
 
-==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName28.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName28.ts (4 errors) ====
     class C {
         [e]: number = 0;
         ~~~
 !!! error TS1166: Computed property names are not allowed in class property declarations.
+         ~
+!!! error TS2304: Cannot find name 'e'.
         [e2]: number
         ~~~~
 !!! error TS1166: Computed property names are not allowed in class property declarations.
+         ~~
+!!! error TS2304: Cannot find name 'e2'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName29.errors.txt b/tests/baselines/reference/parserComputedPropertyName29.errors.txt
index 691a240375a..5e6baed0f06 100644
--- a/tests/baselines/reference/parserComputedPropertyName29.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName29.errors.txt
@@ -1,17 +1,23 @@
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName29.ts(3,5): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName29.ts(3,6): error TS2304: Cannot find name 'e'.
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName29.ts(3,11): error TS2304: Cannot find name 'id'.
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName29.ts(4,5): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName29.ts(4,6): error TS2304: Cannot find name 'e2'.
 
 
-==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName29.ts (3 errors) ====
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName29.ts (5 errors) ====
     class C {
         // yes ASI
         [e] = id++
         ~~~
 !!! error TS1166: Computed property names are not allowed in class property declarations.
+         ~
+!!! error TS2304: Cannot find name 'e'.
               ~~
 !!! error TS2304: Cannot find name 'id'.
         [e2]: number
         ~~~~
 !!! error TS1166: Computed property names are not allowed in class property declarations.
+         ~~
+!!! error TS2304: Cannot find name 'e2'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName3.errors.txt b/tests/baselines/reference/parserComputedPropertyName3.errors.txt
index b13f453cb89..4b20c55f499 100644
--- a/tests/baselines/reference/parserComputedPropertyName3.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName3.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName3.ts(1,11): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName3.ts(1,12): error TS2304: Cannot find name 'e'.
 
 
 ==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName3.ts (1 errors) ====
     var v = { [e]() { } };
-              ~~~
-!!! error TS9002: Computed property names are not currently supported.
\ No newline at end of file
+               ~
+!!! error TS2304: Cannot find name 'e'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName3.js b/tests/baselines/reference/parserComputedPropertyName3.js
new file mode 100644
index 00000000000..2e73fe87d3a
--- /dev/null
+++ b/tests/baselines/reference/parserComputedPropertyName3.js
@@ -0,0 +1,6 @@
+//// [parserComputedPropertyName3.ts]
+var v = { [e]() { } };
+
+//// [parserComputedPropertyName3.js]
+var v = { [e]() {
+} };
diff --git a/tests/baselines/reference/parserComputedPropertyName31.errors.txt b/tests/baselines/reference/parserComputedPropertyName31.errors.txt
index 6dddbd859c9..97a3b1ee187 100644
--- a/tests/baselines/reference/parserComputedPropertyName31.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName31.errors.txt
@@ -1,14 +1,20 @@
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName31.ts(3,5): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName31.ts(3,6): error TS2304: Cannot find name 'e'.
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName31.ts(4,5): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName31.ts(4,6): error TS2304: Cannot find name 'e2'.
 
 
-==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName31.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName31.ts (4 errors) ====
     class C {
         // yes ASI
         [e]: number
         ~~~
 !!! error TS1166: Computed property names are not allowed in class property declarations.
+         ~
+!!! error TS2304: Cannot find name 'e'.
         [e2]: number
         ~~~~
 !!! error TS1166: Computed property names are not allowed in class property declarations.
+         ~~
+!!! error TS2304: Cannot find name 'e2'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName32.errors.txt b/tests/baselines/reference/parserComputedPropertyName32.errors.txt
index 4407014cf99..da423baaa05 100644
--- a/tests/baselines/reference/parserComputedPropertyName32.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName32.errors.txt
@@ -1,9 +1,12 @@
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName32.ts(2,5): error TS1165: Computed property names are not allowed in an ambient context.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName32.ts(2,6): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName32.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName32.ts (2 errors) ====
     declare class C {
         [e](): number 
         ~~~
 !!! error TS1165: Computed property names are not allowed in an ambient context.
+         ~
+!!! error TS2304: Cannot find name 'e'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName33.errors.txt b/tests/baselines/reference/parserComputedPropertyName33.errors.txt
index d56ee49863f..5ce420ceb60 100644
--- a/tests/baselines/reference/parserComputedPropertyName33.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName33.errors.txt
@@ -1,12 +1,15 @@
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName33.ts(3,6): error TS2304: Cannot find name 'e'.
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName33.ts(4,6): error TS2304: Cannot find name 'e2'.
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName33.ts(4,12): error TS1005: ';' expected.
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName33.ts(5,1): error TS1128: Declaration or statement expected.
 
 
-==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName33.ts (3 errors) ====
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName33.ts (4 errors) ====
     class C {
         // No ASI
         [e] = 0
+         ~
+!!! error TS2304: Cannot find name 'e'.
         [e2]() { }
          ~~
 !!! error TS2304: Cannot find name 'e2'.
diff --git a/tests/baselines/reference/parserComputedPropertyName35.errors.txt b/tests/baselines/reference/parserComputedPropertyName35.errors.txt
index d68f0eb1ec7..e603d1c73fd 100644
--- a/tests/baselines/reference/parserComputedPropertyName35.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName35.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName35.ts(2,5): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName35.ts(2,6): error TS1171: A comma expression is not allowed in a computed property name.
 
 
 ==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName35.ts (1 errors) ====
     var x = {
         [0, 1]: { }
-        ~~~~~~
-!!! error TS9002: Computed property names are not currently supported.
+         ~~~~
+!!! error TS1171: A comma expression is not allowed in a computed property name.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName35.js b/tests/baselines/reference/parserComputedPropertyName35.js
new file mode 100644
index 00000000000..15992d54ece
--- /dev/null
+++ b/tests/baselines/reference/parserComputedPropertyName35.js
@@ -0,0 +1,9 @@
+//// [parserComputedPropertyName35.ts]
+var x = {
+    [0, 1]: { }
+}
+
+//// [parserComputedPropertyName35.js]
+var x = {
+    [0, 1]: {}
+};
diff --git a/tests/baselines/reference/parserComputedPropertyName36.errors.txt b/tests/baselines/reference/parserComputedPropertyName36.errors.txt
index d10d826d1a9..1b4130b0e27 100644
--- a/tests/baselines/reference/parserComputedPropertyName36.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName36.errors.txt
@@ -1,9 +1,12 @@
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName36.ts(2,5): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName36.ts(2,6): error TS2304: Cannot find name 'public'.
 
 
-==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName36.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName36.ts (2 errors) ====
     class C {
         [public ]: string;
         ~~~~~~~~~
 !!! error TS1166: Computed property names are not allowed in class property declarations.
+         ~~~~~~
+!!! error TS2304: Cannot find name 'public'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName37.errors.txt b/tests/baselines/reference/parserComputedPropertyName37.errors.txt
index fa1acd5dbe0..64a9e7e99dc 100644
--- a/tests/baselines/reference/parserComputedPropertyName37.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName37.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName37.ts(2,5): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName37.ts(2,6): error TS2304: Cannot find name 'public'.
 
 
 ==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName37.ts (1 errors) ====
     var v = {
         [public]: 0
-        ~~~~~~~~
-!!! error TS9002: Computed property names are not currently supported.
+         ~~~~~~
+!!! error TS2304: Cannot find name 'public'.
     };
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName37.js b/tests/baselines/reference/parserComputedPropertyName37.js
new file mode 100644
index 00000000000..eb16d5ade37
--- /dev/null
+++ b/tests/baselines/reference/parserComputedPropertyName37.js
@@ -0,0 +1,9 @@
+//// [parserComputedPropertyName37.ts]
+var v = {
+    [public]: 0
+};
+
+//// [parserComputedPropertyName37.js]
+var v = {
+    [public]: 0
+};
diff --git a/tests/baselines/reference/parserComputedPropertyName38.errors.txt b/tests/baselines/reference/parserComputedPropertyName38.errors.txt
index 910a907ee0f..4322abf44ed 100644
--- a/tests/baselines/reference/parserComputedPropertyName38.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName38.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName38.ts(2,5): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName38.ts(2,6): error TS2304: Cannot find name 'public'.
 
 
 ==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName38.ts (1 errors) ====
     class C {
         [public]() { }
-        ~~~~~~~~
-!!! error TS9002: Computed property names are not currently supported.
+         ~~~~~~
+!!! error TS2304: Cannot find name 'public'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName38.js b/tests/baselines/reference/parserComputedPropertyName38.js
new file mode 100644
index 00000000000..487ff4078fd
--- /dev/null
+++ b/tests/baselines/reference/parserComputedPropertyName38.js
@@ -0,0 +1,13 @@
+//// [parserComputedPropertyName38.ts]
+class C {
+    [public]() { }
+}
+
+//// [parserComputedPropertyName38.js]
+var C = (function () {
+    function C() {
+    }
+    C.prototype[public] = function () {
+    };
+    return C;
+})();
diff --git a/tests/baselines/reference/parserComputedPropertyName4.errors.txt b/tests/baselines/reference/parserComputedPropertyName4.errors.txt
index c1137b15872..bfc78b162fd 100644
--- a/tests/baselines/reference/parserComputedPropertyName4.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName4.errors.txt
@@ -1,7 +1,10 @@
-tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName4.ts(1,15): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName4.ts(1,15): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName4.ts(1,16): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName4.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName4.ts (2 errors) ====
     var v = { get [e]() { } };
                   ~~~
-!!! error TS9002: Computed property names are not currently supported.
\ No newline at end of file
+!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+                   ~
+!!! error TS2304: Cannot find name 'e'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName4.js b/tests/baselines/reference/parserComputedPropertyName4.js
new file mode 100644
index 00000000000..a88545566e6
--- /dev/null
+++ b/tests/baselines/reference/parserComputedPropertyName4.js
@@ -0,0 +1,6 @@
+//// [parserComputedPropertyName4.ts]
+var v = { get [e]() { } };
+
+//// [parserComputedPropertyName4.js]
+var v = { get [e]() {
+} };
diff --git a/tests/baselines/reference/parserComputedPropertyName40.errors.txt b/tests/baselines/reference/parserComputedPropertyName40.errors.txt
index 93be0ad51b7..862836ae47d 100644
--- a/tests/baselines/reference/parserComputedPropertyName40.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName40.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName40.ts(2,5): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName40.ts(2,6): error TS2304: Cannot find name 'a'.
 
 
 ==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName40.ts (1 errors) ====
     class C {
         [a ? "" : ""]() {}
-        ~~~~~~~~~~~~~
-!!! error TS9002: Computed property names are not currently supported.
+         ~
+!!! error TS2304: Cannot find name 'a'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName40.js b/tests/baselines/reference/parserComputedPropertyName40.js
new file mode 100644
index 00000000000..5f6381360fc
--- /dev/null
+++ b/tests/baselines/reference/parserComputedPropertyName40.js
@@ -0,0 +1,13 @@
+//// [parserComputedPropertyName40.ts]
+class C {
+    [a ? "" : ""]() {}
+}
+
+//// [parserComputedPropertyName40.js]
+var C = (function () {
+    function C() {
+    }
+    C.prototype[a ? "" : ""] = function () {
+    };
+    return C;
+})();
diff --git a/tests/baselines/reference/parserComputedPropertyName41.errors.txt b/tests/baselines/reference/parserComputedPropertyName41.errors.txt
index eb5e9a9ebbf..65d4ec8627f 100644
--- a/tests/baselines/reference/parserComputedPropertyName41.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName41.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName41.ts(2,5): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName41.ts(2,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
 
 
 ==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName41.ts (1 errors) ====
     var v = {
         [0 in []]: true
         ~~~~~~~~~
-!!! error TS9002: Computed property names are not currently supported.
+!!! error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName41.js b/tests/baselines/reference/parserComputedPropertyName41.js
new file mode 100644
index 00000000000..b19cc3e7b3f
--- /dev/null
+++ b/tests/baselines/reference/parserComputedPropertyName41.js
@@ -0,0 +1,9 @@
+//// [parserComputedPropertyName41.ts]
+var v = {
+    [0 in []]: true
+}
+
+//// [parserComputedPropertyName41.js]
+var v = {
+    [0 in []]: true
+};
diff --git a/tests/baselines/reference/parserComputedPropertyName5.errors.txt b/tests/baselines/reference/parserComputedPropertyName5.errors.txt
index f0dd056fdf9..07cc6f3a9f0 100644
--- a/tests/baselines/reference/parserComputedPropertyName5.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName5.errors.txt
@@ -1,7 +1,10 @@
-tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName5.ts(1,22): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName5.ts(1,22): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName5.ts(1,23): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName5.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName5.ts (2 errors) ====
     var v = { public get [e]() { } };
                          ~~~
-!!! error TS9002: Computed property names are not currently supported.
\ No newline at end of file
+!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+                          ~
+!!! error TS2304: Cannot find name 'e'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName5.js b/tests/baselines/reference/parserComputedPropertyName5.js
new file mode 100644
index 00000000000..aa86d54d09c
--- /dev/null
+++ b/tests/baselines/reference/parserComputedPropertyName5.js
@@ -0,0 +1,6 @@
+//// [parserComputedPropertyName5.ts]
+var v = { public get [e]() { } };
+
+//// [parserComputedPropertyName5.js]
+var v = { get [e]() {
+} };
diff --git a/tests/baselines/reference/parserComputedPropertyName6.errors.txt b/tests/baselines/reference/parserComputedPropertyName6.errors.txt
index 893bf3da719..90f1b688408 100644
--- a/tests/baselines/reference/parserComputedPropertyName6.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName6.errors.txt
@@ -1,10 +1,13 @@
-tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName6.ts(1,11): error TS9002: Computed property names are not currently supported.
-tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName6.ts(1,19): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName6.ts(1,12): error TS2304: Cannot find name 'e'.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName6.ts(1,20): error TS2304: Cannot find name 'e'.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName6.ts(1,24): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName6.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName6.ts (3 errors) ====
     var v = { [e]: 1, [e + e]: 2 };
-              ~~~
-!!! error TS9002: Computed property names are not currently supported.
-                      ~~~~~~~
-!!! error TS9002: Computed property names are not currently supported.
\ No newline at end of file
+               ~
+!!! error TS2304: Cannot find name 'e'.
+                       ~
+!!! error TS2304: Cannot find name 'e'.
+                           ~
+!!! error TS2304: Cannot find name 'e'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName6.js b/tests/baselines/reference/parserComputedPropertyName6.js
new file mode 100644
index 00000000000..b60ad66a9d8
--- /dev/null
+++ b/tests/baselines/reference/parserComputedPropertyName6.js
@@ -0,0 +1,5 @@
+//// [parserComputedPropertyName6.ts]
+var v = { [e]: 1, [e + e]: 2 };
+
+//// [parserComputedPropertyName6.js]
+var v = { [e]: 1, [e + e]: 2 };
diff --git a/tests/baselines/reference/parserComputedPropertyName7.errors.txt b/tests/baselines/reference/parserComputedPropertyName7.errors.txt
index 21147be3074..bcf39b0ca0a 100644
--- a/tests/baselines/reference/parserComputedPropertyName7.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName7.errors.txt
@@ -1,9 +1,12 @@
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName7.ts(2,4): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName7.ts(2,5): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName7.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName7.ts (2 errors) ====
     class C {
        [e]
        ~~~
 !!! error TS1166: Computed property names are not allowed in class property declarations.
+        ~
+!!! error TS2304: Cannot find name 'e'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName8.errors.txt b/tests/baselines/reference/parserComputedPropertyName8.errors.txt
index 75352ec9e51..250c7a52c6e 100644
--- a/tests/baselines/reference/parserComputedPropertyName8.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName8.errors.txt
@@ -1,9 +1,12 @@
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName8.ts(2,11): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName8.ts(2,12): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName8.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName8.ts (2 errors) ====
     class C {
        public [e]
               ~~~
 !!! error TS1166: Computed property names are not allowed in class property declarations.
+               ~
+!!! error TS2304: Cannot find name 'e'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName9.errors.txt b/tests/baselines/reference/parserComputedPropertyName9.errors.txt
index eb5cfd28d73..fd434046564 100644
--- a/tests/baselines/reference/parserComputedPropertyName9.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName9.errors.txt
@@ -1,12 +1,15 @@
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName9.ts(2,4): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName9.ts(2,5): error TS2304: Cannot find name 'e'.
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName9.ts(2,9): error TS2304: Cannot find name 'Type'.
 
 
-==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName9.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName9.ts (3 errors) ====
     class C {
        [e]: Type
        ~~~
 !!! error TS1166: Computed property names are not allowed in class property declarations.
+        ~
+!!! error TS2304: Cannot find name 'e'.
             ~~~~
 !!! error TS2304: Cannot find name 'Type'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ComputedPropertyName1.errors.txt b/tests/baselines/reference/parserES5ComputedPropertyName1.errors.txt
index 5bae79b95aa..55af923e54b 100644
--- a/tests/baselines/reference/parserES5ComputedPropertyName1.errors.txt
+++ b/tests/baselines/reference/parserES5ComputedPropertyName1.errors.txt
@@ -1,9 +1,12 @@
 tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName1.ts(2,5): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName1.ts(2,6): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName1.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName1.ts (2 errors) ====
     declare class C {
         [e]: number 
         ~~~
 !!! error TS1166: Computed property names are not allowed in class property declarations.
+         ~
+!!! error TS2304: Cannot find name 'e'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ComputedPropertyName10.errors.txt b/tests/baselines/reference/parserES5ComputedPropertyName10.errors.txt
index 40bec1b4f38..7db85cdef35 100644
--- a/tests/baselines/reference/parserES5ComputedPropertyName10.errors.txt
+++ b/tests/baselines/reference/parserES5ComputedPropertyName10.errors.txt
@@ -1,9 +1,12 @@
 tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName10.ts(2,4): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName10.ts(2,5): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName10.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName10.ts (2 errors) ====
     class C {
        [e] = 1
        ~~~
 !!! error TS1166: Computed property names are not allowed in class property declarations.
+        ~
+!!! error TS2304: Cannot find name 'e'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ComputedPropertyName11.errors.txt b/tests/baselines/reference/parserES5ComputedPropertyName11.errors.txt
index 124db7da75a..ead27a994d1 100644
--- a/tests/baselines/reference/parserES5ComputedPropertyName11.errors.txt
+++ b/tests/baselines/reference/parserES5ComputedPropertyName11.errors.txt
@@ -1,9 +1,12 @@
 tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName11.ts(2,4): error TS1168: Computed property names are not allowed in method overloads.
+tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName11.ts(2,5): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName11.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName11.ts (2 errors) ====
     class C {
        [e]();
        ~~~
 !!! error TS1168: Computed property names are not allowed in method overloads.
+        ~
+!!! error TS2304: Cannot find name 'e'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ComputedPropertyName2.errors.txt b/tests/baselines/reference/parserES5ComputedPropertyName2.errors.txt
index 7b6b74b8fd8..5918387942d 100644
--- a/tests/baselines/reference/parserES5ComputedPropertyName2.errors.txt
+++ b/tests/baselines/reference/parserES5ComputedPropertyName2.errors.txt
@@ -1,7 +1,10 @@
-tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName2.ts(1,11): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName2.ts(1,11): error TS1167: Computed property names are only available when targeting ECMAScript 6 and higher.
+tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName2.ts(1,12): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName2.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName2.ts (2 errors) ====
     var v = { [e]: 1 };
               ~~~
-!!! error TS9002: Computed property names are not currently supported.
\ No newline at end of file
+!!! error TS1167: Computed property names are only available when targeting ECMAScript 6 and higher.
+               ~
+!!! error TS2304: Cannot find name 'e'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ComputedPropertyName3.errors.txt b/tests/baselines/reference/parserES5ComputedPropertyName3.errors.txt
index 669fd190265..097ab1ea9cb 100644
--- a/tests/baselines/reference/parserES5ComputedPropertyName3.errors.txt
+++ b/tests/baselines/reference/parserES5ComputedPropertyName3.errors.txt
@@ -1,7 +1,10 @@
-tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName3.ts(1,11): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName3.ts(1,11): error TS1167: Computed property names are only available when targeting ECMAScript 6 and higher.
+tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName3.ts(1,12): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName3.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName3.ts (2 errors) ====
     var v = { [e]() { } };
               ~~~
-!!! error TS9002: Computed property names are not currently supported.
\ No newline at end of file
+!!! error TS1167: Computed property names are only available when targeting ECMAScript 6 and higher.
+               ~
+!!! error TS2304: Cannot find name 'e'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ComputedPropertyName4.errors.txt b/tests/baselines/reference/parserES5ComputedPropertyName4.errors.txt
index af0c6e858ad..ca69791c93c 100644
--- a/tests/baselines/reference/parserES5ComputedPropertyName4.errors.txt
+++ b/tests/baselines/reference/parserES5ComputedPropertyName4.errors.txt
@@ -1,7 +1,13 @@
-tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName4.ts(1,15): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName4.ts(1,15): error TS1167: Computed property names are only available when targeting ECMAScript 6 and higher.
+tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName4.ts(1,15): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName4.ts(1,16): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName4.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName4.ts (3 errors) ====
     var v = { get [e]() { } };
                   ~~~
-!!! error TS9002: Computed property names are not currently supported.
\ No newline at end of file
+!!! error TS1167: Computed property names are only available when targeting ECMAScript 6 and higher.
+                  ~~~
+!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+                   ~
+!!! error TS2304: Cannot find name 'e'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ComputedPropertyName5.errors.txt b/tests/baselines/reference/parserES5ComputedPropertyName5.errors.txt
index 8eeeef1516f..122ca20a0e4 100644
--- a/tests/baselines/reference/parserES5ComputedPropertyName5.errors.txt
+++ b/tests/baselines/reference/parserES5ComputedPropertyName5.errors.txt
@@ -1,9 +1,12 @@
 tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName5.ts(2,5): error TS1169: Computed property names are not allowed in interfaces.
+tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName5.ts(2,6): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName5.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName5.ts (2 errors) ====
     interface I {
         [e]: number 
         ~~~
 !!! error TS1169: Computed property names are not allowed in interfaces.
+         ~
+!!! error TS2304: Cannot find name 'e'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ComputedPropertyName7.errors.txt b/tests/baselines/reference/parserES5ComputedPropertyName7.errors.txt
index 6aefd27ef58..d38d57d87be 100644
--- a/tests/baselines/reference/parserES5ComputedPropertyName7.errors.txt
+++ b/tests/baselines/reference/parserES5ComputedPropertyName7.errors.txt
@@ -1,9 +1,12 @@
 tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName7.ts(2,4): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName7.ts(2,5): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName7.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName7.ts (2 errors) ====
     class C {
        [e]
        ~~~
 !!! error TS1166: Computed property names are not allowed in class property declarations.
+        ~
+!!! error TS2304: Cannot find name 'e'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ComputedPropertyName8.errors.txt b/tests/baselines/reference/parserES5ComputedPropertyName8.errors.txt
index 4595081c145..e52727c6929 100644
--- a/tests/baselines/reference/parserES5ComputedPropertyName8.errors.txt
+++ b/tests/baselines/reference/parserES5ComputedPropertyName8.errors.txt
@@ -1,7 +1,10 @@
 tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName8.ts(1,10): error TS1170: Computed property names are not allowed in type literals.
+tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName8.ts(1,11): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName8.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName8.ts (2 errors) ====
     var v: { [e]: number };
              ~~~
-!!! error TS1170: Computed property names are not allowed in type literals.
\ No newline at end of file
+!!! error TS1170: Computed property names are not allowed in type literals.
+              ~
+!!! error TS2304: Cannot find name 'e'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ComputedPropertyName9.errors.txt b/tests/baselines/reference/parserES5ComputedPropertyName9.errors.txt
index 6d035a7c610..8cbe0ffcf8d 100644
--- a/tests/baselines/reference/parserES5ComputedPropertyName9.errors.txt
+++ b/tests/baselines/reference/parserES5ComputedPropertyName9.errors.txt
@@ -1,12 +1,15 @@
 tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName9.ts(2,4): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName9.ts(2,5): error TS2304: Cannot find name 'e'.
 tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName9.ts(2,9): error TS2304: Cannot find name 'Type'.
 
 
-==== tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName9.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName9.ts (3 errors) ====
     class C {
        [e]: Type
        ~~~
 !!! error TS1166: Computed property names are not allowed in class property declarations.
+        ~
+!!! error TS2304: Cannot find name 'e'.
             ~~~~
 !!! error TS2304: Cannot find name 'Type'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserIndexSignature11.errors.txt b/tests/baselines/reference/parserIndexSignature11.errors.txt
index c9976e2bc4a..8cf474b19bb 100644
--- a/tests/baselines/reference/parserIndexSignature11.errors.txt
+++ b/tests/baselines/reference/parserIndexSignature11.errors.txt
@@ -1,13 +1,16 @@
 tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature11.ts(2,9): error TS1169: Computed property names are not allowed in interfaces.
+tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature11.ts(2,10): error TS2304: Cannot find name 'p'.
 tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature11.ts(3,9): error TS1021: An index signature must have a type annotation.
 tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature11.ts(4,10): error TS1096: An index signature must have exactly one parameter.
 
 
-==== tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature11.ts (3 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature11.ts (4 errors) ====
     interface I {
-            [p];
+            [p]; // Used to be indexer, now it is a computed property
             ~~~
 !!! error TS1169: Computed property names are not allowed in interfaces.
+             ~
+!!! error TS2304: Cannot find name 'p'.
             [p1: string];
             ~~~~~~~~~~~~~
 !!! error TS1021: An index signature must have a type annotation.
diff --git a/tests/baselines/reference/parserIndexSignature4.errors.txt b/tests/baselines/reference/parserIndexSignature4.errors.txt
index 0f11eb17f3c..d625f27eb6f 100644
--- a/tests/baselines/reference/parserIndexSignature4.errors.txt
+++ b/tests/baselines/reference/parserIndexSignature4.errors.txt
@@ -1,9 +1,12 @@
 tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature4.ts(2,3): error TS1169: Computed property names are not allowed in interfaces.
+tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature4.ts(2,4): error TS2304: Cannot find name 'a'.
 
 
-==== tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature4.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature4.ts (2 errors) ====
     interface I {
-      [a = 0]
+      [a = 0] // Used to be indexer, now it is a computed property
       ~~~~~~~
 !!! error TS1169: Computed property names are not allowed in interfaces.
+       ~
+!!! error TS2304: Cannot find name 'a'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserIndexSignature5.errors.txt b/tests/baselines/reference/parserIndexSignature5.errors.txt
index 6400383f9d2..3f3415973d9 100644
--- a/tests/baselines/reference/parserIndexSignature5.errors.txt
+++ b/tests/baselines/reference/parserIndexSignature5.errors.txt
@@ -1,9 +1,12 @@
 tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature5.ts(2,3): error TS1169: Computed property names are not allowed in interfaces.
+tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature5.ts(2,4): error TS2304: Cannot find name 'a'.
 
 
-==== tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature5.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature5.ts (2 errors) ====
     interface I {
-      [a]
+      [a] // Used to be indexer, now it is a computed property
       ~~~
 !!! error TS1169: Computed property names are not allowed in interfaces.
+       ~
+!!! error TS2304: Cannot find name 'a'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/privateIndexer2.errors.txt b/tests/baselines/reference/privateIndexer2.errors.txt
index 8d3c1ec1e6d..405167d68f8 100644
--- a/tests/baselines/reference/privateIndexer2.errors.txt
+++ b/tests/baselines/reference/privateIndexer2.errors.txt
@@ -1,17 +1,20 @@
 tests/cases/conformance/classes/indexMemberDeclarations/privateIndexer2.ts(4,15): error TS1005: ']' expected.
+tests/cases/conformance/classes/indexMemberDeclarations/privateIndexer2.ts(4,17): error TS2304: Cannot find name 'string'.
 tests/cases/conformance/classes/indexMemberDeclarations/privateIndexer2.ts(4,23): error TS1005: ',' expected.
 tests/cases/conformance/classes/indexMemberDeclarations/privateIndexer2.ts(4,24): error TS1136: Property assignment expected.
 tests/cases/conformance/classes/indexMemberDeclarations/privateIndexer2.ts(4,32): error TS1005: ':' expected.
 tests/cases/conformance/classes/indexMemberDeclarations/privateIndexer2.ts(5,1): error TS1128: Declaration or statement expected.
 
 
-==== tests/cases/conformance/classes/indexMemberDeclarations/privateIndexer2.ts (5 errors) ====
+==== tests/cases/conformance/classes/indexMemberDeclarations/privateIndexer2.ts (6 errors) ====
     // private indexers not allowed
     
     var x = {
         private [x: string]: string;
                   ~
 !!! error TS1005: ']' expected.
+                    ~~~~~~
+!!! error TS2304: Cannot find name 'string'.
                           ~
 !!! error TS1005: ',' expected.
                            ~
diff --git a/tests/baselines/reference/propertyAssignment.errors.txt b/tests/baselines/reference/propertyAssignment.errors.txt
index 2ea55a1a2d3..51850754a9a 100644
--- a/tests/baselines/reference/propertyAssignment.errors.txt
+++ b/tests/baselines/reference/propertyAssignment.errors.txt
@@ -1,17 +1,20 @@
 tests/cases/compiler/propertyAssignment.ts(6,13): error TS1170: Computed property names are not allowed in type literals.
+tests/cases/compiler/propertyAssignment.ts(6,14): error TS2304: Cannot find name 'index'.
 tests/cases/compiler/propertyAssignment.ts(14,1): error TS2322: Type '{ x: number; }' is not assignable to type 'new () => any'.
 tests/cases/compiler/propertyAssignment.ts(16,1): error TS2322: Type '{ x: number; }' is not assignable to type '() => void'.
 
 
-==== tests/cases/compiler/propertyAssignment.ts (3 errors) ====
+==== tests/cases/compiler/propertyAssignment.ts (4 errors) ====
     
     
     var foo1: { new ():any; }   
     var bar1: { x : number; }
     
-    var foo2: { [index]; } // should be an error
+    var foo2: { [index]; } // should be an error, used to be indexer, now it is a computed property
                 ~~~~~~~
 !!! error TS1170: Computed property names are not allowed in type literals.
+                 ~~~~~
+!!! error TS2304: Cannot find name 'index'.
     var bar2: { x : number; }
     
     var foo3: { ():void; }
diff --git a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.errors.txt b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.errors.txt
index cbc517e0520..3cc172c96d5 100644
--- a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.errors.txt
+++ b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.errors.txt
@@ -11,9 +11,10 @@ tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralType
 tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2.ts(26,5): error TS2300: Duplicate identifier 'foo'.
 tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2.ts(26,5): error TS2381: A signature with an implementation cannot use a string literal type.
 tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2.ts(27,5): error TS2300: Duplicate identifier 'foo'.
+tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2.ts(27,5): error TS2381: A signature with an implementation cannot use a string literal type.
 
 
-==== tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2.ts (13 errors) ====
+==== tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2.ts (14 errors) ====
     // String literal types are only valid in overload signatures
     
     function foo(x: any);
@@ -67,5 +68,7 @@ tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralType
         foo(x: 'a') { },
         ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
+        ~~~~~~~~~~~~~~~
+!!! error TS2381: A signature with an implementation cannot use a string literal type.
     }
     
\ No newline at end of file
diff --git a/tests/cases/compiler/complicatedPrivacy.ts b/tests/cases/compiler/complicatedPrivacy.ts
index 6c1e3fa8527..6fe144d237c 100644
--- a/tests/cases/compiler/complicatedPrivacy.ts
+++ b/tests/cases/compiler/complicatedPrivacy.ts
@@ -33,7 +33,7 @@ module m1 {
 
     export function f4(arg1: 
     {
-    [number]: C1;
+    [number]: C1; // Used to be indexer, now it is a computed property
     }) {
     }
 
diff --git a/tests/cases/compiler/indexSignatureMustHaveTypeAnnotation.ts b/tests/cases/compiler/indexSignatureMustHaveTypeAnnotation.ts
index fbe24e975e9..47d818065a1 100644
--- a/tests/cases/compiler/indexSignatureMustHaveTypeAnnotation.ts
+++ b/tests/cases/compiler/indexSignatureMustHaveTypeAnnotation.ts
@@ -1,9 +1,11 @@
 interface I {
+    // Used to be indexer, now it is a computed property
     [x]: string;
     [x: string];
 }
 
 class C {
+    // Used to be indexer, now it is a computed property
     [x]: string
     
 }
diff --git a/tests/cases/compiler/indexSignatureWithInitializer.ts b/tests/cases/compiler/indexSignatureWithInitializer.ts
index a7b185eee0e..f9a4aafc699 100644
--- a/tests/cases/compiler/indexSignatureWithInitializer.ts
+++ b/tests/cases/compiler/indexSignatureWithInitializer.ts
@@ -1,3 +1,4 @@
+// These used to be indexers, now they are computed properties
 interface I {
     [x = '']: string;
 }
diff --git a/tests/cases/compiler/indexWithoutParamType2.ts b/tests/cases/compiler/indexWithoutParamType2.ts
index 9a1976fe9ef..0def5dc06a9 100644
--- a/tests/cases/compiler/indexWithoutParamType2.ts
+++ b/tests/cases/compiler/indexWithoutParamType2.ts
@@ -1,3 +1,4 @@
 class C {
+    // Used to be indexer, now it is a computed property
     [x]: string
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/intTypeCheck.ts b/tests/cases/compiler/intTypeCheck.ts
index 787dc944c43..a1563097863 100644
--- a/tests/cases/compiler/intTypeCheck.ts
+++ b/tests/cases/compiler/intTypeCheck.ts
@@ -31,8 +31,9 @@ interface i3 {
     new (p6: string, ...p7: any[]);
 }
 interface i4 {
-    //Index Signatures
+    // Used to be indexer, now it is a computed property
     [p];
+    //Index Signatures
     [p1: string];
     [p2: string, p3: number];
 }
@@ -65,9 +66,10 @@ interface i11 {
     new (...p3: any[]);
     new (p4: string, p5?: string);
     new (p6: string, ...p7: any[]);
-
-    //Index Signatures
+    
+    // Used to be indexer, now it is a computed property
     [p];
+    //Index Signatures
     [p1: string];
     [p2: string, p3: number];
 
diff --git a/tests/cases/compiler/objectLiteralIndexerNoImplicitAny.ts b/tests/cases/compiler/objectLiteralIndexerNoImplicitAny.ts
new file mode 100644
index 00000000000..c21d8df52fc
--- /dev/null
+++ b/tests/cases/compiler/objectLiteralIndexerNoImplicitAny.ts
@@ -0,0 +1,8 @@
+//@noImplicitAny: true
+interface I {
+    [s: string]: any;
+}
+
+var x: I = {
+    p: null
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/propertyAssignment.ts b/tests/cases/compiler/propertyAssignment.ts
index 0afb8fb60a7..0c8351fb05d 100644
--- a/tests/cases/compiler/propertyAssignment.ts
+++ b/tests/cases/compiler/propertyAssignment.ts
@@ -3,7 +3,7 @@
 var foo1: { new ():any; }   
 var bar1: { x : number; }
 
-var foo2: { [index]; } // should be an error
+var foo2: { [index]; } // should be an error, used to be indexer, now it is a computed property
 var bar2: { x : number; }
 
 var foo3: { ():void; }
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames10.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames10.ts
new file mode 100644
index 00000000000..0ab74d788c8
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames10.ts
@@ -0,0 +1,17 @@
+// @target: es6
+var s: string;
+var n: number;
+var a: any;
+var v = {
+    [s]() { },
+    [n]() { },
+    [s + s]() { },
+    [s + n]() { },
+    [+s]() { },
+    [""]() { },
+    [0]() { },
+    [a]() { },
+    [<any>true]() { },
+    [`hello bye`]() { },
+    [`hello ${a} bye`]() { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames11.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames11.ts
new file mode 100644
index 00000000000..d41c56fe953
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames11.ts
@@ -0,0 +1,17 @@
+// @target: es6
+var s: string;
+var n: number;
+var a: any;
+var v = {
+    get [s]() { return 0; },
+    set [n](v) { },
+    get [s + s]() { return 0; },
+    set [s + n](v) { },
+    get [+s]() { return 0; },
+    set [""](v) { },
+    get [0]() { return 0; },
+    set [a](v) { },
+    get [<any>true]() { return 0; },
+    set [`hello bye`](v) { },
+    get [`hello ${a} bye`]() { return 0; }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames12.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames12.ts
new file mode 100644
index 00000000000..e046899d331
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames12.ts
@@ -0,0 +1,17 @@
+// @target: es6
+var s: string;
+var n: number;
+var a: any;
+class C {
+    [s]: number;
+    [n] = n;
+    static [s + s]: string;
+    [s + n] = 2;
+    [+s]: typeof s;
+    static [""]: number;
+    [0]: number;
+    [a]: number;
+    static [<any>true]: number;
+    [`hello bye`] = 0;
+    static [`hello ${a} bye`] = 0
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames13.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames13.ts
new file mode 100644
index 00000000000..de40dc4e774
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames13.ts
@@ -0,0 +1,17 @@
+// @target: es6
+var s: string;
+var n: number;
+var a: any;
+class C {
+    [s]() {}
+    [n]() { }
+    static [s + s]() { }
+    [s + n]() { }
+    [+s]() { }
+    static [""]() { }
+    [0]() { }
+    [a]() { }
+    static [<any>true]() { }
+    [`hello bye`]() { }
+    static [`hello ${a} bye`]() { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames14.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames14.ts
new file mode 100644
index 00000000000..d90f2d7f976
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames14.ts
@@ -0,0 +1,10 @@
+// @target: es6
+var b: boolean;
+class C {
+    [b]() {}
+    static [true]() { }
+    [[]]() { }
+    static [{}]() { }
+    [undefined]() { }
+    static [null]() { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames15.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames15.ts
new file mode 100644
index 00000000000..60b62d29034
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames15.ts
@@ -0,0 +1,9 @@
+// @target: es6
+var p1: number | string;
+var p2: number | number[];
+var p3: string | boolean;
+class C {
+    [p1]() { }
+    [p2]() { }
+    [p3]() { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames16.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames16.ts
new file mode 100644
index 00000000000..c42e6e97177
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames16.ts
@@ -0,0 +1,17 @@
+// @target: es6
+var s: string;
+var n: number;
+var a: any;
+class C {
+    get [s]() { return 0;}
+    set [n](v) { }
+    static get [s + s]() { return 0; }
+    set [s + n](v) { }
+    get [+s]() { return 0; }
+    static set [""](v) { }
+    get [0]() { return 0; }
+    set [a](v) { }
+    static get [<any>true]() { return 0; }
+    set [`hello bye`](v) { }
+    get [`hello ${a} bye`]() { return 0; }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames17.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames17.ts
new file mode 100644
index 00000000000..d795b527d06
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames17.ts
@@ -0,0 +1,10 @@
+// @target: es6
+var b: boolean;
+class C {
+    get [b]() { return 0;}
+    static set [true](v) { }
+    get [[]]() { return 0; }
+    set [{}](v) { }
+    static get [undefined]() { return 0; }
+    set [null](v) { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames18.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames18.ts
new file mode 100644
index 00000000000..cd7a43f233f
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames18.ts
@@ -0,0 +1,6 @@
+// @target: es6
+function foo() {
+    var obj = {
+        [this.bar]: 0
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames19.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames19.ts
new file mode 100644
index 00000000000..3dbf97d7f7a
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames19.ts
@@ -0,0 +1,6 @@
+// @target: es6
+module M {
+    var obj = {
+        [this.bar]: 0
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames20.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames20.ts
new file mode 100644
index 00000000000..d31f63d2e87
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames20.ts
@@ -0,0 +1,4 @@
+// @target: es6
+var obj = {
+    [this.bar]: 0
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames21.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames21.ts
new file mode 100644
index 00000000000..654f1b29985
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames21.ts
@@ -0,0 +1,7 @@
+// @target: es6
+class C {
+    bar() {
+        return 0;
+    }
+    [this.bar()]() { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames22.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames22.ts
new file mode 100644
index 00000000000..c999e0d642c
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames22.ts
@@ -0,0 +1,9 @@
+// @target: es6
+class C {
+    bar() {
+        var obj = {
+            [this.bar()]() { }
+        };
+        return 0;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames23.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames23.ts
new file mode 100644
index 00000000000..9c7c5bb6539
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames23.ts
@@ -0,0 +1,9 @@
+// @target: es6
+class C {
+    bar() {
+        return 0;
+    }
+    [
+        { [this.bar()]: 1 }[0]
+    ]() { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames24.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames24.ts
new file mode 100644
index 00000000000..dc3a9541e11
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames24.ts
@@ -0,0 +1,11 @@
+// @target: es6
+class Base {
+    bar() {
+        return 0;
+    }
+}
+class C extends Base {
+    // Gets emitted as super, not _super, which is consistent with
+    // use of super in static properties initializers.
+    [super.bar()]() { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames25.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames25.ts
new file mode 100644
index 00000000000..bc07847b251
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames25.ts
@@ -0,0 +1,14 @@
+// @target: es6
+class Base {
+    bar() {
+        return 0;
+    }
+}
+class C extends Base {
+    foo() {
+        var obj = {
+            [super.bar()]() { }
+        };
+        return 0;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames26.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames26.ts
new file mode 100644
index 00000000000..6ef32397f54
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames26.ts
@@ -0,0 +1,13 @@
+// @target: es6
+class Base {
+    bar() {
+        return 0;
+    }
+}
+class C extends Base {
+    // Gets emitted as super, not _super, which is consistent with
+    // use of super in static properties initializers.
+    [
+        { [super.bar()]: 1 }[0]
+    ]() { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames27.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames27.ts
new file mode 100644
index 00000000000..be19acd4729
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames27.ts
@@ -0,0 +1,6 @@
+// @target: es6
+class Base {
+}
+class C extends Base {
+    [(super(), "prop")]() { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames28.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames28.ts
new file mode 100644
index 00000000000..f9b14c3a75c
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames28.ts
@@ -0,0 +1,11 @@
+// @target: es6
+class Base {
+}
+class C extends Base {
+    constructor() {
+        super();
+        var obj = {
+            [(super(), "prop")]() { }
+        };
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames29.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames29.ts
new file mode 100644
index 00000000000..abf213b4c75
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames29.ts
@@ -0,0 +1,11 @@
+// @target: es6
+class C {
+    bar() {
+        () => {
+            var obj = {
+                [this.bar()]() { } // needs capture
+            };
+        }
+        return 0;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames30.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames30.ts
new file mode 100644
index 00000000000..5fba13388f8
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames30.ts
@@ -0,0 +1,16 @@
+// @target: es6
+class Base {
+}
+class C extends Base {
+    constructor() {
+        super();
+        () => {
+            var obj = {
+                // Ideally, we would capture this. But the reference is
+                // illegal, and not capturing this is consistent with
+                //treatment of other similar violations.
+                [(super(), "prop")]() { }
+            };
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames31.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames31.ts
new file mode 100644
index 00000000000..0ee8a0284a3
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames31.ts
@@ -0,0 +1,16 @@
+// @target: es6
+class Base {
+    bar() {
+        return 0;
+    }
+}
+class C extends Base {
+    foo() {
+        () => {
+            var obj = {
+                [super.bar()]() { } // needs capture
+            };
+        }
+        return 0;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames32.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames32.ts
new file mode 100644
index 00000000000..bf888a0c44b
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames32.ts
@@ -0,0 +1,8 @@
+// @target: es6
+function foo<T>() { return '' }
+class C<T> {
+    bar() {
+        return 0;
+    }
+    [foo<T>()]() { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames33.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames33.ts
new file mode 100644
index 00000000000..2a62d003a2e
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames33.ts
@@ -0,0 +1,10 @@
+// @target: es6
+function foo<T>() { return '' }
+class C<T> {
+    bar() {
+        var obj = {
+            [foo<T>()]() { }
+        };
+        return 0;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames34.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames34.ts
new file mode 100644
index 00000000000..2a56735701c
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames34.ts
@@ -0,0 +1,10 @@
+// @target: es6
+function foo<T>() { return '' }
+class C<T> {
+    static bar() {
+        var obj = {
+            [foo<T>()]() { }
+        };
+        return 0;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames35.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames35.ts
new file mode 100644
index 00000000000..f2e2929bf75
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames35.ts
@@ -0,0 +1,6 @@
+// @target: es6
+function foo<T>() { return '' }
+interface I<T> {
+    bar(): string;
+    [foo<T>()](): void;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames36.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames36.ts
new file mode 100644
index 00000000000..36c4e91be48
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames36.ts
@@ -0,0 +1,11 @@
+// @target: es6
+class Foo { x }
+class Foo2 { x; y }
+
+class C {
+    [s: string]: Foo2;
+
+    // Computed properties
+    get ["get1"]() { return new Foo }
+    set ["set1"](p: Foo2) { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames37.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames37.ts
new file mode 100644
index 00000000000..09fe6235a1c
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames37.ts
@@ -0,0 +1,11 @@
+// @target: es6
+class Foo { x }
+class Foo2 { x; y }
+
+class C {
+    [s: number]: Foo2;
+
+    // Computed properties
+    get ["get1"]() { return new Foo }
+    set ["set1"](p: Foo2) { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames38.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames38.ts
new file mode 100644
index 00000000000..9054979dbd8
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames38.ts
@@ -0,0 +1,11 @@
+// @target: es6
+class Foo { x }
+class Foo2 { x; y }
+
+class C {
+    [s: string]: Foo2;
+
+    // Computed properties
+    get [1 << 6]() { return new Foo }
+    set [1 << 6](p: Foo2) { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames39.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames39.ts
new file mode 100644
index 00000000000..f8d4d2a0107
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames39.ts
@@ -0,0 +1,11 @@
+// @target: es6
+class Foo { x }
+class Foo2 { x; y }
+
+class C {
+    [s: number]: Foo2;
+
+    // Computed properties
+    get [1 << 6]() { return new Foo }
+    set [1 << 6](p: Foo2) { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames4.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames4.ts
new file mode 100644
index 00000000000..a6d4e17c44a
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames4.ts
@@ -0,0 +1,17 @@
+// @target: es6
+var s: string;
+var n: number;
+var a: any;
+var v = {
+    [s]: 0,
+    [n]: n,
+    [s + s]: 1,
+    [s + n]: 2,
+    [+s]: s,
+    [""]: 0,
+    [0]: 0,
+    [a]: 1,
+    [<any>true]: 0,
+    [`hello bye`]: 0,
+    [`hello ${a} bye`]: 0
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames40.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames40.ts
new file mode 100644
index 00000000000..94d473193d9
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames40.ts
@@ -0,0 +1,11 @@
+// @target: es6
+class Foo { x }
+class Foo2 { x; y }
+
+class C {
+    [s: string]: () => Foo2;
+
+    // Computed properties
+    [""]() { return new Foo }
+    [""]() { return new Foo2 }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames41.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames41.ts
new file mode 100644
index 00000000000..a376debec56
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames41.ts
@@ -0,0 +1,10 @@
+// @target: es6
+class Foo { x }
+class Foo2 { x; y }
+
+class C {
+    [s: string]: () => Foo2;
+
+    // Computed properties
+    static [""]() { return new Foo }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames42.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames42.ts
new file mode 100644
index 00000000000..ded6cb28ce7
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames42.ts
@@ -0,0 +1,10 @@
+// @target: es6
+class Foo { x }
+class Foo2 { x; y }
+
+class C {
+    [s: string]: Foo2;
+
+    // Computed properties
+    [""]: Foo;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames43.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames43.ts
new file mode 100644
index 00000000000..25028273997
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames43.ts
@@ -0,0 +1,13 @@
+// @target: es6
+class Foo { x }
+class Foo2 { x; y }
+
+class C {
+    [s: string]: Foo2;
+}
+
+class D extends C {
+    // Computed properties
+    get ["get1"]() { return new Foo }
+    set ["set1"](p: Foo2) { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames44.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames44.ts
new file mode 100644
index 00000000000..04c4ad5ed5c
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames44.ts
@@ -0,0 +1,12 @@
+// @target: es6
+class Foo { x }
+class Foo2 { x; y }
+
+class C {
+    [s: string]: Foo2;
+    get ["get1"]() { return new Foo }
+}
+
+class D extends C {
+    set ["set1"](p: Foo) { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames45.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames45.ts
new file mode 100644
index 00000000000..e6e058f24ab
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames45.ts
@@ -0,0 +1,13 @@
+// @target: es6
+class Foo { x }
+class Foo2 { x; y }
+
+class C {
+    get ["get1"]() { return new Foo }
+}
+
+class D extends C {
+    // No error when the indexer is in a class more derived than the computed property
+    [s: string]: Foo2;
+    set ["set1"](p: Foo) { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames46.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames46.ts
new file mode 100644
index 00000000000..219324dc153
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames46.ts
@@ -0,0 +1,4 @@
+// @target: es6
+var o = {
+    ["" || 0]: 0
+};
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames47.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames47.ts
new file mode 100644
index 00000000000..724536c90e8
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames47.ts
@@ -0,0 +1,6 @@
+// @target: es6
+enum E1 { x }
+enum E2 { x }
+var o = {
+    [E1.x || E2.x]: 0
+};
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames48.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames48.ts
new file mode 100644
index 00000000000..3a156aa480e
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames48.ts
@@ -0,0 +1,18 @@
+// @target: es6
+declare function extractIndexer<T>(p: { [n: number]: T }): T;
+
+enum E { x }
+
+var a: any;
+
+extractIndexer({
+    [a]: ""
+}); // Should return string
+
+extractIndexer({
+    [E.x]: ""
+}); // Should return string
+
+extractIndexer({
+    ["" || 0]: ""
+}); // Should return any (widened form of undefined)
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames5.ts
new file mode 100644
index 00000000000..590f819c4e4
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames5.ts
@@ -0,0 +1,10 @@
+// @target: es6
+var b: boolean;
+var v = {
+    [b]: 0,
+    [true]: 1,
+    [[]]: 0,
+    [{}]: 0,
+    [undefined]: undefined,
+    [null]: null
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames6.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames6.ts
new file mode 100644
index 00000000000..b21b76b03f2
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames6.ts
@@ -0,0 +1,9 @@
+// @target: es6
+var p1: number | string;
+var p2: number | number[];
+var p3: string | boolean;
+var v = {
+    [p1]: 0,
+    [p2]: 1,
+    [p3]: 2
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames7.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames7.ts
new file mode 100644
index 00000000000..5063d1e2d0c
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames7.ts
@@ -0,0 +1,7 @@
+// @target: es6
+enum E {
+    member
+}
+var v = {
+    [E.member]: 0
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames8.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames8.ts
new file mode 100644
index 00000000000..95b6398a62d
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames8.ts
@@ -0,0 +1,9 @@
+// @target: es6
+function f<T, U extends string>() {
+    var t: T;
+    var u: U;
+    var v = {
+        [t]: 0,
+        [u]: 1
+    };
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames9.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames9.ts
new file mode 100644
index 00000000000..21dc4eaa1e9
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames9.ts
@@ -0,0 +1,11 @@
+// @target: es6
+function f(s: string): string;
+function f(n: number): number;
+function f<T>(x: T): T;
+function f(x): any { }
+
+var v = {
+    [f("")]: 0,
+    [f(0)]: 0,
+    [f(true)]: 0
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType1.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType1.ts
new file mode 100644
index 00000000000..69c7c3ce958
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType1.ts
@@ -0,0 +1,10 @@
+// @target: es6
+interface I {
+    [s: string]: (x: string) => number;
+    [s: number]: (x: any) => number; // Doesn't get hit
+}
+
+var o: I = {
+    ["" + 0](y) { return y.length; },
+    ["" + 1]: y => y.length
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType10.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType10.ts
new file mode 100644
index 00000000000..f19c7fcab9d
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType10.ts
@@ -0,0 +1,9 @@
+// @target: es6
+interface I {
+    [s: number]: boolean;
+}
+
+var o: I = {
+    [+"foo"]: "",
+    [+"bar"]: 0
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType2.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType2.ts
new file mode 100644
index 00000000000..e9d289c5cd3
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType2.ts
@@ -0,0 +1,10 @@
+// @target: es6
+interface I {
+    [s: string]: (x: any) => number; // Doesn't get hit
+    [s: number]: (x: string) => number;
+}
+
+var o: I = {
+    [+"foo"](y) { return y.length; },
+    [+"bar"]: y => y.length
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType3.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType3.ts
new file mode 100644
index 00000000000..dd2aff2931b
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType3.ts
@@ -0,0 +1,9 @@
+// @target: es6
+interface I {
+    [s: string]: (x: string) => number;
+}
+
+var o: I = {
+    [+"foo"](y) { return y.length; },
+    [+"bar"]: y => y.length
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType4.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType4.ts
new file mode 100644
index 00000000000..ff191a3e80d
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType4.ts
@@ -0,0 +1,10 @@
+// @target: es6
+interface I {
+    [s: string]: any;
+    [s: number]: any;
+}
+
+var o: I = {
+    [""+"foo"]: "",
+    [""+"bar"]: 0
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType5.ts
new file mode 100644
index 00000000000..a78ddef37fc
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType5.ts
@@ -0,0 +1,10 @@
+// @target: es6
+interface I {
+    [s: string]: any;
+    [s: number]: any;
+}
+
+var o: I = {
+    [+"foo"]: "",
+    [+"bar"]: 0
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType6.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType6.ts
new file mode 100644
index 00000000000..70f31378b56
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType6.ts
@@ -0,0 +1,14 @@
+// @target: es6
+interface I<T> {
+    [s: string]: T;
+}
+
+declare function foo<T>(obj: I<T>): T
+
+foo({
+    p: "",
+    0: () => { },
+    ["hi" + "bye"]: true,
+    [0 + 1]: 0,
+    [+"hi"]: [0]
+});
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType7.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType7.ts
new file mode 100644
index 00000000000..1ddb966488d
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType7.ts
@@ -0,0 +1,14 @@
+// @target: es6
+interface I<T> {
+    [s: number]: T;
+}
+
+declare function foo<T>(obj: I<T>): T
+
+foo({
+    p: "",
+    0: () => { },
+    ["hi" + "bye"]: true,
+    [0 + 1]: 0,
+    [+"hi"]: [0]
+});
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType8.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType8.ts
new file mode 100644
index 00000000000..b5caf1e717c
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType8.ts
@@ -0,0 +1,10 @@
+// @target: es6
+interface I {
+    [s: string]: boolean;
+    [s: number]: boolean;
+}
+
+var o: I = {
+    [""+"foo"]: "",
+    [""+"bar"]: 0
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType9.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType9.ts
new file mode 100644
index 00000000000..8282fab0035
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType9.ts
@@ -0,0 +1,10 @@
+// @target: es6
+interface I {
+    [s: string]: boolean;
+    [s: number]: boolean;
+}
+
+var o: I = {
+    [+"foo"]: "",
+    [+"bar"]: 0
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit1.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit1.ts
new file mode 100644
index 00000000000..100c68653c3
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit1.ts
@@ -0,0 +1,7 @@
+// @target: es6
+// @declaration: true
+class C {
+    ["" + ""]() { }
+    get ["" + ""]() { return 0; }
+    set ["" + ""](x) { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit2.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit2.ts
new file mode 100644
index 00000000000..2f353b854cd
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit2.ts
@@ -0,0 +1,7 @@
+// @target: es6
+// @declaration: true
+class C {
+    static ["" + ""]() { }
+    static get ["" + ""]() { return 0; }
+    static set ["" + ""](x) { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit3.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit3.ts
new file mode 100644
index 00000000000..041a2f153e7
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit3.ts
@@ -0,0 +1,5 @@
+// @target: es6
+// @declaration: true
+interface I {
+    ["" + ""](): void;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit4.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit4.ts
new file mode 100644
index 00000000000..59a5fe71267
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit4.ts
@@ -0,0 +1,5 @@
+// @target: es6
+// @declaration: true
+var v: {
+    ["" + ""](): void;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit5.ts
new file mode 100644
index 00000000000..3f24075abbf
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit5.ts
@@ -0,0 +1,8 @@
+// @target: es6
+// @declaration: true
+var v = {
+    ["" + ""]: 0,
+    ["" + ""]() { },
+    get ["" + ""]() { return 0; },
+    set ["" + ""](x) { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesSourceMap1.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesSourceMap1.ts
new file mode 100644
index 00000000000..73d9dc215d9
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesSourceMap1.ts
@@ -0,0 +1,7 @@
+// @target: es6
+// @sourceMap: true
+class C {
+    ["hello"]() {
+        debugger;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNamesSourceMap2.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesSourceMap2.ts
new file mode 100644
index 00000000000..fc7f4fcb39d
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNamesSourceMap2.ts
@@ -0,0 +1,7 @@
+// @target: es6
+// @sourceMap: true
+var v = {
+    ["hello"]() {
+        debugger;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithLHSIsObject.ts b/tests/cases/conformance/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithLHSIsObject.ts
index 285335e40e7..6b88cd39f2a 100644
--- a/tests/cases/conformance/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithLHSIsObject.ts
+++ b/tests/cases/conformance/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithLHSIsObject.ts
@@ -6,7 +6,9 @@ var x2: Function;
 var a: {};
 var b: Object;
 var c: C;
+var d: string | C;
 
 var r1 = a instanceof x1;
 var r2 = b instanceof x2;
-var r3 = c instanceof x1;
\ No newline at end of file
+var r3 = c instanceof x1;
+var r4 = d instanceof x1;
diff --git a/tests/cases/conformance/expressions/contextualTyping/objectLiteralContextualTyping.ts b/tests/cases/conformance/expressions/contextualTyping/objectLiteralContextualTyping.ts
new file mode 100644
index 00000000000..cb2fe8ee8d4
--- /dev/null
+++ b/tests/cases/conformance/expressions/contextualTyping/objectLiteralContextualTyping.ts
@@ -0,0 +1,26 @@
+// Tests related to #1774
+
+interface Item {
+    name: string;
+    description?: string;
+}
+
+declare function foo(item: Item): string;
+declare function foo(item: any): number;
+
+var x = foo({ name: "Sprocket" });
+var x: string;
+
+var y = foo({ name: "Sprocket", description: "Bumpy wheel" });
+var y: string;
+
+var z = foo({ name: "Sprocket", description: false });
+var z: number;
+
+var w = foo({ a: 10 });
+var w: number;
+
+declare function bar<T>(param: { x?: T }): T;
+
+var b = bar({});
+var b: {};
diff --git a/tests/cases/conformance/expressions/typeGuards/TypeGuardWithEnumUnion.ts b/tests/cases/conformance/expressions/typeGuards/TypeGuardWithEnumUnion.ts
new file mode 100644
index 00000000000..3d105e91502
--- /dev/null
+++ b/tests/cases/conformance/expressions/typeGuards/TypeGuardWithEnumUnion.ts
@@ -0,0 +1,35 @@
+enum Color { R, G, B }
+
+function f1(x: Color | string) {
+    if (typeof x === "number") {
+        var y = x;
+        var y: Color;
+    }
+    else {
+        var z = x;
+        var z: string;
+    }
+}
+
+function f2(x: Color | string | string[]) {
+    if (typeof x === "object") {
+        var y = x;
+        var y: string[];
+    }
+    if (typeof x === "number") {
+        var z = x;
+        var z: Color;
+    }
+    else {
+        var w = x;
+        var w: string | string[];
+    }
+    if (typeof x === "string") {
+        var a = x;
+        var a: string;
+    }
+    else {
+        var b = x;
+        var b: Color | string[];
+    }
+}
diff --git a/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature11.ts b/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature11.ts
index 4ef57a277ac..1c78f24a213 100644
--- a/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature11.ts
+++ b/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature11.ts
@@ -1,5 +1,5 @@
 interface I {
-        [p];
+        [p]; // Used to be indexer, now it is a computed property
         [p1: string];
         [p2: string, p3: number];
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature4.ts b/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature4.ts
index a12f8aecf21..a6cf3a720a9 100644
--- a/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature4.ts
+++ b/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature4.ts
@@ -1,3 +1,3 @@
 interface I {
-  [a = 0]
+  [a = 0] // Used to be indexer, now it is a computed property
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature5.ts b/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature5.ts
index 5970ab6d8fb..e77c8fe9bb0 100644
--- a/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature5.ts
+++ b/tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature5.ts
@@ -1,3 +1,3 @@
 interface I {
-  [a]
+  [a] // Used to be indexer, now it is a computed property
 }
\ No newline at end of file
diff --git a/tests/cases/fourslash/commentsUnion.ts b/tests/cases/fourslash/commentsUnion.ts
new file mode 100644
index 00000000000..568e0d93cde
--- /dev/null
+++ b/tests/cases/fourslash/commentsUnion.ts
@@ -0,0 +1,7 @@
+/// <reference path='fourslash.ts' />
+
+////var a: Array<string> | Array<number>;
+////a./*1*/length
+
+goTo.marker('1');
+verify.quickInfoIs("(property) length: number", "Gets or sets the length of the array. This is a number one higher than the highest element defined in an array.");
\ No newline at end of file
diff --git a/tests/cases/fourslash/constEnumsEmitOutputInMultipleFiles.ts b/tests/cases/fourslash/constEnumsEmitOutputInMultipleFiles.ts
new file mode 100644
index 00000000000..0f6be184d8c
--- /dev/null
+++ b/tests/cases/fourslash/constEnumsEmitOutputInMultipleFiles.ts
@@ -0,0 +1,18 @@
+/// <reference path='fourslash.ts'/>
+
+// @Filename: a.ts
+////const enum TestEnum {   
+////    Foo, Bar
+////}
+////var testFirstFile = TestEnum.Bar;
+
+// @Filename: b.ts
+/////// <reference path="a.ts" />
+/////*1*/
+////var testInOtherFile = TestEnum.Bar;
+
+goTo.marker("1");
+verify.verifyGetEmitOutputForCurrentFile(
+"/// <reference path=\"a.ts\" />\r\n\
+var testInOtherFile = 1 /* Bar */;\r\n"
+    )
\ No newline at end of file
diff --git a/tests/cases/fourslash/findReferencesAfterEdit.ts b/tests/cases/fourslash/findReferencesAfterEdit.ts
new file mode 100644
index 00000000000..5eca1a3b8f2
--- /dev/null
+++ b/tests/cases/fourslash/findReferencesAfterEdit.ts
@@ -0,0 +1,22 @@
+/// <reference path='fourslash.ts'/>
+
+// @Filename: a.ts
+////interface A {
+////    foo: string;
+////}
+
+// @Filename: b.ts
+///////<reference path='a.ts'/>
+/////*0*/
+////function foo(x: A) {
+////    x.f/*1*/oo
+////}
+
+goTo.marker("1");
+verify.referencesCountIs(2);
+
+goTo.marker("0");
+edit.insert("\r\n");
+
+goTo.marker("1");
+verify.referencesCountIs(2);
\ No newline at end of file
diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts
index 0f458041521..5b88b15f9fa 100644
--- a/tests/cases/fourslash/fourslash.ts
+++ b/tests/cases/fourslash/fourslash.ts
@@ -264,6 +264,10 @@ module FourSlashInterface {
             FourSlash.currentTestState.verifyCurrentFileContent(text);
         }
 
+        public verifyGetEmitOutputForCurrentFile(expected: string): void {
+            FourSlash.currentTestState.verifyGetEmitOutputForCurrentFile(expected);
+        }
+
         public currentParameterHelpArgumentNameIs(name: string) {
             FourSlash.currentTestState.verifyCurrentParameterHelpName(name);
         }
diff --git a/tests/cases/fourslash/getOccurrencesAfterEdit.ts b/tests/cases/fourslash/getOccurrencesAfterEdit.ts
new file mode 100644
index 00000000000..0654cc3962c
--- /dev/null
+++ b/tests/cases/fourslash/getOccurrencesAfterEdit.ts
@@ -0,0 +1,18 @@
+/// <reference path='fourslash.ts'/>
+
+/////*0*/
+////interface A {
+////    foo: string;
+////}
+////function foo(x: A) {
+////    x.f/*1*/oo
+////}
+
+goTo.marker("1");
+verify.occurrencesAtPositionCount(2);
+
+goTo.marker("0");
+edit.insert("\r\n");
+
+goTo.marker("1");
+verify.occurrencesAtPositionCount(2);
\ No newline at end of file
diff --git a/tests/cases/fourslash/scopeOfUnionProperties.ts b/tests/cases/fourslash/scopeOfUnionProperties.ts
new file mode 100644
index 00000000000..ec2fe3a9ac5
--- /dev/null
+++ b/tests/cases/fourslash/scopeOfUnionProperties.ts
@@ -0,0 +1,7 @@
+/// <reference path='fourslash.ts'/>
+
+////function f(s: string | number) {
+////    s.constr/*1*/uctor
+////}
+goTo.marker("1")
+verify.occurrencesAtPositionCount(1);