diff --git a/Jakefile b/Jakefile
index 665bb807b4..2eb87494f2 100644
--- a/Jakefile
+++ b/Jakefile
@@ -222,15 +222,17 @@ function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, noOu
         var dir = useBuiltCompiler ? builtLocalDirectory : LKGDirectory;
         var options = "--module commonjs -noImplicitAny";
 
-        if (!keepComments) {
-            options += " -removeComments";
+        // Keep comments when specifically requested
+        // or when in debug mode.
+        if (!(keepComments || useDebugMode)) {
+            options += " --removeComments";
         }
 
         if (generateDeclarations) {
             options += " --declaration";
         }
 
-        if (useDebugMode || preserveConstEnums) {
+        if (preserveConstEnums || useDebugMode) {
             options += " --preserveConstEnums";
         }
 
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index 304777e040..0ae33d08fd 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -168,7 +168,7 @@ module ts {
             addDeclarationToSymbol(symbol, node, includes);
             symbol.parent = parent;
 
-            if (node.kind === SyntaxKind.ClassDeclaration && symbol.exports) {
+            if ((node.kind === SyntaxKind.ClassDeclaration || node.kind === SyntaxKind.ClassExpression) && symbol.exports) {
                 // TypeScript 1.0 spec (April 2014): 8.4
                 // Every class automatically contains a static property member named 'prototype', 
                 // the type of which is an instantiation of the class type with type Any supplied as a type argument for each type parameter.
@@ -286,6 +286,7 @@ module ts {
                 case SyntaxKind.ArrowFunction:
                     declareSymbol(container.locals, undefined, node, symbolKind, symbolExcludes);
                     break;
+                case SyntaxKind.ClassExpression:
                 case SyntaxKind.ClassDeclaration:
                     if (node.flags & NodeFlags.Static) {
                         declareSymbol(container.symbol.exports, container.symbol, node, symbolKind, symbolExcludes);
@@ -485,6 +486,9 @@ module ts {
                 case SyntaxKind.ArrowFunction:
                     bindAnonymousDeclaration(<FunctionExpression>node, SymbolFlags.Function, "__function", /*isBlockScopeContainer*/ true);
                     break;
+                case SyntaxKind.ClassExpression:
+                    bindAnonymousDeclaration(<ClassExpression>node, SymbolFlags.Class, "__class", /*isBlockScopeContainer*/ false);
+                    break;
                 case SyntaxKind.CatchClause:
                     bindCatchVariableDeclaration(<CatchClause>node);
                     break;
@@ -584,9 +588,9 @@ module ts {
             // containing class.
             if (node.flags & NodeFlags.AccessibilityModifier &&
                 node.parent.kind === SyntaxKind.Constructor &&
-                node.parent.parent.kind === SyntaxKind.ClassDeclaration) {
+                (node.parent.parent.kind === SyntaxKind.ClassDeclaration || node.parent.parent.kind === SyntaxKind.ClassExpression)) {
 
-                let classDeclaration = <ClassDeclaration>node.parent.parent;
+                let classDeclaration = <ClassLikeDeclaration>node.parent.parent;
                 declareSymbol(classDeclaration.symbol.members, classDeclaration.symbol, node, SymbolFlags.Property, SymbolFlags.PropertyExcludes);
             }
         }
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index f59aaa6449..02d81f5ceb 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -422,8 +422,15 @@ module ts {
                             result = argumentsSymbol;
                             break loop;
                         }
-                        let id = (<FunctionExpression>location).name;
-                        if (id && name === id.text) {
+                        let functionName = (<FunctionExpression>location).name;
+                        if (functionName && name === functionName.text) {
+                            result = location.symbol;
+                            break loop;
+                        }
+                        break;
+                    case SyntaxKind.ClassExpression:
+                        let className = (<ClassExpression>location).name;
+                        if (className && name === className.text) {
                             result = location.symbol;
                             break loop;
                         }
@@ -582,7 +589,7 @@ module ts {
             if (moduleSymbol.flags & SymbolFlags.Variable) {
                 let typeAnnotation = (<VariableDeclaration>moduleSymbol.valueDeclaration).type;
                 if (typeAnnotation) {
-                    return getPropertyOfType(getTypeFromTypeNode(typeAnnotation), name);
+                    return getPropertyOfType(getTypeFromTypeNodeOrHeritageClauseElement(typeAnnotation), name);
                 }
             }
         }
@@ -631,7 +638,7 @@ module ts {
             if (symbol.flags & SymbolFlags.Variable) {
                 var typeAnnotation = (<VariableDeclaration>symbol.valueDeclaration).type;
                 if (typeAnnotation) {
-                    return resolveSymbol(getPropertyOfType(getTypeFromTypeNode(typeAnnotation), name));
+                    return resolveSymbol(getPropertyOfType(getTypeFromTypeNodeOrHeritageClauseElement(typeAnnotation), name));
                 }
             }
         }
@@ -779,8 +786,8 @@ module ts {
         }
 
         // Resolves a qualified name and any involved aliases
-        function resolveEntityName(name: EntityName, meaning: SymbolFlags): Symbol {
-            if (getFullWidth(name) === 0) {
+        function resolveEntityName(name: EntityName | Expression, meaning: SymbolFlags): Symbol {
+            if (nodeIsMissing(name)) {
                 return undefined;
             }
 
@@ -791,18 +798,23 @@ module ts {
                     return undefined;
                 }
             }
-            else if (name.kind === SyntaxKind.QualifiedName) {
-                let namespace = resolveEntityName((<QualifiedName>name).left, SymbolFlags.Namespace);
-                if (!namespace || namespace === unknownSymbol || getFullWidth((<QualifiedName>name).right) === 0) {
+            else if (name.kind === SyntaxKind.QualifiedName || name.kind === SyntaxKind.PropertyAccessExpression) {
+                let left = name.kind === SyntaxKind.QualifiedName ? (<QualifiedName>name).left : (<PropertyAccessExpression>name).expression;
+                let right = name.kind === SyntaxKind.QualifiedName ? (<QualifiedName>name).right : (<PropertyAccessExpression>name).name;
+
+                let namespace = resolveEntityName(left, SymbolFlags.Namespace);
+                if (!namespace || namespace === unknownSymbol || nodeIsMissing(right)) {
                     return undefined;
                 }
-                let right = (<QualifiedName>name).right;
                 symbol = getSymbol(getExportsOfSymbol(namespace), right.text, meaning);
                 if (!symbol) {
                     error(right, Diagnostics.Module_0_has_no_exported_member_1, getFullyQualifiedName(namespace), declarationNameToString(right));
                     return undefined;
                 }
             }
+            else {
+                Debug.fail("Unknown entity name kind.");
+            }
             Debug.assert((symbol.flags & SymbolFlags.Instantiated) === 0, "Should never get an instantiated symbol here.");
             return symbol.flags & meaning ? symbol : resolveAlias(symbol);
         }
@@ -1261,14 +1273,14 @@ module ts {
             }
         }
 
-        function isEntityNameVisible(entityName: EntityName, enclosingDeclaration: Node): SymbolVisibilityResult {
+        function isEntityNameVisible(entityName: EntityName | Expression, enclosingDeclaration: Node): SymbolVisibilityResult {
             // get symbol of the first identifier of the entityName
             let meaning: SymbolFlags;
             if (entityName.parent.kind === SyntaxKind.TypeQuery) {
                 // Typeof value
                 meaning = SymbolFlags.Value | SymbolFlags.ExportValue;
             }
-            else if (entityName.kind === SyntaxKind.QualifiedName ||
+            else if (entityName.kind === SyntaxKind.QualifiedName || entityName.kind === SyntaxKind.PropertyAccessExpression ||
                 entityName.parent.kind === SyntaxKind.ImportEqualsDeclaration) {
                 // Left identifier from type reference or TypeAlias
                 // Entity name of the import declaration
@@ -2094,7 +2106,7 @@ module ts {
             }
             // Use type from type annotation if one is present
             if (declaration.type) {
-                return getTypeFromTypeNode(declaration.type);
+                return getTypeFromTypeNodeOrHeritageClauseElement(declaration.type);
             }
             if (declaration.kind === SyntaxKind.Parameter) {
                 let func = <FunctionLikeDeclaration>declaration.parent;
@@ -2231,7 +2243,7 @@ module ts {
                         return links.type = checkExpression(exportAssignment.expression);
                     }
                     else if (exportAssignment.type) {
-                        return links.type = getTypeFromTypeNode(exportAssignment.type);
+                        return links.type = getTypeFromTypeNodeOrHeritageClauseElement(exportAssignment.type);
                     }
                     else {
                         return links.type = anyType;
@@ -2263,11 +2275,11 @@ module ts {
         function getAnnotatedAccessorType(accessor: AccessorDeclaration): Type {
             if (accessor) {
                 if (accessor.kind === SyntaxKind.GetAccessor) {
-                    return accessor.type && getTypeFromTypeNode(accessor.type);
+                    return accessor.type && getTypeFromTypeNodeOrHeritageClauseElement(accessor.type);
                 }
                 else {
                     let setterTypeAnnotation = getSetAccessorTypeAnnotationNode(accessor);
-                    return setterTypeAnnotation && getTypeFromTypeNode(setterTypeAnnotation);
+                    return setterTypeAnnotation && getTypeFromTypeNodeOrHeritageClauseElement(setterTypeAnnotation);
                 }
             }
             return undefined;
@@ -2433,9 +2445,9 @@ module ts {
                 }
                 type.baseTypes = [];
                 let declaration = <ClassDeclaration>getDeclarationOfKind(symbol, SyntaxKind.ClassDeclaration);
-                let baseTypeNode = getClassBaseTypeNode(declaration);
+                let baseTypeNode = getClassExtendsHeritageClauseElement(declaration);
                 if (baseTypeNode) {
-                    let baseType = getTypeFromTypeReferenceNode(baseTypeNode);
+                    let baseType = getTypeFromHeritageClauseElement(baseTypeNode);
                     if (baseType !== unknownType) {
                         if (getTargetType(baseType).flags & TypeFlags.Class) {
                             if (type !== baseType && !hasBaseType(<InterfaceType>baseType, type)) {
@@ -2476,7 +2488,8 @@ module ts {
                 forEach(symbol.declarations, declaration => {
                     if (declaration.kind === SyntaxKind.InterfaceDeclaration && getInterfaceBaseTypeNodes(<InterfaceDeclaration>declaration)) {
                         forEach(getInterfaceBaseTypeNodes(<InterfaceDeclaration>declaration), node => {
-                            let baseType = getTypeFromTypeReferenceNode(node);
+                            let baseType = getTypeFromHeritageClauseElement(node);
+
                             if (baseType !== unknownType) {
                                 if (getTargetType(baseType).flags & (TypeFlags.Class | TypeFlags.Interface)) {
                                     if (type !== baseType && !hasBaseType(<InterfaceType>baseType, type)) {
@@ -2507,7 +2520,7 @@ module ts {
             if (!links.declaredType) {
                 links.declaredType = resolvingType;
                 let declaration = <TypeAliasDeclaration>getDeclarationOfKind(symbol, SyntaxKind.TypeAliasDeclaration);
-                let type = getTypeFromTypeNode(declaration.type);
+                let type = getTypeFromTypeNodeOrHeritageClauseElement(declaration.type);
                 if (links.declaredType === resolvingType) {
                     links.declaredType = type;
                 }
@@ -3049,7 +3062,7 @@ module ts {
                     returnType = classType;
                 }
                 else if (declaration.type) {
-                    returnType = getTypeFromTypeNode(declaration.type);
+                    returnType = getTypeFromTypeNodeOrHeritageClauseElement(declaration.type);
                 }
                 else {
                     // TypeScript 1.0 spec (April 2014):
@@ -3207,7 +3220,7 @@ module ts {
         function getIndexTypeOfSymbol(symbol: Symbol, kind: IndexKind): Type {
             let declaration = getIndexDeclarationOfSymbol(symbol, kind);
             return declaration
-                ? declaration.type ? getTypeFromTypeNode(declaration.type) : anyType
+                ? declaration.type ? getTypeFromTypeNodeOrHeritageClauseElement(declaration.type) : anyType
                 : undefined;
         }
 
@@ -3218,7 +3231,7 @@ module ts {
                     type.constraint = targetConstraint ? instantiateType(targetConstraint, type.mapper) : noConstraintType;
                 }
                 else {
-                    type.constraint = getTypeFromTypeNode((<TypeParameterDeclaration>getDeclarationOfKind(type.symbol, SyntaxKind.TypeParameter)).constraint);
+                    type.constraint = getTypeFromTypeNodeOrHeritageClauseElement((<TypeParameterDeclaration>getDeclarationOfKind(type.symbol, SyntaxKind.TypeParameter)).constraint);
                 }
             }
             return type.constraint === noConstraintType ? undefined : type.constraint;
@@ -3266,7 +3279,7 @@ module ts {
             return type;
         }
 
-        function isTypeParameterReferenceIllegalInConstraint(typeReferenceNode: TypeReferenceNode, typeParameterSymbol: Symbol): boolean {
+        function isTypeParameterReferenceIllegalInConstraint(typeReferenceNode: TypeReferenceNode | HeritageClauseElement, typeParameterSymbol: Symbol): boolean {
             let links = getNodeLinks(typeReferenceNode);
             if (links.isIllegalTypeReferenceInConstraint !== undefined) {
                 return links.isIllegalTypeReferenceInConstraint;
@@ -3315,39 +3328,57 @@ module ts {
             }
         }
 
-        function getTypeFromTypeReferenceNode(node: TypeReferenceNode): Type {
+        function getTypeFromTypeReference(node: TypeReferenceNode): Type {
+            return getTypeFromTypeReferenceOrHeritageClauseElement(node);
+        }
+
+        function getTypeFromHeritageClauseElement(node: HeritageClauseElement): Type {
+            return getTypeFromTypeReferenceOrHeritageClauseElement(node);
+        }
+
+        function getTypeFromTypeReferenceOrHeritageClauseElement(node: TypeReferenceNode | HeritageClauseElement): Type {
             let links = getNodeLinks(node);
             if (!links.resolvedType) {
-                let symbol = resolveEntityName(node.typeName, SymbolFlags.Type);
                 let type: Type;
-                if (symbol) {
-                    if ((symbol.flags & SymbolFlags.TypeParameter) && isTypeParameterReferenceIllegalInConstraint(node, symbol)) {
-                        // TypeScript 1.0 spec (April 2014): 3.4.1
-                        // Type parameters declared in a particular type parameter list
-                        // may not be referenced in constraints in that type parameter list
-                        // Implementation: such type references are resolved to 'unknown' type that usually denotes error
-                        type = unknownType;
-                    }
-                    else {
-                        type = getDeclaredTypeOfSymbol(symbol);
-                        if (type.flags & (TypeFlags.Class | TypeFlags.Interface) && type.flags & TypeFlags.Reference) {
-                            let typeParameters = (<InterfaceType>type).typeParameters;
-                            if (node.typeArguments && node.typeArguments.length === typeParameters.length) {
-                                type = createTypeReference(<GenericType>type, map(node.typeArguments, getTypeFromTypeNode));
-                            }
-                            else {
-                                error(node, Diagnostics.Generic_type_0_requires_1_type_argument_s, typeToString(type, /*enclosingDeclaration*/ undefined, TypeFormatFlags.WriteArrayAsGenericType), typeParameters.length);
-                                type = undefined;
-                            }
+
+                // We don't currently support heritage clauses with complex expressions in them.
+                // For these cases, we just set the type to be the unknownType.
+                if (node.kind !== SyntaxKind.HeritageClauseElement || isSupportedHeritageClauseElement(<HeritageClauseElement>node)) {
+                    let typeNameOrExpression = node.kind === SyntaxKind.TypeReference
+                        ? (<TypeReferenceNode>node).typeName
+                        : (<HeritageClauseElement>node).expression;
+
+                    let symbol = resolveEntityName(typeNameOrExpression, SymbolFlags.Type);
+                    if (symbol) {
+                        if ((symbol.flags & SymbolFlags.TypeParameter) && isTypeParameterReferenceIllegalInConstraint(node, symbol)) {
+                            // TypeScript 1.0 spec (April 2014): 3.4.1
+                            // Type parameters declared in a particular type parameter list
+                            // may not be referenced in constraints in that type parameter list
+                            // Implementation: such type references are resolved to 'unknown' type that usually denotes error
+                            type = unknownType;
                         }
                         else {
-                            if (node.typeArguments) {
-                                error(node, Diagnostics.Type_0_is_not_generic, typeToString(type));
-                                type = undefined;
+                            type = getDeclaredTypeOfSymbol(symbol);
+                            if (type.flags & (TypeFlags.Class | TypeFlags.Interface) && type.flags & TypeFlags.Reference) {
+                                let typeParameters = (<InterfaceType>type).typeParameters;
+                                if (node.typeArguments && node.typeArguments.length === typeParameters.length) {
+                                    type = createTypeReference(<GenericType>type, map(node.typeArguments, getTypeFromTypeNodeOrHeritageClauseElement));
+                                }
+                                else {
+                                    error(node, Diagnostics.Generic_type_0_requires_1_type_argument_s, typeToString(type, /*enclosingDeclaration*/ undefined, TypeFormatFlags.WriteArrayAsGenericType), typeParameters.length);
+                                    type = undefined;
+                                }
+                            }
+                            else {
+                                if (node.typeArguments) {
+                                    error(node, Diagnostics.Type_0_is_not_generic, typeToString(type));
+                                    type = undefined;
+                                }
                             }
                         }
                     }
                 }
+
                 links.resolvedType = type || unknownType;
             }
             return links.resolvedType;
@@ -3425,7 +3456,7 @@ module ts {
         function getTypeFromArrayTypeNode(node: ArrayTypeNode): Type {
             let links = getNodeLinks(node);
             if (!links.resolvedType) {
-                links.resolvedType = createArrayType(getTypeFromTypeNode(node.elementType));
+                links.resolvedType = createArrayType(getTypeFromTypeNodeOrHeritageClauseElement(node.elementType));
             }
             return links.resolvedType;
         }
@@ -3443,7 +3474,7 @@ module ts {
         function getTypeFromTupleTypeNode(node: TupleTypeNode): Type {
             let links = getNodeLinks(node);
             if (!links.resolvedType) {
-                links.resolvedType = createTupleType(map(node.elementTypes, getTypeFromTypeNode));
+                links.resolvedType = createTupleType(map(node.elementTypes, getTypeFromTypeNodeOrHeritageClauseElement));
             }
             return links.resolvedType;
         }
@@ -3539,7 +3570,7 @@ module ts {
         function getTypeFromUnionTypeNode(node: UnionTypeNode): Type {
             let links = getNodeLinks(node);
             if (!links.resolvedType) {
-                links.resolvedType = getUnionType(map(node.types, getTypeFromTypeNode), /*noSubtypeReduction*/ true);
+                links.resolvedType = getUnionType(map(node.types, getTypeFromTypeNodeOrHeritageClauseElement), /*noSubtypeReduction*/ true);
             }
             return links.resolvedType;
         }
@@ -3571,7 +3602,7 @@ module ts {
             return links.resolvedType;
         }
 
-        function getTypeFromTypeNode(node: TypeNode | LiteralExpression): Type {
+        function getTypeFromTypeNodeOrHeritageClauseElement(node: TypeNode | LiteralExpression | HeritageClauseElement): Type {
             switch (node.kind) {
                 case SyntaxKind.AnyKeyword:
                     return anyType;
@@ -3588,7 +3619,9 @@ module ts {
                 case SyntaxKind.StringLiteral:
                     return getTypeFromStringLiteral(<LiteralExpression>node);
                 case SyntaxKind.TypeReference:
-                    return getTypeFromTypeReferenceNode(<TypeReferenceNode>node);
+                    return getTypeFromTypeReference(<TypeReferenceNode>node);
+                case SyntaxKind.HeritageClauseElement:
+                    return getTypeFromHeritageClauseElement(<HeritageClauseElement>node);
                 case SyntaxKind.TypeQuery:
                     return getTypeFromTypeQueryNode(<TypeQueryNode>node);
                 case SyntaxKind.ArrayType:
@@ -3598,7 +3631,7 @@ module ts {
                 case SyntaxKind.UnionType:
                     return getTypeFromUnionTypeNode(<UnionTypeNode>node);
                 case SyntaxKind.ParenthesizedType:
-                    return getTypeFromTypeNode((<ParenthesizedTypeNode>node).type);
+                    return getTypeFromTypeNodeOrHeritageClauseElement((<ParenthesizedTypeNode>node).type);
                 case SyntaxKind.FunctionType:
                 case SyntaxKind.ConstructorType:
                 case SyntaxKind.TypeLiteral:
@@ -4961,7 +4994,7 @@ module ts {
         function getResolvedSymbol(node: Identifier): Symbol {
             let links = getNodeLinks(node);
             if (!links.resolvedSymbol) {
-                links.resolvedSymbol = (getFullWidth(node) > 0 && resolveName(node, node.text, SymbolFlags.Value | SymbolFlags.ExportValue, Diagnostics.Cannot_find_name_0, node)) || unknownSymbol;
+                links.resolvedSymbol = (!nodeIsMissing(node) && resolveName(node, node.text, SymbolFlags.Value | SymbolFlags.ExportValue, Diagnostics.Cannot_find_name_0, node)) || unknownSymbol;
             }
             return links.resolvedSymbol;
         }
@@ -5467,7 +5500,7 @@ module ts {
             let isCallExpression = node.parent.kind === SyntaxKind.CallExpression && (<CallExpression>node.parent).expression === node;
             let enclosingClass = <ClassDeclaration>getAncestor(node, SyntaxKind.ClassDeclaration);
             let baseClass: Type;
-            if (enclosingClass && getClassBaseTypeNode(enclosingClass)) {
+            if (enclosingClass && getClassExtendsHeritageClauseElement(enclosingClass)) {
                 let classType = <InterfaceType>getDeclaredTypeOfSymbol(getSymbolOfNode(enclosingClass));
                 baseClass = classType.baseTypes.length && classType.baseTypes[0];
             }
@@ -5599,7 +5632,7 @@ module ts {
             let declaration = <VariableLikeDeclaration>node.parent;
             if (node === declaration.initializer) {
                 if (declaration.type) {
-                    return getTypeFromTypeNode(declaration.type);
+                    return getTypeFromTypeNodeOrHeritageClauseElement(declaration.type);
                 }
                 if (declaration.kind === SyntaxKind.Parameter) {
                     let type = getContextuallyTypedParameterType(<ParameterDeclaration>declaration);
@@ -5802,7 +5835,7 @@ module ts {
                 case SyntaxKind.NewExpression:
                     return getContextualTypeForArgument(<CallExpression>parent, node);
                 case SyntaxKind.TypeAssertionExpression:
-                    return getTypeFromTypeNode((<TypeAssertion>parent).type);
+                    return getTypeFromTypeNodeOrHeritageClauseElement((<TypeAssertion>parent).type);
                 case SyntaxKind.BinaryExpression:
                     return getContextualTypeForBinaryOperand(node);
                 case SyntaxKind.PropertyAssignment:
@@ -6459,7 +6492,7 @@ module ts {
                     let templateExpression = <TemplateExpression>tagExpression.template;
                     let lastSpan = lastOrUndefined(templateExpression.templateSpans);
                     Debug.assert(lastSpan !== undefined); // we should always have at least one span.
-                    callIsIncomplete = getFullWidth(lastSpan.literal) === 0 || !!lastSpan.literal.isUnterminated;
+                    callIsIncomplete = nodeIsMissing(lastSpan.literal) || !!lastSpan.literal.isUnterminated;
                 }
                 else {
                     // If the template didn't end in a backtick, or its beginning occurred right prior to EOF,
@@ -6603,7 +6636,7 @@ module ts {
             let typeArgumentsAreAssignable = true;
             for (let i = 0; i < typeParameters.length; i++) {
                 let typeArgNode = typeArguments[i];
-                let typeArgument = getTypeFromTypeNode(typeArgNode);
+                let typeArgument = getTypeFromTypeNodeOrHeritageClauseElement(typeArgNode);
                 // Do not push on this array! It has a preallocated length
                 typeArgumentResultTypes[i] = typeArgument;
                 if (typeArgumentsAreAssignable /* so far */) {
@@ -6677,7 +6710,7 @@ module ts {
         function getEffectiveTypeArguments(callExpression: CallExpression): TypeNode[] {
             if (callExpression.expression.kind === SyntaxKind.SuperKeyword) {
                 let containingClass = <ClassDeclaration>getAncestor(callExpression, SyntaxKind.ClassDeclaration);
-                let baseClassTypeNode = containingClass && getClassBaseTypeNode(containingClass);
+                let baseClassTypeNode = containingClass && getClassExtendsHeritageClauseElement(containingClass);
                 return baseClassTypeNode && baseClassTypeNode.typeArguments;
             }
             else {
@@ -7085,7 +7118,7 @@ module ts {
 
         function checkTypeAssertion(node: TypeAssertion): Type {
             let exprType = checkExpression(node.expression);
-            let targetType = getTypeFromTypeNode(node.type);
+            let targetType = getTypeFromTypeNodeOrHeritageClauseElement(node.type);
             if (produceDiagnostics && targetType !== unknownType) {
                 let widenedType = getWidenedType(exprType);
                 if (!(isTypeAssignableTo(targetType, widenedType))) {
@@ -7264,7 +7297,7 @@ module ts {
         function checkFunctionExpressionOrObjectLiteralMethodBody(node: FunctionExpression | MethodDeclaration) {
             Debug.assert(node.kind !== SyntaxKind.MethodDeclaration || isObjectLiteralMethod(node));
             if (node.type) {
-                checkIfNonVoidFunctionHasReturnExpressionsOrSingleThrowStatment(node, getTypeFromTypeNode(node.type));
+                checkIfNonVoidFunctionHasReturnExpressionsOrSingleThrowStatment(node, getTypeFromTypeNodeOrHeritageClauseElement(node.type));
             }
 
             if (node.body) {
@@ -7274,7 +7307,7 @@ module ts {
                 else {
                     let exprType = checkExpression(<Expression>node.body);
                     if (node.type) {
-                        checkTypeAssignableTo(exprType, getTypeFromTypeNode(node.type), node.body, /*headMessage*/ undefined);
+                        checkTypeAssignableTo(exprType, getTypeFromTypeNodeOrHeritageClauseElement(node.type), node.body, /*headMessage*/ undefined);
                     }
                     checkFunctionExpressionBodies(node.body);
                 }
@@ -7354,23 +7387,6 @@ module ts {
                 }
             }
 
-            function isImportedNameFromExternalModule(n: Node): boolean {
-                switch (n.kind) {
-                    case SyntaxKind.ElementAccessExpression:
-                    case SyntaxKind.PropertyAccessExpression: {
-                        // all bindings for external module should be immutable
-                        // so attempt to use a.b or a[b] as lhs will always fail
-                        // no matter what b is
-                        let symbol = findSymbol((<PropertyAccessExpression | ElementAccessExpression>n).expression);
-                        return symbol && symbol.flags & SymbolFlags.Alias && isExternalModuleSymbol(resolveAlias(symbol));
-                    }
-                    case SyntaxKind.ParenthesizedExpression:
-                        return isImportedNameFromExternalModule((<ParenthesizedExpression>n).expression);
-                    default:
-                        return false;
-                }
-            }
-
             if (!isReferenceOrErrorExpression(n)) {
                 error(n, invalidReferenceMessage);
                 return false;
@@ -7381,10 +7397,6 @@ module ts {
                 return false;
             }
 
-            if (isImportedNameFromExternalModule(n)) {
-                error(n, invalidReferenceMessage);
-            }
-
             return true;
         }
 
@@ -7980,6 +7992,8 @@ module ts {
                     return checkTypeAssertion(<TypeAssertion>node);
                 case SyntaxKind.ParenthesizedExpression:
                     return checkExpression((<ParenthesizedExpression>node).expression, contextualMapper);
+                case SyntaxKind.ClassExpression:
+                    return checkClassExpression(<ClassExpression>node);
                 case SyntaxKind.FunctionExpression:
                 case SyntaxKind.ArrowFunction:
                     return checkFunctionExpressionOrObjectLiteralMethod(<FunctionExpression>node, contextualMapper);
@@ -8207,7 +8221,7 @@ module ts {
             // TS 1.0 spec (April 2014): 8.3.2
             // Constructors of classes with no extends clause may not contain super calls, whereas
             // constructors of derived classes must contain at least one super call somewhere in their function body.
-            if (getClassBaseTypeNode(<ClassDeclaration>node.parent)) {
+            if (getClassExtendsHeritageClauseElement(<ClassDeclaration>node.parent)) {
 
                 if (containsSuperCall(node.body)) {
                     // The first statement in the body of a constructor must be a super call if both of the following are true:
@@ -8278,11 +8292,19 @@ module ts {
             checkDecorators(node);
         }
 
-        function checkTypeReference(node: TypeReferenceNode) {
+        function checkTypeReferenceNode(node: TypeReferenceNode) {
+            return checkTypeReferenceOrHeritageClauseElement(node);
+        }
+
+        function checkHeritageClauseElement(node: HeritageClauseElement) {
+            return checkTypeReferenceOrHeritageClauseElement(node);
+        }
+
+        function checkTypeReferenceOrHeritageClauseElement(node: TypeReferenceNode | HeritageClauseElement) {
             // Grammar checking
             checkGrammarTypeArguments(node, node.typeArguments);
 
-            let type = getTypeFromTypeReferenceNode(node);
+            let type = getTypeFromTypeReferenceOrHeritageClauseElement(node);
             if (type !== unknownType && node.typeArguments) {
                 // Do type argument local checks only if referenced type is successfully resolved
                 let len = node.typeArguments.length;
@@ -8450,7 +8472,7 @@ module ts {
             let isConstructor = (symbol.flags & SymbolFlags.Constructor) !== 0;
 
             function reportImplementationExpectedError(node: FunctionLikeDeclaration): void {
-                if (node.name && getFullWidth(node.name) === 0) {
+                if (node.name && nodeIsMissing(node.name)) {
                     return;
                 }
 
@@ -8773,7 +8795,7 @@ module ts {
 
             checkSourceElement(node.body);
             if (node.type && !isAccessor(node.kind)) {
-                checkIfNonVoidFunctionHasReturnExpressionsOrSingleThrowStatment(node, getTypeFromTypeNode(node.type));
+                checkIfNonVoidFunctionHasReturnExpressionsOrSingleThrowStatment(node, getTypeFromTypeNodeOrHeritageClauseElement(node.type));
             }
 
             // Report an implicit any error if there is no body, no explicit return type, and node is not a private method
@@ -8873,7 +8895,7 @@ module ts {
                 return;
             }
 
-            if (getClassBaseTypeNode(enclosingClass)) {
+            if (getClassExtendsHeritageClauseElement(enclosingClass)) {
                 let isDeclaration = node.kind !== SyntaxKind.Identifier;
                 if (isDeclaration) {
                     error(node, Diagnostics.Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference);
@@ -9721,8 +9743,18 @@ module ts {
             }
         }
 
+        function checkClassExpression(node: ClassExpression): Type {
+            grammarErrorOnNode(node, Diagnostics.class_expressions_are_not_currently_supported);
+            forEach(node.members, checkSourceElement);
+            return unknownType;
+        }
+
         function checkClassDeclaration(node: ClassDeclaration) {
             // Grammar checking
+            if (node.parent.kind !== SyntaxKind.ModuleBlock && node.parent.kind !== SyntaxKind.SourceFile) {
+                grammarErrorOnNode(node, Diagnostics.class_declarations_are_only_supported_directly_inside_a_module_or_as_a_top_level_declaration);
+            }
+
             checkGrammarClassDeclarationHeritageClauses(node);
             checkDecorators(node);
             if (node.name) {
@@ -9735,10 +9767,14 @@ module ts {
             let symbol = getSymbolOfNode(node);
             let type = <InterfaceType>getDeclaredTypeOfSymbol(symbol);
             let staticType = <ObjectType>getTypeOfSymbol(symbol);
-            let baseTypeNode = getClassBaseTypeNode(node);
+            let baseTypeNode = getClassExtendsHeritageClauseElement(node);
             if (baseTypeNode) {
+                if (!isSupportedHeritageClauseElement(baseTypeNode)) {
+                    error(baseTypeNode.expression, Diagnostics.Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_class_extends_clauses);
+                }
+
                 emitExtends = emitExtends || !isInAmbientContext(node);
-                checkTypeReference(baseTypeNode);
+                checkHeritageClauseElement(baseTypeNode);
             }
             if (type.baseTypes.length) {
                 if (produceDiagnostics) {
@@ -9747,7 +9783,8 @@ module ts {
                     let staticBaseType = getTypeOfSymbol(baseType.symbol);
                     checkTypeAssignableTo(staticType, getTypeWithoutConstructors(staticBaseType), node.name || node,
                         Diagnostics.Class_static_side_0_incorrectly_extends_base_class_static_side_1);
-                    if (baseType.symbol !== resolveEntityName(baseTypeNode.typeName, SymbolFlags.Value)) {
+
+                    if (baseType.symbol !== resolveEntityName(baseTypeNode.expression, SymbolFlags.Value)) {
                         error(baseTypeNode, Diagnostics.Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0, typeToString(baseType));
                     }
 
@@ -9757,15 +9794,19 @@ module ts {
 
             if (type.baseTypes.length || (baseTypeNode && compilerOptions.separateCompilation)) {
                 // Check that base type can be evaluated as expression
-                checkExpressionOrQualifiedName(baseTypeNode.typeName);
+                checkExpressionOrQualifiedName(baseTypeNode.expression);
             }
 
-            let implementedTypeNodes = getClassImplementedTypeNodes(node);
+            let implementedTypeNodes = getClassImplementsHeritageClauseElements(node);
             if (implementedTypeNodes) {
                 forEach(implementedTypeNodes, typeRefNode => {
-                    checkTypeReference(typeRefNode);
+                    if (!isSupportedHeritageClauseElement(typeRefNode)) {
+                        error(typeRefNode.expression, Diagnostics.A_class_can_only_implement_an_identifier_Slashqualified_name_with_optional_type_arguments);
+                    }
+
+                    checkHeritageClauseElement(typeRefNode);
                     if (produceDiagnostics) {
-                        let t = getTypeFromTypeReferenceNode(typeRefNode);
+                        let t = getTypeFromHeritageClauseElement(typeRefNode);
                         if (t !== unknownType) {
                             let declaredType = (t.flags & TypeFlags.Reference) ? (<TypeReference>t).target : t;
                             if (declaredType.flags & (TypeFlags.Class | TypeFlags.Interface)) {
@@ -9887,7 +9928,7 @@ module ts {
                 if (!tp1.constraint || !tp2.constraint) {
                     return false;
                 }
-                if (!isTypeIdenticalTo(getTypeFromTypeNode(tp1.constraint), getTypeFromTypeNode(tp2.constraint))) {
+                if (!isTypeIdenticalTo(getTypeFromTypeNodeOrHeritageClauseElement(tp1.constraint), getTypeFromTypeNodeOrHeritageClauseElement(tp2.constraint))) {
                     return false;
                 }
             }
@@ -9958,7 +9999,13 @@ module ts {
                     }
                 }
             }
-            forEach(getInterfaceBaseTypeNodes(node), checkTypeReference);
+            forEach(getInterfaceBaseTypeNodes(node), heritageElement => {
+                if (!isSupportedHeritageClauseElement(heritageElement)) {
+                    error(heritageElement.expression, Diagnostics.An_interface_can_only_extend_an_identifier_Slashqualified_name_with_optional_type_arguments);
+                }
+
+                checkHeritageClauseElement(heritageElement);
+            });
             forEach(node.members, checkSourceElement);
 
             if (produceDiagnostics) {
@@ -10260,16 +10307,25 @@ module ts {
             checkSourceElement(node.body);
         }
 
-        function getFirstIdentifier(node: EntityName): Identifier {
-            while (node.kind === SyntaxKind.QualifiedName) {
-                node = (<QualifiedName>node).left;
+        function getFirstIdentifier(node: EntityName | Expression): Identifier {
+            while (true) {
+                if (node.kind === SyntaxKind.QualifiedName) {
+                    node = (<QualifiedName>node).left;
+                }
+                else if (node.kind === SyntaxKind.PropertyAccessExpression) {
+                    node = (<PropertyAccessExpression>node).expression;
+                }
+                else {
+                    break;
+                }
             }
+            Debug.assert(node.kind === SyntaxKind.Identifier);
             return <Identifier>node;
         }
 
         function checkExternalImportOrExportDeclaration(node: ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration): boolean {
             let moduleName = getExternalModuleName(node);
-            if (getFullWidth(moduleName) !== 0 && moduleName.kind !== SyntaxKind.StringLiteral) {
+            if (!nodeIsMissing(moduleName) && moduleName.kind !== SyntaxKind.StringLiteral) {
                 error(moduleName, Diagnostics.String_literal_expected);
                 return false;
             }
@@ -10490,7 +10546,7 @@ module ts {
                 case SyntaxKind.SetAccessor:
                     return checkAccessorDeclaration(<AccessorDeclaration>node);
                 case SyntaxKind.TypeReference:
-                    return checkTypeReference(<TypeReferenceNode>node);
+                    return checkTypeReferenceNode(<TypeReferenceNode>node);
                 case SyntaxKind.TypeQuery:
                     return checkTypeQuery(<TypeQueryNode>node);
                 case SyntaxKind.TypeLiteral:
@@ -10866,11 +10922,23 @@ module ts {
         // True if the given identifier is part of a type reference
         function isTypeReferenceIdentifier(entityName: EntityName): boolean {
             let node: Node = entityName;
-            while (node.parent && node.parent.kind === SyntaxKind.QualifiedName) node = node.parent;
+            while (node.parent && node.parent.kind === SyntaxKind.QualifiedName) {
+                node = node.parent;
+            }
+
             return node.parent && node.parent.kind === SyntaxKind.TypeReference;
         }
 
-        function isTypeNode(node: Node): boolean {
+        function isHeritageClauseElementIdentifier(entityName: Node): boolean {
+            let node = entityName;
+            while (node.parent && node.parent.kind === SyntaxKind.PropertyAccessExpression) {
+                node = node.parent;
+            }
+
+            return node.parent && node.parent.kind === SyntaxKind.HeritageClauseElement;
+        }
+
+        function isTypeNodeOrHeritageClauseElement(node: Node): boolean {
             if (SyntaxKind.FirstTypeNode <= node.kind && node.kind <= SyntaxKind.LastTypeNode) {
                 return true;
             }
@@ -10887,6 +10955,8 @@ module ts {
                 case SyntaxKind.StringLiteral:
                     // Specialized signatures can have string literals as their parameters' type names
                     return node.parent.kind === SyntaxKind.Parameter;
+                case SyntaxKind.HeritageClauseElement:
+                    return true;
 
                 // Identifiers and qualified names may be type nodes, depending on their context. Climb
                 // above them to find the lowest container
@@ -10895,10 +10965,15 @@ module ts {
                     if (node.parent.kind === SyntaxKind.QualifiedName && (<QualifiedName>node.parent).right === node) {
                         node = node.parent;
                     }
+                    else if (node.parent.kind === SyntaxKind.PropertyAccessExpression && (<PropertyAccessExpression>node.parent).name === node) {
+                        node = node.parent;
+                    }
                     // fall through
                 case SyntaxKind.QualifiedName:
+                case SyntaxKind.PropertyAccessExpression:
                     // At this point, node is either a qualified name or an identifier
-                    Debug.assert(node.kind === SyntaxKind.Identifier || node.kind === SyntaxKind.QualifiedName, "'node' was expected to be a qualified name or identifier in 'isTypeNode'.");
+                    Debug.assert(node.kind === SyntaxKind.Identifier || node.kind === SyntaxKind.QualifiedName || node.kind === SyntaxKind.PropertyAccessExpression,
+                        "'node' was expected to be a qualified name, identifier or property access in 'isTypeNode'.");
 
                     let parent = node.parent;
                     if (parent.kind === SyntaxKind.TypeQuery) {
@@ -10914,6 +10989,8 @@ module ts {
                         return true;
                     }
                     switch (parent.kind) {
+                        case SyntaxKind.HeritageClauseElement:
+                            return true;
                         case SyntaxKind.TypeParameter:
                             return node === (<TypeParameterDeclaration>parent).constraint;
                         case SyntaxKind.PropertyDeclaration:
@@ -10968,11 +11045,6 @@ module ts {
             return getLeftSideOfImportEqualsOrExportAssignment(node) !== undefined;
         }
 
-        function isRightSideOfQualifiedNameOrPropertyAccess(node: Node) {
-            return (node.parent.kind === SyntaxKind.QualifiedName && (<QualifiedName>node.parent).right === node) ||
-                (node.parent.kind === SyntaxKind.PropertyAccessExpression && (<PropertyAccessExpression>node.parent).name === node);
-        }
-
         function getSymbolOfEntityNameOrPropertyAccessExpression(entityName: EntityName | PropertyAccessExpression): Symbol {
             if (isDeclarationName(entityName)) {
                 return getSymbolOfNode(entityName.parent);
@@ -10994,8 +11066,13 @@ module ts {
                 entityName = <QualifiedName | PropertyAccessExpression>entityName.parent;
             }
 
-            if (isExpression(entityName)) {
-                if (getFullWidth(entityName) === 0) {
+            if (isHeritageClauseElementIdentifier(<EntityName>entityName)) {
+                let meaning = entityName.parent.kind === SyntaxKind.HeritageClauseElement ? SymbolFlags.Type : SymbolFlags.Namespace;
+                meaning |= SymbolFlags.Alias;
+                return resolveEntityName(<EntityName>entityName, meaning);
+            }
+            else if (isExpression(entityName)) {
+                if (nodeIsMissing(entityName)) {
                     // Missing entity name.
                     return undefined;
                 }
@@ -11110,12 +11187,12 @@ module ts {
                 return unknownType;
             }
 
-            if (isExpression(node)) {
-                return getTypeOfExpression(<Expression>node);
+            if (isTypeNodeOrHeritageClauseElement(node)) {
+                return getTypeFromTypeNodeOrHeritageClauseElement(<TypeNode | HeritageClauseElement>node);
             }
 
-            if (isTypeNode(node)) {
-                return getTypeFromTypeNode(<TypeNode>node);
+            if (isExpression(node)) {
+                return getTypeOfExpression(<Expression>node);
             }
 
             if (isTypeDeclaration(node)) {
diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts
index 3ba1cb0a1a..7d41a72435 100644
--- a/src/compiler/declarationEmitter.ts
+++ b/src/compiler/declarationEmitter.ts
@@ -314,12 +314,12 @@ module ts {
             }
         }
 
-        function emitTypeWithNewGetSymbolAccessibilityDiagnostic(type: TypeNode | EntityName, getSymbolAccessibilityDiagnostic: GetSymbolAccessibilityDiagnostic) {
+        function emitTypeWithNewGetSymbolAccessibilityDiagnostic(type: TypeNode | EntityName | HeritageClauseElement, getSymbolAccessibilityDiagnostic: GetSymbolAccessibilityDiagnostic) {
             writer.getSymbolAccessibilityDiagnostic = getSymbolAccessibilityDiagnostic;
             emitType(type);
         }
 
-        function emitType(type: TypeNode | StringLiteralExpression | Identifier | QualifiedName) {
+        function emitType(type: TypeNode | StringLiteralExpression | Identifier | QualifiedName | HeritageClauseElement) {
             switch (type.kind) {
                 case SyntaxKind.AnyKeyword:
                 case SyntaxKind.StringKeyword:
@@ -329,6 +329,8 @@ module ts {
                 case SyntaxKind.VoidKeyword:
                 case SyntaxKind.StringLiteral:
                     return writeTextOfNode(currentSourceFile, type);
+                case SyntaxKind.HeritageClauseElement:
+                    return emitHeritageClauseElement(<HeritageClauseElement>type);
                 case SyntaxKind.TypeReference:
                     return emitTypeReference(<TypeReferenceNode>type);
                 case SyntaxKind.TypeQuery:
@@ -350,11 +352,9 @@ module ts {
                     return emitEntityName(<Identifier>type);
                 case SyntaxKind.QualifiedName:
                     return emitEntityName(<QualifiedName>type);
-                default:
-                    Debug.fail("Unknown type annotation: " + type.kind);
             }
 
-            function emitEntityName(entityName: EntityName) {
+            function emitEntityName(entityName: EntityName | PropertyAccessExpression) {
                 let visibilityResult = resolver.isEntityNameVisible(entityName,
                     // Aliases can be written asynchronously so use correct enclosing declaration
                     entityName.parent.kind === SyntaxKind.ImportEqualsDeclaration ? entityName.parent : enclosingDeclaration);
@@ -362,15 +362,28 @@ module ts {
                 handleSymbolAccessibilityError(visibilityResult);
                 writeEntityName(entityName);
 
-                function writeEntityName(entityName: EntityName) {
+                function writeEntityName(entityName: EntityName | Expression) {
                     if (entityName.kind === SyntaxKind.Identifier) {
                         writeTextOfNode(currentSourceFile, entityName);
                     }
                     else {
-                        let qualifiedName = <QualifiedName>entityName;
-                        writeEntityName(qualifiedName.left);
+                        let left = entityName.kind === SyntaxKind.QualifiedName ? (<QualifiedName>entityName).left : (<PropertyAccessExpression>entityName).expression;
+                        let right = entityName.kind === SyntaxKind.QualifiedName ? (<QualifiedName>entityName).right : (<PropertyAccessExpression>entityName).name;
+                        writeEntityName(left);
                         write(".");
-                        writeTextOfNode(currentSourceFile, qualifiedName.right);
+                        writeTextOfNode(currentSourceFile, right);
+                    }
+                }
+            }
+
+            function emitHeritageClauseElement(node: HeritageClauseElement) {
+                if (isSupportedHeritageClauseElement(node)) {
+                    Debug.assert(node.expression.kind === SyntaxKind.Identifier || node.expression.kind === SyntaxKind.PropertyAccessExpression);
+                    emitEntityName(<Identifier | PropertyAccessExpression>node.expression);
+                    if (node.typeArguments) {
+                        write("<");
+                        emitCommaList(node.typeArguments, emitType);
+                        write(">");
                     }
                 }
             }
@@ -827,14 +840,16 @@ module ts {
             }
         }
 
-        function emitHeritageClause(typeReferences: TypeReferenceNode[], isImplementsList: boolean) {
+        function emitHeritageClause(typeReferences: HeritageClauseElement[], isImplementsList: boolean) {
             if (typeReferences) {
                 write(isImplementsList ? " implements " : " extends ");
                 emitCommaList(typeReferences, emitTypeOfTypeReference);
             }
 
-            function emitTypeOfTypeReference(node: TypeReferenceNode) {
-                emitTypeWithNewGetSymbolAccessibilityDiagnostic(node, getHeritageClauseVisibilityError);
+            function emitTypeOfTypeReference(node: HeritageClauseElement) {
+                if (isSupportedHeritageClauseElement(node)) {
+                    emitTypeWithNewGetSymbolAccessibilityDiagnostic(node, getHeritageClauseVisibilityError);
+                }
 
                 function getHeritageClauseVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic {
                     let diagnosticMessage: DiagnosticMessage;
@@ -877,11 +892,11 @@ module ts {
             let prevEnclosingDeclaration = enclosingDeclaration;
             enclosingDeclaration = node;
             emitTypeParameters(node.typeParameters);
-            let baseTypeNode = getClassBaseTypeNode(node);
+            let baseTypeNode = getClassExtendsHeritageClauseElement(node);
             if (baseTypeNode) {
                 emitHeritageClause([baseTypeNode], /*isImplementsList*/ false);
             }
-            emitHeritageClause(getClassImplementedTypeNodes(node), /*isImplementsList*/ true);
+            emitHeritageClause(getClassImplementsHeritageClauseElements(node), /*isImplementsList*/ true);
             write(" {");
             writeLine();
             increaseIndent();
diff --git a/src/compiler/diagnosticInformationMap.generated.ts b/src/compiler/diagnosticInformationMap.generated.ts
index cc4ec2e57a..06d621afeb 100644
--- a/src/compiler/diagnosticInformationMap.generated.ts
+++ b/src/compiler/diagnosticInformationMap.generated.ts
@@ -353,6 +353,8 @@ module ts {
         The_arguments_object_cannot_be_referenced_in_an_arrow_function_Consider_using_a_standard_function_expression: { code: 2496, category: DiagnosticCategory.Error, key: "The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression." },
         External_module_0_resolves_to_a_non_module_entity_and_cannot_be_imported_using_this_construct: { code: 2497, category: DiagnosticCategory.Error, key: "External module '{0}' resolves to a non-module entity and cannot be imported using this construct." },
         External_module_0_uses_export_and_cannot_be_used_with_export_Asterisk: { code: 2498, category: DiagnosticCategory.Error, key: "External module '{0}' uses 'export =' and cannot be used with 'export *'." },
+        An_interface_can_only_extend_an_identifier_Slashqualified_name_with_optional_type_arguments: { code: 2499, category: DiagnosticCategory.Error, key: "An interface can only extend an identifier/qualified-name with optional type arguments." },
+        A_class_can_only_implement_an_identifier_Slashqualified_name_with_optional_type_arguments: { code: 2500, category: DiagnosticCategory.Error, key: "A class can only implement an identifier/qualified-name with optional type arguments." },
         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}'." },
@@ -520,5 +522,8 @@ module ts {
         type_assertion_expressions_can_only_be_used_in_TypeScript: { code: 8016, category: DiagnosticCategory.Error, key: "'type assertion expressions' can only be used in TypeScript." },
         yield_expressions_are_not_currently_supported: { code: 9000, category: DiagnosticCategory.Error, key: "'yield' expressions are not currently supported." },
         Generators_are_not_currently_supported: { code: 9001, category: DiagnosticCategory.Error, key: "Generators are not currently supported." },
+        Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_class_extends_clauses: { code: 9002, category: DiagnosticCategory.Error, key: "Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses." },
+        class_expressions_are_not_currently_supported: { code: 9003, category: DiagnosticCategory.Error, key: "'class' expressions are not currently supported." },
+        class_declarations_are_only_supported_directly_inside_a_module_or_as_a_top_level_declaration: { code: 9004, category: DiagnosticCategory.Error, key: "'class' declarations are only supported directly inside a module or as a top level declaration." },
     };
 }
\ No newline at end of file
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index afc72e53b0..da6e0a0a8f 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -1403,6 +1403,14 @@
         "category": "Error",
         "code": 2498
     },
+    "An interface can only extend an identifier/qualified-name with optional type arguments.": {
+        "category": "Error",
+        "code": 2499
+    },
+    "A class can only implement an identifier/qualified-name with optional type arguments.": {
+        "category": "Error",
+        "code": 2500
+    },
 
     "Import declaration '{0}' is using private name '{1}'.": {
         "category": "Error",
@@ -2073,5 +2081,17 @@
     "Generators are not currently supported.": {
         "category": "Error",
         "code": 9001
+    },
+    "Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses.": {
+        "category": "Error",
+        "code": 9002
+    },
+    "'class' expressions are not currently supported.": {
+        "category": "Error",
+        "code": 9003
+    },
+    "'class' declarations are only supported directly inside a module or as a top level declaration.": {
+        "category": "Error",
+        "code": 9004
     }
 }
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 3ed3cb8e64..6ec4ea2389 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -3198,7 +3198,7 @@ module ts {
                 }
             }
 
-            function emitMemberAssignments(node: ClassDeclaration, staticFlag: NodeFlags) {
+            function emitMemberAssignments(node: ClassLikeDeclaration, staticFlag: NodeFlags) {
                 forEach(node.members, member => {
                     if (member.kind === SyntaxKind.PropertyDeclaration && (member.flags & NodeFlags.Static) === staticFlag && (<PropertyDeclaration>member).initializer) {
                         writeLine();
@@ -3222,9 +3222,13 @@ module ts {
                 });
             }
 
-            function emitMemberFunctionsForES5AndLower(node: ClassDeclaration) {
+            function emitMemberFunctionsForES5AndLower(node: ClassLikeDeclaration) {
                 forEach(node.members, member => {
-                    if (member.kind === SyntaxKind.MethodDeclaration || node.kind === SyntaxKind.MethodSignature) {
+                    if (member.kind === SyntaxKind.SemicolonClassElement) {
+                        writeLine();
+                        write(";");
+                    }
+                    else if (member.kind === SyntaxKind.MethodDeclaration || node.kind === SyntaxKind.MethodSignature) {
                         if (!(<MethodDeclaration>member).body) {
                             return emitOnlyPinnedOrTripleSlashComments(member);
                         }
@@ -3292,12 +3296,14 @@ module ts {
                 });
             }
 
-            function emitMemberFunctionsForES6AndHigher(node: ClassDeclaration) {
+            function emitMemberFunctionsForES6AndHigher(node: ClassLikeDeclaration) {
                 for (let member of node.members) {
                     if ((member.kind === SyntaxKind.MethodDeclaration || node.kind === SyntaxKind.MethodSignature) && !(<MethodDeclaration>member).body) {
                         emitOnlyPinnedOrTripleSlashComments(member);
                     }
-                    else if (member.kind === SyntaxKind.MethodDeclaration || node.kind === SyntaxKind.MethodSignature || member.kind === SyntaxKind.GetAccessor || member.kind === SyntaxKind.SetAccessor) {
+                    else if (member.kind === SyntaxKind.MethodDeclaration ||
+                             member.kind === SyntaxKind.GetAccessor ||
+                             member.kind === SyntaxKind.SetAccessor) {
                         writeLine();
                         emitLeadingComments(member);
                         emitStart(member);
@@ -3316,10 +3322,14 @@ module ts {
                         emitEnd(member);
                         emitTrailingComments(member);
                     }
+                    else if (member.kind === SyntaxKind.SemicolonClassElement) {
+                        writeLine();
+                        write(";");
+                    }
                 }
             }
 
-            function emitConstructor(node: ClassDeclaration, baseTypeNode: TypeReferenceNode) {
+            function emitConstructor(node: ClassLikeDeclaration, baseTypeElement: HeritageClauseElement) {
                 let saveTempFlags = tempFlags;
                 let saveTempVariables = tempVariables;
                 let saveTempParameters = tempParameters;
@@ -3373,7 +3383,7 @@ module ts {
                         //          Let constructor be the result of parsing the String "constructor(... args){ super (...args);}" using the syntactic grammar with the goal symbol MethodDefinition.
                         //      Else,
                         //          Let constructor be the result of parsing the String "constructor( ){ }" using the syntactic grammar with the goal symbol MethodDefinition
-                        if (baseTypeNode) {
+                        if (baseTypeElement) {
                             write("(...args)");
                         }
                         else {
@@ -3392,7 +3402,7 @@ module ts {
                 if (ctor) {
                     emitDefaultValueAssignments(ctor);
                     emitRestParameter(ctor);
-                    if (baseTypeNode) {
+                    if (baseTypeElement) {
                         var superCall = findInitialSuperCall(ctor);
                         if (superCall) {
                             writeLine();
@@ -3402,16 +3412,16 @@ module ts {
                     emitParameterPropertyAssignments(ctor);
                 }
                 else {
-                    if (baseTypeNode) {
+                    if (baseTypeElement) {
                         writeLine();
-                        emitStart(baseTypeNode);
+                        emitStart(baseTypeElement);
                         if (languageVersion < ScriptTarget.ES6) {
                             write("_super.apply(this, arguments);");
                         }
                         else {
                             write("super(...args);");
                         }
-                        emitEnd(baseTypeNode);
+                        emitEnd(baseTypeElement);
                     }
                 }
                 emitMemberAssignments(node, /*staticFlag*/0);
@@ -3440,82 +3450,92 @@ module ts {
                 tempParameters = saveTempParameters;
             }
 
+            function emitClassExpression(node: ClassExpression) {
+                return emitClassLikeDeclaration(node);
+            }
+
             function emitClassDeclaration(node: ClassDeclaration) {
+                return emitClassLikeDeclaration(node);
+            }
+
+            function emitClassLikeDeclaration(node: ClassLikeDeclaration) {
                 if (languageVersion < ScriptTarget.ES6) {
-                    emitClassDeclarationBelowES6(<ClassDeclaration>node);
+                    emitClassLikeDeclarationBelowES6(node);
                 }
                 else {
-                    emitClassDeclarationForES6AndHigher(<ClassDeclaration>node);
+                    emitClassLikeDeclarationForES6AndHigher(node);
                 }
             }
             
-            function emitClassDeclarationForES6AndHigher(node: ClassDeclaration) {
+            function emitClassLikeDeclarationForES6AndHigher(node: ClassLikeDeclaration) {
                 let thisNodeIsDecorated = nodeIsDecorated(node);
-                if (thisNodeIsDecorated) {
-                    // To preserve the correct runtime semantics when decorators are applied to the class,
-                    // the emit needs to follow one of the following rules:
-                    //
-                    // * For a local class declaration:
-                    //
-                    //     @dec class C {
-                    //     }
-                    //
-                    //   The emit should be:
-                    //
-                    //     let C = class {
-                    //     };
-                    //     Object.defineProperty(C, "name", { value: "C", configurable: true });
-                    //     C = __decorate([dec], C);
-                    //
-                    // * For an exported class declaration:
-                    //
-                    //     @dec export class C {
-                    //     }
-                    //
-                    //   The emit should be:
-                    //
-                    //     export let C = class {
-                    //     };
-                    //     Object.defineProperty(C, "name", { value: "C", configurable: true });
-                    //     C = __decorate([dec], C);
-                    //
-                    // * For a default export of a class declaration with a name:
-                    //
-                    //     @dec default export class C {
-                    //     }
-                    //
-                    //   The emit should be:
-                    //
-                    //     let C = class {
-                    //     }
-                    //     Object.defineProperty(C, "name", { value: "C", configurable: true });
-                    //     C = __decorate([dec], C);
-                    //     export default C;
-                    //
-                    // * For a default export of a class declaration without a name:
-                    //
-                    //     @dec default export class {
-                    //     }
-                    //
-                    //   The emit should be:
-                    //
-                    //     let _default = class {
-                    //     }
-                    //     _default = __decorate([dec], _default);
-                    //     export default _default;
-                    //
-                    if (isES6ExportedDeclaration(node) && !(node.flags & NodeFlags.Default)) {
-                        write("export ");
-                    }
+                if (node.kind === SyntaxKind.ClassDeclaration) {
+                    if (thisNodeIsDecorated) {
+                        // To preserve the correct runtime semantics when decorators are applied to the class,
+                        // the emit needs to follow one of the following rules:
+                        //
+                        // * For a local class declaration:
+                        //
+                        //     @dec class C {
+                        //     }
+                        //
+                        //   The emit should be:
+                        //
+                        //     let C = class {
+                        //     };
+                        //     Object.defineProperty(C, "name", { value: "C", configurable: true });
+                        //     C = __decorate([dec], C);
+                        //
+                        // * For an exported class declaration:
+                        //
+                        //     @dec export class C {
+                        //     }
+                        //
+                        //   The emit should be:
+                        //
+                        //     export let C = class {
+                        //     };
+                        //     Object.defineProperty(C, "name", { value: "C", configurable: true });
+                        //     C = __decorate([dec], C);
+                        //
+                        // * For a default export of a class declaration with a name:
+                        //
+                        //     @dec default export class C {
+                        //     }
+                        //
+                        //   The emit should be:
+                        //
+                        //     let C = class {
+                        //     }
+                        //     Object.defineProperty(C, "name", { value: "C", configurable: true });
+                        //     C = __decorate([dec], C);
+                        //     export default C;
+                        //
+                        // * For a default export of a class declaration without a name:
+                        //
+                        //     @dec default export class {
+                        //     }
+                        //
+                        //   The emit should be:
+                        //
+                        //     let _default = class {
+                        //     }
+                        //     _default = __decorate([dec], _default);
+                        //     export default _default;
+                        //
+                        if (isES6ExportedDeclaration(node) && !(node.flags & NodeFlags.Default)) {
+                            write("export ");
+                        }
 
-                    write("let ");
-                    emitDeclarationName(node);
-                    write(" = ");
-                }
-                else if (isES6ExportedDeclaration(node)) {                    
-                    write("export ");
-                    if (node.flags & NodeFlags.Default) {
-                        write("default ");
+                        write("let ");
+                        emitDeclarationName(node);
+                        write(" = ");
+                    }
+                    else if (isES6ExportedDeclaration(node)) {
+                        write("export ");
+                        if (node.flags & NodeFlags.Default) {
+                            write("default ");
+                        }
                     }
                 }
 
@@ -3527,10 +3547,10 @@ module ts {
                     emitDeclarationName(node);
                 }
 
-                var baseTypeNode = getClassBaseTypeNode(node);
+                var baseTypeNode = getClassExtendsHeritageClauseElement(node);
                 if (baseTypeNode) {
                     write(" extends ");
-                    emit(baseTypeNode.typeName);
+                    emit(baseTypeNode.expression);
                 }
 
                 write(" {");
@@ -3593,11 +3613,15 @@ module ts {
                 }
             }
 
-            function emitClassDeclarationBelowES6(node: ClassDeclaration) {
-                write("var ");
-                emitDeclarationName(node);
-                write(" = (function (");
-                let baseTypeNode = getClassBaseTypeNode(node);
+            function emitClassLikeDeclarationBelowES6(node: ClassLikeDeclaration) {
+                if (node.kind === SyntaxKind.ClassDeclaration) {
+                    write("var ");
+                    emitDeclarationName(node);
+                    write(" = ");
+                }
+
+                write("(function (");
+                let baseTypeNode = getClassExtendsHeritageClauseElement(node);
                 if (baseTypeNode) {
                     write("_super");
                 }
@@ -3644,32 +3668,37 @@ module ts {
                 emitStart(node);
                 write(")(");
                 if (baseTypeNode) {
-                    emit(baseTypeNode.typeName);
+                    emit(baseTypeNode.expression);
+                }
+                write(")");
+                if (node.kind === SyntaxKind.ClassDeclaration) {
+                    write(";");
                 }
-                write(");");
                 emitEnd(node);
 
-                emitExportMemberAssignment(node);
+                if (node.kind === SyntaxKind.ClassDeclaration) {
+                    emitExportMemberAssignment(<ClassDeclaration>node);
+                }
 
                 if (languageVersion < ScriptTarget.ES6 && node.parent === currentSourceFile && node.name) {
                     emitExportMemberAssignments(node.name);
                 }
             }
 
-            function emitClassMemberPrefix(node: ClassDeclaration, member: Node) {
+            function emitClassMemberPrefix(node: ClassLikeDeclaration, member: Node) {
                 emitDeclarationName(node);
                 if (!(member.flags & NodeFlags.Static)) {
                     write(".prototype");
                 }
             }
             
-            function emitDecoratorsOfClass(node: ClassDeclaration) {
+            function emitDecoratorsOfClass(node: ClassLikeDeclaration) {
                 emitDecoratorsOfMembers(node, /*staticFlag*/ 0);
                 emitDecoratorsOfMembers(node, NodeFlags.Static);
                 emitDecoratorsOfConstructor(node);
             }
 
-            function emitDecoratorsOfConstructor(node: ClassDeclaration) {
+            function emitDecoratorsOfConstructor(node: ClassLikeDeclaration) {
                 let constructor = getFirstConstructorWithBody(node);
                 if (constructor) {
                     emitDecoratorsOfParameters(node, constructor);
@@ -3701,7 +3730,7 @@ module ts {
                 writeLine();
             }
 
-            function emitDecoratorsOfMembers(node: ClassDeclaration, staticFlag: NodeFlags) {
+            function emitDecoratorsOfMembers(node: ClassLikeDeclaration, staticFlag: NodeFlags) {
                 forEach(node.members, member => {
                     if ((member.flags & NodeFlags.Static) !== staticFlag) {
                         return;
@@ -3805,7 +3834,7 @@ module ts {
                 });
             }
             
-            function emitDecoratorsOfParameters(node: ClassDeclaration, member: FunctionLikeDeclaration) {
+            function emitDecoratorsOfParameters(node: ClassLikeDeclaration, member: FunctionLikeDeclaration) {
                 forEach(member.parameters, (parameter, parameterIndex) => {
                     if (!nodeIsDecorated(parameter)) {
                         return;
@@ -4773,6 +4802,8 @@ var __decorate = this.__decorate || function (decorators, target, key, value) {
                         return emitDebuggerStatement(node);
                     case SyntaxKind.VariableDeclaration:
                         return emitVariableDeclaration(<VariableDeclaration>node);
+                    case SyntaxKind.ClassExpression:
+                        return emitClassExpression(<ClassExpression>node);
                     case SyntaxKind.ClassDeclaration:
                         return emitClassDeclaration(<ClassDeclaration>node);
                     case SyntaxKind.InterfaceDeclaration:
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 14311ccbc5..2972fba397 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -237,12 +237,13 @@ module ts {
             case SyntaxKind.Decorator:
                 return visitNode(cbNode, (<Decorator>node).expression);
             case SyntaxKind.ClassDeclaration:
+            case SyntaxKind.ClassExpression:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, (<ClassDeclaration>node).name) ||
-                    visitNodes(cbNodes, (<ClassDeclaration>node).typeParameters) ||
-                    visitNodes(cbNodes, (<ClassDeclaration>node).heritageClauses) ||
-                    visitNodes(cbNodes, (<ClassDeclaration>node).members);
+                    visitNode(cbNode, (<ClassLikeDeclaration>node).name) ||
+                    visitNodes(cbNodes, (<ClassLikeDeclaration>node).typeParameters) ||
+                    visitNodes(cbNodes, (<ClassLikeDeclaration>node).heritageClauses) ||
+                    visitNodes(cbNodes, (<ClassLikeDeclaration>node).members);
             case SyntaxKind.InterfaceDeclaration:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
@@ -308,6 +309,9 @@ module ts {
                 return visitNode(cbNode, (<ComputedPropertyName>node).expression);
             case SyntaxKind.HeritageClause:
                 return visitNodes(cbNodes, (<HeritageClause>node).types);
+            case SyntaxKind.HeritageClauseElement:
+                return visitNode(cbNode, (<HeritageClauseElement>node).expression) ||
+                    visitNodes(cbNodes, (<HeritageClauseElement>node).typeArguments);
             case SyntaxKind.ExternalModuleReference:
                 return visitNode(cbNode, (<ExternalModuleReference>node).expression);
             case SyntaxKind.MissingDeclaration:
@@ -324,7 +328,7 @@ module ts {
         TypeMembers,               // Members in interface or type literal
         ClassMembers,              // Members in class declaration
         EnumMembers,               // Members in enum declaration
-        TypeReferences,            // Type references in extends or implements clause
+        HeritageClauseElement,     // Elements in a heritage clause
         VariableDeclarations,      // Variable declarations in variable statement
         ObjectBindingElements,     // Binding elements in object binding list
         ArrayBindingElements,      // Binding elements in array binding list
@@ -356,7 +360,7 @@ module ts {
             case ParsingContext.TypeMembers:              return Diagnostics.Property_or_signature_expected;
             case ParsingContext.ClassMembers:             return Diagnostics.Unexpected_token_A_constructor_method_accessor_or_property_was_expected;
             case ParsingContext.EnumMembers:              return Diagnostics.Enum_member_expected;
-            case ParsingContext.TypeReferences:           return Diagnostics.Type_reference_expected;
+            case ParsingContext.HeritageClauseElement:    return Diagnostics.Expression_expected;
             case ParsingContext.VariableDeclarations:     return Diagnostics.Variable_declaration_expected;
             case ParsingContext.ObjectBindingElements:    return Diagnostics.Property_destructuring_pattern_expected;
             case ParsingContext.ArrayBindingElements:     return Diagnostics.Array_element_destructuring_pattern_expected;
@@ -1605,7 +1609,11 @@ module ts {
                 case ParsingContext.TypeMembers:
                     return isStartOfTypeMember();
                 case ParsingContext.ClassMembers:
-                    return lookAhead(isClassMemberStart);
+                    // We allow semicolons as class elements (as specified by ES6) as long as we're
+                    // not in error recovery.  If we're in error recovery, we don't want an errant
+                    // semicolon to be treated as a class member (since they're almost always used
+                    // for statements.
+                    return lookAhead(isClassMemberStart) || (token === SyntaxKind.SemicolonToken && !inErrorRecovery);
                 case ParsingContext.EnumMembers:
                     // Include open bracket computed properties. This technically also lets in indexers,
                     // which would be a candidate for improved error reporting.
@@ -1614,10 +1622,22 @@ module ts {
                     return token === SyntaxKind.OpenBracketToken || token === SyntaxKind.AsteriskToken || isLiteralPropertyName();
                 case ParsingContext.ObjectBindingElements:
                     return isLiteralPropertyName();
-                case ParsingContext.TypeReferences:
-                    // We want to make sure that the "extends" in "extends foo" or the "implements" in
-                    // "implements foo" is not considered a type name.
-                    return isIdentifier() && !isNotHeritageClauseTypeName();
+                case ParsingContext.HeritageClauseElement:
+                    // If we see { } then only consume it as an expression if it is followed by , or {
+                    // That way we won't consume the body of a class in its heritage clause.
+                    if (token === SyntaxKind.OpenBraceToken) {
+                        return lookAhead(isValidHeritageClauseObjectLiteral);
+                    }
+
+                    if (!inErrorRecovery) {
+                        return isStartOfLeftHandSideExpression() && !isHeritageClauseExtendsOrImplementsKeyword();
+                    }
+                    else {
+                        // If we're in error recovery we tighten up what we're willing to match.
+                        // That way we don't treat something like "this" as a valid heritage clause
+                        // element during recovery.
+                        return isIdentifier() && !isHeritageClauseExtendsOrImplementsKeyword();
+                    }
                 case ParsingContext.VariableDeclarations:
                     return isIdentifierOrPattern();
                 case ParsingContext.ArrayBindingElements:
@@ -1641,21 +1661,44 @@ module ts {
             Debug.fail("Non-exhaustive case in 'isListElement'.");
         }
 
+        function isValidHeritageClauseObjectLiteral() {
+            Debug.assert(token === SyntaxKind.OpenBraceToken);
+            if (nextToken() === SyntaxKind.CloseBraceToken) {
+                // if we see  "extends {}" then only treat the {} as what we're extending (and not
+                // the class body) if we have:
+                //
+                //      extends {} { 
+                //      extends {},
+                //      extends {} extends
+                //      extends {} implements
+
+                let next = nextToken();
+                return next === SyntaxKind.CommaToken || next === SyntaxKind.OpenBraceToken || next === SyntaxKind.ExtendsKeyword || next === SyntaxKind.ImplementsKeyword;
+            }
+
+            return true;
+        }
+
         function nextTokenIsIdentifier() {
             nextToken();
             return isIdentifier();
         }
 
-        function isNotHeritageClauseTypeName(): boolean {
+        function isHeritageClauseExtendsOrImplementsKeyword(): boolean {
             if (token === SyntaxKind.ImplementsKeyword ||
                 token === SyntaxKind.ExtendsKeyword) {
 
-                return lookAhead(nextTokenIsIdentifier);
+                return lookAhead(nextTokenIsStartOfExpression);
             }
 
             return false;
         }
 
+        function nextTokenIsStartOfExpression() {
+            nextToken();
+            return isStartOfExpression();
+        }
+
         // True if positioned at a list terminator
         function isListTerminator(kind: ParsingContext): boolean {
             if (token === SyntaxKind.EndOfFileToken) {
@@ -1676,7 +1719,7 @@ module ts {
                     return token === SyntaxKind.CloseBraceToken;
                 case ParsingContext.SwitchClauseStatements:
                     return token === SyntaxKind.CloseBraceToken || token === SyntaxKind.CaseKeyword || token === SyntaxKind.DefaultKeyword;
-                case ParsingContext.TypeReferences:
+                case ParsingContext.HeritageClauseElement:
                     return token === SyntaxKind.OpenBraceToken || token === SyntaxKind.ExtendsKeyword || token === SyntaxKind.ImplementsKeyword;
                 case ParsingContext.VariableDeclarations:
                     return isVariableDeclaratorListTerminator();
@@ -1891,12 +1934,6 @@ module ts {
                 // This would probably be safe to reuse.  There is no speculative parsing with
                 // heritage clauses.
 
-                case ParsingContext.TypeReferences:
-                // This would probably be safe to reuse.  There is no speculative parsing with
-                // type names in a heritage clause.  There can be generic names in the type
-                // name list.  But because it is a type context, we never use speculative
-                // parsing on the type argument list.
-
                 case ParsingContext.TypeParameters:
                 // This would probably be safe to reuse.  There is no speculative parsing with
                 // type parameters.  Note that that's because type *parameters* only occur in
@@ -1923,6 +1960,12 @@ module ts {
                 // cases.  i.e. a property assignment may end with an expression, and thus might
                 // have lookahead far beyond it's old node.
                 case ParsingContext.ObjectLiteralMembers:
+
+                // This is probably not safe to reuse.  There can be speculative parsing with
+                // type names in a heritage clause.  There can be generic names in the type
+                // name list, and there can be left hand side expressions (which can have type
+                // arguments.)
+                case ParsingContext.HeritageClauseElement:
             }
 
             return false;
@@ -1957,6 +2000,7 @@ module ts {
                     case SyntaxKind.GetAccessor:
                     case SyntaxKind.SetAccessor:
                     case SyntaxKind.PropertyDeclaration:
+                    case SyntaxKind.SemicolonClassElement:
                         return true;
                 }
             }
@@ -2846,8 +2890,7 @@ module ts {
         }
 
         // EXPRESSIONS
-
-        function isStartOfExpression(): boolean {
+        function isStartOfLeftHandSideExpression(): boolean {
             switch (token) {
                 case SyntaxKind.ThisKeyword:
                 case SyntaxKind.SuperKeyword:
@@ -2862,9 +2905,23 @@ module ts {
                 case SyntaxKind.OpenBracketToken:
                 case SyntaxKind.OpenBraceToken:
                 case SyntaxKind.FunctionKeyword:
+                case SyntaxKind.ClassKeyword:
                 case SyntaxKind.NewKeyword:
                 case SyntaxKind.SlashToken:
                 case SyntaxKind.SlashEqualsToken:
+                case SyntaxKind.Identifier:
+                    return true;
+                default:
+                    return isIdentifier();
+            }
+        }
+
+        function isStartOfExpression(): boolean {
+            if (isStartOfLeftHandSideExpression()) {
+                return true;
+            }
+
+            switch (token) {
                 case SyntaxKind.PlusToken:
                 case SyntaxKind.MinusToken:
                 case SyntaxKind.TildeToken:
@@ -2875,7 +2932,6 @@ module ts {
                 case SyntaxKind.PlusPlusToken:
                 case SyntaxKind.MinusMinusToken:
                 case SyntaxKind.LessThanToken:
-                case SyntaxKind.Identifier:
                 case SyntaxKind.YieldKeyword:
                     // Yield always starts an expression.  Either it is an identifier (in which case
                     // it is definitely an expression).  Or it's a keyword (either because we're in
@@ -2895,8 +2951,12 @@ module ts {
         }
 
         function isStartOfExpressionStatement(): boolean {
-            // As per the grammar, neither '{' nor 'function' can start an expression statement.
-            return token !== SyntaxKind.OpenBraceToken && token !== SyntaxKind.FunctionKeyword && token !== SyntaxKind.AtToken && isStartOfExpression();
+            // As per the grammar, none of '{' or 'function' or 'class' can start an expression statement.
+            return token !== SyntaxKind.OpenBraceToken &&
+                token !== SyntaxKind.FunctionKeyword &&
+                token !== SyntaxKind.ClassKeyword &&
+                token !== SyntaxKind.AtToken &&
+                isStartOfExpression();
         }
 
         function parseExpression(): Expression {
@@ -3241,8 +3301,12 @@ module ts {
                 return parseFunctionBlock(/*allowYield:*/ false, /* ignoreMissingOpenBrace */ false);
             }
 
-            if (isStartOfStatement(/*inErrorRecovery:*/ true) && !isStartOfExpressionStatement() && token !== SyntaxKind.FunctionKeyword) {
-                // Check if we got a plain statement (i.e. no expression-statements, no functions expressions/declarations)
+            if (isStartOfStatement(/*inErrorRecovery:*/ true) &&
+                !isStartOfExpressionStatement() &&
+                token !== SyntaxKind.FunctionKeyword &&
+                token !== SyntaxKind.ClassKeyword) {
+
+                // Check if we got a plain statement (i.e. no expression-statements, no function/class expressions/declarations)
                 //
                 // Here we try to recover from a potential error situation in the case where the
                 // user meant to supply a block. For example, if the user wrote:
@@ -3667,7 +3731,6 @@ module ts {
                 case SyntaxKind.CloseBracketToken:              // foo<x>]
                 case SyntaxKind.ColonToken:                     // foo<x>:
                 case SyntaxKind.SemicolonToken:                 // foo<x>;
-                case SyntaxKind.CommaToken:                     // foo<x>,
                 case SyntaxKind.QuestionToken:                  // foo<x>?
                 case SyntaxKind.EqualsEqualsToken:              // foo<x> ==
                 case SyntaxKind.EqualsEqualsEqualsToken:        // foo<x> ===
@@ -3685,6 +3748,12 @@ module ts {
                     // treat it as such.
                     return true;
 
+                case SyntaxKind.CommaToken:                     // foo<x>,
+                case SyntaxKind.OpenBraceToken:                 // foo<x> {
+                    // We don't want to treat these as type arguments.  Otherwise we'll parse this
+                    // as an invocation expression.  Instead, we want to parse out the expression 
+                    // in isolation from the type arguments.
+
                 default:
                     // Anything else treat as an expression.
                     return false;
@@ -3709,6 +3778,8 @@ module ts {
                     return parseArrayLiteralExpression();
                 case SyntaxKind.OpenBraceToken:
                     return parseObjectLiteralExpression();
+                case SyntaxKind.ClassKeyword:
+                    return parseClassExpression();
                 case SyntaxKind.FunctionKeyword:
                     return parseFunctionExpression();
                 case SyntaxKind.NewKeyword:
@@ -4129,13 +4200,14 @@ module ts {
         }
 
         function isStartOfStatement(inErrorRecovery: boolean): boolean {
-            // Functions and variable statements are allowed as a statement.  But as per the grammar,
-            // they also allow modifiers.  So we have to check for those statements that might be
-            // following modifiers.This ensures that things work properly when incrementally parsing
-            // as the parser will produce the same FunctionDeclaraiton or VariableStatement if it has
-            // the same text regardless of whether it is inside a block or not.
+            // Functions, variable statements and classes are allowed as a statement.  But as per
+            // the grammar, they also allow modifiers.  So we have to check for those statements 
+            // that might be following modifiers.This ensures that things work properly when
+            // incrementally parsing as the parser will produce the same FunctionDeclaraiton, 
+            // VariableStatement or ClassDeclaration, if it has the same text regardless of whether 
+            // it is inside a block or not.
             if (isModifier(token)) {
-                let result = lookAhead(parseVariableStatementOrFunctionDeclarationWithDecoratorsOrModifiers);
+                let result = lookAhead(parseVariableStatementOrFunctionDeclarationOrClassDeclarationWithDecoratorsOrModifiers);
                 if (result) {
                     return true;
                 }
@@ -4154,6 +4226,7 @@ module ts {
                 case SyntaxKind.VarKeyword:
                 case SyntaxKind.LetKeyword:
                 case SyntaxKind.FunctionKeyword:
+                case SyntaxKind.ClassKeyword:
                 case SyntaxKind.IfKeyword:
                 case SyntaxKind.DoKeyword:
                 case SyntaxKind.WhileKeyword:
@@ -4178,7 +4251,6 @@ module ts {
                     let isConstEnum = lookAhead(nextTokenIsEnumKeyword);
                     return !isConstEnum;
                 case SyntaxKind.InterfaceKeyword:
-                case SyntaxKind.ClassKeyword:
                 case SyntaxKind.ModuleKeyword:
                 case SyntaxKind.EnumKeyword:
                 case SyntaxKind.TypeKeyword:
@@ -4222,6 +4294,8 @@ module ts {
                     return parseVariableStatement(scanner.getStartPos(), /*decorators*/ undefined, /*modifiers:*/ undefined);
                 case SyntaxKind.FunctionKeyword:
                     return parseFunctionDeclaration(scanner.getStartPos(), /*decorators*/ undefined, /*modifiers:*/ undefined);
+                case SyntaxKind.ClassKeyword:
+                    return parseClassDeclaration(scanner.getStartPos(), /*decorators*/ undefined, /*modifiers:*/ undefined);
                 case SyntaxKind.SemicolonToken:
                     return parseEmptyStatement();
                 case SyntaxKind.IfKeyword:
@@ -4267,7 +4341,7 @@ module ts {
                     // Even though variable statements and function declarations cannot have decorators, 
                     // we parse them here to provide better error recovery.
                     if (isModifier(token) || token === SyntaxKind.AtToken) {
-                        let result = tryParse(parseVariableStatementOrFunctionDeclarationWithDecoratorsOrModifiers);
+                        let result = tryParse(parseVariableStatementOrFunctionDeclarationOrClassDeclarationWithDecoratorsOrModifiers);
                         if (result) {
                             return result;
                         }
@@ -4277,7 +4351,7 @@ module ts {
             }
         }
 
-        function parseVariableStatementOrFunctionDeclarationWithDecoratorsOrModifiers(): FunctionDeclaration | VariableStatement {
+        function parseVariableStatementOrFunctionDeclarationOrClassDeclarationWithDecoratorsOrModifiers(): FunctionDeclaration | VariableStatement | ClassDeclaration {
             let start = scanner.getStartPos();
             let decorators = parseDecorators();
             let modifiers = parseModifiers();
@@ -4297,8 +4371,12 @@ module ts {
 
                 case SyntaxKind.VarKeyword:
                     return parseVariableStatement(start, decorators, modifiers);
+
                 case SyntaxKind.FunctionKeyword:
                     return parseFunctionDeclaration(start, decorators, modifiers);
+
+                case SyntaxKind.ClassKeyword:
+                    return parseClassDeclaration(start, decorators, modifiers);
             }
 
             return undefined;
@@ -4619,6 +4697,12 @@ module ts {
         }
 
         function parseClassElement(): ClassElement {
+            if (token === SyntaxKind.SemicolonToken) {
+                let result = <SemicolonClassElement>createNode(SyntaxKind.SemicolonClassElement);
+                nextToken();
+                return finishNode(result);
+            }
+
             let fullStart = getNodePos();
             let decorators = parseDecorators();
             let modifiers = parseModifiers();
@@ -4657,14 +4741,26 @@ module ts {
             Debug.fail("Should not have attempted to parse class member declaration.");
         }
 
+        function parseClassExpression(): ClassExpression {
+            return <ClassExpression>parseClassDeclarationOrExpression(
+                /*fullStart:*/ scanner.getStartPos(),
+                /*decorators:*/ undefined,
+                /*modifiers:*/ undefined,
+                SyntaxKind.ClassExpression);
+        }
+
         function parseClassDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): ClassDeclaration {
+            return <ClassDeclaration>parseClassDeclarationOrExpression(fullStart, decorators, modifiers, SyntaxKind.ClassDeclaration);
+        }
+
+        function parseClassDeclarationOrExpression(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray, kind: SyntaxKind): ClassLikeDeclaration {
             // In ES6 specification, All parts of a ClassDeclaration or a ClassExpression are strict mode code
             let savedStrictModeContext = inStrictModeContext();
             if (languageVersion >= ScriptTarget.ES6) {
                 setStrictModeContext(true);
             }
 
-            var node = <ClassDeclaration>createNode(SyntaxKind.ClassDeclaration, fullStart);
+            var node = <ClassLikeDeclaration>createNode(kind, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             parseExpected(SyntaxKind.ClassKeyword);
@@ -4714,13 +4810,23 @@ module ts {
                 let node = <HeritageClause>createNode(SyntaxKind.HeritageClause);
                 node.token = token;
                 nextToken();
-                node.types = parseDelimitedList(ParsingContext.TypeReferences, parseTypeReference);
+                node.types = parseDelimitedList(ParsingContext.HeritageClauseElement, parseHeritageClauseElement);
                 return finishNode(node);
             }
 
             return undefined;
         }
 
+        function parseHeritageClauseElement(): HeritageClauseElement {
+            let node = <HeritageClauseElement>createNode(SyntaxKind.HeritageClauseElement);
+            node.expression = parseLeftHandSideExpressionOrHigher();
+            if (token === SyntaxKind.LessThanToken) {
+                node.typeArguments = parseBracketedList(ParsingContext.TypeArguments, parseType, SyntaxKind.LessThanToken, SyntaxKind.GreaterThanToken);
+            }
+
+            return finishNode(node);
+        }
+
         function isHeritageClause(): boolean {
             return token === SyntaxKind.ExtendsKeyword || token === SyntaxKind.ImplementsKeyword;
         }
@@ -5263,6 +5369,7 @@ module ts {
                 case SyntaxKind.ArrayLiteralExpression:
                 case SyntaxKind.ParenthesizedExpression:
                 case SyntaxKind.ObjectLiteralExpression:
+                case SyntaxKind.ClassExpression:
                 case SyntaxKind.FunctionExpression:
                 case SyntaxKind.Identifier:
                 case SyntaxKind.RegularExpressionLiteral:
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 8992a6fbd9..ce78dee5a0 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -203,9 +203,12 @@ module ts {
         TemplateExpression,
         YieldExpression,
         SpreadElementExpression,
+        ClassExpression,
         OmittedExpression,
         // Misc
         TemplateSpan,
+        HeritageClauseElement,
+        SemicolonClassElement,
         // Element
         Block,
         VariableStatement,
@@ -536,6 +539,11 @@ module ts {
         body?: Block;
     }
 
+    // For when we encounter a semicolon in a class declaration.  ES6 allows these as class elements.
+    export interface SemicolonClassElement extends ClassElement {
+        _semicolonClassElementBrand: any;
+    }
+
     // See the comment on MethodDeclaration for the intuition behind AccessorDeclaration being a
     // ClassElement and an ObjectLiteralElement.
     export interface AccessorDeclaration extends FunctionLikeDeclaration, ClassElement, ObjectLiteralElement {
@@ -728,6 +736,11 @@ module ts {
         arguments: NodeArray<Expression>;
     }
 
+    export interface HeritageClauseElement extends Node {
+        expression: LeftHandSideExpression;
+        typeArguments?: NodeArray<TypeNode>;
+    }
+
     export interface NewExpression extends CallExpression, PrimaryExpression { }
 
     export interface TaggedTemplateExpression extends MemberExpression {
@@ -849,13 +862,19 @@ module ts {
         _moduleElementBrand: any;
     }
 
-    export interface ClassDeclaration extends Declaration, ModuleElement {
+    export interface ClassLikeDeclaration extends Declaration {
         name?: Identifier;
         typeParameters?: NodeArray<TypeParameterDeclaration>;
         heritageClauses?: NodeArray<HeritageClause>;
         members: NodeArray<ClassElement>;
     }
 
+    export interface ClassDeclaration extends ClassLikeDeclaration, Statement {
+    }
+
+    export interface ClassExpression extends ClassLikeDeclaration, PrimaryExpression {
+    }
+
     export interface ClassElement extends Declaration {
         _classElementBrand: any;
     }
@@ -869,7 +888,7 @@ module ts {
 
     export interface HeritageClause extends Node {
         token: SyntaxKind;
-        types?: NodeArray<TypeReferenceNode>;
+        types?: NodeArray<HeritageClauseElement>;
     }
 
     export interface TypeAliasDeclaration extends Declaration, ModuleElement {
@@ -1231,7 +1250,7 @@ module ts {
         writeReturnTypeOfSignatureDeclaration(signatureDeclaration: SignatureDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void;
         writeTypeOfExpression(expr: Expression, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void;
         isSymbolAccessible(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags): SymbolAccessiblityResult;
-        isEntityNameVisible(entityName: EntityName, enclosingDeclaration: Node): SymbolVisibilityResult;
+        isEntityNameVisible(entityName: EntityName | Expression, enclosingDeclaration: Node): SymbolVisibilityResult;
         // Returns the constant value this property access resolves to, or 'undefined' for a non-constant
         getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;
         resolvesToSomeValue(location: Node, name: string): boolean;
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 936d40e18d..a30462594b 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -286,6 +286,7 @@ module ts {
             case SyntaxKind.VariableDeclaration:
             case SyntaxKind.BindingElement:
             case SyntaxKind.ClassDeclaration:
+            case SyntaxKind.ClassExpression:
             case SyntaxKind.InterfaceDeclaration:
             case SyntaxKind.ModuleDeclaration:
             case SyntaxKind.EnumDeclaration:
@@ -677,6 +678,7 @@ module ts {
             case SyntaxKind.TypeAssertionExpression:
             case SyntaxKind.ParenthesizedExpression:
             case SyntaxKind.FunctionExpression:
+            case SyntaxKind.ClassExpression:
             case SyntaxKind.ArrowFunction:
             case SyntaxKind.VoidExpression:
             case SyntaxKind.DeleteExpression:
@@ -949,12 +951,12 @@ module ts {
             node.kind === SyntaxKind.ExportAssignment && (<ExportAssignment>node).expression.kind === SyntaxKind.Identifier;
     }
 
-    export function getClassBaseTypeNode(node: ClassDeclaration) {
+    export function getClassExtendsHeritageClauseElement(node: ClassLikeDeclaration) {
         let heritageClause = getHeritageClause(node.heritageClauses, SyntaxKind.ExtendsKeyword);
         return heritageClause && heritageClause.types.length > 0 ? heritageClause.types[0] : undefined;
     }
 
-    export function getClassImplementedTypeNodes(node: ClassDeclaration) {
+    export function getClassImplementsHeritageClauseElements(node: ClassDeclaration) {
         let heritageClause = getHeritageClause(node.heritageClauses, SyntaxKind.ImplementsKeyword);
         return heritageClause ? heritageClause.types : undefined;
     }
@@ -1580,7 +1582,7 @@ module ts {
         return getLineAndCharacterOfPosition(currentSourceFile, pos).line;
     }
 
-    export function getFirstConstructorWithBody(node: ClassDeclaration): ConstructorDeclaration {
+    export function getFirstConstructorWithBody(node: ClassLikeDeclaration): ConstructorDeclaration {
         return forEach(node.members, member => {
             if (member.kind === SyntaxKind.Constructor && nodeIsPresent((<ConstructorDeclaration>member).body)) {
                 return <ConstructorDeclaration>member;
@@ -1775,4 +1777,26 @@ module ts {
         }
     }
 
+    // Returns false if this heritage clause element's expression contains something unsupported
+    // (i.e. not a name or dotted name).
+    export function isSupportedHeritageClauseElement(node: HeritageClauseElement): boolean {
+        return isSupportedHeritageClauseElementExpression(node.expression);
+    }
+
+    function isSupportedHeritageClauseElementExpression(node: Expression): boolean {
+        if (node.kind === SyntaxKind.Identifier) {
+            return true;
+        }
+        else if (node.kind === SyntaxKind.PropertyAccessExpression) {
+            return isSupportedHeritageClauseElementExpression((<PropertyAccessExpression>node).expression);
+        }
+        else {
+            return false;
+        }
+    }
+
+    export function isRightSideOfQualifiedNameOrPropertyAccess(node: Node) {
+        return (node.parent.kind === SyntaxKind.QualifiedName && (<QualifiedName>node.parent).right === node) ||
+            (node.parent.kind === SyntaxKind.PropertyAccessExpression && (<PropertyAccessExpression>node.parent).name === node);
+    }
 }
diff --git a/src/harness/typeWriter.ts b/src/harness/typeWriter.ts
index 54cdc27e3b..a83c04e6e8 100644
--- a/src/harness/typeWriter.ts
+++ b/src/harness/typeWriter.ts
@@ -38,7 +38,6 @@ class TypeWriterWalker {
             case ts.SyntaxKind.SuperKeyword:
             case ts.SyntaxKind.ArrayLiteralExpression:
             case ts.SyntaxKind.ObjectLiteralExpression:
-            case ts.SyntaxKind.PropertyAccessExpression:
             case ts.SyntaxKind.ElementAccessExpression:
             case ts.SyntaxKind.CallExpression:
             case ts.SyntaxKind.NewExpression:
@@ -56,6 +55,14 @@ class TypeWriterWalker {
                 this.log(node, this.getTypeOfNode(node));
                 break;
 
+            case ts.SyntaxKind.PropertyAccessExpression:
+                for (var current = node; current.kind === ts.SyntaxKind.PropertyAccessExpression; current = current.parent) {
+                }
+                if (current.kind !== ts.SyntaxKind.HeritageClauseElement) {
+                    this.log(node, this.getTypeOfNode(node));
+                }
+                break;
+
             // Should not change expression status (maybe expressions)
             // TODO: Again, ideally should log number and string literals too,
             // but to be consistent with the old typeWriter, just log identifiers
diff --git a/src/services/services.ts b/src/services/services.ts
index 19c545019a..cf18d86ae3 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -3182,7 +3182,7 @@ module ts {
 
         function getCompletionsAtPosition(fileName: string, position: number): CompletionInfo {
             synchronizeHostData();
-            
+
             let completionData = getCompletionData(fileName, position);
             if (!completionData) {
                 return undefined;
@@ -5182,8 +5182,8 @@ module ts {
                 if (symbol && symbol.flags & (SymbolFlags.Class | SymbolFlags.Interface)) {
                     forEach(symbol.getDeclarations(), declaration => {
                         if (declaration.kind === SyntaxKind.ClassDeclaration) {
-                            getPropertySymbolFromTypeReference(getClassBaseTypeNode(<ClassDeclaration>declaration));
-                            forEach(getClassImplementedTypeNodes(<ClassDeclaration>declaration), getPropertySymbolFromTypeReference);
+                            getPropertySymbolFromTypeReference(getClassExtendsHeritageClauseElement(<ClassDeclaration>declaration));
+                            forEach(getClassImplementsHeritageClauseElements(<ClassDeclaration>declaration), getPropertySymbolFromTypeReference);
                         }
                         else if (declaration.kind === SyntaxKind.InterfaceDeclaration) {
                             forEach(getInterfaceBaseTypeNodes(<InterfaceDeclaration>declaration), getPropertySymbolFromTypeReference);
@@ -5192,7 +5192,7 @@ module ts {
                 }
                 return;
 
-                function getPropertySymbolFromTypeReference(typeReference: TypeReferenceNode) {
+                function getPropertySymbolFromTypeReference(typeReference: HeritageClauseElement) {
                     if (typeReference) {
                         let type = typeInfoResolver.getTypeAtLocation(typeReference);
                         if (type) {
@@ -5449,19 +5449,44 @@ module ts {
         }
 
         function isTypeReference(node: Node): boolean {
-            if (isRightSideOfQualifiedName(node)) {
+            if (isRightSideOfQualifiedNameOrPropertyAccess(node) ) {
                 node = node.parent;
             }
 
-            return node.parent.kind === SyntaxKind.TypeReference;
+            return node.parent.kind === SyntaxKind.TypeReference || node.parent.kind === SyntaxKind.HeritageClauseElement;
         }
 
         function isNamespaceReference(node: Node): boolean {
+            return isQualifiedNameNamespaceReference(node) || isPropertyAccessNamespaceReference(node);
+        }
+
+        function isPropertyAccessNamespaceReference(node: Node): boolean {
+            let root = node;
+            let isLastClause = true;
+            if (root.parent.kind === SyntaxKind.PropertyAccessExpression) {
+                while (root.parent && root.parent.kind === SyntaxKind.PropertyAccessExpression) {
+                    root = root.parent;
+                }
+
+                isLastClause = (<PropertyAccessExpression>root).name === node;
+            }
+
+            if (!isLastClause && root.parent.kind === SyntaxKind.HeritageClauseElement && root.parent.parent.kind === SyntaxKind.HeritageClause) {
+                let decl = root.parent.parent.parent;
+                return (decl.kind === SyntaxKind.ClassDeclaration && (<HeritageClause>root.parent.parent).token === SyntaxKind.ImplementsKeyword) ||
+                    (decl.kind === SyntaxKind.InterfaceDeclaration && (<HeritageClause>root.parent.parent).token === SyntaxKind.ExtendsKeyword);
+            }
+
+            return false;
+        }
+
+        function isQualifiedNameNamespaceReference(node: Node): boolean {
             let root = node;
             let isLastClause = true;
             if (root.parent.kind === SyntaxKind.QualifiedName) {
-                while (root.parent && root.parent.kind === SyntaxKind.QualifiedName)
+                while (root.parent && root.parent.kind === SyntaxKind.QualifiedName) {
                     root = root.parent;
+                }
 
                 isLastClause = (<QualifiedName>root).right === node;
             }
diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js
index e9654249ee..e9c4e08f8c 100644
--- a/tests/baselines/reference/APISample_compile.js
+++ b/tests/baselines/reference/APISample_compile.js
@@ -233,59 +233,62 @@ declare module "typescript" {
         TemplateExpression = 171,
         YieldExpression = 172,
         SpreadElementExpression = 173,
-        OmittedExpression = 174,
-        TemplateSpan = 175,
-        Block = 176,
-        VariableStatement = 177,
-        EmptyStatement = 178,
-        ExpressionStatement = 179,
-        IfStatement = 180,
-        DoStatement = 181,
-        WhileStatement = 182,
-        ForStatement = 183,
-        ForInStatement = 184,
-        ForOfStatement = 185,
-        ContinueStatement = 186,
-        BreakStatement = 187,
-        ReturnStatement = 188,
-        WithStatement = 189,
-        SwitchStatement = 190,
-        LabeledStatement = 191,
-        ThrowStatement = 192,
-        TryStatement = 193,
-        DebuggerStatement = 194,
-        VariableDeclaration = 195,
-        VariableDeclarationList = 196,
-        FunctionDeclaration = 197,
-        ClassDeclaration = 198,
-        InterfaceDeclaration = 199,
-        TypeAliasDeclaration = 200,
-        EnumDeclaration = 201,
-        ModuleDeclaration = 202,
-        ModuleBlock = 203,
-        CaseBlock = 204,
-        ImportEqualsDeclaration = 205,
-        ImportDeclaration = 206,
-        ImportClause = 207,
-        NamespaceImport = 208,
-        NamedImports = 209,
-        ImportSpecifier = 210,
-        ExportAssignment = 211,
-        ExportDeclaration = 212,
-        NamedExports = 213,
-        ExportSpecifier = 214,
-        MissingDeclaration = 215,
-        ExternalModuleReference = 216,
-        CaseClause = 217,
-        DefaultClause = 218,
-        HeritageClause = 219,
-        CatchClause = 220,
-        PropertyAssignment = 221,
-        ShorthandPropertyAssignment = 222,
-        EnumMember = 223,
-        SourceFile = 224,
-        SyntaxList = 225,
-        Count = 226,
+        ClassExpression = 174,
+        OmittedExpression = 175,
+        TemplateSpan = 176,
+        HeritageClauseElement = 177,
+        SemicolonClassElement = 178,
+        Block = 179,
+        VariableStatement = 180,
+        EmptyStatement = 181,
+        ExpressionStatement = 182,
+        IfStatement = 183,
+        DoStatement = 184,
+        WhileStatement = 185,
+        ForStatement = 186,
+        ForInStatement = 187,
+        ForOfStatement = 188,
+        ContinueStatement = 189,
+        BreakStatement = 190,
+        ReturnStatement = 191,
+        WithStatement = 192,
+        SwitchStatement = 193,
+        LabeledStatement = 194,
+        ThrowStatement = 195,
+        TryStatement = 196,
+        DebuggerStatement = 197,
+        VariableDeclaration = 198,
+        VariableDeclarationList = 199,
+        FunctionDeclaration = 200,
+        ClassDeclaration = 201,
+        InterfaceDeclaration = 202,
+        TypeAliasDeclaration = 203,
+        EnumDeclaration = 204,
+        ModuleDeclaration = 205,
+        ModuleBlock = 206,
+        CaseBlock = 207,
+        ImportEqualsDeclaration = 208,
+        ImportDeclaration = 209,
+        ImportClause = 210,
+        NamespaceImport = 211,
+        NamedImports = 212,
+        ImportSpecifier = 213,
+        ExportAssignment = 214,
+        ExportDeclaration = 215,
+        NamedExports = 216,
+        ExportSpecifier = 217,
+        MissingDeclaration = 218,
+        ExternalModuleReference = 219,
+        CaseClause = 220,
+        DefaultClause = 221,
+        HeritageClause = 222,
+        CatchClause = 223,
+        PropertyAssignment = 224,
+        ShorthandPropertyAssignment = 225,
+        EnumMember = 226,
+        SourceFile = 227,
+        SyntaxList = 228,
+        Count = 229,
         FirstAssignment = 53,
         LastAssignment = 64,
         FirstReservedWord = 66,
@@ -469,6 +472,9 @@ declare module "typescript" {
     interface ConstructorDeclaration extends FunctionLikeDeclaration, ClassElement {
         body?: Block;
     }
+    interface SemicolonClassElement extends ClassElement {
+        _semicolonClassElementBrand: any;
+    }
     interface AccessorDeclaration extends FunctionLikeDeclaration, ClassElement, ObjectLiteralElement {
         _accessorDeclarationBrand: any;
         body: Block;
@@ -607,6 +613,10 @@ declare module "typescript" {
         typeArguments?: NodeArray<TypeNode>;
         arguments: NodeArray<Expression>;
     }
+    interface HeritageClauseElement extends Node {
+        expression: LeftHandSideExpression;
+        typeArguments?: NodeArray<TypeNode>;
+    }
     interface NewExpression extends CallExpression, PrimaryExpression {
     }
     interface TaggedTemplateExpression extends MemberExpression {
@@ -701,12 +711,16 @@ declare module "typescript" {
     interface ModuleElement extends Node {
         _moduleElementBrand: any;
     }
-    interface ClassDeclaration extends Declaration, ModuleElement {
+    interface ClassLikeDeclaration extends Declaration {
         name?: Identifier;
         typeParameters?: NodeArray<TypeParameterDeclaration>;
         heritageClauses?: NodeArray<HeritageClause>;
         members: NodeArray<ClassElement>;
     }
+    interface ClassDeclaration extends ClassLikeDeclaration, Statement {
+    }
+    interface ClassExpression extends ClassLikeDeclaration, PrimaryExpression {
+    }
     interface ClassElement extends Declaration {
         _classElementBrand: any;
     }
@@ -718,7 +732,7 @@ declare module "typescript" {
     }
     interface HeritageClause extends Node {
         token: SyntaxKind;
-        types?: NodeArray<TypeReferenceNode>;
+        types?: NodeArray<HeritageClauseElement>;
     }
     interface TypeAliasDeclaration extends Declaration, ModuleElement {
         name: Identifier;
@@ -960,7 +974,7 @@ declare module "typescript" {
         writeReturnTypeOfSignatureDeclaration(signatureDeclaration: SignatureDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void;
         writeTypeOfExpression(expr: Expression, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void;
         isSymbolAccessible(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags): SymbolAccessiblityResult;
-        isEntityNameVisible(entityName: EntityName, enclosingDeclaration: Node): SymbolVisibilityResult;
+        isEntityNameVisible(entityName: EntityName | Expression, enclosingDeclaration: Node): SymbolVisibilityResult;
         getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;
         resolvesToSomeValue(location: Node, name: string): boolean;
         getBlockScopedVariableId(node: Identifier): number;
diff --git a/tests/baselines/reference/APISample_compile.types b/tests/baselines/reference/APISample_compile.types
index 4edfa6fd81..03b47678d2 100644
--- a/tests/baselines/reference/APISample_compile.types
+++ b/tests/baselines/reference/APISample_compile.types
@@ -717,163 +717,172 @@ declare module "typescript" {
         SpreadElementExpression = 173,

 >SpreadElementExpression : SyntaxKind
 
-        OmittedExpression = 174,

+        ClassExpression = 174,

+>ClassExpression : SyntaxKind
+
+        OmittedExpression = 175,

 >OmittedExpression : SyntaxKind
 
-        TemplateSpan = 175,

+        TemplateSpan = 176,

 >TemplateSpan : SyntaxKind
 
-        Block = 176,

+        HeritageClauseElement = 177,

+>HeritageClauseElement : SyntaxKind
+
+        SemicolonClassElement = 178,

+>SemicolonClassElement : SyntaxKind
+
+        Block = 179,

 >Block : SyntaxKind
 
-        VariableStatement = 177,

+        VariableStatement = 180,

 >VariableStatement : SyntaxKind
 
-        EmptyStatement = 178,

+        EmptyStatement = 181,

 >EmptyStatement : SyntaxKind
 
-        ExpressionStatement = 179,

+        ExpressionStatement = 182,

 >ExpressionStatement : SyntaxKind
 
-        IfStatement = 180,

+        IfStatement = 183,

 >IfStatement : SyntaxKind
 
-        DoStatement = 181,

+        DoStatement = 184,

 >DoStatement : SyntaxKind
 
-        WhileStatement = 182,

+        WhileStatement = 185,

 >WhileStatement : SyntaxKind
 
-        ForStatement = 183,

+        ForStatement = 186,

 >ForStatement : SyntaxKind
 
-        ForInStatement = 184,

+        ForInStatement = 187,

 >ForInStatement : SyntaxKind
 
-        ForOfStatement = 185,

+        ForOfStatement = 188,

 >ForOfStatement : SyntaxKind
 
-        ContinueStatement = 186,

+        ContinueStatement = 189,

 >ContinueStatement : SyntaxKind
 
-        BreakStatement = 187,

+        BreakStatement = 190,

 >BreakStatement : SyntaxKind
 
-        ReturnStatement = 188,

+        ReturnStatement = 191,

 >ReturnStatement : SyntaxKind
 
-        WithStatement = 189,

+        WithStatement = 192,

 >WithStatement : SyntaxKind
 
-        SwitchStatement = 190,

+        SwitchStatement = 193,

 >SwitchStatement : SyntaxKind
 
-        LabeledStatement = 191,

+        LabeledStatement = 194,

 >LabeledStatement : SyntaxKind
 
-        ThrowStatement = 192,

+        ThrowStatement = 195,

 >ThrowStatement : SyntaxKind
 
-        TryStatement = 193,

+        TryStatement = 196,

 >TryStatement : SyntaxKind
 
-        DebuggerStatement = 194,

+        DebuggerStatement = 197,

 >DebuggerStatement : SyntaxKind
 
-        VariableDeclaration = 195,

+        VariableDeclaration = 198,

 >VariableDeclaration : SyntaxKind
 
-        VariableDeclarationList = 196,

+        VariableDeclarationList = 199,

 >VariableDeclarationList : SyntaxKind
 
-        FunctionDeclaration = 197,

+        FunctionDeclaration = 200,

 >FunctionDeclaration : SyntaxKind
 
-        ClassDeclaration = 198,

+        ClassDeclaration = 201,

 >ClassDeclaration : SyntaxKind
 
-        InterfaceDeclaration = 199,

+        InterfaceDeclaration = 202,

 >InterfaceDeclaration : SyntaxKind
 
-        TypeAliasDeclaration = 200,

+        TypeAliasDeclaration = 203,

 >TypeAliasDeclaration : SyntaxKind
 
-        EnumDeclaration = 201,

+        EnumDeclaration = 204,

 >EnumDeclaration : SyntaxKind
 
-        ModuleDeclaration = 202,

+        ModuleDeclaration = 205,

 >ModuleDeclaration : SyntaxKind
 
-        ModuleBlock = 203,

+        ModuleBlock = 206,

 >ModuleBlock : SyntaxKind
 
-        CaseBlock = 204,

+        CaseBlock = 207,

 >CaseBlock : SyntaxKind
 
-        ImportEqualsDeclaration = 205,

+        ImportEqualsDeclaration = 208,

 >ImportEqualsDeclaration : SyntaxKind
 
-        ImportDeclaration = 206,

+        ImportDeclaration = 209,

 >ImportDeclaration : SyntaxKind
 
-        ImportClause = 207,

+        ImportClause = 210,

 >ImportClause : SyntaxKind
 
-        NamespaceImport = 208,

+        NamespaceImport = 211,

 >NamespaceImport : SyntaxKind
 
-        NamedImports = 209,

+        NamedImports = 212,

 >NamedImports : SyntaxKind
 
-        ImportSpecifier = 210,

+        ImportSpecifier = 213,

 >ImportSpecifier : SyntaxKind
 
-        ExportAssignment = 211,

+        ExportAssignment = 214,

 >ExportAssignment : SyntaxKind
 
-        ExportDeclaration = 212,

+        ExportDeclaration = 215,

 >ExportDeclaration : SyntaxKind
 
-        NamedExports = 213,

+        NamedExports = 216,

 >NamedExports : SyntaxKind
 
-        ExportSpecifier = 214,

+        ExportSpecifier = 217,

 >ExportSpecifier : SyntaxKind
 
-        MissingDeclaration = 215,

+        MissingDeclaration = 218,

 >MissingDeclaration : SyntaxKind
 
-        ExternalModuleReference = 216,

+        ExternalModuleReference = 219,

 >ExternalModuleReference : SyntaxKind
 
-        CaseClause = 217,

+        CaseClause = 220,

 >CaseClause : SyntaxKind
 
-        DefaultClause = 218,

+        DefaultClause = 221,

 >DefaultClause : SyntaxKind
 
-        HeritageClause = 219,

+        HeritageClause = 222,

 >HeritageClause : SyntaxKind
 
-        CatchClause = 220,

+        CatchClause = 223,

 >CatchClause : SyntaxKind
 
-        PropertyAssignment = 221,

+        PropertyAssignment = 224,

 >PropertyAssignment : SyntaxKind
 
-        ShorthandPropertyAssignment = 222,

+        ShorthandPropertyAssignment = 225,

 >ShorthandPropertyAssignment : SyntaxKind
 
-        EnumMember = 223,

+        EnumMember = 226,

 >EnumMember : SyntaxKind
 
-        SourceFile = 224,

+        SourceFile = 227,

 >SourceFile : SyntaxKind
 
-        SyntaxList = 225,

+        SyntaxList = 228,

 >SyntaxList : SyntaxKind
 
-        Count = 226,

+        Count = 229,

 >Count : SyntaxKind
 
         FirstAssignment = 53,

@@ -1430,6 +1439,13 @@ declare module "typescript" {
         body?: Block;

 >body : Block
 >Block : Block
+    }

+    interface SemicolonClassElement extends ClassElement {

+>SemicolonClassElement : SemicolonClassElement
+>ClassElement : ClassElement
+
+        _semicolonClassElementBrand: any;

+>_semicolonClassElementBrand : any
     }

     interface AccessorDeclaration extends FunctionLikeDeclaration, ClassElement, ObjectLiteralElement {

 >AccessorDeclaration : AccessorDeclaration
@@ -1831,6 +1847,19 @@ declare module "typescript" {
 >arguments : NodeArray<Expression>
 >NodeArray : NodeArray<T>
 >Expression : Expression
+    }

+    interface HeritageClauseElement extends Node {

+>HeritageClauseElement : HeritageClauseElement
+>Node : Node
+
+        expression: LeftHandSideExpression;

+>expression : LeftHandSideExpression
+>LeftHandSideExpression : LeftHandSideExpression
+
+        typeArguments?: NodeArray<TypeNode>;

+>typeArguments : NodeArray<TypeNode>
+>NodeArray : NodeArray<T>
+>TypeNode : TypeNode
     }

     interface NewExpression extends CallExpression, PrimaryExpression {

 >NewExpression : NewExpression
@@ -2115,10 +2144,9 @@ declare module "typescript" {
         _moduleElementBrand: any;

 >_moduleElementBrand : any
     }

-    interface ClassDeclaration extends Declaration, ModuleElement {

->ClassDeclaration : ClassDeclaration
+    interface ClassLikeDeclaration extends Declaration {

+>ClassLikeDeclaration : ClassLikeDeclaration
 >Declaration : Declaration
->ModuleElement : ModuleElement
 
         name?: Identifier;

 >name : Identifier
@@ -2138,6 +2166,16 @@ declare module "typescript" {
 >members : NodeArray<ClassElement>
 >NodeArray : NodeArray<T>
 >ClassElement : ClassElement
+    }

+    interface ClassDeclaration extends ClassLikeDeclaration, Statement {

+>ClassDeclaration : ClassDeclaration
+>ClassLikeDeclaration : ClassLikeDeclaration
+>Statement : Statement
+    }

+    interface ClassExpression extends ClassLikeDeclaration, PrimaryExpression {

+>ClassExpression : ClassExpression
+>ClassLikeDeclaration : ClassLikeDeclaration
+>PrimaryExpression : PrimaryExpression
     }

     interface ClassElement extends Declaration {

 >ClassElement : ClassElement
@@ -2178,10 +2216,10 @@ declare module "typescript" {
 >token : SyntaxKind
 >SyntaxKind : SyntaxKind
 
-        types?: NodeArray<TypeReferenceNode>;

->types : NodeArray<TypeReferenceNode>
+        types?: NodeArray<HeritageClauseElement>;

+>types : NodeArray<HeritageClauseElement>
 >NodeArray : NodeArray<T>
->TypeReferenceNode : TypeReferenceNode
+>HeritageClauseElement : HeritageClauseElement
     }

     interface TypeAliasDeclaration extends Declaration, ModuleElement {

 >TypeAliasDeclaration : TypeAliasDeclaration
@@ -3125,10 +3163,11 @@ declare module "typescript" {
 >SymbolFlags : SymbolFlags
 >SymbolAccessiblityResult : SymbolAccessiblityResult
 
-        isEntityNameVisible(entityName: EntityName, enclosingDeclaration: Node): SymbolVisibilityResult;

->isEntityNameVisible : (entityName: Identifier | QualifiedName, enclosingDeclaration: Node) => SymbolVisibilityResult
->entityName : Identifier | QualifiedName
+        isEntityNameVisible(entityName: EntityName | Expression, enclosingDeclaration: Node): SymbolVisibilityResult;

+>isEntityNameVisible : (entityName: Identifier | Expression | QualifiedName, enclosingDeclaration: Node) => SymbolVisibilityResult
+>entityName : Identifier | Expression | QualifiedName
 >EntityName : Identifier | QualifiedName
+>Expression : Expression
 >enclosingDeclaration : Node
 >Node : Node
 >SymbolVisibilityResult : SymbolVisibilityResult
diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js
index f553c6ee30..eb03805e71 100644
--- a/tests/baselines/reference/APISample_linter.js
+++ b/tests/baselines/reference/APISample_linter.js
@@ -264,59 +264,62 @@ declare module "typescript" {
         TemplateExpression = 171,
         YieldExpression = 172,
         SpreadElementExpression = 173,
-        OmittedExpression = 174,
-        TemplateSpan = 175,
-        Block = 176,
-        VariableStatement = 177,
-        EmptyStatement = 178,
-        ExpressionStatement = 179,
-        IfStatement = 180,
-        DoStatement = 181,
-        WhileStatement = 182,
-        ForStatement = 183,
-        ForInStatement = 184,
-        ForOfStatement = 185,
-        ContinueStatement = 186,
-        BreakStatement = 187,
-        ReturnStatement = 188,
-        WithStatement = 189,
-        SwitchStatement = 190,
-        LabeledStatement = 191,
-        ThrowStatement = 192,
-        TryStatement = 193,
-        DebuggerStatement = 194,
-        VariableDeclaration = 195,
-        VariableDeclarationList = 196,
-        FunctionDeclaration = 197,
-        ClassDeclaration = 198,
-        InterfaceDeclaration = 199,
-        TypeAliasDeclaration = 200,
-        EnumDeclaration = 201,
-        ModuleDeclaration = 202,
-        ModuleBlock = 203,
-        CaseBlock = 204,
-        ImportEqualsDeclaration = 205,
-        ImportDeclaration = 206,
-        ImportClause = 207,
-        NamespaceImport = 208,
-        NamedImports = 209,
-        ImportSpecifier = 210,
-        ExportAssignment = 211,
-        ExportDeclaration = 212,
-        NamedExports = 213,
-        ExportSpecifier = 214,
-        MissingDeclaration = 215,
-        ExternalModuleReference = 216,
-        CaseClause = 217,
-        DefaultClause = 218,
-        HeritageClause = 219,
-        CatchClause = 220,
-        PropertyAssignment = 221,
-        ShorthandPropertyAssignment = 222,
-        EnumMember = 223,
-        SourceFile = 224,
-        SyntaxList = 225,
-        Count = 226,
+        ClassExpression = 174,
+        OmittedExpression = 175,
+        TemplateSpan = 176,
+        HeritageClauseElement = 177,
+        SemicolonClassElement = 178,
+        Block = 179,
+        VariableStatement = 180,
+        EmptyStatement = 181,
+        ExpressionStatement = 182,
+        IfStatement = 183,
+        DoStatement = 184,
+        WhileStatement = 185,
+        ForStatement = 186,
+        ForInStatement = 187,
+        ForOfStatement = 188,
+        ContinueStatement = 189,
+        BreakStatement = 190,
+        ReturnStatement = 191,
+        WithStatement = 192,
+        SwitchStatement = 193,
+        LabeledStatement = 194,
+        ThrowStatement = 195,
+        TryStatement = 196,
+        DebuggerStatement = 197,
+        VariableDeclaration = 198,
+        VariableDeclarationList = 199,
+        FunctionDeclaration = 200,
+        ClassDeclaration = 201,
+        InterfaceDeclaration = 202,
+        TypeAliasDeclaration = 203,
+        EnumDeclaration = 204,
+        ModuleDeclaration = 205,
+        ModuleBlock = 206,
+        CaseBlock = 207,
+        ImportEqualsDeclaration = 208,
+        ImportDeclaration = 209,
+        ImportClause = 210,
+        NamespaceImport = 211,
+        NamedImports = 212,
+        ImportSpecifier = 213,
+        ExportAssignment = 214,
+        ExportDeclaration = 215,
+        NamedExports = 216,
+        ExportSpecifier = 217,
+        MissingDeclaration = 218,
+        ExternalModuleReference = 219,
+        CaseClause = 220,
+        DefaultClause = 221,
+        HeritageClause = 222,
+        CatchClause = 223,
+        PropertyAssignment = 224,
+        ShorthandPropertyAssignment = 225,
+        EnumMember = 226,
+        SourceFile = 227,
+        SyntaxList = 228,
+        Count = 229,
         FirstAssignment = 53,
         LastAssignment = 64,
         FirstReservedWord = 66,
@@ -500,6 +503,9 @@ declare module "typescript" {
     interface ConstructorDeclaration extends FunctionLikeDeclaration, ClassElement {
         body?: Block;
     }
+    interface SemicolonClassElement extends ClassElement {
+        _semicolonClassElementBrand: any;
+    }
     interface AccessorDeclaration extends FunctionLikeDeclaration, ClassElement, ObjectLiteralElement {
         _accessorDeclarationBrand: any;
         body: Block;
@@ -638,6 +644,10 @@ declare module "typescript" {
         typeArguments?: NodeArray<TypeNode>;
         arguments: NodeArray<Expression>;
     }
+    interface HeritageClauseElement extends Node {
+        expression: LeftHandSideExpression;
+        typeArguments?: NodeArray<TypeNode>;
+    }
     interface NewExpression extends CallExpression, PrimaryExpression {
     }
     interface TaggedTemplateExpression extends MemberExpression {
@@ -732,12 +742,16 @@ declare module "typescript" {
     interface ModuleElement extends Node {
         _moduleElementBrand: any;
     }
-    interface ClassDeclaration extends Declaration, ModuleElement {
+    interface ClassLikeDeclaration extends Declaration {
         name?: Identifier;
         typeParameters?: NodeArray<TypeParameterDeclaration>;
         heritageClauses?: NodeArray<HeritageClause>;
         members: NodeArray<ClassElement>;
     }
+    interface ClassDeclaration extends ClassLikeDeclaration, Statement {
+    }
+    interface ClassExpression extends ClassLikeDeclaration, PrimaryExpression {
+    }
     interface ClassElement extends Declaration {
         _classElementBrand: any;
     }
@@ -749,7 +763,7 @@ declare module "typescript" {
     }
     interface HeritageClause extends Node {
         token: SyntaxKind;
-        types?: NodeArray<TypeReferenceNode>;
+        types?: NodeArray<HeritageClauseElement>;
     }
     interface TypeAliasDeclaration extends Declaration, ModuleElement {
         name: Identifier;
@@ -991,7 +1005,7 @@ declare module "typescript" {
         writeReturnTypeOfSignatureDeclaration(signatureDeclaration: SignatureDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void;
         writeTypeOfExpression(expr: Expression, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void;
         isSymbolAccessible(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags): SymbolAccessiblityResult;
-        isEntityNameVisible(entityName: EntityName, enclosingDeclaration: Node): SymbolVisibilityResult;
+        isEntityNameVisible(entityName: EntityName | Expression, enclosingDeclaration: Node): SymbolVisibilityResult;
         getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;
         resolvesToSomeValue(location: Node, name: string): boolean;
         getBlockScopedVariableId(node: Identifier): number;
@@ -2044,21 +2058,21 @@ function delint(sourceFile) {
     delintNode(sourceFile);
     function delintNode(node) {
         switch (node.kind) {
-            case 183 /* ForStatement */:
-            case 184 /* ForInStatement */:
-            case 182 /* WhileStatement */:
-            case 181 /* DoStatement */:
-                if (node.statement.kind !== 176 /* Block */) {
+            case 186 /* ForStatement */:
+            case 187 /* ForInStatement */:
+            case 185 /* WhileStatement */:
+            case 184 /* DoStatement */:
+                if (node.statement.kind !== 179 /* Block */) {
                     report(node, "A looping statement's contents should be wrapped in a block body.");
                 }
                 break;
-            case 180 /* IfStatement */:
+            case 183 /* IfStatement */:
                 var ifStatement = node;
-                if (ifStatement.thenStatement.kind !== 176 /* Block */) {
+                if (ifStatement.thenStatement.kind !== 179 /* Block */) {
                     report(ifStatement.thenStatement, "An if statement's contents should be wrapped in a block body.");
                 }
                 if (ifStatement.elseStatement &&
-                    ifStatement.elseStatement.kind !== 176 /* Block */ && ifStatement.elseStatement.kind !== 180 /* IfStatement */) {
+                    ifStatement.elseStatement.kind !== 179 /* Block */ && ifStatement.elseStatement.kind !== 183 /* IfStatement */) {
                     report(ifStatement.elseStatement, "An else statement's contents should be wrapped in a block body.");
                 }
                 break;
diff --git a/tests/baselines/reference/APISample_linter.types b/tests/baselines/reference/APISample_linter.types
index 2a3af87d9f..7bad2f379e 100644
--- a/tests/baselines/reference/APISample_linter.types
+++ b/tests/baselines/reference/APISample_linter.types
@@ -863,163 +863,172 @@ declare module "typescript" {
         SpreadElementExpression = 173,

 >SpreadElementExpression : SyntaxKind
 
-        OmittedExpression = 174,

+        ClassExpression = 174,

+>ClassExpression : SyntaxKind
+
+        OmittedExpression = 175,

 >OmittedExpression : SyntaxKind
 
-        TemplateSpan = 175,

+        TemplateSpan = 176,

 >TemplateSpan : SyntaxKind
 
-        Block = 176,

+        HeritageClauseElement = 177,

+>HeritageClauseElement : SyntaxKind
+
+        SemicolonClassElement = 178,

+>SemicolonClassElement : SyntaxKind
+
+        Block = 179,

 >Block : SyntaxKind
 
-        VariableStatement = 177,

+        VariableStatement = 180,

 >VariableStatement : SyntaxKind
 
-        EmptyStatement = 178,

+        EmptyStatement = 181,

 >EmptyStatement : SyntaxKind
 
-        ExpressionStatement = 179,

+        ExpressionStatement = 182,

 >ExpressionStatement : SyntaxKind
 
-        IfStatement = 180,

+        IfStatement = 183,

 >IfStatement : SyntaxKind
 
-        DoStatement = 181,

+        DoStatement = 184,

 >DoStatement : SyntaxKind
 
-        WhileStatement = 182,

+        WhileStatement = 185,

 >WhileStatement : SyntaxKind
 
-        ForStatement = 183,

+        ForStatement = 186,

 >ForStatement : SyntaxKind
 
-        ForInStatement = 184,

+        ForInStatement = 187,

 >ForInStatement : SyntaxKind
 
-        ForOfStatement = 185,

+        ForOfStatement = 188,

 >ForOfStatement : SyntaxKind
 
-        ContinueStatement = 186,

+        ContinueStatement = 189,

 >ContinueStatement : SyntaxKind
 
-        BreakStatement = 187,

+        BreakStatement = 190,

 >BreakStatement : SyntaxKind
 
-        ReturnStatement = 188,

+        ReturnStatement = 191,

 >ReturnStatement : SyntaxKind
 
-        WithStatement = 189,

+        WithStatement = 192,

 >WithStatement : SyntaxKind
 
-        SwitchStatement = 190,

+        SwitchStatement = 193,

 >SwitchStatement : SyntaxKind
 
-        LabeledStatement = 191,

+        LabeledStatement = 194,

 >LabeledStatement : SyntaxKind
 
-        ThrowStatement = 192,

+        ThrowStatement = 195,

 >ThrowStatement : SyntaxKind
 
-        TryStatement = 193,

+        TryStatement = 196,

 >TryStatement : SyntaxKind
 
-        DebuggerStatement = 194,

+        DebuggerStatement = 197,

 >DebuggerStatement : SyntaxKind
 
-        VariableDeclaration = 195,

+        VariableDeclaration = 198,

 >VariableDeclaration : SyntaxKind
 
-        VariableDeclarationList = 196,

+        VariableDeclarationList = 199,

 >VariableDeclarationList : SyntaxKind
 
-        FunctionDeclaration = 197,

+        FunctionDeclaration = 200,

 >FunctionDeclaration : SyntaxKind
 
-        ClassDeclaration = 198,

+        ClassDeclaration = 201,

 >ClassDeclaration : SyntaxKind
 
-        InterfaceDeclaration = 199,

+        InterfaceDeclaration = 202,

 >InterfaceDeclaration : SyntaxKind
 
-        TypeAliasDeclaration = 200,

+        TypeAliasDeclaration = 203,

 >TypeAliasDeclaration : SyntaxKind
 
-        EnumDeclaration = 201,

+        EnumDeclaration = 204,

 >EnumDeclaration : SyntaxKind
 
-        ModuleDeclaration = 202,

+        ModuleDeclaration = 205,

 >ModuleDeclaration : SyntaxKind
 
-        ModuleBlock = 203,

+        ModuleBlock = 206,

 >ModuleBlock : SyntaxKind
 
-        CaseBlock = 204,

+        CaseBlock = 207,

 >CaseBlock : SyntaxKind
 
-        ImportEqualsDeclaration = 205,

+        ImportEqualsDeclaration = 208,

 >ImportEqualsDeclaration : SyntaxKind
 
-        ImportDeclaration = 206,

+        ImportDeclaration = 209,

 >ImportDeclaration : SyntaxKind
 
-        ImportClause = 207,

+        ImportClause = 210,

 >ImportClause : SyntaxKind
 
-        NamespaceImport = 208,

+        NamespaceImport = 211,

 >NamespaceImport : SyntaxKind
 
-        NamedImports = 209,

+        NamedImports = 212,

 >NamedImports : SyntaxKind
 
-        ImportSpecifier = 210,

+        ImportSpecifier = 213,

 >ImportSpecifier : SyntaxKind
 
-        ExportAssignment = 211,

+        ExportAssignment = 214,

 >ExportAssignment : SyntaxKind
 
-        ExportDeclaration = 212,

+        ExportDeclaration = 215,

 >ExportDeclaration : SyntaxKind
 
-        NamedExports = 213,

+        NamedExports = 216,

 >NamedExports : SyntaxKind
 
-        ExportSpecifier = 214,

+        ExportSpecifier = 217,

 >ExportSpecifier : SyntaxKind
 
-        MissingDeclaration = 215,

+        MissingDeclaration = 218,

 >MissingDeclaration : SyntaxKind
 
-        ExternalModuleReference = 216,

+        ExternalModuleReference = 219,

 >ExternalModuleReference : SyntaxKind
 
-        CaseClause = 217,

+        CaseClause = 220,

 >CaseClause : SyntaxKind
 
-        DefaultClause = 218,

+        DefaultClause = 221,

 >DefaultClause : SyntaxKind
 
-        HeritageClause = 219,

+        HeritageClause = 222,

 >HeritageClause : SyntaxKind
 
-        CatchClause = 220,

+        CatchClause = 223,

 >CatchClause : SyntaxKind
 
-        PropertyAssignment = 221,

+        PropertyAssignment = 224,

 >PropertyAssignment : SyntaxKind
 
-        ShorthandPropertyAssignment = 222,

+        ShorthandPropertyAssignment = 225,

 >ShorthandPropertyAssignment : SyntaxKind
 
-        EnumMember = 223,

+        EnumMember = 226,

 >EnumMember : SyntaxKind
 
-        SourceFile = 224,

+        SourceFile = 227,

 >SourceFile : SyntaxKind
 
-        SyntaxList = 225,

+        SyntaxList = 228,

 >SyntaxList : SyntaxKind
 
-        Count = 226,

+        Count = 229,

 >Count : SyntaxKind
 
         FirstAssignment = 53,

@@ -1576,6 +1585,13 @@ declare module "typescript" {
         body?: Block;

 >body : Block
 >Block : Block
+    }

+    interface SemicolonClassElement extends ClassElement {

+>SemicolonClassElement : SemicolonClassElement
+>ClassElement : ClassElement
+
+        _semicolonClassElementBrand: any;

+>_semicolonClassElementBrand : any
     }

     interface AccessorDeclaration extends FunctionLikeDeclaration, ClassElement, ObjectLiteralElement {

 >AccessorDeclaration : AccessorDeclaration
@@ -1977,6 +1993,19 @@ declare module "typescript" {
 >arguments : NodeArray<Expression>
 >NodeArray : NodeArray<T>
 >Expression : Expression
+    }

+    interface HeritageClauseElement extends Node {

+>HeritageClauseElement : HeritageClauseElement
+>Node : Node
+
+        expression: LeftHandSideExpression;

+>expression : LeftHandSideExpression
+>LeftHandSideExpression : LeftHandSideExpression
+
+        typeArguments?: NodeArray<TypeNode>;

+>typeArguments : NodeArray<TypeNode>
+>NodeArray : NodeArray<T>
+>TypeNode : TypeNode
     }

     interface NewExpression extends CallExpression, PrimaryExpression {

 >NewExpression : NewExpression
@@ -2261,10 +2290,9 @@ declare module "typescript" {
         _moduleElementBrand: any;

 >_moduleElementBrand : any
     }

-    interface ClassDeclaration extends Declaration, ModuleElement {

->ClassDeclaration : ClassDeclaration
+    interface ClassLikeDeclaration extends Declaration {

+>ClassLikeDeclaration : ClassLikeDeclaration
 >Declaration : Declaration
->ModuleElement : ModuleElement
 
         name?: Identifier;

 >name : Identifier
@@ -2284,6 +2312,16 @@ declare module "typescript" {
 >members : NodeArray<ClassElement>
 >NodeArray : NodeArray<T>
 >ClassElement : ClassElement
+    }

+    interface ClassDeclaration extends ClassLikeDeclaration, Statement {

+>ClassDeclaration : ClassDeclaration
+>ClassLikeDeclaration : ClassLikeDeclaration
+>Statement : Statement
+    }

+    interface ClassExpression extends ClassLikeDeclaration, PrimaryExpression {

+>ClassExpression : ClassExpression
+>ClassLikeDeclaration : ClassLikeDeclaration
+>PrimaryExpression : PrimaryExpression
     }

     interface ClassElement extends Declaration {

 >ClassElement : ClassElement
@@ -2324,10 +2362,10 @@ declare module "typescript" {
 >token : SyntaxKind
 >SyntaxKind : SyntaxKind
 
-        types?: NodeArray<TypeReferenceNode>;

->types : NodeArray<TypeReferenceNode>
+        types?: NodeArray<HeritageClauseElement>;

+>types : NodeArray<HeritageClauseElement>
 >NodeArray : NodeArray<T>
->TypeReferenceNode : TypeReferenceNode
+>HeritageClauseElement : HeritageClauseElement
     }

     interface TypeAliasDeclaration extends Declaration, ModuleElement {

 >TypeAliasDeclaration : TypeAliasDeclaration
@@ -3271,10 +3309,11 @@ declare module "typescript" {
 >SymbolFlags : SymbolFlags
 >SymbolAccessiblityResult : SymbolAccessiblityResult
 
-        isEntityNameVisible(entityName: EntityName, enclosingDeclaration: Node): SymbolVisibilityResult;

->isEntityNameVisible : (entityName: Identifier | QualifiedName, enclosingDeclaration: Node) => SymbolVisibilityResult
->entityName : Identifier | QualifiedName
+        isEntityNameVisible(entityName: EntityName | Expression, enclosingDeclaration: Node): SymbolVisibilityResult;

+>isEntityNameVisible : (entityName: Identifier | Expression | QualifiedName, enclosingDeclaration: Node) => SymbolVisibilityResult
+>entityName : Identifier | Expression | QualifiedName
 >EntityName : Identifier | QualifiedName
+>Expression : Expression
 >enclosingDeclaration : Node
 >Node : Node
 >SymbolVisibilityResult : SymbolVisibilityResult
diff --git a/tests/baselines/reference/APISample_linter.types.pull b/tests/baselines/reference/APISample_linter.types.pull
new file mode 100644
index 0000000000..759a8390d6
--- /dev/null
+++ b/tests/baselines/reference/APISample_linter.types.pull
@@ -0,0 +1,6412 @@
+=== tests/cases/compiler/APISample_linter.ts ===
+
+/*
+ * Note: This test is a public API sample. The sample sources can be found 
+         at: https://github.com/Microsoft/TypeScript/wiki/Using-the-Compiler-API#traversing-the-ast-with-a-little-linter
+ *       Please log a "breaking change" issue for any API breaking change affecting this issue
+ */
+
+declare var process: any;
+>process : any
+
+declare var console: any;
+>console : any
+
+declare var fs: any;
+>fs : any
+
+import ts = require("typescript");
+>ts : typeof ts
+
+export function delint(sourceFile: ts.SourceFile) {
+>delint : (sourceFile: ts.SourceFile) => void
+>sourceFile : ts.SourceFile
+>ts : unknown
+>SourceFile : ts.SourceFile
+
+    delintNode(sourceFile);
+>delintNode(sourceFile) : void
+>delintNode : (node: ts.Node) => void
+>sourceFile : ts.SourceFile
+
+    function delintNode(node: ts.Node) {
+>delintNode : (node: ts.Node) => void
+>node : ts.Node
+>ts : unknown
+>Node : ts.Node
+
+        switch (node.kind) {
+>node.kind : ts.SyntaxKind
+>node : ts.Node
+>kind : ts.SyntaxKind
+
+            case ts.SyntaxKind.ForStatement:
+>ts.SyntaxKind.ForStatement : ts.SyntaxKind
+>ts.SyntaxKind : typeof ts.SyntaxKind
+>ts : typeof ts
+>SyntaxKind : typeof ts.SyntaxKind
+>ForStatement : ts.SyntaxKind
+
+            case ts.SyntaxKind.ForInStatement:
+>ts.SyntaxKind.ForInStatement : ts.SyntaxKind
+>ts.SyntaxKind : typeof ts.SyntaxKind
+>ts : typeof ts
+>SyntaxKind : typeof ts.SyntaxKind
+>ForInStatement : ts.SyntaxKind
+
+            case ts.SyntaxKind.WhileStatement:
+>ts.SyntaxKind.WhileStatement : ts.SyntaxKind
+>ts.SyntaxKind : typeof ts.SyntaxKind
+>ts : typeof ts
+>SyntaxKind : typeof ts.SyntaxKind
+>WhileStatement : ts.SyntaxKind
+
+            case ts.SyntaxKind.DoStatement:
+>ts.SyntaxKind.DoStatement : ts.SyntaxKind
+>ts.SyntaxKind : typeof ts.SyntaxKind
+>ts : typeof ts
+>SyntaxKind : typeof ts.SyntaxKind
+>DoStatement : ts.SyntaxKind
+
+                if ((<ts.IterationStatement>node).statement.kind !== ts.SyntaxKind.Block) {
+>(<ts.IterationStatement>node).statement.kind !== ts.SyntaxKind.Block : boolean
+>(<ts.IterationStatement>node).statement.kind : ts.SyntaxKind
+>(<ts.IterationStatement>node).statement : ts.Statement
+>(<ts.IterationStatement>node) : ts.IterationStatement
+><ts.IterationStatement>node : ts.IterationStatement
+>ts : unknown
+>IterationStatement : ts.IterationStatement
+>node : ts.Node
+>statement : ts.Statement
+>kind : ts.SyntaxKind
+>ts.SyntaxKind.Block : ts.SyntaxKind
+>ts.SyntaxKind : typeof ts.SyntaxKind
+>ts : typeof ts
+>SyntaxKind : typeof ts.SyntaxKind
+>Block : ts.SyntaxKind
+
+                    report(node, "A looping statement's contents should be wrapped in a block body.");
+>report(node, "A looping statement's contents should be wrapped in a block body.") : void
+>report : (node: ts.Node, message: string) => void
+>node : ts.Node
+                }
+                break;
+            case ts.SyntaxKind.IfStatement:
+>ts.SyntaxKind.IfStatement : ts.SyntaxKind
+>ts.SyntaxKind : typeof ts.SyntaxKind
+>ts : typeof ts
+>SyntaxKind : typeof ts.SyntaxKind
+>IfStatement : ts.SyntaxKind
+
+                var ifStatement = (<ts.IfStatement>node);
+>ifStatement : ts.IfStatement
+>(<ts.IfStatement>node) : ts.IfStatement
+><ts.IfStatement>node : ts.IfStatement
+>ts : unknown
+>IfStatement : ts.IfStatement
+>node : ts.Node
+
+                if (ifStatement.thenStatement.kind !== ts.SyntaxKind.Block) {
+>ifStatement.thenStatement.kind !== ts.SyntaxKind.Block : boolean
+>ifStatement.thenStatement.kind : ts.SyntaxKind
+>ifStatement.thenStatement : ts.Statement
+>ifStatement : ts.IfStatement
+>thenStatement : ts.Statement
+>kind : ts.SyntaxKind
+>ts.SyntaxKind.Block : ts.SyntaxKind
+>ts.SyntaxKind : typeof ts.SyntaxKind
+>ts : typeof ts
+>SyntaxKind : typeof ts.SyntaxKind
+>Block : ts.SyntaxKind
+
+                    report(ifStatement.thenStatement, "An if statement's contents should be wrapped in a block body.");
+>report(ifStatement.thenStatement, "An if statement's contents should be wrapped in a block body.") : void
+>report : (node: ts.Node, message: string) => void
+>ifStatement.thenStatement : ts.Statement
+>ifStatement : ts.IfStatement
+>thenStatement : ts.Statement
+                }
+                if (ifStatement.elseStatement &&
+>ifStatement.elseStatement &&                    ifStatement.elseStatement.kind !== ts.SyntaxKind.Block && ifStatement.elseStatement.kind !== ts.SyntaxKind.IfStatement : boolean
+>ifStatement.elseStatement &&                    ifStatement.elseStatement.kind !== ts.SyntaxKind.Block : boolean
+>ifStatement.elseStatement : ts.Statement
+>ifStatement : ts.IfStatement
+>elseStatement : ts.Statement
+
+                    ifStatement.elseStatement.kind !== ts.SyntaxKind.Block && ifStatement.elseStatement.kind !== ts.SyntaxKind.IfStatement) {
+>ifStatement.elseStatement.kind !== ts.SyntaxKind.Block : boolean
+>ifStatement.elseStatement.kind : ts.SyntaxKind
+>ifStatement.elseStatement : ts.Statement
+>ifStatement : ts.IfStatement
+>elseStatement : ts.Statement
+>kind : ts.SyntaxKind
+>ts.SyntaxKind.Block : ts.SyntaxKind
+>ts.SyntaxKind : typeof ts.SyntaxKind
+>ts : typeof ts
+>SyntaxKind : typeof ts.SyntaxKind
+>Block : ts.SyntaxKind
+>ifStatement.elseStatement.kind !== ts.SyntaxKind.IfStatement : boolean
+>ifStatement.elseStatement.kind : ts.SyntaxKind
+>ifStatement.elseStatement : ts.Statement
+>ifStatement : ts.IfStatement
+>elseStatement : ts.Statement
+>kind : ts.SyntaxKind
+>ts.SyntaxKind.IfStatement : ts.SyntaxKind
+>ts.SyntaxKind : typeof ts.SyntaxKind
+>ts : typeof ts
+>SyntaxKind : typeof ts.SyntaxKind
+>IfStatement : ts.SyntaxKind
+
+                    report(ifStatement.elseStatement, "An else statement's contents should be wrapped in a block body.");
+>report(ifStatement.elseStatement, "An else statement's contents should be wrapped in a block body.") : void
+>report : (node: ts.Node, message: string) => void
+>ifStatement.elseStatement : ts.Statement
+>ifStatement : ts.IfStatement
+>elseStatement : ts.Statement
+                }
+                break;
+
+            case ts.SyntaxKind.BinaryExpression:
+>ts.SyntaxKind.BinaryExpression : ts.SyntaxKind
+>ts.SyntaxKind : typeof ts.SyntaxKind
+>ts : typeof ts
+>SyntaxKind : typeof ts.SyntaxKind
+>BinaryExpression : ts.SyntaxKind
+
+                var op = (<ts.BinaryExpression>node).operatorToken.kind;
+>op : ts.SyntaxKind
+>(<ts.BinaryExpression>node).operatorToken.kind : ts.SyntaxKind
+>(<ts.BinaryExpression>node).operatorToken : ts.Node
+>(<ts.BinaryExpression>node) : ts.BinaryExpression
+><ts.BinaryExpression>node : ts.BinaryExpression
+>ts : unknown
+>BinaryExpression : ts.BinaryExpression
+>node : ts.Node
+>operatorToken : ts.Node
+>kind : ts.SyntaxKind
+
+                if (op === ts.SyntaxKind.EqualsEqualsToken || op === ts.SyntaxKind.ExclamationEqualsToken) {
+>op === ts.SyntaxKind.EqualsEqualsToken || op === ts.SyntaxKind.ExclamationEqualsToken : boolean
+>op === ts.SyntaxKind.EqualsEqualsToken : boolean
+>op : ts.SyntaxKind
+>ts.SyntaxKind.EqualsEqualsToken : ts.SyntaxKind
+>ts.SyntaxKind : typeof ts.SyntaxKind
+>ts : typeof ts
+>SyntaxKind : typeof ts.SyntaxKind
+>EqualsEqualsToken : ts.SyntaxKind
+>op === ts.SyntaxKind.ExclamationEqualsToken : boolean
+>op : ts.SyntaxKind
+>ts.SyntaxKind.ExclamationEqualsToken : ts.SyntaxKind
+>ts.SyntaxKind : typeof ts.SyntaxKind
+>ts : typeof ts
+>SyntaxKind : typeof ts.SyntaxKind
+>ExclamationEqualsToken : ts.SyntaxKind
+
+                    report(node, "Use '===' and '!=='.")
+>report(node, "Use '===' and '!=='.") : void
+>report : (node: ts.Node, message: string) => void
+>node : ts.Node
+                }
+                break;
+        }
+
+        ts.forEachChild(node, delintNode);
+>ts.forEachChild(node, delintNode) : void
+>ts.forEachChild : <T>(node: ts.Node, cbNode: (node: ts.Node) => T, cbNodeArray?: (nodes: ts.Node[]) => T) => T
+>ts : typeof ts
+>forEachChild : <T>(node: ts.Node, cbNode: (node: ts.Node) => T, cbNodeArray?: (nodes: ts.Node[]) => T) => T
+>node : ts.Node
+>delintNode : (node: ts.Node) => void
+    }
+
+    function report(node: ts.Node, message: string) {
+>report : (node: ts.Node, message: string) => void
+>node : ts.Node
+>ts : unknown
+>Node : ts.Node
+>message : string
+
+        var lineChar = sourceFile.getLineAndCharacterOfPosition(node.getStart());
+>lineChar : ts.LineAndCharacter
+>sourceFile.getLineAndCharacterOfPosition(node.getStart()) : ts.LineAndCharacter
+>sourceFile.getLineAndCharacterOfPosition : (pos: number) => ts.LineAndCharacter
+>sourceFile : ts.SourceFile
+>getLineAndCharacterOfPosition : (pos: number) => ts.LineAndCharacter
+>node.getStart() : number
+>node.getStart : (sourceFile?: ts.SourceFile) => number
+>node : ts.Node
+>getStart : (sourceFile?: ts.SourceFile) => number
+
+        console.log(`${sourceFile.fileName} (${lineChar.line + 1},${lineChar.character + 1}): ${message}`)
+>console.log(`${sourceFile.fileName} (${lineChar.line + 1},${lineChar.character + 1}): ${message}`) : any
+>console.log : any
+>console : any
+>log : any
+>sourceFile.fileName : string
+>sourceFile : ts.SourceFile
+>fileName : string
+>lineChar.line + 1 : number
+>lineChar.line : number
+>lineChar : ts.LineAndCharacter
+>line : number
+>lineChar.character + 1 : number
+>lineChar.character : number
+>lineChar : ts.LineAndCharacter
+>character : number
+>message : string
+    }
+}
+
+var fileNames = process.argv.slice(2);
+>fileNames : any
+>process.argv.slice(2) : any
+>process.argv.slice : any
+>process.argv : any
+>process : any
+>argv : any
+>slice : any
+
+fileNames.forEach(fileName => {
+>fileNames.forEach(fileName => {    // Parse a file    var sourceFile = ts.createSourceFile(fileName, fs.readFileSync(fileName).toString(), ts.ScriptTarget.ES6, /*setParentNodes */ true);    // delint it    delint(sourceFile);}) : any
+>fileNames.forEach : any
+>fileNames : any
+>forEach : any
+>fileName => {    // Parse a file    var sourceFile = ts.createSourceFile(fileName, fs.readFileSync(fileName).toString(), ts.ScriptTarget.ES6, /*setParentNodes */ true);    // delint it    delint(sourceFile);} : (fileName: any) => void
+>fileName : any
+
+    // Parse a file
+    var sourceFile = ts.createSourceFile(fileName, fs.readFileSync(fileName).toString(), ts.ScriptTarget.ES6, /*setParentNodes */ true);
+>sourceFile : ts.SourceFile
+>ts.createSourceFile(fileName, fs.readFileSync(fileName).toString(), ts.ScriptTarget.ES6, /*setParentNodes */ true) : ts.SourceFile
+>ts.createSourceFile : (fileName: string, sourceText: string, languageVersion: ts.ScriptTarget, setParentNodes?: boolean) => ts.SourceFile
+>ts : typeof ts
+>createSourceFile : (fileName: string, sourceText: string, languageVersion: ts.ScriptTarget, setParentNodes?: boolean) => ts.SourceFile
+>fileName : any
+>fs.readFileSync(fileName).toString() : any
+>fs.readFileSync(fileName).toString : any
+>fs.readFileSync(fileName) : any
+>fs.readFileSync : any
+>fs : any
+>readFileSync : any
+>fileName : any
+>toString : any
+>ts.ScriptTarget.ES6 : ts.ScriptTarget
+>ts.ScriptTarget : typeof ts.ScriptTarget
+>ts : typeof ts
+>ScriptTarget : typeof ts.ScriptTarget
+>ES6 : ts.ScriptTarget
+
+    // delint it
+    delint(sourceFile);
+>delint(sourceFile) : void
+>delint : (sourceFile: ts.SourceFile) => void
+>sourceFile : ts.SourceFile
+
+});
+
+=== typescript.d.ts ===
+/*! *****************************************************************************

+Copyright (c) Microsoft Corporation. All rights reserved. 

+Licensed under the Apache License, Version 2.0 (the "License"); you may not use

+this file except in compliance with the License. You may obtain a copy of the

+License at http://www.apache.org/licenses/LICENSE-2.0  

+ 

+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED

+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, 

+MERCHANTABLITY OR NON-INFRINGEMENT. 

+ 

+See the Apache Version 2.0 License for specific language governing permissions

+and limitations under the License.

+***************************************************************************** */

+

+declare module "typescript" {

+    interface Map<T> {

+>Map : Map<T>
+>T : T
+
+        [index: string]: T;

+>index : string
+>T : T
+    }

+    interface TextRange {

+>TextRange : TextRange
+
+        pos: number;

+>pos : number
+
+        end: number;

+>end : number
+    }

+    const enum SyntaxKind {

+>SyntaxKind : SyntaxKind
+
+        Unknown = 0,

+>Unknown : SyntaxKind
+
+        EndOfFileToken = 1,

+>EndOfFileToken : SyntaxKind
+
+        SingleLineCommentTrivia = 2,

+>SingleLineCommentTrivia : SyntaxKind
+
+        MultiLineCommentTrivia = 3,

+>MultiLineCommentTrivia : SyntaxKind
+
+        NewLineTrivia = 4,

+>NewLineTrivia : SyntaxKind
+
+        WhitespaceTrivia = 5,

+>WhitespaceTrivia : SyntaxKind
+
+        ConflictMarkerTrivia = 6,

+>ConflictMarkerTrivia : SyntaxKind
+
+        NumericLiteral = 7,

+>NumericLiteral : SyntaxKind
+
+        StringLiteral = 8,

+>StringLiteral : SyntaxKind
+
+        RegularExpressionLiteral = 9,

+>RegularExpressionLiteral : SyntaxKind
+
+        NoSubstitutionTemplateLiteral = 10,

+>NoSubstitutionTemplateLiteral : SyntaxKind
+
+        TemplateHead = 11,

+>TemplateHead : SyntaxKind
+
+        TemplateMiddle = 12,

+>TemplateMiddle : SyntaxKind
+
+        TemplateTail = 13,

+>TemplateTail : SyntaxKind
+
+        OpenBraceToken = 14,

+>OpenBraceToken : SyntaxKind
+
+        CloseBraceToken = 15,

+>CloseBraceToken : SyntaxKind
+
+        OpenParenToken = 16,

+>OpenParenToken : SyntaxKind
+
+        CloseParenToken = 17,

+>CloseParenToken : SyntaxKind
+
+        OpenBracketToken = 18,

+>OpenBracketToken : SyntaxKind
+
+        CloseBracketToken = 19,

+>CloseBracketToken : SyntaxKind
+
+        DotToken = 20,

+>DotToken : SyntaxKind
+
+        DotDotDotToken = 21,

+>DotDotDotToken : SyntaxKind
+
+        SemicolonToken = 22,

+>SemicolonToken : SyntaxKind
+
+        CommaToken = 23,

+>CommaToken : SyntaxKind
+
+        LessThanToken = 24,

+>LessThanToken : SyntaxKind
+
+        GreaterThanToken = 25,

+>GreaterThanToken : SyntaxKind
+
+        LessThanEqualsToken = 26,

+>LessThanEqualsToken : SyntaxKind
+
+        GreaterThanEqualsToken = 27,

+>GreaterThanEqualsToken : SyntaxKind
+
+        EqualsEqualsToken = 28,

+>EqualsEqualsToken : SyntaxKind
+
+        ExclamationEqualsToken = 29,

+>ExclamationEqualsToken : SyntaxKind
+
+        EqualsEqualsEqualsToken = 30,

+>EqualsEqualsEqualsToken : SyntaxKind
+
+        ExclamationEqualsEqualsToken = 31,

+>ExclamationEqualsEqualsToken : SyntaxKind
+
+        EqualsGreaterThanToken = 32,

+>EqualsGreaterThanToken : SyntaxKind
+
+        PlusToken = 33,

+>PlusToken : SyntaxKind
+
+        MinusToken = 34,

+>MinusToken : SyntaxKind
+
+        AsteriskToken = 35,

+>AsteriskToken : SyntaxKind
+
+        SlashToken = 36,

+>SlashToken : SyntaxKind
+
+        PercentToken = 37,

+>PercentToken : SyntaxKind
+
+        PlusPlusToken = 38,

+>PlusPlusToken : SyntaxKind
+
+        MinusMinusToken = 39,

+>MinusMinusToken : SyntaxKind
+
+        LessThanLessThanToken = 40,

+>LessThanLessThanToken : SyntaxKind
+
+        GreaterThanGreaterThanToken = 41,

+>GreaterThanGreaterThanToken : SyntaxKind
+
+        GreaterThanGreaterThanGreaterThanToken = 42,

+>GreaterThanGreaterThanGreaterThanToken : SyntaxKind
+
+        AmpersandToken = 43,

+>AmpersandToken : SyntaxKind
+
+        BarToken = 44,

+>BarToken : SyntaxKind
+
+        CaretToken = 45,

+>CaretToken : SyntaxKind
+
+        ExclamationToken = 46,

+>ExclamationToken : SyntaxKind
+
+        TildeToken = 47,

+>TildeToken : SyntaxKind
+
+        AmpersandAmpersandToken = 48,

+>AmpersandAmpersandToken : SyntaxKind
+
+        BarBarToken = 49,

+>BarBarToken : SyntaxKind
+
+        QuestionToken = 50,

+>QuestionToken : SyntaxKind
+
+        ColonToken = 51,

+>ColonToken : SyntaxKind
+
+        AtToken = 52,

+>AtToken : SyntaxKind
+
+        EqualsToken = 53,

+>EqualsToken : SyntaxKind
+
+        PlusEqualsToken = 54,

+>PlusEqualsToken : SyntaxKind
+
+        MinusEqualsToken = 55,

+>MinusEqualsToken : SyntaxKind
+
+        AsteriskEqualsToken = 56,

+>AsteriskEqualsToken : SyntaxKind
+
+        SlashEqualsToken = 57,

+>SlashEqualsToken : SyntaxKind
+
+        PercentEqualsToken = 58,

+>PercentEqualsToken : SyntaxKind
+
+        LessThanLessThanEqualsToken = 59,

+>LessThanLessThanEqualsToken : SyntaxKind
+
+        GreaterThanGreaterThanEqualsToken = 60,

+>GreaterThanGreaterThanEqualsToken : SyntaxKind
+
+        GreaterThanGreaterThanGreaterThanEqualsToken = 61,

+>GreaterThanGreaterThanGreaterThanEqualsToken : SyntaxKind
+
+        AmpersandEqualsToken = 62,

+>AmpersandEqualsToken : SyntaxKind
+
+        BarEqualsToken = 63,

+>BarEqualsToken : SyntaxKind
+
+        CaretEqualsToken = 64,

+>CaretEqualsToken : SyntaxKind
+
+        Identifier = 65,

+>Identifier : SyntaxKind
+
+        BreakKeyword = 66,

+>BreakKeyword : SyntaxKind
+
+        CaseKeyword = 67,

+>CaseKeyword : SyntaxKind
+
+        CatchKeyword = 68,

+>CatchKeyword : SyntaxKind
+
+        ClassKeyword = 69,

+>ClassKeyword : SyntaxKind
+
+        ConstKeyword = 70,

+>ConstKeyword : SyntaxKind
+
+        ContinueKeyword = 71,

+>ContinueKeyword : SyntaxKind
+
+        DebuggerKeyword = 72,

+>DebuggerKeyword : SyntaxKind
+
+        DefaultKeyword = 73,

+>DefaultKeyword : SyntaxKind
+
+        DeleteKeyword = 74,

+>DeleteKeyword : SyntaxKind
+
+        DoKeyword = 75,

+>DoKeyword : SyntaxKind
+
+        ElseKeyword = 76,

+>ElseKeyword : SyntaxKind
+
+        EnumKeyword = 77,

+>EnumKeyword : SyntaxKind
+
+        ExportKeyword = 78,

+>ExportKeyword : SyntaxKind
+
+        ExtendsKeyword = 79,

+>ExtendsKeyword : SyntaxKind
+
+        FalseKeyword = 80,

+>FalseKeyword : SyntaxKind
+
+        FinallyKeyword = 81,

+>FinallyKeyword : SyntaxKind
+
+        ForKeyword = 82,

+>ForKeyword : SyntaxKind
+
+        FunctionKeyword = 83,

+>FunctionKeyword : SyntaxKind
+
+        IfKeyword = 84,

+>IfKeyword : SyntaxKind
+
+        ImportKeyword = 85,

+>ImportKeyword : SyntaxKind
+
+        InKeyword = 86,

+>InKeyword : SyntaxKind
+
+        InstanceOfKeyword = 87,

+>InstanceOfKeyword : SyntaxKind
+
+        NewKeyword = 88,

+>NewKeyword : SyntaxKind
+
+        NullKeyword = 89,

+>NullKeyword : SyntaxKind
+
+        ReturnKeyword = 90,

+>ReturnKeyword : SyntaxKind
+
+        SuperKeyword = 91,

+>SuperKeyword : SyntaxKind
+
+        SwitchKeyword = 92,

+>SwitchKeyword : SyntaxKind
+
+        ThisKeyword = 93,

+>ThisKeyword : SyntaxKind
+
+        ThrowKeyword = 94,

+>ThrowKeyword : SyntaxKind
+
+        TrueKeyword = 95,

+>TrueKeyword : SyntaxKind
+
+        TryKeyword = 96,

+>TryKeyword : SyntaxKind
+
+        TypeOfKeyword = 97,

+>TypeOfKeyword : SyntaxKind
+
+        VarKeyword = 98,

+>VarKeyword : SyntaxKind
+
+        VoidKeyword = 99,

+>VoidKeyword : SyntaxKind
+
+        WhileKeyword = 100,

+>WhileKeyword : SyntaxKind
+
+        WithKeyword = 101,

+>WithKeyword : SyntaxKind
+
+        AsKeyword = 102,

+>AsKeyword : SyntaxKind
+
+        ImplementsKeyword = 103,

+>ImplementsKeyword : SyntaxKind
+
+        InterfaceKeyword = 104,

+>InterfaceKeyword : SyntaxKind
+
+        LetKeyword = 105,

+>LetKeyword : SyntaxKind
+
+        PackageKeyword = 106,

+>PackageKeyword : SyntaxKind
+
+        PrivateKeyword = 107,

+>PrivateKeyword : SyntaxKind
+
+        ProtectedKeyword = 108,

+>ProtectedKeyword : SyntaxKind
+
+        PublicKeyword = 109,

+>PublicKeyword : SyntaxKind
+
+        StaticKeyword = 110,

+>StaticKeyword : SyntaxKind
+
+        YieldKeyword = 111,

+>YieldKeyword : SyntaxKind
+
+        AnyKeyword = 112,

+>AnyKeyword : SyntaxKind
+
+        BooleanKeyword = 113,

+>BooleanKeyword : SyntaxKind
+
+        ConstructorKeyword = 114,

+>ConstructorKeyword : SyntaxKind
+
+        DeclareKeyword = 115,

+>DeclareKeyword : SyntaxKind
+
+        GetKeyword = 116,

+>GetKeyword : SyntaxKind
+
+        ModuleKeyword = 117,

+>ModuleKeyword : SyntaxKind
+
+        RequireKeyword = 118,

+>RequireKeyword : SyntaxKind
+
+        NumberKeyword = 119,

+>NumberKeyword : SyntaxKind
+
+        SetKeyword = 120,

+>SetKeyword : SyntaxKind
+
+        StringKeyword = 121,

+>StringKeyword : SyntaxKind
+
+        SymbolKeyword = 122,

+>SymbolKeyword : SyntaxKind
+
+        TypeKeyword = 123,

+>TypeKeyword : SyntaxKind
+
+        FromKeyword = 124,

+>FromKeyword : SyntaxKind
+
+        OfKeyword = 125,

+>OfKeyword : SyntaxKind
+
+        QualifiedName = 126,

+>QualifiedName : SyntaxKind
+
+        ComputedPropertyName = 127,

+>ComputedPropertyName : SyntaxKind
+
+        TypeParameter = 128,

+>TypeParameter : SyntaxKind
+
+        Parameter = 129,

+>Parameter : SyntaxKind
+
+        Decorator = 130,

+>Decorator : SyntaxKind
+
+        PropertySignature = 131,

+>PropertySignature : SyntaxKind
+
+        PropertyDeclaration = 132,

+>PropertyDeclaration : SyntaxKind
+
+        MethodSignature = 133,

+>MethodSignature : SyntaxKind
+
+        MethodDeclaration = 134,

+>MethodDeclaration : SyntaxKind
+
+        Constructor = 135,

+>Constructor : SyntaxKind
+
+        GetAccessor = 136,

+>GetAccessor : SyntaxKind
+
+        SetAccessor = 137,

+>SetAccessor : SyntaxKind
+
+        CallSignature = 138,

+>CallSignature : SyntaxKind
+
+        ConstructSignature = 139,

+>ConstructSignature : SyntaxKind
+
+        IndexSignature = 140,

+>IndexSignature : SyntaxKind
+
+        TypeReference = 141,

+>TypeReference : SyntaxKind
+
+        FunctionType = 142,

+>FunctionType : SyntaxKind
+
+        ConstructorType = 143,

+>ConstructorType : SyntaxKind
+
+        TypeQuery = 144,

+>TypeQuery : SyntaxKind
+
+        TypeLiteral = 145,

+>TypeLiteral : SyntaxKind
+
+        ArrayType = 146,

+>ArrayType : SyntaxKind
+
+        TupleType = 147,

+>TupleType : SyntaxKind
+
+        UnionType = 148,

+>UnionType : SyntaxKind
+
+        ParenthesizedType = 149,

+>ParenthesizedType : SyntaxKind
+
+        ObjectBindingPattern = 150,

+>ObjectBindingPattern : SyntaxKind
+
+        ArrayBindingPattern = 151,

+>ArrayBindingPattern : SyntaxKind
+
+        BindingElement = 152,

+>BindingElement : SyntaxKind
+
+        ArrayLiteralExpression = 153,

+>ArrayLiteralExpression : SyntaxKind
+
+        ObjectLiteralExpression = 154,

+>ObjectLiteralExpression : SyntaxKind
+
+        PropertyAccessExpression = 155,

+>PropertyAccessExpression : SyntaxKind
+
+        ElementAccessExpression = 156,

+>ElementAccessExpression : SyntaxKind
+
+        CallExpression = 157,

+>CallExpression : SyntaxKind
+
+        NewExpression = 158,

+>NewExpression : SyntaxKind
+
+        TaggedTemplateExpression = 159,

+>TaggedTemplateExpression : SyntaxKind
+
+        TypeAssertionExpression = 160,

+>TypeAssertionExpression : SyntaxKind
+
+        ParenthesizedExpression = 161,

+>ParenthesizedExpression : SyntaxKind
+
+        FunctionExpression = 162,

+>FunctionExpression : SyntaxKind
+
+        ArrowFunction = 163,

+>ArrowFunction : SyntaxKind
+
+        DeleteExpression = 164,

+>DeleteExpression : SyntaxKind
+
+        TypeOfExpression = 165,

+>TypeOfExpression : SyntaxKind
+
+        VoidExpression = 166,

+>VoidExpression : SyntaxKind
+
+        PrefixUnaryExpression = 167,

+>PrefixUnaryExpression : SyntaxKind
+
+        PostfixUnaryExpression = 168,

+>PostfixUnaryExpression : SyntaxKind
+
+        BinaryExpression = 169,

+>BinaryExpression : SyntaxKind
+
+        ConditionalExpression = 170,

+>ConditionalExpression : SyntaxKind
+
+        TemplateExpression = 171,

+>TemplateExpression : SyntaxKind
+
+        YieldExpression = 172,

+>YieldExpression : SyntaxKind
+
+        SpreadElementExpression = 173,

+>SpreadElementExpression : SyntaxKind
+
+        ClassExpression = 174,

+>ClassExpression : SyntaxKind
+
+        OmittedExpression = 175,

+>OmittedExpression : SyntaxKind
+
+        TemplateSpan = 176,

+>TemplateSpan : SyntaxKind
+
+        HeritageClauseElement = 177,

+>HeritageClauseElement : SyntaxKind
+
+        SemicolonClassElement = 178,

+>SemicolonClassElement : SyntaxKind
+
+        Block = 179,

+>Block : SyntaxKind
+
+        VariableStatement = 180,

+>VariableStatement : SyntaxKind
+
+        EmptyStatement = 181,

+>EmptyStatement : SyntaxKind
+
+        ExpressionStatement = 182,

+>ExpressionStatement : SyntaxKind
+
+        IfStatement = 183,

+>IfStatement : SyntaxKind
+
+        DoStatement = 184,

+>DoStatement : SyntaxKind
+
+        WhileStatement = 185,

+>WhileStatement : SyntaxKind
+
+        ForStatement = 186,

+>ForStatement : SyntaxKind
+
+        ForInStatement = 187,

+>ForInStatement : SyntaxKind
+
+        ForOfStatement = 188,

+>ForOfStatement : SyntaxKind
+
+        ContinueStatement = 189,

+>ContinueStatement : SyntaxKind
+
+        BreakStatement = 190,

+>BreakStatement : SyntaxKind
+
+        ReturnStatement = 191,

+>ReturnStatement : SyntaxKind
+
+        WithStatement = 192,

+>WithStatement : SyntaxKind
+
+        SwitchStatement = 193,

+>SwitchStatement : SyntaxKind
+
+        LabeledStatement = 194,

+>LabeledStatement : SyntaxKind
+
+        ThrowStatement = 195,

+>ThrowStatement : SyntaxKind
+
+        TryStatement = 196,

+>TryStatement : SyntaxKind
+
+        DebuggerStatement = 197,

+>DebuggerStatement : SyntaxKind
+
+        VariableDeclaration = 198,

+>VariableDeclaration : SyntaxKind
+
+        VariableDeclarationList = 199,

+>VariableDeclarationList : SyntaxKind
+
+        FunctionDeclaration = 200,

+>FunctionDeclaration : SyntaxKind
+
+        ClassDeclaration = 201,

+>ClassDeclaration : SyntaxKind
+
+        InterfaceDeclaration = 202,

+>InterfaceDeclaration : SyntaxKind
+
+        TypeAliasDeclaration = 203,

+>TypeAliasDeclaration : SyntaxKind
+
+        EnumDeclaration = 204,

+>EnumDeclaration : SyntaxKind
+
+        ModuleDeclaration = 205,

+>ModuleDeclaration : SyntaxKind
+
+        ModuleBlock = 206,

+>ModuleBlock : SyntaxKind
+
+        CaseBlock = 207,

+>CaseBlock : SyntaxKind
+
+        ImportEqualsDeclaration = 208,

+>ImportEqualsDeclaration : SyntaxKind
+
+        ImportDeclaration = 209,

+>ImportDeclaration : SyntaxKind
+
+        ImportClause = 210,

+>ImportClause : SyntaxKind
+
+        NamespaceImport = 211,

+>NamespaceImport : SyntaxKind
+
+        NamedImports = 212,

+>NamedImports : SyntaxKind
+
+        ImportSpecifier = 213,

+>ImportSpecifier : SyntaxKind
+
+        ExportAssignment = 214,

+>ExportAssignment : SyntaxKind
+
+        ExportDeclaration = 215,

+>ExportDeclaration : SyntaxKind
+
+        NamedExports = 216,

+>NamedExports : SyntaxKind
+
+        ExportSpecifier = 217,

+>ExportSpecifier : SyntaxKind
+
+        MissingDeclaration = 218,

+>MissingDeclaration : SyntaxKind
+
+        ExternalModuleReference = 219,

+>ExternalModuleReference : SyntaxKind
+
+        CaseClause = 220,

+>CaseClause : SyntaxKind
+
+        DefaultClause = 221,

+>DefaultClause : SyntaxKind
+
+        HeritageClause = 222,

+>HeritageClause : SyntaxKind
+
+        CatchClause = 223,

+>CatchClause : SyntaxKind
+
+        PropertyAssignment = 224,

+>PropertyAssignment : SyntaxKind
+
+        ShorthandPropertyAssignment = 225,

+>ShorthandPropertyAssignment : SyntaxKind
+
+        EnumMember = 226,

+>EnumMember : SyntaxKind
+
+        SourceFile = 227,

+>SourceFile : SyntaxKind
+
+        SyntaxList = 228,

+>SyntaxList : SyntaxKind
+
+        Count = 229,

+>Count : SyntaxKind
+
+        FirstAssignment = 53,

+>FirstAssignment : SyntaxKind
+
+        LastAssignment = 64,

+>LastAssignment : SyntaxKind
+
+        FirstReservedWord = 66,

+>FirstReservedWord : SyntaxKind
+
+        LastReservedWord = 101,

+>LastReservedWord : SyntaxKind
+
+        FirstKeyword = 66,

+>FirstKeyword : SyntaxKind
+
+        LastKeyword = 125,

+>LastKeyword : SyntaxKind
+
+        FirstFutureReservedWord = 103,

+>FirstFutureReservedWord : SyntaxKind
+
+        LastFutureReservedWord = 111,

+>LastFutureReservedWord : SyntaxKind
+
+        FirstTypeNode = 141,

+>FirstTypeNode : SyntaxKind
+
+        LastTypeNode = 149,

+>LastTypeNode : SyntaxKind
+
+        FirstPunctuation = 14,

+>FirstPunctuation : SyntaxKind
+
+        LastPunctuation = 64,

+>LastPunctuation : SyntaxKind
+
+        FirstToken = 0,

+>FirstToken : SyntaxKind
+
+        LastToken = 125,

+>LastToken : SyntaxKind
+
+        FirstTriviaToken = 2,

+>FirstTriviaToken : SyntaxKind
+
+        LastTriviaToken = 6,

+>LastTriviaToken : SyntaxKind
+
+        FirstLiteralToken = 7,

+>FirstLiteralToken : SyntaxKind
+
+        LastLiteralToken = 10,

+>LastLiteralToken : SyntaxKind
+
+        FirstTemplateToken = 10,

+>FirstTemplateToken : SyntaxKind
+
+        LastTemplateToken = 13,

+>LastTemplateToken : SyntaxKind
+
+        FirstBinaryOperator = 24,

+>FirstBinaryOperator : SyntaxKind
+
+        LastBinaryOperator = 64,

+>LastBinaryOperator : SyntaxKind
+
+        FirstNode = 126,

+>FirstNode : SyntaxKind
+    }

+    const enum NodeFlags {

+>NodeFlags : NodeFlags
+
+        Export = 1,

+>Export : NodeFlags
+
+        Ambient = 2,

+>Ambient : NodeFlags
+
+        Public = 16,

+>Public : NodeFlags
+
+        Private = 32,

+>Private : NodeFlags
+
+        Protected = 64,

+>Protected : NodeFlags
+
+        Static = 128,

+>Static : NodeFlags
+
+        Default = 256,

+>Default : NodeFlags
+
+        MultiLine = 512,

+>MultiLine : NodeFlags
+
+        Synthetic = 1024,

+>Synthetic : NodeFlags
+
+        DeclarationFile = 2048,

+>DeclarationFile : NodeFlags
+
+        Let = 4096,

+>Let : NodeFlags
+
+        Const = 8192,

+>Const : NodeFlags
+
+        OctalLiteral = 16384,

+>OctalLiteral : NodeFlags
+
+        ExportContext = 32768,

+>ExportContext : NodeFlags
+
+        Modifier = 499,

+>Modifier : NodeFlags
+
+        AccessibilityModifier = 112,

+>AccessibilityModifier : NodeFlags
+
+        BlockScoped = 12288,

+>BlockScoped : NodeFlags
+    }

+    const enum ParserContextFlags {

+>ParserContextFlags : ParserContextFlags
+
+        StrictMode = 1,

+>StrictMode : ParserContextFlags
+
+        DisallowIn = 2,

+>DisallowIn : ParserContextFlags
+
+        Yield = 4,

+>Yield : ParserContextFlags
+
+        GeneratorParameter = 8,

+>GeneratorParameter : ParserContextFlags
+
+        Decorator = 16,

+>Decorator : ParserContextFlags
+
+        ThisNodeHasError = 32,

+>ThisNodeHasError : ParserContextFlags
+
+        ParserGeneratedFlags = 63,

+>ParserGeneratedFlags : ParserContextFlags
+
+        ThisNodeOrAnySubNodesHasError = 64,

+>ThisNodeOrAnySubNodesHasError : ParserContextFlags
+
+        HasAggregatedChildData = 128,

+>HasAggregatedChildData : ParserContextFlags
+    }

+    const enum RelationComparisonResult {

+>RelationComparisonResult : RelationComparisonResult
+
+        Succeeded = 1,

+>Succeeded : RelationComparisonResult
+
+        Failed = 2,

+>Failed : RelationComparisonResult
+
+        FailedAndReported = 3,

+>FailedAndReported : RelationComparisonResult
+    }

+    interface Node extends TextRange {

+>Node : Node
+>TextRange : TextRange
+
+        kind: SyntaxKind;

+>kind : SyntaxKind
+>SyntaxKind : SyntaxKind
+
+        flags: NodeFlags;

+>flags : NodeFlags
+>NodeFlags : NodeFlags
+
+        parserContextFlags?: ParserContextFlags;

+>parserContextFlags : ParserContextFlags
+>ParserContextFlags : ParserContextFlags
+
+        decorators?: NodeArray<Decorator>;

+>decorators : NodeArray<Decorator>
+>NodeArray : NodeArray<T>
+>Decorator : Decorator
+
+        modifiers?: ModifiersArray;

+>modifiers : ModifiersArray
+>ModifiersArray : ModifiersArray
+
+        id?: number;

+>id : number
+
+        parent?: Node;

+>parent : Node
+>Node : Node
+
+        symbol?: Symbol;

+>symbol : Symbol
+>Symbol : Symbol
+
+        locals?: SymbolTable;

+>locals : SymbolTable
+>SymbolTable : SymbolTable
+
+        nextContainer?: Node;

+>nextContainer : Node
+>Node : Node
+
+        localSymbol?: Symbol;

+>localSymbol : Symbol
+>Symbol : Symbol
+    }

+    interface NodeArray<T> extends Array<T>, TextRange {

+>NodeArray : NodeArray<T>
+>T : T
+>Array : T[]
+>T : T
+>TextRange : TextRange
+
+        hasTrailingComma?: boolean;

+>hasTrailingComma : boolean
+    }

+    interface ModifiersArray extends NodeArray<Node> {

+>ModifiersArray : ModifiersArray
+>NodeArray : NodeArray<T>
+>Node : Node
+
+        flags: number;

+>flags : number
+    }

+    interface Identifier extends PrimaryExpression {

+>Identifier : Identifier
+>PrimaryExpression : PrimaryExpression
+
+        text: string;

+>text : string
+    }

+    interface QualifiedName extends Node {

+>QualifiedName : QualifiedName
+>Node : Node
+
+        left: EntityName;

+>left : Identifier | QualifiedName
+>EntityName : Identifier | QualifiedName
+
+        right: Identifier;

+>right : Identifier
+>Identifier : Identifier
+    }

+    type EntityName = Identifier | QualifiedName;

+>EntityName : Identifier | QualifiedName
+>Identifier : Identifier
+>QualifiedName : QualifiedName
+
+    type DeclarationName = Identifier | LiteralExpression | ComputedPropertyName | BindingPattern;

+>DeclarationName : Identifier | LiteralExpression | ComputedPropertyName | BindingPattern
+>Identifier : Identifier
+>LiteralExpression : LiteralExpression
+>ComputedPropertyName : ComputedPropertyName
+>BindingPattern : BindingPattern
+
+    interface Declaration extends Node {

+>Declaration : Declaration
+>Node : Node
+
+        _declarationBrand: any;

+>_declarationBrand : any
+
+        name?: DeclarationName;

+>name : Identifier | LiteralExpression | ComputedPropertyName | BindingPattern
+>DeclarationName : Identifier | LiteralExpression | ComputedPropertyName | BindingPattern
+    }

+    interface ComputedPropertyName extends Node {

+>ComputedPropertyName : ComputedPropertyName
+>Node : Node
+
+        expression: Expression;

+>expression : Expression
+>Expression : Expression
+    }

+    interface Decorator extends Node {

+>Decorator : Decorator
+>Node : Node
+
+        expression: LeftHandSideExpression;

+>expression : LeftHandSideExpression
+>LeftHandSideExpression : LeftHandSideExpression
+    }

+    interface TypeParameterDeclaration extends Declaration {

+>TypeParameterDeclaration : TypeParameterDeclaration
+>Declaration : Declaration
+
+        name: Identifier;

+>name : Identifier
+>Identifier : Identifier
+
+        constraint?: TypeNode;

+>constraint : TypeNode
+>TypeNode : TypeNode
+
+        expression?: Expression;

+>expression : Expression
+>Expression : Expression
+    }

+    interface SignatureDeclaration extends Declaration {

+>SignatureDeclaration : SignatureDeclaration
+>Declaration : Declaration
+
+        typeParameters?: NodeArray<TypeParameterDeclaration>;

+>typeParameters : NodeArray<TypeParameterDeclaration>
+>NodeArray : NodeArray<T>
+>TypeParameterDeclaration : TypeParameterDeclaration
+
+        parameters: NodeArray<ParameterDeclaration>;

+>parameters : NodeArray<ParameterDeclaration>
+>NodeArray : NodeArray<T>
+>ParameterDeclaration : ParameterDeclaration
+
+        type?: TypeNode;

+>type : TypeNode
+>TypeNode : TypeNode
+    }

+    interface VariableDeclaration extends Declaration {

+>VariableDeclaration : VariableDeclaration
+>Declaration : Declaration
+
+        parent?: VariableDeclarationList;

+>parent : VariableDeclarationList
+>VariableDeclarationList : VariableDeclarationList
+
+        name: Identifier | BindingPattern;

+>name : Identifier | BindingPattern
+>Identifier : Identifier
+>BindingPattern : BindingPattern
+
+        type?: TypeNode;

+>type : TypeNode
+>TypeNode : TypeNode
+
+        initializer?: Expression;

+>initializer : Expression
+>Expression : Expression
+    }

+    interface VariableDeclarationList extends Node {

+>VariableDeclarationList : VariableDeclarationList
+>Node : Node
+
+        declarations: NodeArray<VariableDeclaration>;

+>declarations : NodeArray<VariableDeclaration>
+>NodeArray : NodeArray<T>
+>VariableDeclaration : VariableDeclaration
+    }

+    interface ParameterDeclaration extends Declaration {

+>ParameterDeclaration : ParameterDeclaration
+>Declaration : Declaration
+
+        dotDotDotToken?: Node;

+>dotDotDotToken : Node
+>Node : Node
+
+        name: Identifier | BindingPattern;

+>name : Identifier | BindingPattern
+>Identifier : Identifier
+>BindingPattern : BindingPattern
+
+        questionToken?: Node;

+>questionToken : Node
+>Node : Node
+
+        type?: TypeNode;

+>type : TypeNode
+>TypeNode : TypeNode
+
+        initializer?: Expression;

+>initializer : Expression
+>Expression : Expression
+    }

+    interface BindingElement extends Declaration {

+>BindingElement : BindingElement
+>Declaration : Declaration
+
+        propertyName?: Identifier;

+>propertyName : Identifier
+>Identifier : Identifier
+
+        dotDotDotToken?: Node;

+>dotDotDotToken : Node
+>Node : Node
+
+        name: Identifier | BindingPattern;

+>name : Identifier | BindingPattern
+>Identifier : Identifier
+>BindingPattern : BindingPattern
+
+        initializer?: Expression;

+>initializer : Expression
+>Expression : Expression
+    }

+    interface PropertyDeclaration extends Declaration, ClassElement {

+>PropertyDeclaration : PropertyDeclaration
+>Declaration : Declaration
+>ClassElement : ClassElement
+
+        name: DeclarationName;

+>name : Identifier | LiteralExpression | ComputedPropertyName | BindingPattern
+>DeclarationName : Identifier | LiteralExpression | ComputedPropertyName | BindingPattern
+
+        questionToken?: Node;

+>questionToken : Node
+>Node : Node
+
+        type?: TypeNode;

+>type : TypeNode
+>TypeNode : TypeNode
+
+        initializer?: Expression;

+>initializer : Expression
+>Expression : Expression
+    }

+    interface ObjectLiteralElement extends Declaration {

+>ObjectLiteralElement : ObjectLiteralElement
+>Declaration : Declaration
+
+        _objectLiteralBrandBrand: any;

+>_objectLiteralBrandBrand : any
+    }

+    interface PropertyAssignment extends ObjectLiteralElement {

+>PropertyAssignment : PropertyAssignment
+>ObjectLiteralElement : ObjectLiteralElement
+
+        _propertyAssignmentBrand: any;

+>_propertyAssignmentBrand : any
+
+        name: DeclarationName;

+>name : Identifier | LiteralExpression | ComputedPropertyName | BindingPattern
+>DeclarationName : Identifier | LiteralExpression | ComputedPropertyName | BindingPattern
+
+        questionToken?: Node;

+>questionToken : Node
+>Node : Node
+
+        initializer: Expression;

+>initializer : Expression
+>Expression : Expression
+    }

+    interface ShorthandPropertyAssignment extends ObjectLiteralElement {

+>ShorthandPropertyAssignment : ShorthandPropertyAssignment
+>ObjectLiteralElement : ObjectLiteralElement
+
+        name: Identifier;

+>name : Identifier
+>Identifier : Identifier
+
+        questionToken?: Node;

+>questionToken : Node
+>Node : Node
+    }

+    interface VariableLikeDeclaration extends Declaration {

+>VariableLikeDeclaration : VariableLikeDeclaration
+>Declaration : Declaration
+
+        propertyName?: Identifier;

+>propertyName : Identifier
+>Identifier : Identifier
+
+        dotDotDotToken?: Node;

+>dotDotDotToken : Node
+>Node : Node
+
+        name: DeclarationName;

+>name : Identifier | LiteralExpression | ComputedPropertyName | BindingPattern
+>DeclarationName : Identifier | LiteralExpression | ComputedPropertyName | BindingPattern
+
+        questionToken?: Node;

+>questionToken : Node
+>Node : Node
+
+        type?: TypeNode;

+>type : TypeNode
+>TypeNode : TypeNode
+
+        initializer?: Expression;

+>initializer : Expression
+>Expression : Expression
+    }

+    interface BindingPattern extends Node {

+>BindingPattern : BindingPattern
+>Node : Node
+
+        elements: NodeArray<BindingElement>;

+>elements : NodeArray<BindingElement>
+>NodeArray : NodeArray<T>
+>BindingElement : BindingElement
+    }

+    /**

+     * Several node kinds share function-like features such as a signature,

+     * a name, and a body. These nodes should extend FunctionLikeDeclaration.

+     * Examples:

+     *  FunctionDeclaration

+     *  MethodDeclaration

+     *  AccessorDeclaration

+     */

+    interface FunctionLikeDeclaration extends SignatureDeclaration {

+>FunctionLikeDeclaration : FunctionLikeDeclaration
+>SignatureDeclaration : SignatureDeclaration
+
+        _functionLikeDeclarationBrand: any;

+>_functionLikeDeclarationBrand : any
+
+        asteriskToken?: Node;

+>asteriskToken : Node
+>Node : Node
+
+        questionToken?: Node;

+>questionToken : Node
+>Node : Node
+
+        body?: Block | Expression;

+>body : Expression | Block
+>Block : Block
+>Expression : Expression
+    }

+    interface FunctionDeclaration extends FunctionLikeDeclaration, Statement {

+>FunctionDeclaration : FunctionDeclaration
+>FunctionLikeDeclaration : FunctionLikeDeclaration
+>Statement : Statement
+
+        name?: Identifier;

+>name : Identifier
+>Identifier : Identifier
+
+        body?: Block;

+>body : Block
+>Block : Block
+    }

+    interface MethodDeclaration extends FunctionLikeDeclaration, ClassElement, ObjectLiteralElement {

+>MethodDeclaration : MethodDeclaration
+>FunctionLikeDeclaration : FunctionLikeDeclaration
+>ClassElement : ClassElement
+>ObjectLiteralElement : ObjectLiteralElement
+
+        body?: Block;

+>body : Block
+>Block : Block
+    }

+    interface ConstructorDeclaration extends FunctionLikeDeclaration, ClassElement {

+>ConstructorDeclaration : ConstructorDeclaration
+>FunctionLikeDeclaration : FunctionLikeDeclaration
+>ClassElement : ClassElement
+
+        body?: Block;

+>body : Block
+>Block : Block
+    }

+    interface SemicolonClassElement extends ClassElement {

+>SemicolonClassElement : SemicolonClassElement
+>ClassElement : ClassElement
+
+        _semicolonClassElementBrand: any;

+>_semicolonClassElementBrand : any
+    }

+    interface AccessorDeclaration extends FunctionLikeDeclaration, ClassElement, ObjectLiteralElement {

+>AccessorDeclaration : AccessorDeclaration
+>FunctionLikeDeclaration : FunctionLikeDeclaration
+>ClassElement : ClassElement
+>ObjectLiteralElement : ObjectLiteralElement
+
+        _accessorDeclarationBrand: any;

+>_accessorDeclarationBrand : any
+
+        body: Block;

+>body : Block
+>Block : Block
+    }

+    interface IndexSignatureDeclaration extends SignatureDeclaration, ClassElement {

+>IndexSignatureDeclaration : IndexSignatureDeclaration
+>SignatureDeclaration : SignatureDeclaration
+>ClassElement : ClassElement
+
+        _indexSignatureDeclarationBrand: any;

+>_indexSignatureDeclarationBrand : any
+    }

+    interface TypeNode extends Node {

+>TypeNode : TypeNode
+>Node : Node
+
+        _typeNodeBrand: any;

+>_typeNodeBrand : any
+    }

+    interface FunctionOrConstructorTypeNode extends TypeNode, SignatureDeclaration {

+>FunctionOrConstructorTypeNode : FunctionOrConstructorTypeNode
+>TypeNode : TypeNode
+>SignatureDeclaration : SignatureDeclaration
+
+        _functionOrConstructorTypeNodeBrand: any;

+>_functionOrConstructorTypeNodeBrand : any
+    }

+    interface TypeReferenceNode extends TypeNode {

+>TypeReferenceNode : TypeReferenceNode
+>TypeNode : TypeNode
+
+        typeName: EntityName;

+>typeName : Identifier | QualifiedName
+>EntityName : Identifier | QualifiedName
+
+        typeArguments?: NodeArray<TypeNode>;

+>typeArguments : NodeArray<TypeNode>
+>NodeArray : NodeArray<T>
+>TypeNode : TypeNode
+    }

+    interface TypeQueryNode extends TypeNode {

+>TypeQueryNode : TypeQueryNode
+>TypeNode : TypeNode
+
+        exprName: EntityName;

+>exprName : Identifier | QualifiedName
+>EntityName : Identifier | QualifiedName
+    }

+    interface TypeLiteralNode extends TypeNode, Declaration {

+>TypeLiteralNode : TypeLiteralNode
+>TypeNode : TypeNode
+>Declaration : Declaration
+
+        members: NodeArray<Node>;

+>members : NodeArray<Node>
+>NodeArray : NodeArray<T>
+>Node : Node
+    }

+    interface ArrayTypeNode extends TypeNode {

+>ArrayTypeNode : ArrayTypeNode
+>TypeNode : TypeNode
+
+        elementType: TypeNode;

+>elementType : TypeNode
+>TypeNode : TypeNode
+    }

+    interface TupleTypeNode extends TypeNode {

+>TupleTypeNode : TupleTypeNode
+>TypeNode : TypeNode
+
+        elementTypes: NodeArray<TypeNode>;

+>elementTypes : NodeArray<TypeNode>
+>NodeArray : NodeArray<T>
+>TypeNode : TypeNode
+    }

+    interface UnionTypeNode extends TypeNode {

+>UnionTypeNode : UnionTypeNode
+>TypeNode : TypeNode
+
+        types: NodeArray<TypeNode>;

+>types : NodeArray<TypeNode>
+>NodeArray : NodeArray<T>
+>TypeNode : TypeNode
+    }

+    interface ParenthesizedTypeNode extends TypeNode {

+>ParenthesizedTypeNode : ParenthesizedTypeNode
+>TypeNode : TypeNode
+
+        type: TypeNode;

+>type : TypeNode
+>TypeNode : TypeNode
+    }

+    interface StringLiteralTypeNode extends LiteralExpression, TypeNode {

+>StringLiteralTypeNode : StringLiteralTypeNode
+>LiteralExpression : LiteralExpression
+>TypeNode : TypeNode
+    }

+    interface Expression extends Node {

+>Expression : Expression
+>Node : Node
+
+        _expressionBrand: any;

+>_expressionBrand : any
+
+        contextualType?: Type;

+>contextualType : Type
+>Type : Type
+    }

+    interface UnaryExpression extends Expression {

+>UnaryExpression : UnaryExpression
+>Expression : Expression
+
+        _unaryExpressionBrand: any;

+>_unaryExpressionBrand : any
+    }

+    interface PrefixUnaryExpression extends UnaryExpression {

+>PrefixUnaryExpression : PrefixUnaryExpression
+>UnaryExpression : UnaryExpression
+
+        operator: SyntaxKind;

+>operator : SyntaxKind
+>SyntaxKind : SyntaxKind
+
+        operand: UnaryExpression;

+>operand : UnaryExpression
+>UnaryExpression : UnaryExpression
+    }

+    interface PostfixUnaryExpression extends PostfixExpression {

+>PostfixUnaryExpression : PostfixUnaryExpression
+>PostfixExpression : PostfixExpression
+
+        operand: LeftHandSideExpression;

+>operand : LeftHandSideExpression
+>LeftHandSideExpression : LeftHandSideExpression
+
+        operator: SyntaxKind;

+>operator : SyntaxKind
+>SyntaxKind : SyntaxKind
+    }

+    interface PostfixExpression extends UnaryExpression {

+>PostfixExpression : PostfixExpression
+>UnaryExpression : UnaryExpression
+
+        _postfixExpressionBrand: any;

+>_postfixExpressionBrand : any
+    }

+    interface LeftHandSideExpression extends PostfixExpression {

+>LeftHandSideExpression : LeftHandSideExpression
+>PostfixExpression : PostfixExpression
+
+        _leftHandSideExpressionBrand: any;

+>_leftHandSideExpressionBrand : any
+    }

+    interface MemberExpression extends LeftHandSideExpression {

+>MemberExpression : MemberExpression
+>LeftHandSideExpression : LeftHandSideExpression
+
+        _memberExpressionBrand: any;

+>_memberExpressionBrand : any
+    }

+    interface PrimaryExpression extends MemberExpression {

+>PrimaryExpression : PrimaryExpression
+>MemberExpression : MemberExpression
+
+        _primaryExpressionBrand: any;

+>_primaryExpressionBrand : any
+    }

+    interface DeleteExpression extends UnaryExpression {

+>DeleteExpression : DeleteExpression
+>UnaryExpression : UnaryExpression
+
+        expression: UnaryExpression;

+>expression : UnaryExpression
+>UnaryExpression : UnaryExpression
+    }

+    interface TypeOfExpression extends UnaryExpression {

+>TypeOfExpression : TypeOfExpression
+>UnaryExpression : UnaryExpression
+
+        expression: UnaryExpression;

+>expression : UnaryExpression
+>UnaryExpression : UnaryExpression
+    }

+    interface VoidExpression extends UnaryExpression {

+>VoidExpression : VoidExpression
+>UnaryExpression : UnaryExpression
+
+        expression: UnaryExpression;

+>expression : UnaryExpression
+>UnaryExpression : UnaryExpression
+    }

+    interface YieldExpression extends Expression {

+>YieldExpression : YieldExpression
+>Expression : Expression
+
+        asteriskToken?: Node;

+>asteriskToken : Node
+>Node : Node
+
+        expression: Expression;

+>expression : Expression
+>Expression : Expression
+    }

+    interface BinaryExpression extends Expression {

+>BinaryExpression : BinaryExpression
+>Expression : Expression
+
+        left: Expression;

+>left : Expression
+>Expression : Expression
+
+        operatorToken: Node;

+>operatorToken : Node
+>Node : Node
+
+        right: Expression;

+>right : Expression
+>Expression : Expression
+    }

+    interface ConditionalExpression extends Expression {

+>ConditionalExpression : ConditionalExpression
+>Expression : Expression
+
+        condition: Expression;

+>condition : Expression
+>Expression : Expression
+
+        questionToken: Node;

+>questionToken : Node
+>Node : Node
+
+        whenTrue: Expression;

+>whenTrue : Expression
+>Expression : Expression
+
+        colonToken: Node;

+>colonToken : Node
+>Node : Node
+
+        whenFalse: Expression;

+>whenFalse : Expression
+>Expression : Expression
+    }

+    interface FunctionExpression extends PrimaryExpression, FunctionLikeDeclaration {

+>FunctionExpression : FunctionExpression
+>PrimaryExpression : PrimaryExpression
+>FunctionLikeDeclaration : FunctionLikeDeclaration
+
+        name?: Identifier;

+>name : Identifier
+>Identifier : Identifier
+
+        body: Block | Expression;

+>body : Expression | Block
+>Block : Block
+>Expression : Expression
+    }

+    interface ArrowFunction extends Expression, FunctionLikeDeclaration {

+>ArrowFunction : ArrowFunction
+>Expression : Expression
+>FunctionLikeDeclaration : FunctionLikeDeclaration
+
+        equalsGreaterThanToken: Node;

+>equalsGreaterThanToken : Node
+>Node : Node
+    }

+    interface LiteralExpression extends PrimaryExpression {

+>LiteralExpression : LiteralExpression
+>PrimaryExpression : PrimaryExpression
+
+        text: string;

+>text : string
+
+        isUnterminated?: boolean;

+>isUnterminated : boolean
+
+        hasExtendedUnicodeEscape?: boolean;

+>hasExtendedUnicodeEscape : boolean
+    }

+    interface StringLiteralExpression extends LiteralExpression {

+>StringLiteralExpression : StringLiteralExpression
+>LiteralExpression : LiteralExpression
+
+        _stringLiteralExpressionBrand: any;

+>_stringLiteralExpressionBrand : any
+    }

+    interface TemplateExpression extends PrimaryExpression {

+>TemplateExpression : TemplateExpression
+>PrimaryExpression : PrimaryExpression
+
+        head: LiteralExpression;

+>head : LiteralExpression
+>LiteralExpression : LiteralExpression
+
+        templateSpans: NodeArray<TemplateSpan>;

+>templateSpans : NodeArray<TemplateSpan>
+>NodeArray : NodeArray<T>
+>TemplateSpan : TemplateSpan
+    }

+    interface TemplateSpan extends Node {

+>TemplateSpan : TemplateSpan
+>Node : Node
+
+        expression: Expression;

+>expression : Expression
+>Expression : Expression
+
+        literal: LiteralExpression;

+>literal : LiteralExpression
+>LiteralExpression : LiteralExpression
+    }

+    interface ParenthesizedExpression extends PrimaryExpression {

+>ParenthesizedExpression : ParenthesizedExpression
+>PrimaryExpression : PrimaryExpression
+
+        expression: Expression;

+>expression : Expression
+>Expression : Expression
+    }

+    interface ArrayLiteralExpression extends PrimaryExpression {

+>ArrayLiteralExpression : ArrayLiteralExpression
+>PrimaryExpression : PrimaryExpression
+
+        elements: NodeArray<Expression>;

+>elements : NodeArray<Expression>
+>NodeArray : NodeArray<T>
+>Expression : Expression
+    }

+    interface SpreadElementExpression extends Expression {

+>SpreadElementExpression : SpreadElementExpression
+>Expression : Expression
+
+        expression: Expression;

+>expression : Expression
+>Expression : Expression
+    }

+    interface ObjectLiteralExpression extends PrimaryExpression, Declaration {

+>ObjectLiteralExpression : ObjectLiteralExpression
+>PrimaryExpression : PrimaryExpression
+>Declaration : Declaration
+
+        properties: NodeArray<ObjectLiteralElement>;

+>properties : NodeArray<ObjectLiteralElement>
+>NodeArray : NodeArray<T>
+>ObjectLiteralElement : ObjectLiteralElement
+    }

+    interface PropertyAccessExpression extends MemberExpression {

+>PropertyAccessExpression : PropertyAccessExpression
+>MemberExpression : MemberExpression
+
+        expression: LeftHandSideExpression;

+>expression : LeftHandSideExpression
+>LeftHandSideExpression : LeftHandSideExpression
+
+        dotToken: Node;

+>dotToken : Node
+>Node : Node
+
+        name: Identifier;

+>name : Identifier
+>Identifier : Identifier
+    }

+    interface ElementAccessExpression extends MemberExpression {

+>ElementAccessExpression : ElementAccessExpression
+>MemberExpression : MemberExpression
+
+        expression: LeftHandSideExpression;

+>expression : LeftHandSideExpression
+>LeftHandSideExpression : LeftHandSideExpression
+
+        argumentExpression?: Expression;

+>argumentExpression : Expression
+>Expression : Expression
+    }

+    interface CallExpression extends LeftHandSideExpression {

+>CallExpression : CallExpression
+>LeftHandSideExpression : LeftHandSideExpression
+
+        expression: LeftHandSideExpression;

+>expression : LeftHandSideExpression
+>LeftHandSideExpression : LeftHandSideExpression
+
+        typeArguments?: NodeArray<TypeNode>;

+>typeArguments : NodeArray<TypeNode>
+>NodeArray : NodeArray<T>
+>TypeNode : TypeNode
+
+        arguments: NodeArray<Expression>;

+>arguments : NodeArray<Expression>
+>NodeArray : NodeArray<T>
+>Expression : Expression
+    }

+    interface HeritageClauseElement extends Node {

+>HeritageClauseElement : HeritageClauseElement
+>Node : Node
+
+        expression: LeftHandSideExpression;

+>expression : LeftHandSideExpression
+>LeftHandSideExpression : LeftHandSideExpression
+
+        typeArguments?: NodeArray<TypeNode>;

+>typeArguments : NodeArray<TypeNode>
+>NodeArray : NodeArray<T>
+>TypeNode : TypeNode
+    }

+    interface NewExpression extends CallExpression, PrimaryExpression {

+>NewExpression : NewExpression
+>CallExpression : CallExpression
+>PrimaryExpression : PrimaryExpression
+    }

+    interface TaggedTemplateExpression extends MemberExpression {

+>TaggedTemplateExpression : TaggedTemplateExpression
+>MemberExpression : MemberExpression
+
+        tag: LeftHandSideExpression;

+>tag : LeftHandSideExpression
+>LeftHandSideExpression : LeftHandSideExpression
+
+        template: LiteralExpression | TemplateExpression;

+>template : LiteralExpression | TemplateExpression
+>LiteralExpression : LiteralExpression
+>TemplateExpression : TemplateExpression
+    }

+    type CallLikeExpression = CallExpression | NewExpression | TaggedTemplateExpression;

+>CallLikeExpression : CallExpression | NewExpression | TaggedTemplateExpression
+>CallExpression : CallExpression
+>NewExpression : NewExpression
+>TaggedTemplateExpression : TaggedTemplateExpression
+
+    interface TypeAssertion extends UnaryExpression {

+>TypeAssertion : TypeAssertion
+>UnaryExpression : UnaryExpression
+
+        type: TypeNode;

+>type : TypeNode
+>TypeNode : TypeNode
+
+        expression: UnaryExpression;

+>expression : UnaryExpression
+>UnaryExpression : UnaryExpression
+    }

+    interface Statement extends Node, ModuleElement {

+>Statement : Statement
+>Node : Node
+>ModuleElement : ModuleElement
+
+        _statementBrand: any;

+>_statementBrand : any
+    }

+    interface Block extends Statement {

+>Block : Block
+>Statement : Statement
+
+        statements: NodeArray<Statement>;

+>statements : NodeArray<Statement>
+>NodeArray : NodeArray<T>
+>Statement : Statement
+    }

+    interface VariableStatement extends Statement {

+>VariableStatement : VariableStatement
+>Statement : Statement
+
+        declarationList: VariableDeclarationList;

+>declarationList : VariableDeclarationList
+>VariableDeclarationList : VariableDeclarationList
+    }

+    interface ExpressionStatement extends Statement {

+>ExpressionStatement : ExpressionStatement
+>Statement : Statement
+
+        expression: Expression;

+>expression : Expression
+>Expression : Expression
+    }

+    interface IfStatement extends Statement {

+>IfStatement : IfStatement
+>Statement : Statement
+
+        expression: Expression;

+>expression : Expression
+>Expression : Expression
+
+        thenStatement: Statement;

+>thenStatement : Statement
+>Statement : Statement
+
+        elseStatement?: Statement;

+>elseStatement : Statement
+>Statement : Statement
+    }

+    interface IterationStatement extends Statement {

+>IterationStatement : IterationStatement
+>Statement : Statement
+
+        statement: Statement;

+>statement : Statement
+>Statement : Statement
+    }

+    interface DoStatement extends IterationStatement {

+>DoStatement : DoStatement
+>IterationStatement : IterationStatement
+
+        expression: Expression;

+>expression : Expression
+>Expression : Expression
+    }

+    interface WhileStatement extends IterationStatement {

+>WhileStatement : WhileStatement
+>IterationStatement : IterationStatement
+
+        expression: Expression;

+>expression : Expression
+>Expression : Expression
+    }

+    interface ForStatement extends IterationStatement {

+>ForStatement : ForStatement
+>IterationStatement : IterationStatement
+
+        initializer?: VariableDeclarationList | Expression;

+>initializer : Expression | VariableDeclarationList
+>VariableDeclarationList : VariableDeclarationList
+>Expression : Expression
+
+        condition?: Expression;

+>condition : Expression
+>Expression : Expression
+
+        iterator?: Expression;

+>iterator : Expression
+>Expression : Expression
+    }

+    interface ForInStatement extends IterationStatement {

+>ForInStatement : ForInStatement
+>IterationStatement : IterationStatement
+
+        initializer: VariableDeclarationList | Expression;

+>initializer : Expression | VariableDeclarationList
+>VariableDeclarationList : VariableDeclarationList
+>Expression : Expression
+
+        expression: Expression;

+>expression : Expression
+>Expression : Expression
+    }

+    interface ForOfStatement extends IterationStatement {

+>ForOfStatement : ForOfStatement
+>IterationStatement : IterationStatement
+
+        initializer: VariableDeclarationList | Expression;

+>initializer : Expression | VariableDeclarationList
+>VariableDeclarationList : VariableDeclarationList
+>Expression : Expression
+
+        expression: Expression;

+>expression : Expression
+>Expression : Expression
+    }

+    interface BreakOrContinueStatement extends Statement {

+>BreakOrContinueStatement : BreakOrContinueStatement
+>Statement : Statement
+
+        label?: Identifier;

+>label : Identifier
+>Identifier : Identifier
+    }

+    interface ReturnStatement extends Statement {

+>ReturnStatement : ReturnStatement
+>Statement : Statement
+
+        expression?: Expression;

+>expression : Expression
+>Expression : Expression
+    }

+    interface WithStatement extends Statement {

+>WithStatement : WithStatement
+>Statement : Statement
+
+        expression: Expression;

+>expression : Expression
+>Expression : Expression
+
+        statement: Statement;

+>statement : Statement
+>Statement : Statement
+    }

+    interface SwitchStatement extends Statement {

+>SwitchStatement : SwitchStatement
+>Statement : Statement
+
+        expression: Expression;

+>expression : Expression
+>Expression : Expression
+
+        caseBlock: CaseBlock;

+>caseBlock : CaseBlock
+>CaseBlock : CaseBlock
+    }

+    interface CaseBlock extends Node {

+>CaseBlock : CaseBlock
+>Node : Node
+
+        clauses: NodeArray<CaseOrDefaultClause>;

+>clauses : NodeArray<CaseClause | DefaultClause>
+>NodeArray : NodeArray<T>
+>CaseOrDefaultClause : CaseClause | DefaultClause
+    }

+    interface CaseClause extends Node {

+>CaseClause : CaseClause
+>Node : Node
+
+        expression?: Expression;

+>expression : Expression
+>Expression : Expression
+
+        statements: NodeArray<Statement>;

+>statements : NodeArray<Statement>
+>NodeArray : NodeArray<T>
+>Statement : Statement
+    }

+    interface DefaultClause extends Node {

+>DefaultClause : DefaultClause
+>Node : Node
+
+        statements: NodeArray<Statement>;

+>statements : NodeArray<Statement>
+>NodeArray : NodeArray<T>
+>Statement : Statement
+    }

+    type CaseOrDefaultClause = CaseClause | DefaultClause;

+>CaseOrDefaultClause : CaseClause | DefaultClause
+>CaseClause : CaseClause
+>DefaultClause : DefaultClause
+
+    interface LabeledStatement extends Statement {

+>LabeledStatement : LabeledStatement
+>Statement : Statement
+
+        label: Identifier;

+>label : Identifier
+>Identifier : Identifier
+
+        statement: Statement;

+>statement : Statement
+>Statement : Statement
+    }

+    interface ThrowStatement extends Statement {

+>ThrowStatement : ThrowStatement
+>Statement : Statement
+
+        expression: Expression;

+>expression : Expression
+>Expression : Expression
+    }

+    interface TryStatement extends Statement {

+>TryStatement : TryStatement
+>Statement : Statement
+
+        tryBlock: Block;

+>tryBlock : Block
+>Block : Block
+
+        catchClause?: CatchClause;

+>catchClause : CatchClause
+>CatchClause : CatchClause
+
+        finallyBlock?: Block;

+>finallyBlock : Block
+>Block : Block
+    }

+    interface CatchClause extends Node {

+>CatchClause : CatchClause
+>Node : Node
+
+        variableDeclaration: VariableDeclaration;

+>variableDeclaration : VariableDeclaration
+>VariableDeclaration : VariableDeclaration
+
+        block: Block;

+>block : Block
+>Block : Block
+    }

+    interface ModuleElement extends Node {

+>ModuleElement : ModuleElement
+>Node : Node
+
+        _moduleElementBrand: any;

+>_moduleElementBrand : any
+    }

+    interface ClassLikeDeclaration extends Declaration {

+>ClassLikeDeclaration : ClassLikeDeclaration
+>Declaration : Declaration
+
+        name?: Identifier;

+>name : Identifier
+>Identifier : Identifier
+
+        typeParameters?: NodeArray<TypeParameterDeclaration>;

+>typeParameters : NodeArray<TypeParameterDeclaration>
+>NodeArray : NodeArray<T>
+>TypeParameterDeclaration : TypeParameterDeclaration
+
+        heritageClauses?: NodeArray<HeritageClause>;

+>heritageClauses : NodeArray<HeritageClause>
+>NodeArray : NodeArray<T>
+>HeritageClause : HeritageClause
+
+        members: NodeArray<ClassElement>;

+>members : NodeArray<ClassElement>
+>NodeArray : NodeArray<T>
+>ClassElement : ClassElement
+    }

+    interface ClassDeclaration extends ClassLikeDeclaration, Statement {

+>ClassDeclaration : ClassDeclaration
+>ClassLikeDeclaration : ClassLikeDeclaration
+>Statement : Statement
+    }

+    interface ClassExpression extends ClassLikeDeclaration, PrimaryExpression {

+>ClassExpression : ClassExpression
+>ClassLikeDeclaration : ClassLikeDeclaration
+>PrimaryExpression : PrimaryExpression
+    }

+    interface ClassElement extends Declaration {

+>ClassElement : ClassElement
+>Declaration : Declaration
+
+        _classElementBrand: any;

+>_classElementBrand : any
+    }

+    interface InterfaceDeclaration extends Declaration, ModuleElement {

+>InterfaceDeclaration : InterfaceDeclaration
+>Declaration : Declaration
+>ModuleElement : ModuleElement
+
+        name: Identifier;

+>name : Identifier
+>Identifier : Identifier
+
+        typeParameters?: NodeArray<TypeParameterDeclaration>;

+>typeParameters : NodeArray<TypeParameterDeclaration>
+>NodeArray : NodeArray<T>
+>TypeParameterDeclaration : TypeParameterDeclaration
+
+        heritageClauses?: NodeArray<HeritageClause>;

+>heritageClauses : NodeArray<HeritageClause>
+>NodeArray : NodeArray<T>
+>HeritageClause : HeritageClause
+
+        members: NodeArray<Declaration>;

+>members : NodeArray<Declaration>
+>NodeArray : NodeArray<T>
+>Declaration : Declaration
+    }

+    interface HeritageClause extends Node {

+>HeritageClause : HeritageClause
+>Node : Node
+
+        token: SyntaxKind;

+>token : SyntaxKind
+>SyntaxKind : SyntaxKind
+
+        types?: NodeArray<HeritageClauseElement>;

+>types : NodeArray<HeritageClauseElement>
+>NodeArray : NodeArray<T>
+>HeritageClauseElement : HeritageClauseElement
+    }

+    interface TypeAliasDeclaration extends Declaration, ModuleElement {

+>TypeAliasDeclaration : TypeAliasDeclaration
+>Declaration : Declaration
+>ModuleElement : ModuleElement
+
+        name: Identifier;

+>name : Identifier
+>Identifier : Identifier
+
+        type: TypeNode;

+>type : TypeNode
+>TypeNode : TypeNode
+    }

+    interface EnumMember extends Declaration {

+>EnumMember : EnumMember
+>Declaration : Declaration
+
+        name: DeclarationName;

+>name : Identifier | LiteralExpression | ComputedPropertyName | BindingPattern
+>DeclarationName : Identifier | LiteralExpression | ComputedPropertyName | BindingPattern
+
+        initializer?: Expression;

+>initializer : Expression
+>Expression : Expression
+    }

+    interface EnumDeclaration extends Declaration, ModuleElement {

+>EnumDeclaration : EnumDeclaration
+>Declaration : Declaration
+>ModuleElement : ModuleElement
+
+        name: Identifier;

+>name : Identifier
+>Identifier : Identifier
+
+        members: NodeArray<EnumMember>;

+>members : NodeArray<EnumMember>
+>NodeArray : NodeArray<T>
+>EnumMember : EnumMember
+    }

+    interface ModuleDeclaration extends Declaration, ModuleElement {

+>ModuleDeclaration : ModuleDeclaration
+>Declaration : Declaration
+>ModuleElement : ModuleElement
+
+        name: Identifier | LiteralExpression;

+>name : Identifier | LiteralExpression
+>Identifier : Identifier
+>LiteralExpression : LiteralExpression
+
+        body: ModuleBlock | ModuleDeclaration;

+>body : ModuleDeclaration | ModuleBlock
+>ModuleBlock : ModuleBlock
+>ModuleDeclaration : ModuleDeclaration
+    }

+    interface ModuleBlock extends Node, ModuleElement {

+>ModuleBlock : ModuleBlock
+>Node : Node
+>ModuleElement : ModuleElement
+
+        statements: NodeArray<ModuleElement>;

+>statements : NodeArray<ModuleElement>
+>NodeArray : NodeArray<T>
+>ModuleElement : ModuleElement
+    }

+    interface ImportEqualsDeclaration extends Declaration, ModuleElement {

+>ImportEqualsDeclaration : ImportEqualsDeclaration
+>Declaration : Declaration
+>ModuleElement : ModuleElement
+
+        name: Identifier;

+>name : Identifier
+>Identifier : Identifier
+
+        moduleReference: EntityName | ExternalModuleReference;

+>moduleReference : Identifier | QualifiedName | ExternalModuleReference
+>EntityName : Identifier | QualifiedName
+>ExternalModuleReference : ExternalModuleReference
+    }

+    interface ExternalModuleReference extends Node {

+>ExternalModuleReference : ExternalModuleReference
+>Node : Node
+
+        expression?: Expression;

+>expression : Expression
+>Expression : Expression
+    }

+    interface ImportDeclaration extends Statement, ModuleElement {

+>ImportDeclaration : ImportDeclaration
+>Statement : Statement
+>ModuleElement : ModuleElement
+
+        importClause?: ImportClause;

+>importClause : ImportClause
+>ImportClause : ImportClause
+
+        moduleSpecifier: Expression;

+>moduleSpecifier : Expression
+>Expression : Expression
+    }

+    interface ImportClause extends Declaration {

+>ImportClause : ImportClause
+>Declaration : Declaration
+
+        name?: Identifier;

+>name : Identifier
+>Identifier : Identifier
+
+        namedBindings?: NamespaceImport | NamedImports;

+>namedBindings : NamespaceImport | NamedImportsOrExports
+>NamespaceImport : NamespaceImport
+>NamedImports : NamedImportsOrExports
+    }

+    interface NamespaceImport extends Declaration {

+>NamespaceImport : NamespaceImport
+>Declaration : Declaration
+
+        name: Identifier;

+>name : Identifier
+>Identifier : Identifier
+    }

+    interface ExportDeclaration extends Declaration, ModuleElement {

+>ExportDeclaration : ExportDeclaration
+>Declaration : Declaration
+>ModuleElement : ModuleElement
+
+        exportClause?: NamedExports;

+>exportClause : NamedImportsOrExports
+>NamedExports : NamedImportsOrExports
+
+        moduleSpecifier?: Expression;

+>moduleSpecifier : Expression
+>Expression : Expression
+    }

+    interface NamedImportsOrExports extends Node {

+>NamedImportsOrExports : NamedImportsOrExports
+>Node : Node
+
+        elements: NodeArray<ImportOrExportSpecifier>;

+>elements : NodeArray<ImportOrExportSpecifier>
+>NodeArray : NodeArray<T>
+>ImportOrExportSpecifier : ImportOrExportSpecifier
+    }

+    type NamedImports = NamedImportsOrExports;

+>NamedImports : NamedImportsOrExports
+>NamedImportsOrExports : NamedImportsOrExports
+
+    type NamedExports = NamedImportsOrExports;

+>NamedExports : NamedImportsOrExports
+>NamedImportsOrExports : NamedImportsOrExports
+
+    interface ImportOrExportSpecifier extends Declaration {

+>ImportOrExportSpecifier : ImportOrExportSpecifier
+>Declaration : Declaration
+
+        propertyName?: Identifier;

+>propertyName : Identifier
+>Identifier : Identifier
+
+        name: Identifier;

+>name : Identifier
+>Identifier : Identifier
+    }

+    type ImportSpecifier = ImportOrExportSpecifier;

+>ImportSpecifier : ImportOrExportSpecifier
+>ImportOrExportSpecifier : ImportOrExportSpecifier
+
+    type ExportSpecifier = ImportOrExportSpecifier;

+>ExportSpecifier : ImportOrExportSpecifier
+>ImportOrExportSpecifier : ImportOrExportSpecifier
+
+    interface ExportAssignment extends Declaration, ModuleElement {

+>ExportAssignment : ExportAssignment
+>Declaration : Declaration
+>ModuleElement : ModuleElement
+
+        isExportEquals?: boolean;

+>isExportEquals : boolean
+
+        expression?: Expression;

+>expression : Expression
+>Expression : Expression
+
+        type?: TypeNode;

+>type : TypeNode
+>TypeNode : TypeNode
+    }

+    interface FileReference extends TextRange {

+>FileReference : FileReference
+>TextRange : TextRange
+
+        fileName: string;

+>fileName : string
+    }

+    interface CommentRange extends TextRange {

+>CommentRange : CommentRange
+>TextRange : TextRange
+
+        hasTrailingNewLine?: boolean;

+>hasTrailingNewLine : boolean
+    }

+    interface SourceFile extends Declaration {

+>SourceFile : SourceFile
+>Declaration : Declaration
+
+        statements: NodeArray<ModuleElement>;

+>statements : NodeArray<ModuleElement>
+>NodeArray : NodeArray<T>
+>ModuleElement : ModuleElement
+
+        endOfFileToken: Node;

+>endOfFileToken : Node
+>Node : Node
+
+        fileName: string;

+>fileName : string
+
+        text: string;

+>text : string
+
+        amdDependencies: {

+>amdDependencies : { path: string; name: string; }[]
+
+            path: string;

+>path : string
+
+            name: string;

+>name : string
+
+        }[];

+        amdModuleName: string;

+>amdModuleName : string
+
+        referencedFiles: FileReference[];

+>referencedFiles : FileReference[]
+>FileReference : FileReference
+
+        hasNoDefaultLib: boolean;

+>hasNoDefaultLib : boolean
+
+        externalModuleIndicator: Node;

+>externalModuleIndicator : Node
+>Node : Node
+
+        languageVersion: ScriptTarget;

+>languageVersion : ScriptTarget
+>ScriptTarget : ScriptTarget
+
+        identifiers: Map<string>;

+>identifiers : Map<string>
+>Map : Map<T>
+    }

+    interface ScriptReferenceHost {

+>ScriptReferenceHost : ScriptReferenceHost
+
+        getCompilerOptions(): CompilerOptions;

+>getCompilerOptions : () => CompilerOptions
+>CompilerOptions : CompilerOptions
+
+        getSourceFile(fileName: string): SourceFile;

+>getSourceFile : (fileName: string) => SourceFile
+>fileName : string
+>SourceFile : SourceFile
+
+        getCurrentDirectory(): string;

+>getCurrentDirectory : () => string
+    }

+    interface WriteFileCallback {

+>WriteFileCallback : WriteFileCallback
+
+        (fileName: string, data: string, writeByteOrderMark: boolean, onError?: (message: string) => void): void;

+>fileName : string
+>data : string
+>writeByteOrderMark : boolean
+>onError : (message: string) => void
+>message : string
+    }

+    interface Program extends ScriptReferenceHost {

+>Program : Program
+>ScriptReferenceHost : ScriptReferenceHost
+
+        getSourceFiles(): SourceFile[];

+>getSourceFiles : () => SourceFile[]
+>SourceFile : SourceFile
+
+        /**

+         * Emits the JavaScript and declaration files.  If targetSourceFile is not specified, then

+         * the JavaScript and declaration files will be produced for all the files in this program.

+         * If targetSourceFile is specified, then only the JavaScript and declaration for that

+         * specific file will be generated.

+         *

+         * If writeFile is not specified then the writeFile callback from the compiler host will be

+         * used for writing the JavaScript and declaration files.  Otherwise, the writeFile parameter

+         * will be invoked when writing the JavaScript and declaration files.

+         */

+        emit(targetSourceFile?: SourceFile, writeFile?: WriteFileCallback): EmitResult;

+>emit : (targetSourceFile?: SourceFile, writeFile?: WriteFileCallback) => EmitResult
+>targetSourceFile : SourceFile
+>SourceFile : SourceFile
+>writeFile : WriteFileCallback
+>WriteFileCallback : WriteFileCallback
+>EmitResult : EmitResult
+
+        getSyntacticDiagnostics(sourceFile?: SourceFile): Diagnostic[];

+>getSyntacticDiagnostics : (sourceFile?: SourceFile) => Diagnostic[]
+>sourceFile : SourceFile
+>SourceFile : SourceFile
+>Diagnostic : Diagnostic
+
+        getGlobalDiagnostics(): Diagnostic[];

+>getGlobalDiagnostics : () => Diagnostic[]
+>Diagnostic : Diagnostic
+
+        getSemanticDiagnostics(sourceFile?: SourceFile): Diagnostic[];

+>getSemanticDiagnostics : (sourceFile?: SourceFile) => Diagnostic[]
+>sourceFile : SourceFile
+>SourceFile : SourceFile
+>Diagnostic : Diagnostic
+
+        getDeclarationDiagnostics(sourceFile?: SourceFile): Diagnostic[];

+>getDeclarationDiagnostics : (sourceFile?: SourceFile) => Diagnostic[]
+>sourceFile : SourceFile
+>SourceFile : SourceFile
+>Diagnostic : Diagnostic
+
+        getTypeChecker(): TypeChecker;

+>getTypeChecker : () => TypeChecker
+>TypeChecker : TypeChecker
+
+        getCommonSourceDirectory(): string;

+>getCommonSourceDirectory : () => string
+    }

+    interface SourceMapSpan {

+>SourceMapSpan : SourceMapSpan
+
+        emittedLine: number;

+>emittedLine : number
+
+        emittedColumn: number;

+>emittedColumn : number
+
+        sourceLine: number;

+>sourceLine : number
+
+        sourceColumn: number;

+>sourceColumn : number
+
+        nameIndex?: number;

+>nameIndex : number
+
+        sourceIndex: number;

+>sourceIndex : number
+    }

+    interface SourceMapData {

+>SourceMapData : SourceMapData
+
+        sourceMapFilePath: string;

+>sourceMapFilePath : string
+
+        jsSourceMappingURL: string;

+>jsSourceMappingURL : string
+
+        sourceMapFile: string;

+>sourceMapFile : string
+
+        sourceMapSourceRoot: string;

+>sourceMapSourceRoot : string
+
+        sourceMapSources: string[];

+>sourceMapSources : string[]
+
+        inputSourceFileNames: string[];

+>inputSourceFileNames : string[]
+
+        sourceMapNames?: string[];

+>sourceMapNames : string[]
+
+        sourceMapMappings: string;

+>sourceMapMappings : string
+
+        sourceMapDecodedMappings: SourceMapSpan[];

+>sourceMapDecodedMappings : SourceMapSpan[]
+>SourceMapSpan : SourceMapSpan
+    }

+    enum ExitStatus {

+>ExitStatus : ExitStatus
+
+        Success = 0,

+>Success : ExitStatus
+
+        DiagnosticsPresent_OutputsSkipped = 1,

+>DiagnosticsPresent_OutputsSkipped : ExitStatus
+
+        DiagnosticsPresent_OutputsGenerated = 2,

+>DiagnosticsPresent_OutputsGenerated : ExitStatus
+    }

+    interface EmitResult {

+>EmitResult : EmitResult
+
+        emitSkipped: boolean;

+>emitSkipped : boolean
+
+        diagnostics: Diagnostic[];

+>diagnostics : Diagnostic[]
+>Diagnostic : Diagnostic
+
+        sourceMaps: SourceMapData[];

+>sourceMaps : SourceMapData[]
+>SourceMapData : SourceMapData
+    }

+    interface TypeCheckerHost {

+>TypeCheckerHost : TypeCheckerHost
+
+        getCompilerOptions(): CompilerOptions;

+>getCompilerOptions : () => CompilerOptions
+>CompilerOptions : CompilerOptions
+
+        getSourceFiles(): SourceFile[];

+>getSourceFiles : () => SourceFile[]
+>SourceFile : SourceFile
+
+        getSourceFile(fileName: string): SourceFile;

+>getSourceFile : (fileName: string) => SourceFile
+>fileName : string
+>SourceFile : SourceFile
+    }

+    interface TypeChecker {

+>TypeChecker : TypeChecker
+
+        getTypeOfSymbolAtLocation(symbol: Symbol, node: Node): Type;

+>getTypeOfSymbolAtLocation : (symbol: Symbol, node: Node) => Type
+>symbol : Symbol
+>Symbol : Symbol
+>node : Node
+>Node : Node
+>Type : Type
+
+        getDeclaredTypeOfSymbol(symbol: Symbol): Type;

+>getDeclaredTypeOfSymbol : (symbol: Symbol) => Type
+>symbol : Symbol
+>Symbol : Symbol
+>Type : Type
+
+        getPropertiesOfType(type: Type): Symbol[];

+>getPropertiesOfType : (type: Type) => Symbol[]
+>type : Type
+>Type : Type
+>Symbol : Symbol
+
+        getPropertyOfType(type: Type, propertyName: string): Symbol;

+>getPropertyOfType : (type: Type, propertyName: string) => Symbol
+>type : Type
+>Type : Type
+>propertyName : string
+>Symbol : Symbol
+
+        getSignaturesOfType(type: Type, kind: SignatureKind): Signature[];

+>getSignaturesOfType : (type: Type, kind: SignatureKind) => Signature[]
+>type : Type
+>Type : Type
+>kind : SignatureKind
+>SignatureKind : SignatureKind
+>Signature : Signature
+
+        getIndexTypeOfType(type: Type, kind: IndexKind): Type;

+>getIndexTypeOfType : (type: Type, kind: IndexKind) => Type
+>type : Type
+>Type : Type
+>kind : IndexKind
+>IndexKind : IndexKind
+>Type : Type
+
+        getReturnTypeOfSignature(signature: Signature): Type;

+>getReturnTypeOfSignature : (signature: Signature) => Type
+>signature : Signature
+>Signature : Signature
+>Type : Type
+
+        getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[];

+>getSymbolsInScope : (location: Node, meaning: SymbolFlags) => Symbol[]
+>location : Node
+>Node : Node
+>meaning : SymbolFlags
+>SymbolFlags : SymbolFlags
+>Symbol : Symbol
+
+        getSymbolAtLocation(node: Node): Symbol;

+>getSymbolAtLocation : (node: Node) => Symbol
+>node : Node
+>Node : Node
+>Symbol : Symbol
+
+        getShorthandAssignmentValueSymbol(location: Node): Symbol;

+>getShorthandAssignmentValueSymbol : (location: Node) => Symbol
+>location : Node
+>Node : Node
+>Symbol : Symbol
+
+        getTypeAtLocation(node: Node): Type;

+>getTypeAtLocation : (node: Node) => Type
+>node : Node
+>Node : Node
+>Type : Type
+
+        typeToString(type: Type, enclosingDeclaration?: Node, flags?: TypeFormatFlags): string;

+>typeToString : (type: Type, enclosingDeclaration?: Node, flags?: TypeFormatFlags) => string
+>type : Type
+>Type : Type
+>enclosingDeclaration : Node
+>Node : Node
+>flags : TypeFormatFlags
+>TypeFormatFlags : TypeFormatFlags
+
+        symbolToString(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags): string;

+>symbolToString : (symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags) => string
+>symbol : Symbol
+>Symbol : Symbol
+>enclosingDeclaration : Node
+>Node : Node
+>meaning : SymbolFlags
+>SymbolFlags : SymbolFlags
+
+        getSymbolDisplayBuilder(): SymbolDisplayBuilder;

+>getSymbolDisplayBuilder : () => SymbolDisplayBuilder
+>SymbolDisplayBuilder : SymbolDisplayBuilder
+
+        getFullyQualifiedName(symbol: Symbol): string;

+>getFullyQualifiedName : (symbol: Symbol) => string
+>symbol : Symbol
+>Symbol : Symbol
+
+        getAugmentedPropertiesOfType(type: Type): Symbol[];

+>getAugmentedPropertiesOfType : (type: Type) => Symbol[]
+>type : Type
+>Type : Type
+>Symbol : Symbol
+
+        getRootSymbols(symbol: Symbol): Symbol[];

+>getRootSymbols : (symbol: Symbol) => Symbol[]
+>symbol : Symbol
+>Symbol : Symbol
+>Symbol : Symbol
+
+        getContextualType(node: Expression): Type;

+>getContextualType : (node: Expression) => Type
+>node : Expression
+>Expression : Expression
+>Type : Type
+
+        getResolvedSignature(node: CallLikeExpression, candidatesOutArray?: Signature[]): Signature;

+>getResolvedSignature : (node: CallExpression | NewExpression | TaggedTemplateExpression, candidatesOutArray?: Signature[]) => Signature
+>node : CallExpression | NewExpression | TaggedTemplateExpression
+>CallLikeExpression : CallExpression | NewExpression | TaggedTemplateExpression
+>candidatesOutArray : Signature[]
+>Signature : Signature
+>Signature : Signature
+
+        getSignatureFromDeclaration(declaration: SignatureDeclaration): Signature;

+>getSignatureFromDeclaration : (declaration: SignatureDeclaration) => Signature
+>declaration : SignatureDeclaration
+>SignatureDeclaration : SignatureDeclaration
+>Signature : Signature
+
+        isImplementationOfOverload(node: FunctionLikeDeclaration): boolean;

+>isImplementationOfOverload : (node: FunctionLikeDeclaration) => boolean
+>node : FunctionLikeDeclaration
+>FunctionLikeDeclaration : FunctionLikeDeclaration
+
+        isUndefinedSymbol(symbol: Symbol): boolean;

+>isUndefinedSymbol : (symbol: Symbol) => boolean
+>symbol : Symbol
+>Symbol : Symbol
+
+        isArgumentsSymbol(symbol: Symbol): boolean;

+>isArgumentsSymbol : (symbol: Symbol) => boolean
+>symbol : Symbol
+>Symbol : Symbol
+
+        getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;

+>getConstantValue : (node: PropertyAccessExpression | ElementAccessExpression | EnumMember) => number
+>node : PropertyAccessExpression | ElementAccessExpression | EnumMember
+>EnumMember : EnumMember
+>PropertyAccessExpression : PropertyAccessExpression
+>ElementAccessExpression : ElementAccessExpression
+
+        isValidPropertyAccess(node: PropertyAccessExpression | QualifiedName, propertyName: string): boolean;

+>isValidPropertyAccess : (node: QualifiedName | PropertyAccessExpression, propertyName: string) => boolean
+>node : QualifiedName | PropertyAccessExpression
+>PropertyAccessExpression : PropertyAccessExpression
+>QualifiedName : QualifiedName
+>propertyName : string
+
+        getAliasedSymbol(symbol: Symbol): Symbol;

+>getAliasedSymbol : (symbol: Symbol) => Symbol
+>symbol : Symbol
+>Symbol : Symbol
+>Symbol : Symbol
+
+        getExportsOfExternalModule(node: ImportDeclaration): Symbol[];

+>getExportsOfExternalModule : (node: ImportDeclaration) => Symbol[]
+>node : ImportDeclaration
+>ImportDeclaration : ImportDeclaration
+>Symbol : Symbol
+    }

+    interface SymbolDisplayBuilder {

+>SymbolDisplayBuilder : SymbolDisplayBuilder
+
+        buildTypeDisplay(type: Type, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;

+>buildTypeDisplay : (type: Type, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags) => void
+>type : Type
+>Type : Type
+>writer : SymbolWriter
+>SymbolWriter : SymbolWriter
+>enclosingDeclaration : Node
+>Node : Node
+>flags : TypeFormatFlags
+>TypeFormatFlags : TypeFormatFlags
+
+        buildSymbolDisplay(symbol: Symbol, writer: SymbolWriter, enclosingDeclaration?: Node, meaning?: SymbolFlags, flags?: SymbolFormatFlags): void;

+>buildSymbolDisplay : (symbol: Symbol, writer: SymbolWriter, enclosingDeclaration?: Node, meaning?: SymbolFlags, flags?: SymbolFormatFlags) => void
+>symbol : Symbol
+>Symbol : Symbol
+>writer : SymbolWriter
+>SymbolWriter : SymbolWriter
+>enclosingDeclaration : Node
+>Node : Node
+>meaning : SymbolFlags
+>SymbolFlags : SymbolFlags
+>flags : SymbolFormatFlags
+>SymbolFormatFlags : SymbolFormatFlags
+
+        buildSignatureDisplay(signatures: Signature, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;

+>buildSignatureDisplay : (signatures: Signature, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags) => void
+>signatures : Signature
+>Signature : Signature
+>writer : SymbolWriter
+>SymbolWriter : SymbolWriter
+>enclosingDeclaration : Node
+>Node : Node
+>flags : TypeFormatFlags
+>TypeFormatFlags : TypeFormatFlags
+
+        buildParameterDisplay(parameter: Symbol, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;

+>buildParameterDisplay : (parameter: Symbol, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags) => void
+>parameter : Symbol
+>Symbol : Symbol
+>writer : SymbolWriter
+>SymbolWriter : SymbolWriter
+>enclosingDeclaration : Node
+>Node : Node
+>flags : TypeFormatFlags
+>TypeFormatFlags : TypeFormatFlags
+
+        buildTypeParameterDisplay(tp: TypeParameter, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;

+>buildTypeParameterDisplay : (tp: TypeParameter, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags) => void
+>tp : TypeParameter
+>TypeParameter : TypeParameter
+>writer : SymbolWriter
+>SymbolWriter : SymbolWriter
+>enclosingDeclaration : Node
+>Node : Node
+>flags : TypeFormatFlags
+>TypeFormatFlags : TypeFormatFlags
+
+        buildTypeParameterDisplayFromSymbol(symbol: Symbol, writer: SymbolWriter, enclosingDeclaraiton?: Node, flags?: TypeFormatFlags): void;

+>buildTypeParameterDisplayFromSymbol : (symbol: Symbol, writer: SymbolWriter, enclosingDeclaraiton?: Node, flags?: TypeFormatFlags) => void
+>symbol : Symbol
+>Symbol : Symbol
+>writer : SymbolWriter
+>SymbolWriter : SymbolWriter
+>enclosingDeclaraiton : Node
+>Node : Node
+>flags : TypeFormatFlags
+>TypeFormatFlags : TypeFormatFlags
+
+        buildDisplayForParametersAndDelimiters(parameters: Symbol[], writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;

+>buildDisplayForParametersAndDelimiters : (parameters: Symbol[], writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags) => void
+>parameters : Symbol[]
+>Symbol : Symbol
+>writer : SymbolWriter
+>SymbolWriter : SymbolWriter
+>enclosingDeclaration : Node
+>Node : Node
+>flags : TypeFormatFlags
+>TypeFormatFlags : TypeFormatFlags
+
+        buildDisplayForTypeParametersAndDelimiters(typeParameters: TypeParameter[], writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;

+>buildDisplayForTypeParametersAndDelimiters : (typeParameters: TypeParameter[], writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags) => void
+>typeParameters : TypeParameter[]
+>TypeParameter : TypeParameter
+>writer : SymbolWriter
+>SymbolWriter : SymbolWriter
+>enclosingDeclaration : Node
+>Node : Node
+>flags : TypeFormatFlags
+>TypeFormatFlags : TypeFormatFlags
+
+        buildReturnTypeDisplay(signature: Signature, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;

+>buildReturnTypeDisplay : (signature: Signature, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags) => void
+>signature : Signature
+>Signature : Signature
+>writer : SymbolWriter
+>SymbolWriter : SymbolWriter
+>enclosingDeclaration : Node
+>Node : Node
+>flags : TypeFormatFlags
+>TypeFormatFlags : TypeFormatFlags
+    }

+    interface SymbolWriter {

+>SymbolWriter : SymbolWriter
+
+        writeKeyword(text: string): void;

+>writeKeyword : (text: string) => void
+>text : string
+
+        writeOperator(text: string): void;

+>writeOperator : (text: string) => void
+>text : string
+
+        writePunctuation(text: string): void;

+>writePunctuation : (text: string) => void
+>text : string
+
+        writeSpace(text: string): void;

+>writeSpace : (text: string) => void
+>text : string
+
+        writeStringLiteral(text: string): void;

+>writeStringLiteral : (text: string) => void
+>text : string
+
+        writeParameter(text: string): void;

+>writeParameter : (text: string) => void
+>text : string
+
+        writeSymbol(text: string, symbol: Symbol): void;

+>writeSymbol : (text: string, symbol: Symbol) => void
+>text : string
+>symbol : Symbol
+>Symbol : Symbol
+
+        writeLine(): void;

+>writeLine : () => void
+
+        increaseIndent(): void;

+>increaseIndent : () => void
+
+        decreaseIndent(): void;

+>decreaseIndent : () => void
+
+        clear(): void;

+>clear : () => void
+
+        trackSymbol(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags): void;

+>trackSymbol : (symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags) => void
+>symbol : Symbol
+>Symbol : Symbol
+>enclosingDeclaration : Node
+>Node : Node
+>meaning : SymbolFlags
+>SymbolFlags : SymbolFlags
+    }

+    const enum TypeFormatFlags {

+>TypeFormatFlags : TypeFormatFlags
+
+        None = 0,

+>None : TypeFormatFlags
+
+        WriteArrayAsGenericType = 1,

+>WriteArrayAsGenericType : TypeFormatFlags
+
+        UseTypeOfFunction = 2,

+>UseTypeOfFunction : TypeFormatFlags
+
+        NoTruncation = 4,

+>NoTruncation : TypeFormatFlags
+
+        WriteArrowStyleSignature = 8,

+>WriteArrowStyleSignature : TypeFormatFlags
+
+        WriteOwnNameForAnyLike = 16,

+>WriteOwnNameForAnyLike : TypeFormatFlags
+
+        WriteTypeArgumentsOfSignature = 32,

+>WriteTypeArgumentsOfSignature : TypeFormatFlags
+
+        InElementType = 64,

+>InElementType : TypeFormatFlags
+
+        UseFullyQualifiedType = 128,

+>UseFullyQualifiedType : TypeFormatFlags
+    }

+    const enum SymbolFormatFlags {

+>SymbolFormatFlags : SymbolFormatFlags
+
+        None = 0,

+>None : SymbolFormatFlags
+
+        WriteTypeParametersOrArguments = 1,

+>WriteTypeParametersOrArguments : SymbolFormatFlags
+
+        UseOnlyExternalAliasing = 2,

+>UseOnlyExternalAliasing : SymbolFormatFlags
+    }

+    const enum SymbolAccessibility {

+>SymbolAccessibility : SymbolAccessibility
+
+        Accessible = 0,

+>Accessible : SymbolAccessibility
+
+        NotAccessible = 1,

+>NotAccessible : SymbolAccessibility
+
+        CannotBeNamed = 2,

+>CannotBeNamed : SymbolAccessibility
+    }

+    type AnyImportSyntax = ImportDeclaration | ImportEqualsDeclaration;

+>AnyImportSyntax : ImportEqualsDeclaration | ImportDeclaration
+>ImportDeclaration : ImportDeclaration
+>ImportEqualsDeclaration : ImportEqualsDeclaration
+
+    interface SymbolVisibilityResult {

+>SymbolVisibilityResult : SymbolVisibilityResult
+
+        accessibility: SymbolAccessibility;

+>accessibility : SymbolAccessibility
+>SymbolAccessibility : SymbolAccessibility
+
+        aliasesToMakeVisible?: AnyImportSyntax[];

+>aliasesToMakeVisible : (ImportEqualsDeclaration | ImportDeclaration)[]
+>AnyImportSyntax : ImportEqualsDeclaration | ImportDeclaration
+
+        errorSymbolName?: string;

+>errorSymbolName : string
+
+        errorNode?: Node;

+>errorNode : Node
+>Node : Node
+    }

+    interface SymbolAccessiblityResult extends SymbolVisibilityResult {

+>SymbolAccessiblityResult : SymbolAccessiblityResult
+>SymbolVisibilityResult : SymbolVisibilityResult
+
+        errorModuleName?: string;

+>errorModuleName : string
+    }

+    interface EmitResolver {

+>EmitResolver : EmitResolver
+
+        hasGlobalName(name: string): boolean;

+>hasGlobalName : (name: string) => boolean
+>name : string
+
+        getExpressionNameSubstitution(node: Identifier, getGeneratedNameForNode: (node: Node) => string): string;

+>getExpressionNameSubstitution : (node: Identifier, getGeneratedNameForNode: (node: Node) => string) => string
+>node : Identifier
+>Identifier : Identifier
+>getGeneratedNameForNode : (node: Node) => string
+>node : Node
+>Node : Node
+
+        isValueAliasDeclaration(node: Node): boolean;

+>isValueAliasDeclaration : (node: Node) => boolean
+>node : Node
+>Node : Node
+
+        isReferencedAliasDeclaration(node: Node, checkChildren?: boolean): boolean;

+>isReferencedAliasDeclaration : (node: Node, checkChildren?: boolean) => boolean
+>node : Node
+>Node : Node
+>checkChildren : boolean
+
+        isTopLevelValueImportEqualsWithEntityName(node: ImportEqualsDeclaration): boolean;

+>isTopLevelValueImportEqualsWithEntityName : (node: ImportEqualsDeclaration) => boolean
+>node : ImportEqualsDeclaration
+>ImportEqualsDeclaration : ImportEqualsDeclaration
+
+        getNodeCheckFlags(node: Node): NodeCheckFlags;

+>getNodeCheckFlags : (node: Node) => NodeCheckFlags
+>node : Node
+>Node : Node
+>NodeCheckFlags : NodeCheckFlags
+
+        isDeclarationVisible(node: Declaration): boolean;

+>isDeclarationVisible : (node: Declaration) => boolean
+>node : Declaration
+>Declaration : Declaration
+
+        collectLinkedAliases(node: Identifier): Node[];

+>collectLinkedAliases : (node: Identifier) => Node[]
+>node : Identifier
+>Identifier : Identifier
+>Node : Node
+
+        isImplementationOfOverload(node: FunctionLikeDeclaration): boolean;

+>isImplementationOfOverload : (node: FunctionLikeDeclaration) => boolean
+>node : FunctionLikeDeclaration
+>FunctionLikeDeclaration : FunctionLikeDeclaration
+
+        writeTypeOfDeclaration(declaration: AccessorDeclaration | VariableLikeDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void;

+>writeTypeOfDeclaration : (declaration: VariableLikeDeclaration | AccessorDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter) => void
+>declaration : VariableLikeDeclaration | AccessorDeclaration
+>AccessorDeclaration : AccessorDeclaration
+>VariableLikeDeclaration : VariableLikeDeclaration
+>enclosingDeclaration : Node
+>Node : Node
+>flags : TypeFormatFlags
+>TypeFormatFlags : TypeFormatFlags
+>writer : SymbolWriter
+>SymbolWriter : SymbolWriter
+
+        writeReturnTypeOfSignatureDeclaration(signatureDeclaration: SignatureDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void;

+>writeReturnTypeOfSignatureDeclaration : (signatureDeclaration: SignatureDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter) => void
+>signatureDeclaration : SignatureDeclaration
+>SignatureDeclaration : SignatureDeclaration
+>enclosingDeclaration : Node
+>Node : Node
+>flags : TypeFormatFlags
+>TypeFormatFlags : TypeFormatFlags
+>writer : SymbolWriter
+>SymbolWriter : SymbolWriter
+
+        writeTypeOfExpression(expr: Expression, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void;

+>writeTypeOfExpression : (expr: Expression, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter) => void
+>expr : Expression
+>Expression : Expression
+>enclosingDeclaration : Node
+>Node : Node
+>flags : TypeFormatFlags
+>TypeFormatFlags : TypeFormatFlags
+>writer : SymbolWriter
+>SymbolWriter : SymbolWriter
+
+        isSymbolAccessible(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags): SymbolAccessiblityResult;

+>isSymbolAccessible : (symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags) => SymbolAccessiblityResult
+>symbol : Symbol
+>Symbol : Symbol
+>enclosingDeclaration : Node
+>Node : Node
+>meaning : SymbolFlags
+>SymbolFlags : SymbolFlags
+>SymbolAccessiblityResult : SymbolAccessiblityResult
+
+        isEntityNameVisible(entityName: EntityName | Expression, enclosingDeclaration: Node): SymbolVisibilityResult;

+>isEntityNameVisible : (entityName: Expression | Identifier | QualifiedName, enclosingDeclaration: Node) => SymbolVisibilityResult
+>entityName : Expression | Identifier | QualifiedName
+>EntityName : Identifier | QualifiedName
+>Expression : Expression
+>enclosingDeclaration : Node
+>Node : Node
+>SymbolVisibilityResult : SymbolVisibilityResult
+
+        getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;

+>getConstantValue : (node: PropertyAccessExpression | ElementAccessExpression | EnumMember) => number
+>node : PropertyAccessExpression | ElementAccessExpression | EnumMember
+>EnumMember : EnumMember
+>PropertyAccessExpression : PropertyAccessExpression
+>ElementAccessExpression : ElementAccessExpression
+
+        resolvesToSomeValue(location: Node, name: string): boolean;

+>resolvesToSomeValue : (location: Node, name: string) => boolean
+>location : Node
+>Node : Node
+>name : string
+
+        getBlockScopedVariableId(node: Identifier): number;

+>getBlockScopedVariableId : (node: Identifier) => number
+>node : Identifier
+>Identifier : Identifier
+    }

+    const enum SymbolFlags {

+>SymbolFlags : SymbolFlags
+
+        FunctionScopedVariable = 1,

+>FunctionScopedVariable : SymbolFlags
+
+        BlockScopedVariable = 2,

+>BlockScopedVariable : SymbolFlags
+
+        Property = 4,

+>Property : SymbolFlags
+
+        EnumMember = 8,

+>EnumMember : SymbolFlags
+
+        Function = 16,

+>Function : SymbolFlags
+
+        Class = 32,

+>Class : SymbolFlags
+
+        Interface = 64,

+>Interface : SymbolFlags
+
+        ConstEnum = 128,

+>ConstEnum : SymbolFlags
+
+        RegularEnum = 256,

+>RegularEnum : SymbolFlags
+
+        ValueModule = 512,

+>ValueModule : SymbolFlags
+
+        NamespaceModule = 1024,

+>NamespaceModule : SymbolFlags
+
+        TypeLiteral = 2048,

+>TypeLiteral : SymbolFlags
+
+        ObjectLiteral = 4096,

+>ObjectLiteral : SymbolFlags
+
+        Method = 8192,

+>Method : SymbolFlags
+
+        Constructor = 16384,

+>Constructor : SymbolFlags
+
+        GetAccessor = 32768,

+>GetAccessor : SymbolFlags
+
+        SetAccessor = 65536,

+>SetAccessor : SymbolFlags
+
+        Signature = 131072,

+>Signature : SymbolFlags
+
+        TypeParameter = 262144,

+>TypeParameter : SymbolFlags
+
+        TypeAlias = 524288,

+>TypeAlias : SymbolFlags
+
+        ExportValue = 1048576,

+>ExportValue : SymbolFlags
+
+        ExportType = 2097152,

+>ExportType : SymbolFlags
+
+        ExportNamespace = 4194304,

+>ExportNamespace : SymbolFlags
+
+        Alias = 8388608,

+>Alias : SymbolFlags
+
+        Instantiated = 16777216,

+>Instantiated : SymbolFlags
+
+        Merged = 33554432,

+>Merged : SymbolFlags
+
+        Transient = 67108864,

+>Transient : SymbolFlags
+
+        Prototype = 134217728,

+>Prototype : SymbolFlags
+
+        UnionProperty = 268435456,

+>UnionProperty : SymbolFlags
+
+        Optional = 536870912,

+>Optional : SymbolFlags
+
+        ExportStar = 1073741824,

+>ExportStar : SymbolFlags
+
+        Enum = 384,

+>Enum : SymbolFlags
+
+        Variable = 3,

+>Variable : SymbolFlags
+
+        Value = 107455,

+>Value : SymbolFlags
+
+        Type = 793056,

+>Type : SymbolFlags
+
+        Namespace = 1536,

+>Namespace : SymbolFlags
+
+        Module = 1536,

+>Module : SymbolFlags
+
+        Accessor = 98304,

+>Accessor : SymbolFlags
+
+        FunctionScopedVariableExcludes = 107454,

+>FunctionScopedVariableExcludes : SymbolFlags
+
+        BlockScopedVariableExcludes = 107455,

+>BlockScopedVariableExcludes : SymbolFlags
+
+        ParameterExcludes = 107455,

+>ParameterExcludes : SymbolFlags
+
+        PropertyExcludes = 107455,

+>PropertyExcludes : SymbolFlags
+
+        EnumMemberExcludes = 107455,

+>EnumMemberExcludes : SymbolFlags
+
+        FunctionExcludes = 106927,

+>FunctionExcludes : SymbolFlags
+
+        ClassExcludes = 899583,

+>ClassExcludes : SymbolFlags
+
+        InterfaceExcludes = 792992,

+>InterfaceExcludes : SymbolFlags
+
+        RegularEnumExcludes = 899327,

+>RegularEnumExcludes : SymbolFlags
+
+        ConstEnumExcludes = 899967,

+>ConstEnumExcludes : SymbolFlags
+
+        ValueModuleExcludes = 106639,

+>ValueModuleExcludes : SymbolFlags
+
+        NamespaceModuleExcludes = 0,

+>NamespaceModuleExcludes : SymbolFlags
+
+        MethodExcludes = 99263,

+>MethodExcludes : SymbolFlags
+
+        GetAccessorExcludes = 41919,

+>GetAccessorExcludes : SymbolFlags
+
+        SetAccessorExcludes = 74687,

+>SetAccessorExcludes : SymbolFlags
+
+        TypeParameterExcludes = 530912,

+>TypeParameterExcludes : SymbolFlags
+
+        TypeAliasExcludes = 793056,

+>TypeAliasExcludes : SymbolFlags
+
+        AliasExcludes = 8388608,

+>AliasExcludes : SymbolFlags
+
+        ModuleMember = 8914931,

+>ModuleMember : SymbolFlags
+
+        ExportHasLocal = 944,

+>ExportHasLocal : SymbolFlags
+
+        HasLocals = 255504,

+>HasLocals : SymbolFlags
+
+        HasExports = 1952,

+>HasExports : SymbolFlags
+
+        HasMembers = 6240,

+>HasMembers : SymbolFlags
+
+        IsContainer = 262128,

+>IsContainer : SymbolFlags
+
+        PropertyOrAccessor = 98308,

+>PropertyOrAccessor : SymbolFlags
+
+        Export = 7340032,

+>Export : SymbolFlags
+    }

+    interface Symbol {

+>Symbol : Symbol
+
+        flags: SymbolFlags;

+>flags : SymbolFlags
+>SymbolFlags : SymbolFlags
+
+        name: string;

+>name : string
+
+        id?: number;

+>id : number
+
+        mergeId?: number;

+>mergeId : number
+
+        declarations?: Declaration[];

+>declarations : Declaration[]
+>Declaration : Declaration
+
+        parent?: Symbol;

+>parent : Symbol
+>Symbol : Symbol
+
+        members?: SymbolTable;

+>members : SymbolTable
+>SymbolTable : SymbolTable
+
+        exports?: SymbolTable;

+>exports : SymbolTable
+>SymbolTable : SymbolTable
+
+        exportSymbol?: Symbol;

+>exportSymbol : Symbol
+>Symbol : Symbol
+
+        valueDeclaration?: Declaration;

+>valueDeclaration : Declaration
+>Declaration : Declaration
+
+        constEnumOnlyModule?: boolean;

+>constEnumOnlyModule : boolean
+    }

+    interface SymbolLinks {

+>SymbolLinks : SymbolLinks
+
+        target?: Symbol;

+>target : Symbol
+>Symbol : Symbol
+
+        type?: Type;

+>type : Type
+>Type : Type
+
+        declaredType?: Type;

+>declaredType : Type
+>Type : Type
+
+        mapper?: TypeMapper;

+>mapper : TypeMapper
+>TypeMapper : TypeMapper
+
+        referenced?: boolean;

+>referenced : boolean
+
+        unionType?: UnionType;

+>unionType : UnionType
+>UnionType : UnionType
+
+        resolvedExports?: SymbolTable;

+>resolvedExports : SymbolTable
+>SymbolTable : SymbolTable
+
+        exportsChecked?: boolean;

+>exportsChecked : boolean
+    }

+    interface TransientSymbol extends Symbol, SymbolLinks {

+>TransientSymbol : TransientSymbol
+>Symbol : Symbol
+>SymbolLinks : SymbolLinks
+    }

+    interface SymbolTable {

+>SymbolTable : SymbolTable
+
+        [index: string]: Symbol;

+>index : string
+>Symbol : Symbol
+    }

+    const enum NodeCheckFlags {

+>NodeCheckFlags : NodeCheckFlags
+
+        TypeChecked = 1,

+>TypeChecked : NodeCheckFlags
+
+        LexicalThis = 2,

+>LexicalThis : NodeCheckFlags
+
+        CaptureThis = 4,

+>CaptureThis : NodeCheckFlags
+
+        EmitExtends = 8,

+>EmitExtends : NodeCheckFlags
+
+        SuperInstance = 16,

+>SuperInstance : NodeCheckFlags
+
+        SuperStatic = 32,

+>SuperStatic : NodeCheckFlags
+
+        ContextChecked = 64,

+>ContextChecked : NodeCheckFlags
+
+        EnumValuesComputed = 128,

+>EnumValuesComputed : NodeCheckFlags
+
+        BlockScopedBindingInLoop = 256,

+>BlockScopedBindingInLoop : NodeCheckFlags
+
+        EmitDecorate = 512,

+>EmitDecorate : NodeCheckFlags
+    }

+    interface NodeLinks {

+>NodeLinks : NodeLinks
+
+        resolvedType?: Type;

+>resolvedType : Type
+>Type : Type
+
+        resolvedSignature?: Signature;

+>resolvedSignature : Signature
+>Signature : Signature
+
+        resolvedSymbol?: Symbol;

+>resolvedSymbol : Symbol
+>Symbol : Symbol
+
+        flags?: NodeCheckFlags;

+>flags : NodeCheckFlags
+>NodeCheckFlags : NodeCheckFlags
+
+        enumMemberValue?: number;

+>enumMemberValue : number
+
+        isIllegalTypeReferenceInConstraint?: boolean;

+>isIllegalTypeReferenceInConstraint : boolean
+
+        isVisible?: boolean;

+>isVisible : boolean
+
+        generatedName?: string;

+>generatedName : string
+
+        generatedNames?: Map<string>;

+>generatedNames : Map<string>
+>Map : Map<T>
+
+        assignmentChecks?: Map<boolean>;

+>assignmentChecks : Map<boolean>
+>Map : Map<T>
+
+        hasReportedStatementInAmbientContext?: boolean;

+>hasReportedStatementInAmbientContext : boolean
+
+        importOnRightSide?: Symbol;

+>importOnRightSide : Symbol
+>Symbol : Symbol
+    }

+    const enum TypeFlags {

+>TypeFlags : TypeFlags
+
+        Any = 1,

+>Any : TypeFlags
+
+        String = 2,

+>String : TypeFlags
+
+        Number = 4,

+>Number : TypeFlags
+
+        Boolean = 8,

+>Boolean : TypeFlags
+
+        Void = 16,

+>Void : TypeFlags
+
+        Undefined = 32,

+>Undefined : TypeFlags
+
+        Null = 64,

+>Null : TypeFlags
+
+        Enum = 128,

+>Enum : TypeFlags
+
+        StringLiteral = 256,

+>StringLiteral : TypeFlags
+
+        TypeParameter = 512,

+>TypeParameter : TypeFlags
+
+        Class = 1024,

+>Class : TypeFlags
+
+        Interface = 2048,

+>Interface : TypeFlags
+
+        Reference = 4096,

+>Reference : TypeFlags
+
+        Tuple = 8192,

+>Tuple : TypeFlags
+
+        Union = 16384,

+>Union : TypeFlags
+
+        Anonymous = 32768,

+>Anonymous : TypeFlags
+
+        FromSignature = 65536,

+>FromSignature : TypeFlags
+
+        ObjectLiteral = 131072,

+>ObjectLiteral : TypeFlags
+
+        ContainsUndefinedOrNull = 262144,

+>ContainsUndefinedOrNull : TypeFlags
+
+        ContainsObjectLiteral = 524288,

+>ContainsObjectLiteral : TypeFlags
+
+        ESSymbol = 1048576,

+>ESSymbol : TypeFlags
+
+        Intrinsic = 1048703,

+>Intrinsic : TypeFlags
+
+        Primitive = 1049086,

+>Primitive : TypeFlags
+
+        StringLike = 258,

+>StringLike : TypeFlags
+
+        NumberLike = 132,

+>NumberLike : TypeFlags
+
+        ObjectType = 48128,

+>ObjectType : TypeFlags
+
+        RequiresWidening = 786432,

+>RequiresWidening : TypeFlags
+    }

+    interface Type {

+>Type : Type
+
+        flags: TypeFlags;

+>flags : TypeFlags
+>TypeFlags : TypeFlags
+
+        id: number;

+>id : number
+
+        symbol?: Symbol;

+>symbol : Symbol
+>Symbol : Symbol
+    }

+    interface IntrinsicType extends Type {

+>IntrinsicType : IntrinsicType
+>Type : Type
+
+        intrinsicName: string;

+>intrinsicName : string
+    }

+    interface StringLiteralType extends Type {

+>StringLiteralType : StringLiteralType
+>Type : Type
+
+        text: string;

+>text : string
+    }

+    interface ObjectType extends Type {

+>ObjectType : ObjectType
+>Type : Type
+    }

+    interface InterfaceType extends ObjectType {

+>InterfaceType : InterfaceType
+>ObjectType : ObjectType
+
+        typeParameters: TypeParameter[];

+>typeParameters : TypeParameter[]
+>TypeParameter : TypeParameter
+
+        baseTypes: ObjectType[];

+>baseTypes : ObjectType[]
+>ObjectType : ObjectType
+
+        declaredProperties: Symbol[];

+>declaredProperties : Symbol[]
+>Symbol : Symbol
+
+        declaredCallSignatures: Signature[];

+>declaredCallSignatures : Signature[]
+>Signature : Signature
+
+        declaredConstructSignatures: Signature[];

+>declaredConstructSignatures : Signature[]
+>Signature : Signature
+
+        declaredStringIndexType: Type;

+>declaredStringIndexType : Type
+>Type : Type
+
+        declaredNumberIndexType: Type;

+>declaredNumberIndexType : Type
+>Type : Type
+    }

+    interface TypeReference extends ObjectType {

+>TypeReference : TypeReference
+>ObjectType : ObjectType
+
+        target: GenericType;

+>target : GenericType
+>GenericType : GenericType
+
+        typeArguments: Type[];

+>typeArguments : Type[]
+>Type : Type
+    }

+    interface GenericType extends InterfaceType, TypeReference {

+>GenericType : GenericType
+>InterfaceType : InterfaceType
+>TypeReference : TypeReference
+
+        instantiations: Map<TypeReference>;

+>instantiations : Map<TypeReference>
+>Map : Map<T>
+>TypeReference : TypeReference
+    }

+    interface TupleType extends ObjectType {

+>TupleType : TupleType
+>ObjectType : ObjectType
+
+        elementTypes: Type[];

+>elementTypes : Type[]
+>Type : Type
+
+        baseArrayType: TypeReference;

+>baseArrayType : TypeReference
+>TypeReference : TypeReference
+    }

+    interface UnionType extends Type {

+>UnionType : UnionType
+>Type : Type
+
+        types: Type[];

+>types : Type[]
+>Type : Type
+
+        resolvedProperties: SymbolTable;

+>resolvedProperties : SymbolTable
+>SymbolTable : SymbolTable
+    }

+    interface ResolvedType extends ObjectType, UnionType {

+>ResolvedType : ResolvedType
+>ObjectType : ObjectType
+>UnionType : UnionType
+
+        members: SymbolTable;

+>members : SymbolTable
+>SymbolTable : SymbolTable
+
+        properties: Symbol[];

+>properties : Symbol[]
+>Symbol : Symbol
+
+        callSignatures: Signature[];

+>callSignatures : Signature[]
+>Signature : Signature
+
+        constructSignatures: Signature[];

+>constructSignatures : Signature[]
+>Signature : Signature
+
+        stringIndexType: Type;

+>stringIndexType : Type
+>Type : Type
+
+        numberIndexType: Type;

+>numberIndexType : Type
+>Type : Type
+    }

+    interface TypeParameter extends Type {

+>TypeParameter : TypeParameter
+>Type : Type
+
+        constraint: Type;

+>constraint : Type
+>Type : Type
+
+        target?: TypeParameter;

+>target : TypeParameter
+>TypeParameter : TypeParameter
+
+        mapper?: TypeMapper;

+>mapper : TypeMapper
+>TypeMapper : TypeMapper
+    }

+    const enum SignatureKind {

+>SignatureKind : SignatureKind
+
+        Call = 0,

+>Call : SignatureKind
+
+        Construct = 1,

+>Construct : SignatureKind
+    }

+    interface Signature {

+>Signature : Signature
+
+        declaration: SignatureDeclaration;

+>declaration : SignatureDeclaration
+>SignatureDeclaration : SignatureDeclaration
+
+        typeParameters: TypeParameter[];

+>typeParameters : TypeParameter[]
+>TypeParameter : TypeParameter
+
+        parameters: Symbol[];

+>parameters : Symbol[]
+>Symbol : Symbol
+
+        resolvedReturnType: Type;

+>resolvedReturnType : Type
+>Type : Type
+
+        minArgumentCount: number;

+>minArgumentCount : number
+
+        hasRestParameter: boolean;

+>hasRestParameter : boolean
+
+        hasStringLiterals: boolean;

+>hasStringLiterals : boolean
+
+        target?: Signature;

+>target : Signature
+>Signature : Signature
+
+        mapper?: TypeMapper;

+>mapper : TypeMapper
+>TypeMapper : TypeMapper
+
+        unionSignatures?: Signature[];

+>unionSignatures : Signature[]
+>Signature : Signature
+
+        erasedSignatureCache?: Signature;

+>erasedSignatureCache : Signature
+>Signature : Signature
+
+        isolatedSignatureType?: ObjectType;

+>isolatedSignatureType : ObjectType
+>ObjectType : ObjectType
+    }

+    const enum IndexKind {

+>IndexKind : IndexKind
+
+        String = 0,

+>String : IndexKind
+
+        Number = 1,

+>Number : IndexKind
+    }

+    interface TypeMapper {

+>TypeMapper : TypeMapper
+
+        (t: Type): Type;

+>t : Type
+>Type : Type
+>Type : Type
+    }

+    interface DiagnosticMessage {

+>DiagnosticMessage : DiagnosticMessage
+
+        key: string;

+>key : string
+
+        category: DiagnosticCategory;

+>category : DiagnosticCategory
+>DiagnosticCategory : DiagnosticCategory
+
+        code: number;

+>code : number
+    }

+    interface DiagnosticMessageChain {

+>DiagnosticMessageChain : DiagnosticMessageChain
+
+        messageText: string;

+>messageText : string
+
+        category: DiagnosticCategory;

+>category : DiagnosticCategory
+>DiagnosticCategory : DiagnosticCategory
+
+        code: number;

+>code : number
+
+        next?: DiagnosticMessageChain;

+>next : DiagnosticMessageChain
+>DiagnosticMessageChain : DiagnosticMessageChain
+    }

+    interface Diagnostic {

+>Diagnostic : Diagnostic
+
+        file: SourceFile;

+>file : SourceFile
+>SourceFile : SourceFile
+
+        start: number;

+>start : number
+
+        length: number;

+>length : number
+
+        messageText: string | DiagnosticMessageChain;

+>messageText : string | DiagnosticMessageChain
+>DiagnosticMessageChain : DiagnosticMessageChain
+
+        category: DiagnosticCategory;

+>category : DiagnosticCategory
+>DiagnosticCategory : DiagnosticCategory
+
+        code: number;

+>code : number
+    }

+    enum DiagnosticCategory {

+>DiagnosticCategory : DiagnosticCategory
+
+        Warning = 0,

+>Warning : DiagnosticCategory
+
+        Error = 1,

+>Error : DiagnosticCategory
+
+        Message = 2,

+>Message : DiagnosticCategory
+    }

+    interface CompilerOptions {

+>CompilerOptions : CompilerOptions
+
+        allowNonTsExtensions?: boolean;

+>allowNonTsExtensions : boolean
+
+        charset?: string;

+>charset : string
+
+        declaration?: boolean;

+>declaration : boolean
+
+        diagnostics?: boolean;

+>diagnostics : boolean
+
+        emitBOM?: boolean;

+>emitBOM : boolean
+
+        help?: boolean;

+>help : boolean
+
+        listFiles?: boolean;

+>listFiles : boolean
+
+        locale?: string;

+>locale : string
+
+        mapRoot?: string;

+>mapRoot : string
+
+        module?: ModuleKind;

+>module : ModuleKind
+>ModuleKind : ModuleKind
+
+        noEmit?: boolean;

+>noEmit : boolean
+
+        noEmitOnError?: boolean;

+>noEmitOnError : boolean
+
+        noErrorTruncation?: boolean;

+>noErrorTruncation : boolean
+
+        noImplicitAny?: boolean;

+>noImplicitAny : boolean
+
+        noLib?: boolean;

+>noLib : boolean
+
+        noResolve?: boolean;

+>noResolve : boolean
+
+        out?: string;

+>out : string
+
+        outDir?: string;

+>outDir : string
+
+        preserveConstEnums?: boolean;

+>preserveConstEnums : boolean
+
+        project?: string;

+>project : string
+
+        removeComments?: boolean;

+>removeComments : boolean
+
+        sourceMap?: boolean;

+>sourceMap : boolean
+
+        sourceRoot?: string;

+>sourceRoot : string
+
+        suppressImplicitAnyIndexErrors?: boolean;

+>suppressImplicitAnyIndexErrors : boolean
+
+        target?: ScriptTarget;

+>target : ScriptTarget
+>ScriptTarget : ScriptTarget
+
+        version?: boolean;

+>version : boolean
+
+        watch?: boolean;

+>watch : boolean
+
+        separateCompilation?: boolean;

+>separateCompilation : boolean
+
+        [option: string]: string | number | boolean;

+>option : string
+    }

+    const enum ModuleKind {

+>ModuleKind : ModuleKind
+
+        None = 0,

+>None : ModuleKind
+
+        CommonJS = 1,

+>CommonJS : ModuleKind
+
+        AMD = 2,

+>AMD : ModuleKind
+    }

+    interface LineAndCharacter {

+>LineAndCharacter : LineAndCharacter
+
+        line: number;

+>line : number
+
+        character: number;

+>character : number
+    }

+    const enum ScriptTarget {

+>ScriptTarget : ScriptTarget
+
+        ES3 = 0,

+>ES3 : ScriptTarget
+
+        ES5 = 1,

+>ES5 : ScriptTarget
+
+        ES6 = 2,

+>ES6 : ScriptTarget
+
+        Latest = 2,

+>Latest : ScriptTarget
+    }

+    interface ParsedCommandLine {

+>ParsedCommandLine : ParsedCommandLine
+
+        options: CompilerOptions;

+>options : CompilerOptions
+>CompilerOptions : CompilerOptions
+
+        fileNames: string[];

+>fileNames : string[]
+
+        errors: Diagnostic[];

+>errors : Diagnostic[]
+>Diagnostic : Diagnostic
+    }

+    interface CommandLineOption {

+>CommandLineOption : CommandLineOption
+
+        name: string;

+>name : string
+
+        type: string | Map<number>;

+>type : string | Map<number>
+>Map : Map<T>
+
+        isFilePath?: boolean;

+>isFilePath : boolean
+
+        shortName?: string;

+>shortName : string
+
+        description?: DiagnosticMessage;

+>description : DiagnosticMessage
+>DiagnosticMessage : DiagnosticMessage
+
+        paramType?: DiagnosticMessage;

+>paramType : DiagnosticMessage
+>DiagnosticMessage : DiagnosticMessage
+
+        error?: DiagnosticMessage;

+>error : DiagnosticMessage
+>DiagnosticMessage : DiagnosticMessage
+
+        experimental?: boolean;

+>experimental : boolean
+    }

+    const enum CharacterCodes {

+>CharacterCodes : CharacterCodes
+
+        nullCharacter = 0,

+>nullCharacter : CharacterCodes
+
+        maxAsciiCharacter = 127,

+>maxAsciiCharacter : CharacterCodes
+
+        lineFeed = 10,

+>lineFeed : CharacterCodes
+
+        carriageReturn = 13,

+>carriageReturn : CharacterCodes
+
+        lineSeparator = 8232,

+>lineSeparator : CharacterCodes
+
+        paragraphSeparator = 8233,

+>paragraphSeparator : CharacterCodes
+
+        nextLine = 133,

+>nextLine : CharacterCodes
+
+        space = 32,

+>space : CharacterCodes
+
+        nonBreakingSpace = 160,

+>nonBreakingSpace : CharacterCodes
+
+        enQuad = 8192,

+>enQuad : CharacterCodes
+
+        emQuad = 8193,

+>emQuad : CharacterCodes
+
+        enSpace = 8194,

+>enSpace : CharacterCodes
+
+        emSpace = 8195,

+>emSpace : CharacterCodes
+
+        threePerEmSpace = 8196,

+>threePerEmSpace : CharacterCodes
+
+        fourPerEmSpace = 8197,

+>fourPerEmSpace : CharacterCodes
+
+        sixPerEmSpace = 8198,

+>sixPerEmSpace : CharacterCodes
+
+        figureSpace = 8199,

+>figureSpace : CharacterCodes
+
+        punctuationSpace = 8200,

+>punctuationSpace : CharacterCodes
+
+        thinSpace = 8201,

+>thinSpace : CharacterCodes
+
+        hairSpace = 8202,

+>hairSpace : CharacterCodes
+
+        zeroWidthSpace = 8203,

+>zeroWidthSpace : CharacterCodes
+
+        narrowNoBreakSpace = 8239,

+>narrowNoBreakSpace : CharacterCodes
+
+        ideographicSpace = 12288,

+>ideographicSpace : CharacterCodes
+
+        mathematicalSpace = 8287,

+>mathematicalSpace : CharacterCodes
+
+        ogham = 5760,

+>ogham : CharacterCodes
+
+        _ = 95,

+>_ : CharacterCodes
+
+        $ = 36,

+>$ : CharacterCodes
+
+        _0 = 48,

+>_0 : CharacterCodes
+
+        _1 = 49,

+>_1 : CharacterCodes
+
+        _2 = 50,

+>_2 : CharacterCodes
+
+        _3 = 51,

+>_3 : CharacterCodes
+
+        _4 = 52,

+>_4 : CharacterCodes
+
+        _5 = 53,

+>_5 : CharacterCodes
+
+        _6 = 54,

+>_6 : CharacterCodes
+
+        _7 = 55,

+>_7 : CharacterCodes
+
+        _8 = 56,

+>_8 : CharacterCodes
+
+        _9 = 57,

+>_9 : CharacterCodes
+
+        a = 97,

+>a : CharacterCodes
+
+        b = 98,

+>b : CharacterCodes
+
+        c = 99,

+>c : CharacterCodes
+
+        d = 100,

+>d : CharacterCodes
+
+        e = 101,

+>e : CharacterCodes
+
+        f = 102,

+>f : CharacterCodes
+
+        g = 103,

+>g : CharacterCodes
+
+        h = 104,

+>h : CharacterCodes
+
+        i = 105,

+>i : CharacterCodes
+
+        j = 106,

+>j : CharacterCodes
+
+        k = 107,

+>k : CharacterCodes
+
+        l = 108,

+>l : CharacterCodes
+
+        m = 109,

+>m : CharacterCodes
+
+        n = 110,

+>n : CharacterCodes
+
+        o = 111,

+>o : CharacterCodes
+
+        p = 112,

+>p : CharacterCodes
+
+        q = 113,

+>q : CharacterCodes
+
+        r = 114,

+>r : CharacterCodes
+
+        s = 115,

+>s : CharacterCodes
+
+        t = 116,

+>t : CharacterCodes
+
+        u = 117,

+>u : CharacterCodes
+
+        v = 118,

+>v : CharacterCodes
+
+        w = 119,

+>w : CharacterCodes
+
+        x = 120,

+>x : CharacterCodes
+
+        y = 121,

+>y : CharacterCodes
+
+        z = 122,

+>z : CharacterCodes
+
+        A = 65,

+>A : CharacterCodes
+
+        B = 66,

+>B : CharacterCodes
+
+        C = 67,

+>C : CharacterCodes
+
+        D = 68,

+>D : CharacterCodes
+
+        E = 69,

+>E : CharacterCodes
+
+        F = 70,

+>F : CharacterCodes
+
+        G = 71,

+>G : CharacterCodes
+
+        H = 72,

+>H : CharacterCodes
+
+        I = 73,

+>I : CharacterCodes
+
+        J = 74,

+>J : CharacterCodes
+
+        K = 75,

+>K : CharacterCodes
+
+        L = 76,

+>L : CharacterCodes
+
+        M = 77,

+>M : CharacterCodes
+
+        N = 78,

+>N : CharacterCodes
+
+        O = 79,

+>O : CharacterCodes
+
+        P = 80,

+>P : CharacterCodes
+
+        Q = 81,

+>Q : CharacterCodes
+
+        R = 82,

+>R : CharacterCodes
+
+        S = 83,

+>S : CharacterCodes
+
+        T = 84,

+>T : CharacterCodes
+
+        U = 85,

+>U : CharacterCodes
+
+        V = 86,

+>V : CharacterCodes
+
+        W = 87,

+>W : CharacterCodes
+
+        X = 88,

+>X : CharacterCodes
+
+        Y = 89,

+>Y : CharacterCodes
+
+        Z = 90,

+>Z : CharacterCodes
+
+        ampersand = 38,

+>ampersand : CharacterCodes
+
+        asterisk = 42,

+>asterisk : CharacterCodes
+
+        at = 64,

+>at : CharacterCodes
+
+        backslash = 92,

+>backslash : CharacterCodes
+
+        backtick = 96,

+>backtick : CharacterCodes
+
+        bar = 124,

+>bar : CharacterCodes
+
+        caret = 94,

+>caret : CharacterCodes
+
+        closeBrace = 125,

+>closeBrace : CharacterCodes
+
+        closeBracket = 93,

+>closeBracket : CharacterCodes
+
+        closeParen = 41,

+>closeParen : CharacterCodes
+
+        colon = 58,

+>colon : CharacterCodes
+
+        comma = 44,

+>comma : CharacterCodes
+
+        dot = 46,

+>dot : CharacterCodes
+
+        doubleQuote = 34,

+>doubleQuote : CharacterCodes
+
+        equals = 61,

+>equals : CharacterCodes
+
+        exclamation = 33,

+>exclamation : CharacterCodes
+
+        greaterThan = 62,

+>greaterThan : CharacterCodes
+
+        hash = 35,

+>hash : CharacterCodes
+
+        lessThan = 60,

+>lessThan : CharacterCodes
+
+        minus = 45,

+>minus : CharacterCodes
+
+        openBrace = 123,

+>openBrace : CharacterCodes
+
+        openBracket = 91,

+>openBracket : CharacterCodes
+
+        openParen = 40,

+>openParen : CharacterCodes
+
+        percent = 37,

+>percent : CharacterCodes
+
+        plus = 43,

+>plus : CharacterCodes
+
+        question = 63,

+>question : CharacterCodes
+
+        semicolon = 59,

+>semicolon : CharacterCodes
+
+        singleQuote = 39,

+>singleQuote : CharacterCodes
+
+        slash = 47,

+>slash : CharacterCodes
+
+        tilde = 126,

+>tilde : CharacterCodes
+
+        backspace = 8,

+>backspace : CharacterCodes
+
+        formFeed = 12,

+>formFeed : CharacterCodes
+
+        byteOrderMark = 65279,

+>byteOrderMark : CharacterCodes
+
+        tab = 9,

+>tab : CharacterCodes
+
+        verticalTab = 11,

+>verticalTab : CharacterCodes
+    }

+    interface CancellationToken {

+>CancellationToken : CancellationToken
+
+        isCancellationRequested(): boolean;

+>isCancellationRequested : () => boolean
+    }

+    interface CompilerHost {

+>CompilerHost : CompilerHost
+
+        getSourceFile(fileName: string, languageVersion: ScriptTarget, onError?: (message: string) => void): SourceFile;

+>getSourceFile : (fileName: string, languageVersion: ScriptTarget, onError?: (message: string) => void) => SourceFile
+>fileName : string
+>languageVersion : ScriptTarget
+>ScriptTarget : ScriptTarget
+>onError : (message: string) => void
+>message : string
+>SourceFile : SourceFile
+
+        getDefaultLibFileName(options: CompilerOptions): string;

+>getDefaultLibFileName : (options: CompilerOptions) => string
+>options : CompilerOptions
+>CompilerOptions : CompilerOptions
+
+        getCancellationToken?(): CancellationToken;

+>getCancellationToken : () => CancellationToken
+>CancellationToken : CancellationToken
+
+        writeFile: WriteFileCallback;

+>writeFile : WriteFileCallback
+>WriteFileCallback : WriteFileCallback
+
+        getCurrentDirectory(): string;

+>getCurrentDirectory : () => string
+
+        getCanonicalFileName(fileName: string): string;

+>getCanonicalFileName : (fileName: string) => string
+>fileName : string
+
+        useCaseSensitiveFileNames(): boolean;

+>useCaseSensitiveFileNames : () => boolean
+
+        getNewLine(): string;

+>getNewLine : () => string
+    }

+    interface TextSpan {

+>TextSpan : TextSpan
+
+        start: number;

+>start : number
+
+        length: number;

+>length : number
+    }

+    interface TextChangeRange {

+>TextChangeRange : TextChangeRange
+
+        span: TextSpan;

+>span : TextSpan
+>TextSpan : TextSpan
+
+        newLength: number;

+>newLength : number
+    }

+}

+declare module "typescript" {

+    interface ErrorCallback {

+>ErrorCallback : ErrorCallback
+
+        (message: DiagnosticMessage, length: number): void;

+>message : DiagnosticMessage
+>DiagnosticMessage : DiagnosticMessage
+>length : number
+    }

+    interface Scanner {

+>Scanner : Scanner
+
+        getStartPos(): number;

+>getStartPos : () => number
+
+        getToken(): SyntaxKind;

+>getToken : () => SyntaxKind
+>SyntaxKind : SyntaxKind
+
+        getTextPos(): number;

+>getTextPos : () => number
+
+        getTokenPos(): number;

+>getTokenPos : () => number
+
+        getTokenText(): string;

+>getTokenText : () => string
+
+        getTokenValue(): string;

+>getTokenValue : () => string
+
+        hasExtendedUnicodeEscape(): boolean;

+>hasExtendedUnicodeEscape : () => boolean
+
+        hasPrecedingLineBreak(): boolean;

+>hasPrecedingLineBreak : () => boolean
+
+        isIdentifier(): boolean;

+>isIdentifier : () => boolean
+
+        isReservedWord(): boolean;

+>isReservedWord : () => boolean
+
+        isUnterminated(): boolean;

+>isUnterminated : () => boolean
+
+        reScanGreaterToken(): SyntaxKind;

+>reScanGreaterToken : () => SyntaxKind
+>SyntaxKind : SyntaxKind
+
+        reScanSlashToken(): SyntaxKind;

+>reScanSlashToken : () => SyntaxKind
+>SyntaxKind : SyntaxKind
+
+        reScanTemplateToken(): SyntaxKind;

+>reScanTemplateToken : () => SyntaxKind
+>SyntaxKind : SyntaxKind
+
+        scan(): SyntaxKind;

+>scan : () => SyntaxKind
+>SyntaxKind : SyntaxKind
+
+        setText(text: string): void;

+>setText : (text: string) => void
+>text : string
+
+        setTextPos(textPos: number): void;

+>setTextPos : (textPos: number) => void
+>textPos : number
+
+        lookAhead<T>(callback: () => T): T;

+>lookAhead : <T>(callback: () => T) => T
+>T : T
+>callback : () => T
+>T : T
+>T : T
+
+        tryScan<T>(callback: () => T): T;

+>tryScan : <T>(callback: () => T) => T
+>T : T
+>callback : () => T
+>T : T
+>T : T
+    }

+    function tokenToString(t: SyntaxKind): string;

+>tokenToString : (t: SyntaxKind) => string
+>t : SyntaxKind
+>SyntaxKind : SyntaxKind
+
+    function computeLineStarts(text: string): number[];

+>computeLineStarts : (text: string) => number[]
+>text : string
+
+    function getPositionOfLineAndCharacter(sourceFile: SourceFile, line: number, character: number): number;

+>getPositionOfLineAndCharacter : (sourceFile: SourceFile, line: number, character: number) => number
+>sourceFile : SourceFile
+>SourceFile : SourceFile
+>line : number
+>character : number
+
+    function computePositionOfLineAndCharacter(lineStarts: number[], line: number, character: number): number;

+>computePositionOfLineAndCharacter : (lineStarts: number[], line: number, character: number) => number
+>lineStarts : number[]
+>line : number
+>character : number
+
+    function getLineStarts(sourceFile: SourceFile): number[];

+>getLineStarts : (sourceFile: SourceFile) => number[]
+>sourceFile : SourceFile
+>SourceFile : SourceFile
+
+    function computeLineAndCharacterOfPosition(lineStarts: number[], position: number): {

+>computeLineAndCharacterOfPosition : (lineStarts: number[], position: number) => { line: number; character: number; }
+>lineStarts : number[]
+>position : number
+
+        line: number;

+>line : number
+
+        character: number;

+>character : number
+
+    };

+    function getLineAndCharacterOfPosition(sourceFile: SourceFile, position: number): LineAndCharacter;

+>getLineAndCharacterOfPosition : (sourceFile: SourceFile, position: number) => LineAndCharacter
+>sourceFile : SourceFile
+>SourceFile : SourceFile
+>position : number
+>LineAndCharacter : LineAndCharacter
+
+    function isWhiteSpace(ch: number): boolean;

+>isWhiteSpace : (ch: number) => boolean
+>ch : number
+
+    function isLineBreak(ch: number): boolean;

+>isLineBreak : (ch: number) => boolean
+>ch : number
+
+    function isOctalDigit(ch: number): boolean;

+>isOctalDigit : (ch: number) => boolean
+>ch : number
+
+    function skipTrivia(text: string, pos: number, stopAfterLineBreak?: boolean): number;

+>skipTrivia : (text: string, pos: number, stopAfterLineBreak?: boolean) => number
+>text : string
+>pos : number
+>stopAfterLineBreak : boolean
+
+    function getLeadingCommentRanges(text: string, pos: number): CommentRange[];

+>getLeadingCommentRanges : (text: string, pos: number) => CommentRange[]
+>text : string
+>pos : number
+>CommentRange : CommentRange
+
+    function getTrailingCommentRanges(text: string, pos: number): CommentRange[];

+>getTrailingCommentRanges : (text: string, pos: number) => CommentRange[]
+>text : string
+>pos : number
+>CommentRange : CommentRange
+
+    function isIdentifierStart(ch: number, languageVersion: ScriptTarget): boolean;

+>isIdentifierStart : (ch: number, languageVersion: ScriptTarget) => boolean
+>ch : number
+>languageVersion : ScriptTarget
+>ScriptTarget : ScriptTarget
+
+    function isIdentifierPart(ch: number, languageVersion: ScriptTarget): boolean;

+>isIdentifierPart : (ch: number, languageVersion: ScriptTarget) => boolean
+>ch : number
+>languageVersion : ScriptTarget
+>ScriptTarget : ScriptTarget
+
+    function createScanner(languageVersion: ScriptTarget, skipTrivia: boolean, text?: string, onError?: ErrorCallback): Scanner;

+>createScanner : (languageVersion: ScriptTarget, skipTrivia: boolean, text?: string, onError?: ErrorCallback) => Scanner
+>languageVersion : ScriptTarget
+>ScriptTarget : ScriptTarget
+>skipTrivia : boolean
+>text : string
+>onError : ErrorCallback
+>ErrorCallback : ErrorCallback
+>Scanner : Scanner
+}

+declare module "typescript" {

+    function getNodeConstructor(kind: SyntaxKind): new () => Node;

+>getNodeConstructor : (kind: SyntaxKind) => new () => Node
+>kind : SyntaxKind
+>SyntaxKind : SyntaxKind
+>Node : Node
+
+    function createNode(kind: SyntaxKind): Node;

+>createNode : (kind: SyntaxKind) => Node
+>kind : SyntaxKind
+>SyntaxKind : SyntaxKind
+>Node : Node
+
+    function forEachChild<T>(node: Node, cbNode: (node: Node) => T, cbNodeArray?: (nodes: Node[]) => T): T;

+>forEachChild : <T>(node: Node, cbNode: (node: Node) => T, cbNodeArray?: (nodes: Node[]) => T) => T
+>T : T
+>node : Node
+>Node : Node
+>cbNode : (node: Node) => T
+>node : Node
+>Node : Node
+>T : T
+>cbNodeArray : (nodes: Node[]) => T
+>nodes : Node[]
+>Node : Node
+>T : T
+>T : T
+
+    function modifierToFlag(token: SyntaxKind): NodeFlags;

+>modifierToFlag : (token: SyntaxKind) => NodeFlags
+>token : SyntaxKind
+>SyntaxKind : SyntaxKind
+>NodeFlags : NodeFlags
+
+    function updateSourceFile(sourceFile: SourceFile, newText: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;

+>updateSourceFile : (sourceFile: SourceFile, newText: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean) => SourceFile
+>sourceFile : SourceFile
+>SourceFile : SourceFile
+>newText : string
+>textChangeRange : TextChangeRange
+>TextChangeRange : TextChangeRange
+>aggressiveChecks : boolean
+>SourceFile : SourceFile
+
+    function isEvalOrArgumentsIdentifier(node: Node): boolean;

+>isEvalOrArgumentsIdentifier : (node: Node) => boolean
+>node : Node
+>Node : Node
+
+    function createSourceFile(fileName: string, sourceText: string, languageVersion: ScriptTarget, setParentNodes?: boolean): SourceFile;

+>createSourceFile : (fileName: string, sourceText: string, languageVersion: ScriptTarget, setParentNodes?: boolean) => SourceFile
+>fileName : string
+>sourceText : string
+>languageVersion : ScriptTarget
+>ScriptTarget : ScriptTarget
+>setParentNodes : boolean
+>SourceFile : SourceFile
+
+    function isLeftHandSideExpression(expr: Expression): boolean;

+>isLeftHandSideExpression : (expr: Expression) => boolean
+>expr : Expression
+>Expression : Expression
+
+    function isAssignmentOperator(token: SyntaxKind): boolean;

+>isAssignmentOperator : (token: SyntaxKind) => boolean
+>token : SyntaxKind
+>SyntaxKind : SyntaxKind
+}

+declare module "typescript" {

+    function createTypeChecker(host: TypeCheckerHost, produceDiagnostics: boolean): TypeChecker;

+>createTypeChecker : (host: TypeCheckerHost, produceDiagnostics: boolean) => TypeChecker
+>host : TypeCheckerHost
+>TypeCheckerHost : TypeCheckerHost
+>produceDiagnostics : boolean
+>TypeChecker : TypeChecker
+}

+declare module "typescript" {

+    /** The version of the TypeScript compiler release */

+    let version: string;

+>version : string
+
+    function findConfigFile(searchPath: string): string;

+>findConfigFile : (searchPath: string) => string
+>searchPath : string
+
+    function createCompilerHost(options: CompilerOptions, setParentNodes?: boolean): CompilerHost;

+>createCompilerHost : (options: CompilerOptions, setParentNodes?: boolean) => CompilerHost
+>options : CompilerOptions
+>CompilerOptions : CompilerOptions
+>setParentNodes : boolean
+>CompilerHost : CompilerHost
+
+    function getPreEmitDiagnostics(program: Program): Diagnostic[];

+>getPreEmitDiagnostics : (program: Program) => Diagnostic[]
+>program : Program
+>Program : Program
+>Diagnostic : Diagnostic
+
+    function flattenDiagnosticMessageText(messageText: string | DiagnosticMessageChain, newLine: string): string;

+>flattenDiagnosticMessageText : (messageText: string | DiagnosticMessageChain, newLine: string) => string
+>messageText : string | DiagnosticMessageChain
+>DiagnosticMessageChain : DiagnosticMessageChain
+>newLine : string
+
+    function createProgram(rootNames: string[], options: CompilerOptions, host?: CompilerHost): Program;

+>createProgram : (rootNames: string[], options: CompilerOptions, host?: CompilerHost) => Program
+>rootNames : string[]
+>options : CompilerOptions
+>CompilerOptions : CompilerOptions
+>host : CompilerHost
+>CompilerHost : CompilerHost
+>Program : Program
+}

+declare module "typescript" {

+    /** The version of the language service API */

+    let servicesVersion: string;

+>servicesVersion : string
+
+    interface Node {

+>Node : Node
+
+        getSourceFile(): SourceFile;

+>getSourceFile : () => SourceFile
+>SourceFile : SourceFile
+
+        getChildCount(sourceFile?: SourceFile): number;

+>getChildCount : (sourceFile?: SourceFile) => number
+>sourceFile : SourceFile
+>SourceFile : SourceFile
+
+        getChildAt(index: number, sourceFile?: SourceFile): Node;

+>getChildAt : (index: number, sourceFile?: SourceFile) => Node
+>index : number
+>sourceFile : SourceFile
+>SourceFile : SourceFile
+>Node : Node
+
+        getChildren(sourceFile?: SourceFile): Node[];

+>getChildren : (sourceFile?: SourceFile) => Node[]
+>sourceFile : SourceFile
+>SourceFile : SourceFile
+>Node : Node
+
+        getStart(sourceFile?: SourceFile): number;

+>getStart : (sourceFile?: SourceFile) => number
+>sourceFile : SourceFile
+>SourceFile : SourceFile
+
+        getFullStart(): number;

+>getFullStart : () => number
+
+        getEnd(): number;

+>getEnd : () => number
+
+        getWidth(sourceFile?: SourceFile): number;

+>getWidth : (sourceFile?: SourceFile) => number
+>sourceFile : SourceFile
+>SourceFile : SourceFile
+
+        getFullWidth(): number;

+>getFullWidth : () => number
+
+        getLeadingTriviaWidth(sourceFile?: SourceFile): number;

+>getLeadingTriviaWidth : (sourceFile?: SourceFile) => number
+>sourceFile : SourceFile
+>SourceFile : SourceFile
+
+        getFullText(sourceFile?: SourceFile): string;

+>getFullText : (sourceFile?: SourceFile) => string
+>sourceFile : SourceFile
+>SourceFile : SourceFile
+
+        getText(sourceFile?: SourceFile): string;

+>getText : (sourceFile?: SourceFile) => string
+>sourceFile : SourceFile
+>SourceFile : SourceFile
+
+        getFirstToken(sourceFile?: SourceFile): Node;

+>getFirstToken : (sourceFile?: SourceFile) => Node
+>sourceFile : SourceFile
+>SourceFile : SourceFile
+>Node : Node
+
+        getLastToken(sourceFile?: SourceFile): Node;

+>getLastToken : (sourceFile?: SourceFile) => Node
+>sourceFile : SourceFile
+>SourceFile : SourceFile
+>Node : Node
+    }

+    interface Symbol {

+>Symbol : Symbol
+
+        getFlags(): SymbolFlags;

+>getFlags : () => SymbolFlags
+>SymbolFlags : SymbolFlags
+
+        getName(): string;

+>getName : () => string
+
+        getDeclarations(): Declaration[];

+>getDeclarations : () => Declaration[]
+>Declaration : Declaration
+
+        getDocumentationComment(): SymbolDisplayPart[];

+>getDocumentationComment : () => SymbolDisplayPart[]
+>SymbolDisplayPart : SymbolDisplayPart
+    }

+    interface Type {

+>Type : Type
+
+        getFlags(): TypeFlags;

+>getFlags : () => TypeFlags
+>TypeFlags : TypeFlags
+
+        getSymbol(): Symbol;

+>getSymbol : () => Symbol
+>Symbol : Symbol
+
+        getProperties(): Symbol[];

+>getProperties : () => Symbol[]
+>Symbol : Symbol
+
+        getProperty(propertyName: string): Symbol;

+>getProperty : (propertyName: string) => Symbol
+>propertyName : string
+>Symbol : Symbol
+
+        getApparentProperties(): Symbol[];

+>getApparentProperties : () => Symbol[]
+>Symbol : Symbol
+
+        getCallSignatures(): Signature[];

+>getCallSignatures : () => Signature[]
+>Signature : Signature
+
+        getConstructSignatures(): Signature[];

+>getConstructSignatures : () => Signature[]
+>Signature : Signature
+
+        getStringIndexType(): Type;

+>getStringIndexType : () => Type
+>Type : Type
+
+        getNumberIndexType(): Type;

+>getNumberIndexType : () => Type
+>Type : Type
+    }

+    interface Signature {

+>Signature : Signature
+
+        getDeclaration(): SignatureDeclaration;

+>getDeclaration : () => SignatureDeclaration
+>SignatureDeclaration : SignatureDeclaration
+
+        getTypeParameters(): Type[];

+>getTypeParameters : () => Type[]
+>Type : Type
+
+        getParameters(): Symbol[];

+>getParameters : () => Symbol[]
+>Symbol : Symbol
+
+        getReturnType(): Type;

+>getReturnType : () => Type
+>Type : Type
+
+        getDocumentationComment(): SymbolDisplayPart[];

+>getDocumentationComment : () => SymbolDisplayPart[]
+>SymbolDisplayPart : SymbolDisplayPart
+    }

+    interface SourceFile {

+>SourceFile : SourceFile
+
+        getNamedDeclarations(): Declaration[];

+>getNamedDeclarations : () => Declaration[]
+>Declaration : Declaration
+
+        getLineAndCharacterOfPosition(pos: number): LineAndCharacter;

+>getLineAndCharacterOfPosition : (pos: number) => LineAndCharacter
+>pos : number
+>LineAndCharacter : LineAndCharacter
+
+        getLineStarts(): number[];

+>getLineStarts : () => number[]
+
+        getPositionOfLineAndCharacter(line: number, character: number): number;

+>getPositionOfLineAndCharacter : (line: number, character: number) => number
+>line : number
+>character : number
+
+        update(newText: string, textChangeRange: TextChangeRange): SourceFile;

+>update : (newText: string, textChangeRange: TextChangeRange) => SourceFile
+>newText : string
+>textChangeRange : TextChangeRange
+>TextChangeRange : TextChangeRange
+>SourceFile : SourceFile
+    }

+    /**

+     * Represents an immutable snapshot of a script at a specified time.Once acquired, the

+     * snapshot is observably immutable. i.e. the same calls with the same parameters will return

+     * the same values.

+     */

+    interface IScriptSnapshot {

+>IScriptSnapshot : IScriptSnapshot
+
+        /** Gets a portion of the script snapshot specified by [start, end). */

+        getText(start: number, end: number): string;

+>getText : (start: number, end: number) => string
+>start : number
+>end : number
+
+        /** Gets the length of this script snapshot. */

+        getLength(): number;

+>getLength : () => number
+
+        /**

+         * Gets the TextChangeRange that describe how the text changed between this text and

+         * an older version.  This information is used by the incremental parser to determine

+         * what sections of the script need to be re-parsed.  'undefined' can be returned if the

+         * change range cannot be determined.  However, in that case, incremental parsing will

+         * not happen and the entire document will be re - parsed.

+         */

+        getChangeRange(oldSnapshot: IScriptSnapshot): TextChangeRange;

+>getChangeRange : (oldSnapshot: IScriptSnapshot) => TextChangeRange
+>oldSnapshot : IScriptSnapshot
+>IScriptSnapshot : IScriptSnapshot
+>TextChangeRange : TextChangeRange
+    }

+    module ScriptSnapshot {

+>ScriptSnapshot : typeof ScriptSnapshot
+
+        function fromString(text: string): IScriptSnapshot;

+>fromString : (text: string) => IScriptSnapshot
+>text : string
+>IScriptSnapshot : IScriptSnapshot
+    }

+    interface PreProcessedFileInfo {

+>PreProcessedFileInfo : PreProcessedFileInfo
+
+        referencedFiles: FileReference[];

+>referencedFiles : FileReference[]
+>FileReference : FileReference
+
+        importedFiles: FileReference[];

+>importedFiles : FileReference[]
+>FileReference : FileReference
+
+        isLibFile: boolean;

+>isLibFile : boolean
+    }

+    interface LanguageServiceHost {

+>LanguageServiceHost : LanguageServiceHost
+
+        getCompilationSettings(): CompilerOptions;

+>getCompilationSettings : () => CompilerOptions
+>CompilerOptions : CompilerOptions
+
+        getNewLine?(): string;

+>getNewLine : () => string
+
+        getScriptFileNames(): string[];

+>getScriptFileNames : () => string[]
+
+        getScriptVersion(fileName: string): string;

+>getScriptVersion : (fileName: string) => string
+>fileName : string
+
+        getScriptSnapshot(fileName: string): IScriptSnapshot;

+>getScriptSnapshot : (fileName: string) => IScriptSnapshot
+>fileName : string
+>IScriptSnapshot : IScriptSnapshot
+
+        getLocalizedDiagnosticMessages?(): any;

+>getLocalizedDiagnosticMessages : () => any
+
+        getCancellationToken?(): CancellationToken;

+>getCancellationToken : () => CancellationToken
+>CancellationToken : CancellationToken
+
+        getCurrentDirectory(): string;

+>getCurrentDirectory : () => string
+
+        getDefaultLibFileName(options: CompilerOptions): string;

+>getDefaultLibFileName : (options: CompilerOptions) => string
+>options : CompilerOptions
+>CompilerOptions : CompilerOptions
+
+        log?(s: string): void;

+>log : (s: string) => void
+>s : string
+
+        trace?(s: string): void;

+>trace : (s: string) => void
+>s : string
+
+        error?(s: string): void;

+>error : (s: string) => void
+>s : string
+    }

+    interface LanguageService {

+>LanguageService : LanguageService
+
+        cleanupSemanticCache(): void;

+>cleanupSemanticCache : () => void
+
+        getSyntacticDiagnostics(fileName: string): Diagnostic[];

+>getSyntacticDiagnostics : (fileName: string) => Diagnostic[]
+>fileName : string
+>Diagnostic : Diagnostic
+
+        getSemanticDiagnostics(fileName: string): Diagnostic[];

+>getSemanticDiagnostics : (fileName: string) => Diagnostic[]
+>fileName : string
+>Diagnostic : Diagnostic
+
+        getCompilerOptionsDiagnostics(): Diagnostic[];

+>getCompilerOptionsDiagnostics : () => Diagnostic[]
+>Diagnostic : Diagnostic
+
+        getSyntacticClassifications(fileName: string, span: TextSpan): ClassifiedSpan[];

+>getSyntacticClassifications : (fileName: string, span: TextSpan) => ClassifiedSpan[]
+>fileName : string
+>span : TextSpan
+>TextSpan : TextSpan
+>ClassifiedSpan : ClassifiedSpan
+
+        getSemanticClassifications(fileName: string, span: TextSpan): ClassifiedSpan[];

+>getSemanticClassifications : (fileName: string, span: TextSpan) => ClassifiedSpan[]
+>fileName : string
+>span : TextSpan
+>TextSpan : TextSpan
+>ClassifiedSpan : ClassifiedSpan
+
+        getCompletionsAtPosition(fileName: string, position: number): CompletionInfo;

+>getCompletionsAtPosition : (fileName: string, position: number) => CompletionInfo
+>fileName : string
+>position : number
+>CompletionInfo : CompletionInfo
+
+        getCompletionEntryDetails(fileName: string, position: number, entryName: string): CompletionEntryDetails;

+>getCompletionEntryDetails : (fileName: string, position: number, entryName: string) => CompletionEntryDetails
+>fileName : string
+>position : number
+>entryName : string
+>CompletionEntryDetails : CompletionEntryDetails
+
+        getQuickInfoAtPosition(fileName: string, position: number): QuickInfo;

+>getQuickInfoAtPosition : (fileName: string, position: number) => QuickInfo
+>fileName : string
+>position : number
+>QuickInfo : QuickInfo
+
+        getNameOrDottedNameSpan(fileName: string, startPos: number, endPos: number): TextSpan;

+>getNameOrDottedNameSpan : (fileName: string, startPos: number, endPos: number) => TextSpan
+>fileName : string
+>startPos : number
+>endPos : number
+>TextSpan : TextSpan
+
+        getBreakpointStatementAtPosition(fileName: string, position: number): TextSpan;

+>getBreakpointStatementAtPosition : (fileName: string, position: number) => TextSpan
+>fileName : string
+>position : number
+>TextSpan : TextSpan
+
+        getSignatureHelpItems(fileName: string, position: number): SignatureHelpItems;

+>getSignatureHelpItems : (fileName: string, position: number) => SignatureHelpItems
+>fileName : string
+>position : number
+>SignatureHelpItems : SignatureHelpItems
+
+        getRenameInfo(fileName: string, position: number): RenameInfo;

+>getRenameInfo : (fileName: string, position: number) => RenameInfo
+>fileName : string
+>position : number
+>RenameInfo : RenameInfo
+
+        findRenameLocations(fileName: string, position: number, findInStrings: boolean, findInComments: boolean): RenameLocation[];

+>findRenameLocations : (fileName: string, position: number, findInStrings: boolean, findInComments: boolean) => RenameLocation[]
+>fileName : string
+>position : number
+>findInStrings : boolean
+>findInComments : boolean
+>RenameLocation : RenameLocation
+
+        getDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[];

+>getDefinitionAtPosition : (fileName: string, position: number) => DefinitionInfo[]
+>fileName : string
+>position : number
+>DefinitionInfo : DefinitionInfo
+
+        getReferencesAtPosition(fileName: string, position: number): ReferenceEntry[];

+>getReferencesAtPosition : (fileName: string, position: number) => ReferenceEntry[]
+>fileName : string
+>position : number
+>ReferenceEntry : ReferenceEntry
+
+        getOccurrencesAtPosition(fileName: string, position: number): ReferenceEntry[];

+>getOccurrencesAtPosition : (fileName: string, position: number) => ReferenceEntry[]
+>fileName : string
+>position : number
+>ReferenceEntry : ReferenceEntry
+
+        findReferences(fileName: string, position: number): ReferencedSymbol[];

+>findReferences : (fileName: string, position: number) => ReferencedSymbol[]
+>fileName : string
+>position : number
+>ReferencedSymbol : ReferencedSymbol
+
+        getNavigateToItems(searchValue: string, maxResultCount?: number): NavigateToItem[];

+>getNavigateToItems : (searchValue: string, maxResultCount?: number) => NavigateToItem[]
+>searchValue : string
+>maxResultCount : number
+>NavigateToItem : NavigateToItem
+
+        getNavigationBarItems(fileName: string): NavigationBarItem[];

+>getNavigationBarItems : (fileName: string) => NavigationBarItem[]
+>fileName : string
+>NavigationBarItem : NavigationBarItem
+
+        getOutliningSpans(fileName: string): OutliningSpan[];

+>getOutliningSpans : (fileName: string) => OutliningSpan[]
+>fileName : string
+>OutliningSpan : OutliningSpan
+
+        getTodoComments(fileName: string, descriptors: TodoCommentDescriptor[]): TodoComment[];

+>getTodoComments : (fileName: string, descriptors: TodoCommentDescriptor[]) => TodoComment[]
+>fileName : string
+>descriptors : TodoCommentDescriptor[]
+>TodoCommentDescriptor : TodoCommentDescriptor
+>TodoComment : TodoComment
+
+        getBraceMatchingAtPosition(fileName: string, position: number): TextSpan[];

+>getBraceMatchingAtPosition : (fileName: string, position: number) => TextSpan[]
+>fileName : string
+>position : number
+>TextSpan : TextSpan
+
+        getIndentationAtPosition(fileName: string, position: number, options: EditorOptions): number;

+>getIndentationAtPosition : (fileName: string, position: number, options: EditorOptions) => number
+>fileName : string
+>position : number
+>options : EditorOptions
+>EditorOptions : EditorOptions
+
+        getFormattingEditsForRange(fileName: string, start: number, end: number, options: FormatCodeOptions): TextChange[];

+>getFormattingEditsForRange : (fileName: string, start: number, end: number, options: FormatCodeOptions) => TextChange[]
+>fileName : string
+>start : number
+>end : number
+>options : FormatCodeOptions
+>FormatCodeOptions : FormatCodeOptions
+>TextChange : TextChange
+
+        getFormattingEditsForDocument(fileName: string, options: FormatCodeOptions): TextChange[];

+>getFormattingEditsForDocument : (fileName: string, options: FormatCodeOptions) => TextChange[]
+>fileName : string
+>options : FormatCodeOptions
+>FormatCodeOptions : FormatCodeOptions
+>TextChange : TextChange
+
+        getFormattingEditsAfterKeystroke(fileName: string, position: number, key: string, options: FormatCodeOptions): TextChange[];

+>getFormattingEditsAfterKeystroke : (fileName: string, position: number, key: string, options: FormatCodeOptions) => TextChange[]
+>fileName : string
+>position : number
+>key : string
+>options : FormatCodeOptions
+>FormatCodeOptions : FormatCodeOptions
+>TextChange : TextChange
+
+        getEmitOutput(fileName: string): EmitOutput;

+>getEmitOutput : (fileName: string) => EmitOutput
+>fileName : string
+>EmitOutput : EmitOutput
+
+        getProgram(): Program;

+>getProgram : () => Program
+>Program : Program
+
+        getSourceFile(fileName: string): SourceFile;

+>getSourceFile : (fileName: string) => SourceFile
+>fileName : string
+>SourceFile : SourceFile
+
+        dispose(): void;

+>dispose : () => void
+    }

+    interface ClassifiedSpan {

+>ClassifiedSpan : ClassifiedSpan
+
+        textSpan: TextSpan;

+>textSpan : TextSpan
+>TextSpan : TextSpan
+
+        classificationType: string;

+>classificationType : string
+    }

+    interface NavigationBarItem {

+>NavigationBarItem : NavigationBarItem
+
+        text: string;

+>text : string
+
+        kind: string;

+>kind : string
+
+        kindModifiers: string;

+>kindModifiers : string
+
+        spans: TextSpan[];

+>spans : TextSpan[]
+>TextSpan : TextSpan
+
+        childItems: NavigationBarItem[];

+>childItems : NavigationBarItem[]
+>NavigationBarItem : NavigationBarItem
+
+        indent: number;

+>indent : number
+
+        bolded: boolean;

+>bolded : boolean
+
+        grayed: boolean;

+>grayed : boolean
+    }

+    interface TodoCommentDescriptor {

+>TodoCommentDescriptor : TodoCommentDescriptor
+
+        text: string;

+>text : string
+
+        priority: number;

+>priority : number
+    }

+    interface TodoComment {

+>TodoComment : TodoComment
+
+        descriptor: TodoCommentDescriptor;

+>descriptor : TodoCommentDescriptor
+>TodoCommentDescriptor : TodoCommentDescriptor
+
+        message: string;

+>message : string
+
+        position: number;

+>position : number
+    }

+    class TextChange {

+>TextChange : TextChange
+
+        span: TextSpan;

+>span : TextSpan
+>TextSpan : TextSpan
+
+        newText: string;

+>newText : string
+    }

+    interface RenameLocation {

+>RenameLocation : RenameLocation
+
+        textSpan: TextSpan;

+>textSpan : TextSpan
+>TextSpan : TextSpan
+
+        fileName: string;

+>fileName : string
+    }

+    interface ReferenceEntry {

+>ReferenceEntry : ReferenceEntry
+
+        textSpan: TextSpan;

+>textSpan : TextSpan
+>TextSpan : TextSpan
+
+        fileName: string;

+>fileName : string
+
+        isWriteAccess: boolean;

+>isWriteAccess : boolean
+    }

+    interface NavigateToItem {

+>NavigateToItem : NavigateToItem
+
+        name: string;

+>name : string
+
+        kind: string;

+>kind : string
+
+        kindModifiers: string;

+>kindModifiers : string
+
+        matchKind: string;

+>matchKind : string
+
+        isCaseSensitive: boolean;

+>isCaseSensitive : boolean
+
+        fileName: string;

+>fileName : string
+
+        textSpan: TextSpan;

+>textSpan : TextSpan
+>TextSpan : TextSpan
+
+        containerName: string;

+>containerName : string
+
+        containerKind: string;

+>containerKind : string
+    }

+    interface EditorOptions {

+>EditorOptions : EditorOptions
+
+        IndentSize: number;

+>IndentSize : number
+
+        TabSize: number;

+>TabSize : number
+
+        NewLineCharacter: string;

+>NewLineCharacter : string
+
+        ConvertTabsToSpaces: boolean;

+>ConvertTabsToSpaces : boolean
+    }

+    interface FormatCodeOptions extends EditorOptions {

+>FormatCodeOptions : FormatCodeOptions
+>EditorOptions : EditorOptions
+
+        InsertSpaceAfterCommaDelimiter: boolean;

+>InsertSpaceAfterCommaDelimiter : boolean
+
+        InsertSpaceAfterSemicolonInForStatements: boolean;

+>InsertSpaceAfterSemicolonInForStatements : boolean
+
+        InsertSpaceBeforeAndAfterBinaryOperators: boolean;

+>InsertSpaceBeforeAndAfterBinaryOperators : boolean
+
+        InsertSpaceAfterKeywordsInControlFlowStatements: boolean;

+>InsertSpaceAfterKeywordsInControlFlowStatements : boolean
+
+        InsertSpaceAfterFunctionKeywordForAnonymousFunctions: boolean;

+>InsertSpaceAfterFunctionKeywordForAnonymousFunctions : boolean
+
+        InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: boolean;

+>InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis : boolean
+
+        PlaceOpenBraceOnNewLineForFunctions: boolean;

+>PlaceOpenBraceOnNewLineForFunctions : boolean
+
+        PlaceOpenBraceOnNewLineForControlBlocks: boolean;

+>PlaceOpenBraceOnNewLineForControlBlocks : boolean
+
+        [s: string]: boolean | number | string;

+>s : string
+    }

+    interface DefinitionInfo {

+>DefinitionInfo : DefinitionInfo
+
+        fileName: string;

+>fileName : string
+
+        textSpan: TextSpan;

+>textSpan : TextSpan
+>TextSpan : TextSpan
+
+        kind: string;

+>kind : string
+
+        name: string;

+>name : string
+
+        containerKind: string;

+>containerKind : string
+
+        containerName: string;

+>containerName : string
+    }

+    interface ReferencedSymbol {

+>ReferencedSymbol : ReferencedSymbol
+
+        definition: DefinitionInfo;

+>definition : DefinitionInfo
+>DefinitionInfo : DefinitionInfo
+
+        references: ReferenceEntry[];

+>references : ReferenceEntry[]
+>ReferenceEntry : ReferenceEntry
+    }

+    enum SymbolDisplayPartKind {

+>SymbolDisplayPartKind : SymbolDisplayPartKind
+
+        aliasName = 0,

+>aliasName : SymbolDisplayPartKind
+
+        className = 1,

+>className : SymbolDisplayPartKind
+
+        enumName = 2,

+>enumName : SymbolDisplayPartKind
+
+        fieldName = 3,

+>fieldName : SymbolDisplayPartKind
+
+        interfaceName = 4,

+>interfaceName : SymbolDisplayPartKind
+
+        keyword = 5,

+>keyword : SymbolDisplayPartKind
+
+        lineBreak = 6,

+>lineBreak : SymbolDisplayPartKind
+
+        numericLiteral = 7,

+>numericLiteral : SymbolDisplayPartKind
+
+        stringLiteral = 8,

+>stringLiteral : SymbolDisplayPartKind
+
+        localName = 9,

+>localName : SymbolDisplayPartKind
+
+        methodName = 10,

+>methodName : SymbolDisplayPartKind
+
+        moduleName = 11,

+>moduleName : SymbolDisplayPartKind
+
+        operator = 12,

+>operator : SymbolDisplayPartKind
+
+        parameterName = 13,

+>parameterName : SymbolDisplayPartKind
+
+        propertyName = 14,

+>propertyName : SymbolDisplayPartKind
+
+        punctuation = 15,

+>punctuation : SymbolDisplayPartKind
+
+        space = 16,

+>space : SymbolDisplayPartKind
+
+        text = 17,

+>text : SymbolDisplayPartKind
+
+        typeParameterName = 18,

+>typeParameterName : SymbolDisplayPartKind
+
+        enumMemberName = 19,

+>enumMemberName : SymbolDisplayPartKind
+
+        functionName = 20,

+>functionName : SymbolDisplayPartKind
+
+        regularExpressionLiteral = 21,

+>regularExpressionLiteral : SymbolDisplayPartKind
+    }

+    interface SymbolDisplayPart {

+>SymbolDisplayPart : SymbolDisplayPart
+
+        text: string;

+>text : string
+
+        kind: string;

+>kind : string
+    }

+    interface QuickInfo {

+>QuickInfo : QuickInfo
+
+        kind: string;

+>kind : string
+
+        kindModifiers: string;

+>kindModifiers : string
+
+        textSpan: TextSpan;

+>textSpan : TextSpan
+>TextSpan : TextSpan
+
+        displayParts: SymbolDisplayPart[];

+>displayParts : SymbolDisplayPart[]
+>SymbolDisplayPart : SymbolDisplayPart
+
+        documentation: SymbolDisplayPart[];

+>documentation : SymbolDisplayPart[]
+>SymbolDisplayPart : SymbolDisplayPart
+    }

+    interface RenameInfo {

+>RenameInfo : RenameInfo
+
+        canRename: boolean;

+>canRename : boolean
+
+        localizedErrorMessage: string;

+>localizedErrorMessage : string
+
+        displayName: string;

+>displayName : string
+
+        fullDisplayName: string;

+>fullDisplayName : string
+
+        kind: string;

+>kind : string
+
+        kindModifiers: string;

+>kindModifiers : string
+
+        triggerSpan: TextSpan;

+>triggerSpan : TextSpan
+>TextSpan : TextSpan
+    }

+    interface SignatureHelpParameter {

+>SignatureHelpParameter : SignatureHelpParameter
+
+        name: string;

+>name : string
+
+        documentation: SymbolDisplayPart[];

+>documentation : SymbolDisplayPart[]
+>SymbolDisplayPart : SymbolDisplayPart
+
+        displayParts: SymbolDisplayPart[];

+>displayParts : SymbolDisplayPart[]
+>SymbolDisplayPart : SymbolDisplayPart
+
+        isOptional: boolean;

+>isOptional : boolean
+    }

+    /**

+     * Represents a single signature to show in signature help.

+     * The id is used for subsequent calls into the language service to ask questions about the

+     * signature help item in the context of any documents that have been updated.  i.e. after

+     * an edit has happened, while signature help is still active, the host can ask important

+     * questions like 'what parameter is the user currently contained within?'.

+     */

+    interface SignatureHelpItem {

+>SignatureHelpItem : SignatureHelpItem
+
+        isVariadic: boolean;

+>isVariadic : boolean
+
+        prefixDisplayParts: SymbolDisplayPart[];

+>prefixDisplayParts : SymbolDisplayPart[]
+>SymbolDisplayPart : SymbolDisplayPart
+
+        suffixDisplayParts: SymbolDisplayPart[];

+>suffixDisplayParts : SymbolDisplayPart[]
+>SymbolDisplayPart : SymbolDisplayPart
+
+        separatorDisplayParts: SymbolDisplayPart[];

+>separatorDisplayParts : SymbolDisplayPart[]
+>SymbolDisplayPart : SymbolDisplayPart
+
+        parameters: SignatureHelpParameter[];

+>parameters : SignatureHelpParameter[]
+>SignatureHelpParameter : SignatureHelpParameter
+
+        documentation: SymbolDisplayPart[];

+>documentation : SymbolDisplayPart[]
+>SymbolDisplayPart : SymbolDisplayPart
+    }

+    /**

+     * Represents a set of signature help items, and the preferred item that should be selected.

+     */

+    interface SignatureHelpItems {

+>SignatureHelpItems : SignatureHelpItems
+
+        items: SignatureHelpItem[];

+>items : SignatureHelpItem[]
+>SignatureHelpItem : SignatureHelpItem
+
+        applicableSpan: TextSpan;

+>applicableSpan : TextSpan
+>TextSpan : TextSpan
+
+        selectedItemIndex: number;

+>selectedItemIndex : number
+
+        argumentIndex: number;

+>argumentIndex : number
+
+        argumentCount: number;

+>argumentCount : number
+    }

+    interface CompletionInfo {

+>CompletionInfo : CompletionInfo
+
+        isMemberCompletion: boolean;

+>isMemberCompletion : boolean
+
+        isNewIdentifierLocation: boolean;

+>isNewIdentifierLocation : boolean
+
+        entries: CompletionEntry[];

+>entries : CompletionEntry[]
+>CompletionEntry : CompletionEntry
+    }

+    interface CompletionEntry {

+>CompletionEntry : CompletionEntry
+
+        name: string;

+>name : string
+
+        kind: string;

+>kind : string
+
+        kindModifiers: string;

+>kindModifiers : string
+    }

+    interface CompletionEntryDetails {

+>CompletionEntryDetails : CompletionEntryDetails
+
+        name: string;

+>name : string
+
+        kind: string;

+>kind : string
+
+        kindModifiers: string;

+>kindModifiers : string
+
+        displayParts: SymbolDisplayPart[];

+>displayParts : SymbolDisplayPart[]
+>SymbolDisplayPart : SymbolDisplayPart
+
+        documentation: SymbolDisplayPart[];

+>documentation : SymbolDisplayPart[]
+>SymbolDisplayPart : SymbolDisplayPart
+    }

+    interface OutliningSpan {

+>OutliningSpan : OutliningSpan
+
+        /** The span of the document to actually collapse. */

+        textSpan: TextSpan;

+>textSpan : TextSpan
+>TextSpan : TextSpan
+
+        /** The span of the document to display when the user hovers over the collapsed span. */

+        hintSpan: TextSpan;

+>hintSpan : TextSpan
+>TextSpan : TextSpan
+
+        /** The text to display in the editor for the collapsed region. */

+        bannerText: string;

+>bannerText : string
+
+        /**

+          * Whether or not this region should be automatically collapsed when

+          * the 'Collapse to Definitions' command is invoked.

+          */

+        autoCollapse: boolean;

+>autoCollapse : boolean
+    }

+    interface EmitOutput {

+>EmitOutput : EmitOutput
+
+        outputFiles: OutputFile[];

+>outputFiles : OutputFile[]
+>OutputFile : OutputFile
+
+        emitSkipped: boolean;

+>emitSkipped : boolean
+    }

+    const enum OutputFileType {

+>OutputFileType : OutputFileType
+
+        JavaScript = 0,

+>JavaScript : OutputFileType
+
+        SourceMap = 1,

+>SourceMap : OutputFileType
+
+        Declaration = 2,

+>Declaration : OutputFileType
+    }

+    interface OutputFile {

+>OutputFile : OutputFile
+
+        name: string;

+>name : string
+
+        writeByteOrderMark: boolean;

+>writeByteOrderMark : boolean
+
+        text: string;

+>text : string
+    }

+    const enum EndOfLineState {

+>EndOfLineState : EndOfLineState
+
+        Start = 0,

+>Start : EndOfLineState
+
+        InMultiLineCommentTrivia = 1,

+>InMultiLineCommentTrivia : EndOfLineState
+
+        InSingleQuoteStringLiteral = 2,

+>InSingleQuoteStringLiteral : EndOfLineState
+
+        InDoubleQuoteStringLiteral = 3,

+>InDoubleQuoteStringLiteral : EndOfLineState
+
+        InTemplateHeadOrNoSubstitutionTemplate = 4,

+>InTemplateHeadOrNoSubstitutionTemplate : EndOfLineState
+
+        InTemplateMiddleOrTail = 5,

+>InTemplateMiddleOrTail : EndOfLineState
+
+        InTemplateSubstitutionPosition = 6,

+>InTemplateSubstitutionPosition : EndOfLineState
+    }

+    enum TokenClass {

+>TokenClass : TokenClass
+
+        Punctuation = 0,

+>Punctuation : TokenClass
+
+        Keyword = 1,

+>Keyword : TokenClass
+
+        Operator = 2,

+>Operator : TokenClass
+
+        Comment = 3,

+>Comment : TokenClass
+
+        Whitespace = 4,

+>Whitespace : TokenClass
+
+        Identifier = 5,

+>Identifier : TokenClass
+
+        NumberLiteral = 6,

+>NumberLiteral : TokenClass
+
+        StringLiteral = 7,

+>StringLiteral : TokenClass
+
+        RegExpLiteral = 8,

+>RegExpLiteral : TokenClass
+    }

+    interface ClassificationResult {

+>ClassificationResult : ClassificationResult
+
+        finalLexState: EndOfLineState;

+>finalLexState : EndOfLineState
+>EndOfLineState : EndOfLineState
+
+        entries: ClassificationInfo[];

+>entries : ClassificationInfo[]
+>ClassificationInfo : ClassificationInfo
+    }

+    interface ClassificationInfo {

+>ClassificationInfo : ClassificationInfo
+
+        length: number;

+>length : number
+
+        classification: TokenClass;

+>classification : TokenClass
+>TokenClass : TokenClass
+    }

+    interface Classifier {

+>Classifier : Classifier
+
+        /**

+         * Gives lexical classifications of tokens on a line without any syntactic context.

+         * For instance, a token consisting of the text 'string' can be either an identifier

+         * named 'string' or the keyword 'string', however, because this classifier is not aware,

+         * it relies on certain heuristics to give acceptable results. For classifications where

+         * speed trumps accuracy, this function is preferable; however, for true accuracy, the

+         * syntactic classifier is ideal. In fact, in certain editing scenarios, combining the

+         * lexical, syntactic, and semantic classifiers may issue the best user experience.

+         *

+         * @param text                      The text of a line to classify.

+         * @param lexState                  The state of the lexical classifier at the end of the previous line.

+         * @param syntacticClassifierAbsent Whether the client is *not* using a syntactic classifier.

+         *                                  If there is no syntactic classifier (syntacticClassifierAbsent=true),

+         *                                  certain heuristics may be used in its place; however, if there is a

+         *                                  syntactic classifier (syntacticClassifierAbsent=false), certain

+         *                                  classifications which may be incorrectly categorized will be given

+         *                                  back as Identifiers in order to allow the syntactic classifier to

+         *                                  subsume the classification.

+         */

+        getClassificationsForLine(text: string, lexState: EndOfLineState, syntacticClassifierAbsent: boolean): ClassificationResult;

+>getClassificationsForLine : (text: string, lexState: EndOfLineState, syntacticClassifierAbsent: boolean) => ClassificationResult
+>text : string
+>lexState : EndOfLineState
+>EndOfLineState : EndOfLineState
+>syntacticClassifierAbsent : boolean
+>ClassificationResult : ClassificationResult
+    }

+    /**

+      * The document registry represents a store of SourceFile objects that can be shared between

+      * multiple LanguageService instances. A LanguageService instance holds on the SourceFile (AST)

+      * of files in the context.

+      * SourceFile objects account for most of the memory usage by the language service. Sharing

+      * the same DocumentRegistry instance between different instances of LanguageService allow

+      * for more efficient memory utilization since all projects will share at least the library

+      * file (lib.d.ts).

+      *

+      * A more advanced use of the document registry is to serialize sourceFile objects to disk

+      * and re-hydrate them when needed.

+      *

+      * To create a default DocumentRegistry, use createDocumentRegistry to create one, and pass it

+      * to all subsequent createLanguageService calls.

+      */

+    interface DocumentRegistry {

+>DocumentRegistry : DocumentRegistry
+
+        /**

+          * Request a stored SourceFile with a given fileName and compilationSettings.

+          * The first call to acquire will call createLanguageServiceSourceFile to generate

+          * the SourceFile if was not found in the registry.

+          *

+          * @param fileName The name of the file requested

+          * @param compilationSettings Some compilation settings like target affects the

+          * shape of a the resulting SourceFile. This allows the DocumentRegistry to store

+          * multiple copies of the same file for different compilation settings.

+          * @parm scriptSnapshot Text of the file. Only used if the file was not found

+          * in the registry and a new one was created.

+          * @parm version Current version of the file. Only used if the file was not found

+          * in the registry and a new one was created.

+          */

+        acquireDocument(fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string): SourceFile;

+>acquireDocument : (fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string) => SourceFile
+>fileName : string
+>compilationSettings : CompilerOptions
+>CompilerOptions : CompilerOptions
+>scriptSnapshot : IScriptSnapshot
+>IScriptSnapshot : IScriptSnapshot
+>version : string
+>SourceFile : SourceFile
+
+        /**

+          * Request an updated version of an already existing SourceFile with a given fileName

+          * and compilationSettings. The update will in-turn call updateLanguageServiceSourceFile

+          * to get an updated SourceFile.

+          *

+          * @param fileName The name of the file requested

+          * @param compilationSettings Some compilation settings like target affects the

+          * shape of a the resulting SourceFile. This allows the DocumentRegistry to store

+          * multiple copies of the same file for different compilation settings.

+          * @param scriptSnapshot Text of the file.

+          * @param version Current version of the file.

+          */

+        updateDocument(fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string): SourceFile;

+>updateDocument : (fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string) => SourceFile
+>fileName : string
+>compilationSettings : CompilerOptions
+>CompilerOptions : CompilerOptions
+>scriptSnapshot : IScriptSnapshot
+>IScriptSnapshot : IScriptSnapshot
+>version : string
+>SourceFile : SourceFile
+
+        /**

+          * Informs the DocumentRegistry that a file is not needed any longer.

+          *

+          * Note: It is not allowed to call release on a SourceFile that was not acquired from

+          * this registry originally.

+          *

+          * @param fileName The name of the file to be released

+          * @param compilationSettings The compilation settings used to acquire the file

+          */

+        releaseDocument(fileName: string, compilationSettings: CompilerOptions): void;

+>releaseDocument : (fileName: string, compilationSettings: CompilerOptions) => void
+>fileName : string
+>compilationSettings : CompilerOptions
+>CompilerOptions : CompilerOptions
+    }

+    class ScriptElementKind {

+>ScriptElementKind : ScriptElementKind
+
+        static unknown: string;

+>unknown : string
+
+        static keyword: string;

+>keyword : string
+
+        static scriptElement: string;

+>scriptElement : string
+
+        static moduleElement: string;

+>moduleElement : string
+
+        static classElement: string;

+>classElement : string
+
+        static interfaceElement: string;

+>interfaceElement : string
+
+        static typeElement: string;

+>typeElement : string
+
+        static enumElement: string;

+>enumElement : string
+
+        static variableElement: string;

+>variableElement : string
+
+        static localVariableElement: string;

+>localVariableElement : string
+
+        static functionElement: string;

+>functionElement : string
+
+        static localFunctionElement: string;

+>localFunctionElement : string
+
+        static memberFunctionElement: string;

+>memberFunctionElement : string
+
+        static memberGetAccessorElement: string;

+>memberGetAccessorElement : string
+
+        static memberSetAccessorElement: string;

+>memberSetAccessorElement : string
+
+        static memberVariableElement: string;

+>memberVariableElement : string
+
+        static constructorImplementationElement: string;

+>constructorImplementationElement : string
+
+        static callSignatureElement: string;

+>callSignatureElement : string
+
+        static indexSignatureElement: string;

+>indexSignatureElement : string
+
+        static constructSignatureElement: string;

+>constructSignatureElement : string
+
+        static parameterElement: string;

+>parameterElement : string
+
+        static typeParameterElement: string;

+>typeParameterElement : string
+
+        static primitiveType: string;

+>primitiveType : string
+
+        static label: string;

+>label : string
+
+        static alias: string;

+>alias : string
+
+        static constElement: string;

+>constElement : string
+
+        static letElement: string;

+>letElement : string
+    }

+    class ScriptElementKindModifier {

+>ScriptElementKindModifier : ScriptElementKindModifier
+
+        static none: string;

+>none : string
+
+        static publicMemberModifier: string;

+>publicMemberModifier : string
+
+        static privateMemberModifier: string;

+>privateMemberModifier : string
+
+        static protectedMemberModifier: string;

+>protectedMemberModifier : string
+
+        static exportedModifier: string;

+>exportedModifier : string
+
+        static ambientModifier: string;

+>ambientModifier : string
+
+        static staticModifier: string;

+>staticModifier : string
+    }

+    class ClassificationTypeNames {

+>ClassificationTypeNames : ClassificationTypeNames
+
+        static comment: string;

+>comment : string
+
+        static identifier: string;

+>identifier : string
+
+        static keyword: string;

+>keyword : string
+
+        static numericLiteral: string;

+>numericLiteral : string
+
+        static operator: string;

+>operator : string
+
+        static stringLiteral: string;

+>stringLiteral : string
+
+        static whiteSpace: string;

+>whiteSpace : string
+
+        static text: string;

+>text : string
+
+        static punctuation: string;

+>punctuation : string
+
+        static className: string;

+>className : string
+
+        static enumName: string;

+>enumName : string
+
+        static interfaceName: string;

+>interfaceName : string
+
+        static moduleName: string;

+>moduleName : string
+
+        static typeParameterName: string;

+>typeParameterName : string
+
+        static typeAlias: string;

+>typeAlias : string
+    }

+    interface DisplayPartsSymbolWriter extends SymbolWriter {

+>DisplayPartsSymbolWriter : DisplayPartsSymbolWriter
+>SymbolWriter : SymbolWriter
+
+        displayParts(): SymbolDisplayPart[];

+>displayParts : () => SymbolDisplayPart[]
+>SymbolDisplayPart : SymbolDisplayPart
+    }

+    function displayPartsToString(displayParts: SymbolDisplayPart[]): string;

+>displayPartsToString : (displayParts: SymbolDisplayPart[]) => string
+>displayParts : SymbolDisplayPart[]
+>SymbolDisplayPart : SymbolDisplayPart
+
+    function getDefaultCompilerOptions(): CompilerOptions;

+>getDefaultCompilerOptions : () => CompilerOptions
+>CompilerOptions : CompilerOptions
+
+    class OperationCanceledException {

+>OperationCanceledException : OperationCanceledException
+    }

+    class CancellationTokenObject {

+>CancellationTokenObject : CancellationTokenObject
+
+        private cancellationToken;

+>cancellationToken : any
+
+        static None: CancellationTokenObject;

+>None : CancellationTokenObject
+>CancellationTokenObject : CancellationTokenObject
+
+        constructor(cancellationToken: CancellationToken);

+>cancellationToken : CancellationToken
+>CancellationToken : CancellationToken
+
+        isCancellationRequested(): boolean;

+>isCancellationRequested : () => boolean
+
+        throwIfCancellationRequested(): void;

+>throwIfCancellationRequested : () => void
+    }

+    function transpile(input: string, compilerOptions?: CompilerOptions, fileName?: string, diagnostics?: Diagnostic[]): string;

+>transpile : (input: string, compilerOptions?: CompilerOptions, fileName?: string, diagnostics?: Diagnostic[]) => string
+>input : string
+>compilerOptions : CompilerOptions
+>CompilerOptions : CompilerOptions
+>fileName : string
+>diagnostics : Diagnostic[]
+>Diagnostic : Diagnostic
+
+    function createLanguageServiceSourceFile(fileName: string, scriptSnapshot: IScriptSnapshot, scriptTarget: ScriptTarget, version: string, setNodeParents: boolean): SourceFile;

+>createLanguageServiceSourceFile : (fileName: string, scriptSnapshot: IScriptSnapshot, scriptTarget: ScriptTarget, version: string, setNodeParents: boolean) => SourceFile
+>fileName : string
+>scriptSnapshot : IScriptSnapshot
+>IScriptSnapshot : IScriptSnapshot
+>scriptTarget : ScriptTarget
+>ScriptTarget : ScriptTarget
+>version : string
+>setNodeParents : boolean
+>SourceFile : SourceFile
+
+    let disableIncrementalParsing: boolean;

+>disableIncrementalParsing : boolean
+
+    function updateLanguageServiceSourceFile(sourceFile: SourceFile, scriptSnapshot: IScriptSnapshot, version: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;

+>updateLanguageServiceSourceFile : (sourceFile: SourceFile, scriptSnapshot: IScriptSnapshot, version: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean) => SourceFile
+>sourceFile : SourceFile
+>SourceFile : SourceFile
+>scriptSnapshot : IScriptSnapshot
+>IScriptSnapshot : IScriptSnapshot
+>version : string
+>textChangeRange : TextChangeRange
+>TextChangeRange : TextChangeRange
+>aggressiveChecks : boolean
+>SourceFile : SourceFile
+
+    function createDocumentRegistry(): DocumentRegistry;

+>createDocumentRegistry : () => DocumentRegistry
+>DocumentRegistry : DocumentRegistry
+
+    function preProcessFile(sourceText: string, readImportFiles?: boolean): PreProcessedFileInfo;

+>preProcessFile : (sourceText: string, readImportFiles?: boolean) => PreProcessedFileInfo
+>sourceText : string
+>readImportFiles : boolean
+>PreProcessedFileInfo : PreProcessedFileInfo
+
+    function createLanguageService(host: LanguageServiceHost, documentRegistry?: DocumentRegistry): LanguageService;

+>createLanguageService : (host: LanguageServiceHost, documentRegistry?: DocumentRegistry) => LanguageService
+>host : LanguageServiceHost
+>LanguageServiceHost : LanguageServiceHost
+>documentRegistry : DocumentRegistry
+>DocumentRegistry : DocumentRegistry
+>LanguageService : LanguageService
+
+    function createClassifier(): Classifier;

+>createClassifier : () => Classifier
+>Classifier : Classifier
+
+    /**

+      * Get the path of the default library file (lib.d.ts) as distributed with the typescript

+      * node package.

+      * The functionality is not supported if the ts module is consumed outside of a node module.

+      */

+    function getDefaultLibFilePath(options: CompilerOptions): string;

+>getDefaultLibFilePath : (options: CompilerOptions) => string
+>options : CompilerOptions
+>CompilerOptions : CompilerOptions
+}

+
diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js
index 1346958509..9488ed3c13 100644
--- a/tests/baselines/reference/APISample_transform.js
+++ b/tests/baselines/reference/APISample_transform.js
@@ -265,59 +265,62 @@ declare module "typescript" {
         TemplateExpression = 171,
         YieldExpression = 172,
         SpreadElementExpression = 173,
-        OmittedExpression = 174,
-        TemplateSpan = 175,
-        Block = 176,
-        VariableStatement = 177,
-        EmptyStatement = 178,
-        ExpressionStatement = 179,
-        IfStatement = 180,
-        DoStatement = 181,
-        WhileStatement = 182,
-        ForStatement = 183,
-        ForInStatement = 184,
-        ForOfStatement = 185,
-        ContinueStatement = 186,
-        BreakStatement = 187,
-        ReturnStatement = 188,
-        WithStatement = 189,
-        SwitchStatement = 190,
-        LabeledStatement = 191,
-        ThrowStatement = 192,
-        TryStatement = 193,
-        DebuggerStatement = 194,
-        VariableDeclaration = 195,
-        VariableDeclarationList = 196,
-        FunctionDeclaration = 197,
-        ClassDeclaration = 198,
-        InterfaceDeclaration = 199,
-        TypeAliasDeclaration = 200,
-        EnumDeclaration = 201,
-        ModuleDeclaration = 202,
-        ModuleBlock = 203,
-        CaseBlock = 204,
-        ImportEqualsDeclaration = 205,
-        ImportDeclaration = 206,
-        ImportClause = 207,
-        NamespaceImport = 208,
-        NamedImports = 209,
-        ImportSpecifier = 210,
-        ExportAssignment = 211,
-        ExportDeclaration = 212,
-        NamedExports = 213,
-        ExportSpecifier = 214,
-        MissingDeclaration = 215,
-        ExternalModuleReference = 216,
-        CaseClause = 217,
-        DefaultClause = 218,
-        HeritageClause = 219,
-        CatchClause = 220,
-        PropertyAssignment = 221,
-        ShorthandPropertyAssignment = 222,
-        EnumMember = 223,
-        SourceFile = 224,
-        SyntaxList = 225,
-        Count = 226,
+        ClassExpression = 174,
+        OmittedExpression = 175,
+        TemplateSpan = 176,
+        HeritageClauseElement = 177,
+        SemicolonClassElement = 178,
+        Block = 179,
+        VariableStatement = 180,
+        EmptyStatement = 181,
+        ExpressionStatement = 182,
+        IfStatement = 183,
+        DoStatement = 184,
+        WhileStatement = 185,
+        ForStatement = 186,
+        ForInStatement = 187,
+        ForOfStatement = 188,
+        ContinueStatement = 189,
+        BreakStatement = 190,
+        ReturnStatement = 191,
+        WithStatement = 192,
+        SwitchStatement = 193,
+        LabeledStatement = 194,
+        ThrowStatement = 195,
+        TryStatement = 196,
+        DebuggerStatement = 197,
+        VariableDeclaration = 198,
+        VariableDeclarationList = 199,
+        FunctionDeclaration = 200,
+        ClassDeclaration = 201,
+        InterfaceDeclaration = 202,
+        TypeAliasDeclaration = 203,
+        EnumDeclaration = 204,
+        ModuleDeclaration = 205,
+        ModuleBlock = 206,
+        CaseBlock = 207,
+        ImportEqualsDeclaration = 208,
+        ImportDeclaration = 209,
+        ImportClause = 210,
+        NamespaceImport = 211,
+        NamedImports = 212,
+        ImportSpecifier = 213,
+        ExportAssignment = 214,
+        ExportDeclaration = 215,
+        NamedExports = 216,
+        ExportSpecifier = 217,
+        MissingDeclaration = 218,
+        ExternalModuleReference = 219,
+        CaseClause = 220,
+        DefaultClause = 221,
+        HeritageClause = 222,
+        CatchClause = 223,
+        PropertyAssignment = 224,
+        ShorthandPropertyAssignment = 225,
+        EnumMember = 226,
+        SourceFile = 227,
+        SyntaxList = 228,
+        Count = 229,
         FirstAssignment = 53,
         LastAssignment = 64,
         FirstReservedWord = 66,
@@ -501,6 +504,9 @@ declare module "typescript" {
     interface ConstructorDeclaration extends FunctionLikeDeclaration, ClassElement {
         body?: Block;
     }
+    interface SemicolonClassElement extends ClassElement {
+        _semicolonClassElementBrand: any;
+    }
     interface AccessorDeclaration extends FunctionLikeDeclaration, ClassElement, ObjectLiteralElement {
         _accessorDeclarationBrand: any;
         body: Block;
@@ -639,6 +645,10 @@ declare module "typescript" {
         typeArguments?: NodeArray<TypeNode>;
         arguments: NodeArray<Expression>;
     }
+    interface HeritageClauseElement extends Node {
+        expression: LeftHandSideExpression;
+        typeArguments?: NodeArray<TypeNode>;
+    }
     interface NewExpression extends CallExpression, PrimaryExpression {
     }
     interface TaggedTemplateExpression extends MemberExpression {
@@ -733,12 +743,16 @@ declare module "typescript" {
     interface ModuleElement extends Node {
         _moduleElementBrand: any;
     }
-    interface ClassDeclaration extends Declaration, ModuleElement {
+    interface ClassLikeDeclaration extends Declaration {
         name?: Identifier;
         typeParameters?: NodeArray<TypeParameterDeclaration>;
         heritageClauses?: NodeArray<HeritageClause>;
         members: NodeArray<ClassElement>;
     }
+    interface ClassDeclaration extends ClassLikeDeclaration, Statement {
+    }
+    interface ClassExpression extends ClassLikeDeclaration, PrimaryExpression {
+    }
     interface ClassElement extends Declaration {
         _classElementBrand: any;
     }
@@ -750,7 +764,7 @@ declare module "typescript" {
     }
     interface HeritageClause extends Node {
         token: SyntaxKind;
-        types?: NodeArray<TypeReferenceNode>;
+        types?: NodeArray<HeritageClauseElement>;
     }
     interface TypeAliasDeclaration extends Declaration, ModuleElement {
         name: Identifier;
@@ -992,7 +1006,7 @@ declare module "typescript" {
         writeReturnTypeOfSignatureDeclaration(signatureDeclaration: SignatureDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void;
         writeTypeOfExpression(expr: Expression, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void;
         isSymbolAccessible(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags): SymbolAccessiblityResult;
-        isEntityNameVisible(entityName: EntityName, enclosingDeclaration: Node): SymbolVisibilityResult;
+        isEntityNameVisible(entityName: EntityName | Expression, enclosingDeclaration: Node): SymbolVisibilityResult;
         getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;
         resolvesToSomeValue(location: Node, name: string): boolean;
         getBlockScopedVariableId(node: Identifier): number;
diff --git a/tests/baselines/reference/APISample_transform.types b/tests/baselines/reference/APISample_transform.types
index a3dc3f0e2e..75e800230c 100644
--- a/tests/baselines/reference/APISample_transform.types
+++ b/tests/baselines/reference/APISample_transform.types
@@ -813,163 +813,172 @@ declare module "typescript" {
         SpreadElementExpression = 173,

 >SpreadElementExpression : SyntaxKind
 
-        OmittedExpression = 174,

+        ClassExpression = 174,

+>ClassExpression : SyntaxKind
+
+        OmittedExpression = 175,

 >OmittedExpression : SyntaxKind
 
-        TemplateSpan = 175,

+        TemplateSpan = 176,

 >TemplateSpan : SyntaxKind
 
-        Block = 176,

+        HeritageClauseElement = 177,

+>HeritageClauseElement : SyntaxKind
+
+        SemicolonClassElement = 178,

+>SemicolonClassElement : SyntaxKind
+
+        Block = 179,

 >Block : SyntaxKind
 
-        VariableStatement = 177,

+        VariableStatement = 180,

 >VariableStatement : SyntaxKind
 
-        EmptyStatement = 178,

+        EmptyStatement = 181,

 >EmptyStatement : SyntaxKind
 
-        ExpressionStatement = 179,

+        ExpressionStatement = 182,

 >ExpressionStatement : SyntaxKind
 
-        IfStatement = 180,

+        IfStatement = 183,

 >IfStatement : SyntaxKind
 
-        DoStatement = 181,

+        DoStatement = 184,

 >DoStatement : SyntaxKind
 
-        WhileStatement = 182,

+        WhileStatement = 185,

 >WhileStatement : SyntaxKind
 
-        ForStatement = 183,

+        ForStatement = 186,

 >ForStatement : SyntaxKind
 
-        ForInStatement = 184,

+        ForInStatement = 187,

 >ForInStatement : SyntaxKind
 
-        ForOfStatement = 185,

+        ForOfStatement = 188,

 >ForOfStatement : SyntaxKind
 
-        ContinueStatement = 186,

+        ContinueStatement = 189,

 >ContinueStatement : SyntaxKind
 
-        BreakStatement = 187,

+        BreakStatement = 190,

 >BreakStatement : SyntaxKind
 
-        ReturnStatement = 188,

+        ReturnStatement = 191,

 >ReturnStatement : SyntaxKind
 
-        WithStatement = 189,

+        WithStatement = 192,

 >WithStatement : SyntaxKind
 
-        SwitchStatement = 190,

+        SwitchStatement = 193,

 >SwitchStatement : SyntaxKind
 
-        LabeledStatement = 191,

+        LabeledStatement = 194,

 >LabeledStatement : SyntaxKind
 
-        ThrowStatement = 192,

+        ThrowStatement = 195,

 >ThrowStatement : SyntaxKind
 
-        TryStatement = 193,

+        TryStatement = 196,

 >TryStatement : SyntaxKind
 
-        DebuggerStatement = 194,

+        DebuggerStatement = 197,

 >DebuggerStatement : SyntaxKind
 
-        VariableDeclaration = 195,

+        VariableDeclaration = 198,

 >VariableDeclaration : SyntaxKind
 
-        VariableDeclarationList = 196,

+        VariableDeclarationList = 199,

 >VariableDeclarationList : SyntaxKind
 
-        FunctionDeclaration = 197,

+        FunctionDeclaration = 200,

 >FunctionDeclaration : SyntaxKind
 
-        ClassDeclaration = 198,

+        ClassDeclaration = 201,

 >ClassDeclaration : SyntaxKind
 
-        InterfaceDeclaration = 199,

+        InterfaceDeclaration = 202,

 >InterfaceDeclaration : SyntaxKind
 
-        TypeAliasDeclaration = 200,

+        TypeAliasDeclaration = 203,

 >TypeAliasDeclaration : SyntaxKind
 
-        EnumDeclaration = 201,

+        EnumDeclaration = 204,

 >EnumDeclaration : SyntaxKind
 
-        ModuleDeclaration = 202,

+        ModuleDeclaration = 205,

 >ModuleDeclaration : SyntaxKind
 
-        ModuleBlock = 203,

+        ModuleBlock = 206,

 >ModuleBlock : SyntaxKind
 
-        CaseBlock = 204,

+        CaseBlock = 207,

 >CaseBlock : SyntaxKind
 
-        ImportEqualsDeclaration = 205,

+        ImportEqualsDeclaration = 208,

 >ImportEqualsDeclaration : SyntaxKind
 
-        ImportDeclaration = 206,

+        ImportDeclaration = 209,

 >ImportDeclaration : SyntaxKind
 
-        ImportClause = 207,

+        ImportClause = 210,

 >ImportClause : SyntaxKind
 
-        NamespaceImport = 208,

+        NamespaceImport = 211,

 >NamespaceImport : SyntaxKind
 
-        NamedImports = 209,

+        NamedImports = 212,

 >NamedImports : SyntaxKind
 
-        ImportSpecifier = 210,

+        ImportSpecifier = 213,

 >ImportSpecifier : SyntaxKind
 
-        ExportAssignment = 211,

+        ExportAssignment = 214,

 >ExportAssignment : SyntaxKind
 
-        ExportDeclaration = 212,

+        ExportDeclaration = 215,

 >ExportDeclaration : SyntaxKind
 
-        NamedExports = 213,

+        NamedExports = 216,

 >NamedExports : SyntaxKind
 
-        ExportSpecifier = 214,

+        ExportSpecifier = 217,

 >ExportSpecifier : SyntaxKind
 
-        MissingDeclaration = 215,

+        MissingDeclaration = 218,

 >MissingDeclaration : SyntaxKind
 
-        ExternalModuleReference = 216,

+        ExternalModuleReference = 219,

 >ExternalModuleReference : SyntaxKind
 
-        CaseClause = 217,

+        CaseClause = 220,

 >CaseClause : SyntaxKind
 
-        DefaultClause = 218,

+        DefaultClause = 221,

 >DefaultClause : SyntaxKind
 
-        HeritageClause = 219,

+        HeritageClause = 222,

 >HeritageClause : SyntaxKind
 
-        CatchClause = 220,

+        CatchClause = 223,

 >CatchClause : SyntaxKind
 
-        PropertyAssignment = 221,

+        PropertyAssignment = 224,

 >PropertyAssignment : SyntaxKind
 
-        ShorthandPropertyAssignment = 222,

+        ShorthandPropertyAssignment = 225,

 >ShorthandPropertyAssignment : SyntaxKind
 
-        EnumMember = 223,

+        EnumMember = 226,

 >EnumMember : SyntaxKind
 
-        SourceFile = 224,

+        SourceFile = 227,

 >SourceFile : SyntaxKind
 
-        SyntaxList = 225,

+        SyntaxList = 228,

 >SyntaxList : SyntaxKind
 
-        Count = 226,

+        Count = 229,

 >Count : SyntaxKind
 
         FirstAssignment = 53,

@@ -1526,6 +1535,13 @@ declare module "typescript" {
         body?: Block;

 >body : Block
 >Block : Block
+    }

+    interface SemicolonClassElement extends ClassElement {

+>SemicolonClassElement : SemicolonClassElement
+>ClassElement : ClassElement
+
+        _semicolonClassElementBrand: any;

+>_semicolonClassElementBrand : any
     }

     interface AccessorDeclaration extends FunctionLikeDeclaration, ClassElement, ObjectLiteralElement {

 >AccessorDeclaration : AccessorDeclaration
@@ -1927,6 +1943,19 @@ declare module "typescript" {
 >arguments : NodeArray<Expression>
 >NodeArray : NodeArray<T>
 >Expression : Expression
+    }

+    interface HeritageClauseElement extends Node {

+>HeritageClauseElement : HeritageClauseElement
+>Node : Node
+
+        expression: LeftHandSideExpression;

+>expression : LeftHandSideExpression
+>LeftHandSideExpression : LeftHandSideExpression
+
+        typeArguments?: NodeArray<TypeNode>;

+>typeArguments : NodeArray<TypeNode>
+>NodeArray : NodeArray<T>
+>TypeNode : TypeNode
     }

     interface NewExpression extends CallExpression, PrimaryExpression {

 >NewExpression : NewExpression
@@ -2211,10 +2240,9 @@ declare module "typescript" {
         _moduleElementBrand: any;

 >_moduleElementBrand : any
     }

-    interface ClassDeclaration extends Declaration, ModuleElement {

->ClassDeclaration : ClassDeclaration
+    interface ClassLikeDeclaration extends Declaration {

+>ClassLikeDeclaration : ClassLikeDeclaration
 >Declaration : Declaration
->ModuleElement : ModuleElement
 
         name?: Identifier;

 >name : Identifier
@@ -2234,6 +2262,16 @@ declare module "typescript" {
 >members : NodeArray<ClassElement>
 >NodeArray : NodeArray<T>
 >ClassElement : ClassElement
+    }

+    interface ClassDeclaration extends ClassLikeDeclaration, Statement {

+>ClassDeclaration : ClassDeclaration
+>ClassLikeDeclaration : ClassLikeDeclaration
+>Statement : Statement
+    }

+    interface ClassExpression extends ClassLikeDeclaration, PrimaryExpression {

+>ClassExpression : ClassExpression
+>ClassLikeDeclaration : ClassLikeDeclaration
+>PrimaryExpression : PrimaryExpression
     }

     interface ClassElement extends Declaration {

 >ClassElement : ClassElement
@@ -2274,10 +2312,10 @@ declare module "typescript" {
 >token : SyntaxKind
 >SyntaxKind : SyntaxKind
 
-        types?: NodeArray<TypeReferenceNode>;

->types : NodeArray<TypeReferenceNode>
+        types?: NodeArray<HeritageClauseElement>;

+>types : NodeArray<HeritageClauseElement>
 >NodeArray : NodeArray<T>
->TypeReferenceNode : TypeReferenceNode
+>HeritageClauseElement : HeritageClauseElement
     }

     interface TypeAliasDeclaration extends Declaration, ModuleElement {

 >TypeAliasDeclaration : TypeAliasDeclaration
@@ -3221,10 +3259,11 @@ declare module "typescript" {
 >SymbolFlags : SymbolFlags
 >SymbolAccessiblityResult : SymbolAccessiblityResult
 
-        isEntityNameVisible(entityName: EntityName, enclosingDeclaration: Node): SymbolVisibilityResult;

->isEntityNameVisible : (entityName: Identifier | QualifiedName, enclosingDeclaration: Node) => SymbolVisibilityResult
->entityName : Identifier | QualifiedName
+        isEntityNameVisible(entityName: EntityName | Expression, enclosingDeclaration: Node): SymbolVisibilityResult;

+>isEntityNameVisible : (entityName: Identifier | Expression | QualifiedName, enclosingDeclaration: Node) => SymbolVisibilityResult
+>entityName : Identifier | Expression | QualifiedName
 >EntityName : Identifier | QualifiedName
+>Expression : Expression
 >enclosingDeclaration : Node
 >Node : Node
 >SymbolVisibilityResult : SymbolVisibilityResult
diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js
index 0d76740ed9..cb2ae64392 100644
--- a/tests/baselines/reference/APISample_watcher.js
+++ b/tests/baselines/reference/APISample_watcher.js
@@ -302,59 +302,62 @@ declare module "typescript" {
         TemplateExpression = 171,
         YieldExpression = 172,
         SpreadElementExpression = 173,
-        OmittedExpression = 174,
-        TemplateSpan = 175,
-        Block = 176,
-        VariableStatement = 177,
-        EmptyStatement = 178,
-        ExpressionStatement = 179,
-        IfStatement = 180,
-        DoStatement = 181,
-        WhileStatement = 182,
-        ForStatement = 183,
-        ForInStatement = 184,
-        ForOfStatement = 185,
-        ContinueStatement = 186,
-        BreakStatement = 187,
-        ReturnStatement = 188,
-        WithStatement = 189,
-        SwitchStatement = 190,
-        LabeledStatement = 191,
-        ThrowStatement = 192,
-        TryStatement = 193,
-        DebuggerStatement = 194,
-        VariableDeclaration = 195,
-        VariableDeclarationList = 196,
-        FunctionDeclaration = 197,
-        ClassDeclaration = 198,
-        InterfaceDeclaration = 199,
-        TypeAliasDeclaration = 200,
-        EnumDeclaration = 201,
-        ModuleDeclaration = 202,
-        ModuleBlock = 203,
-        CaseBlock = 204,
-        ImportEqualsDeclaration = 205,
-        ImportDeclaration = 206,
-        ImportClause = 207,
-        NamespaceImport = 208,
-        NamedImports = 209,
-        ImportSpecifier = 210,
-        ExportAssignment = 211,
-        ExportDeclaration = 212,
-        NamedExports = 213,
-        ExportSpecifier = 214,
-        MissingDeclaration = 215,
-        ExternalModuleReference = 216,
-        CaseClause = 217,
-        DefaultClause = 218,
-        HeritageClause = 219,
-        CatchClause = 220,
-        PropertyAssignment = 221,
-        ShorthandPropertyAssignment = 222,
-        EnumMember = 223,
-        SourceFile = 224,
-        SyntaxList = 225,
-        Count = 226,
+        ClassExpression = 174,
+        OmittedExpression = 175,
+        TemplateSpan = 176,
+        HeritageClauseElement = 177,
+        SemicolonClassElement = 178,
+        Block = 179,
+        VariableStatement = 180,
+        EmptyStatement = 181,
+        ExpressionStatement = 182,
+        IfStatement = 183,
+        DoStatement = 184,
+        WhileStatement = 185,
+        ForStatement = 186,
+        ForInStatement = 187,
+        ForOfStatement = 188,
+        ContinueStatement = 189,
+        BreakStatement = 190,
+        ReturnStatement = 191,
+        WithStatement = 192,
+        SwitchStatement = 193,
+        LabeledStatement = 194,
+        ThrowStatement = 195,
+        TryStatement = 196,
+        DebuggerStatement = 197,
+        VariableDeclaration = 198,
+        VariableDeclarationList = 199,
+        FunctionDeclaration = 200,
+        ClassDeclaration = 201,
+        InterfaceDeclaration = 202,
+        TypeAliasDeclaration = 203,
+        EnumDeclaration = 204,
+        ModuleDeclaration = 205,
+        ModuleBlock = 206,
+        CaseBlock = 207,
+        ImportEqualsDeclaration = 208,
+        ImportDeclaration = 209,
+        ImportClause = 210,
+        NamespaceImport = 211,
+        NamedImports = 212,
+        ImportSpecifier = 213,
+        ExportAssignment = 214,
+        ExportDeclaration = 215,
+        NamedExports = 216,
+        ExportSpecifier = 217,
+        MissingDeclaration = 218,
+        ExternalModuleReference = 219,
+        CaseClause = 220,
+        DefaultClause = 221,
+        HeritageClause = 222,
+        CatchClause = 223,
+        PropertyAssignment = 224,
+        ShorthandPropertyAssignment = 225,
+        EnumMember = 226,
+        SourceFile = 227,
+        SyntaxList = 228,
+        Count = 229,
         FirstAssignment = 53,
         LastAssignment = 64,
         FirstReservedWord = 66,
@@ -538,6 +541,9 @@ declare module "typescript" {
     interface ConstructorDeclaration extends FunctionLikeDeclaration, ClassElement {
         body?: Block;
     }
+    interface SemicolonClassElement extends ClassElement {
+        _semicolonClassElementBrand: any;
+    }
     interface AccessorDeclaration extends FunctionLikeDeclaration, ClassElement, ObjectLiteralElement {
         _accessorDeclarationBrand: any;
         body: Block;
@@ -676,6 +682,10 @@ declare module "typescript" {
         typeArguments?: NodeArray<TypeNode>;
         arguments: NodeArray<Expression>;
     }
+    interface HeritageClauseElement extends Node {
+        expression: LeftHandSideExpression;
+        typeArguments?: NodeArray<TypeNode>;
+    }
     interface NewExpression extends CallExpression, PrimaryExpression {
     }
     interface TaggedTemplateExpression extends MemberExpression {
@@ -770,12 +780,16 @@ declare module "typescript" {
     interface ModuleElement extends Node {
         _moduleElementBrand: any;
     }
-    interface ClassDeclaration extends Declaration, ModuleElement {
+    interface ClassLikeDeclaration extends Declaration {
         name?: Identifier;
         typeParameters?: NodeArray<TypeParameterDeclaration>;
         heritageClauses?: NodeArray<HeritageClause>;
         members: NodeArray<ClassElement>;
     }
+    interface ClassDeclaration extends ClassLikeDeclaration, Statement {
+    }
+    interface ClassExpression extends ClassLikeDeclaration, PrimaryExpression {
+    }
     interface ClassElement extends Declaration {
         _classElementBrand: any;
     }
@@ -787,7 +801,7 @@ declare module "typescript" {
     }
     interface HeritageClause extends Node {
         token: SyntaxKind;
-        types?: NodeArray<TypeReferenceNode>;
+        types?: NodeArray<HeritageClauseElement>;
     }
     interface TypeAliasDeclaration extends Declaration, ModuleElement {
         name: Identifier;
@@ -1029,7 +1043,7 @@ declare module "typescript" {
         writeReturnTypeOfSignatureDeclaration(signatureDeclaration: SignatureDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void;
         writeTypeOfExpression(expr: Expression, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void;
         isSymbolAccessible(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags): SymbolAccessiblityResult;
-        isEntityNameVisible(entityName: EntityName, enclosingDeclaration: Node): SymbolVisibilityResult;
+        isEntityNameVisible(entityName: EntityName | Expression, enclosingDeclaration: Node): SymbolVisibilityResult;
         getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;
         resolvesToSomeValue(location: Node, name: string): boolean;
         getBlockScopedVariableId(node: Identifier): number;
diff --git a/tests/baselines/reference/APISample_watcher.types b/tests/baselines/reference/APISample_watcher.types
index ea2436b289..f1f949a9e3 100644
--- a/tests/baselines/reference/APISample_watcher.types
+++ b/tests/baselines/reference/APISample_watcher.types
@@ -986,163 +986,172 @@ declare module "typescript" {
         SpreadElementExpression = 173,

 >SpreadElementExpression : SyntaxKind
 
-        OmittedExpression = 174,

+        ClassExpression = 174,

+>ClassExpression : SyntaxKind
+
+        OmittedExpression = 175,

 >OmittedExpression : SyntaxKind
 
-        TemplateSpan = 175,

+        TemplateSpan = 176,

 >TemplateSpan : SyntaxKind
 
-        Block = 176,

+        HeritageClauseElement = 177,

+>HeritageClauseElement : SyntaxKind
+
+        SemicolonClassElement = 178,

+>SemicolonClassElement : SyntaxKind
+
+        Block = 179,

 >Block : SyntaxKind
 
-        VariableStatement = 177,

+        VariableStatement = 180,

 >VariableStatement : SyntaxKind
 
-        EmptyStatement = 178,

+        EmptyStatement = 181,

 >EmptyStatement : SyntaxKind
 
-        ExpressionStatement = 179,

+        ExpressionStatement = 182,

 >ExpressionStatement : SyntaxKind
 
-        IfStatement = 180,

+        IfStatement = 183,

 >IfStatement : SyntaxKind
 
-        DoStatement = 181,

+        DoStatement = 184,

 >DoStatement : SyntaxKind
 
-        WhileStatement = 182,

+        WhileStatement = 185,

 >WhileStatement : SyntaxKind
 
-        ForStatement = 183,

+        ForStatement = 186,

 >ForStatement : SyntaxKind
 
-        ForInStatement = 184,

+        ForInStatement = 187,

 >ForInStatement : SyntaxKind
 
-        ForOfStatement = 185,

+        ForOfStatement = 188,

 >ForOfStatement : SyntaxKind
 
-        ContinueStatement = 186,

+        ContinueStatement = 189,

 >ContinueStatement : SyntaxKind
 
-        BreakStatement = 187,

+        BreakStatement = 190,

 >BreakStatement : SyntaxKind
 
-        ReturnStatement = 188,

+        ReturnStatement = 191,

 >ReturnStatement : SyntaxKind
 
-        WithStatement = 189,

+        WithStatement = 192,

 >WithStatement : SyntaxKind
 
-        SwitchStatement = 190,

+        SwitchStatement = 193,

 >SwitchStatement : SyntaxKind
 
-        LabeledStatement = 191,

+        LabeledStatement = 194,

 >LabeledStatement : SyntaxKind
 
-        ThrowStatement = 192,

+        ThrowStatement = 195,

 >ThrowStatement : SyntaxKind
 
-        TryStatement = 193,

+        TryStatement = 196,

 >TryStatement : SyntaxKind
 
-        DebuggerStatement = 194,

+        DebuggerStatement = 197,

 >DebuggerStatement : SyntaxKind
 
-        VariableDeclaration = 195,

+        VariableDeclaration = 198,

 >VariableDeclaration : SyntaxKind
 
-        VariableDeclarationList = 196,

+        VariableDeclarationList = 199,

 >VariableDeclarationList : SyntaxKind
 
-        FunctionDeclaration = 197,

+        FunctionDeclaration = 200,

 >FunctionDeclaration : SyntaxKind
 
-        ClassDeclaration = 198,

+        ClassDeclaration = 201,

 >ClassDeclaration : SyntaxKind
 
-        InterfaceDeclaration = 199,

+        InterfaceDeclaration = 202,

 >InterfaceDeclaration : SyntaxKind
 
-        TypeAliasDeclaration = 200,

+        TypeAliasDeclaration = 203,

 >TypeAliasDeclaration : SyntaxKind
 
-        EnumDeclaration = 201,

+        EnumDeclaration = 204,

 >EnumDeclaration : SyntaxKind
 
-        ModuleDeclaration = 202,

+        ModuleDeclaration = 205,

 >ModuleDeclaration : SyntaxKind
 
-        ModuleBlock = 203,

+        ModuleBlock = 206,

 >ModuleBlock : SyntaxKind
 
-        CaseBlock = 204,

+        CaseBlock = 207,

 >CaseBlock : SyntaxKind
 
-        ImportEqualsDeclaration = 205,

+        ImportEqualsDeclaration = 208,

 >ImportEqualsDeclaration : SyntaxKind
 
-        ImportDeclaration = 206,

+        ImportDeclaration = 209,

 >ImportDeclaration : SyntaxKind
 
-        ImportClause = 207,

+        ImportClause = 210,

 >ImportClause : SyntaxKind
 
-        NamespaceImport = 208,

+        NamespaceImport = 211,

 >NamespaceImport : SyntaxKind
 
-        NamedImports = 209,

+        NamedImports = 212,

 >NamedImports : SyntaxKind
 
-        ImportSpecifier = 210,

+        ImportSpecifier = 213,

 >ImportSpecifier : SyntaxKind
 
-        ExportAssignment = 211,

+        ExportAssignment = 214,

 >ExportAssignment : SyntaxKind
 
-        ExportDeclaration = 212,

+        ExportDeclaration = 215,

 >ExportDeclaration : SyntaxKind
 
-        NamedExports = 213,

+        NamedExports = 216,

 >NamedExports : SyntaxKind
 
-        ExportSpecifier = 214,

+        ExportSpecifier = 217,

 >ExportSpecifier : SyntaxKind
 
-        MissingDeclaration = 215,

+        MissingDeclaration = 218,

 >MissingDeclaration : SyntaxKind
 
-        ExternalModuleReference = 216,

+        ExternalModuleReference = 219,

 >ExternalModuleReference : SyntaxKind
 
-        CaseClause = 217,

+        CaseClause = 220,

 >CaseClause : SyntaxKind
 
-        DefaultClause = 218,

+        DefaultClause = 221,

 >DefaultClause : SyntaxKind
 
-        HeritageClause = 219,

+        HeritageClause = 222,

 >HeritageClause : SyntaxKind
 
-        CatchClause = 220,

+        CatchClause = 223,

 >CatchClause : SyntaxKind
 
-        PropertyAssignment = 221,

+        PropertyAssignment = 224,

 >PropertyAssignment : SyntaxKind
 
-        ShorthandPropertyAssignment = 222,

+        ShorthandPropertyAssignment = 225,

 >ShorthandPropertyAssignment : SyntaxKind
 
-        EnumMember = 223,

+        EnumMember = 226,

 >EnumMember : SyntaxKind
 
-        SourceFile = 224,

+        SourceFile = 227,

 >SourceFile : SyntaxKind
 
-        SyntaxList = 225,

+        SyntaxList = 228,

 >SyntaxList : SyntaxKind
 
-        Count = 226,

+        Count = 229,

 >Count : SyntaxKind
 
         FirstAssignment = 53,

@@ -1699,6 +1708,13 @@ declare module "typescript" {
         body?: Block;

 >body : Block
 >Block : Block
+    }

+    interface SemicolonClassElement extends ClassElement {

+>SemicolonClassElement : SemicolonClassElement
+>ClassElement : ClassElement
+
+        _semicolonClassElementBrand: any;

+>_semicolonClassElementBrand : any
     }

     interface AccessorDeclaration extends FunctionLikeDeclaration, ClassElement, ObjectLiteralElement {

 >AccessorDeclaration : AccessorDeclaration
@@ -2100,6 +2116,19 @@ declare module "typescript" {
 >arguments : NodeArray<Expression>
 >NodeArray : NodeArray<T>
 >Expression : Expression
+    }

+    interface HeritageClauseElement extends Node {

+>HeritageClauseElement : HeritageClauseElement
+>Node : Node
+
+        expression: LeftHandSideExpression;

+>expression : LeftHandSideExpression
+>LeftHandSideExpression : LeftHandSideExpression
+
+        typeArguments?: NodeArray<TypeNode>;

+>typeArguments : NodeArray<TypeNode>
+>NodeArray : NodeArray<T>
+>TypeNode : TypeNode
     }

     interface NewExpression extends CallExpression, PrimaryExpression {

 >NewExpression : NewExpression
@@ -2384,10 +2413,9 @@ declare module "typescript" {
         _moduleElementBrand: any;

 >_moduleElementBrand : any
     }

-    interface ClassDeclaration extends Declaration, ModuleElement {

->ClassDeclaration : ClassDeclaration
+    interface ClassLikeDeclaration extends Declaration {

+>ClassLikeDeclaration : ClassLikeDeclaration
 >Declaration : Declaration
->ModuleElement : ModuleElement
 
         name?: Identifier;

 >name : Identifier
@@ -2407,6 +2435,16 @@ declare module "typescript" {
 >members : NodeArray<ClassElement>
 >NodeArray : NodeArray<T>
 >ClassElement : ClassElement
+    }

+    interface ClassDeclaration extends ClassLikeDeclaration, Statement {

+>ClassDeclaration : ClassDeclaration
+>ClassLikeDeclaration : ClassLikeDeclaration
+>Statement : Statement
+    }

+    interface ClassExpression extends ClassLikeDeclaration, PrimaryExpression {

+>ClassExpression : ClassExpression
+>ClassLikeDeclaration : ClassLikeDeclaration
+>PrimaryExpression : PrimaryExpression
     }

     interface ClassElement extends Declaration {

 >ClassElement : ClassElement
@@ -2447,10 +2485,10 @@ declare module "typescript" {
 >token : SyntaxKind
 >SyntaxKind : SyntaxKind
 
-        types?: NodeArray<TypeReferenceNode>;

->types : NodeArray<TypeReferenceNode>
+        types?: NodeArray<HeritageClauseElement>;

+>types : NodeArray<HeritageClauseElement>
 >NodeArray : NodeArray<T>
->TypeReferenceNode : TypeReferenceNode
+>HeritageClauseElement : HeritageClauseElement
     }

     interface TypeAliasDeclaration extends Declaration, ModuleElement {

 >TypeAliasDeclaration : TypeAliasDeclaration
@@ -3394,10 +3432,11 @@ declare module "typescript" {
 >SymbolFlags : SymbolFlags
 >SymbolAccessiblityResult : SymbolAccessiblityResult
 
-        isEntityNameVisible(entityName: EntityName, enclosingDeclaration: Node): SymbolVisibilityResult;

->isEntityNameVisible : (entityName: Identifier | QualifiedName, enclosingDeclaration: Node) => SymbolVisibilityResult
->entityName : Identifier | QualifiedName
+        isEntityNameVisible(entityName: EntityName | Expression, enclosingDeclaration: Node): SymbolVisibilityResult;

+>isEntityNameVisible : (entityName: Identifier | Expression | QualifiedName, enclosingDeclaration: Node) => SymbolVisibilityResult
+>entityName : Identifier | Expression | QualifiedName
 >EntityName : Identifier | QualifiedName
+>Expression : Expression
 >enclosingDeclaration : Node
 >Node : Node
 >SymbolVisibilityResult : SymbolVisibilityResult
diff --git a/tests/baselines/reference/aliasUsageInAccessorsOfClass.types b/tests/baselines/reference/aliasUsageInAccessorsOfClass.types
index c300ae861a..a666d2cee9 100644
--- a/tests/baselines/reference/aliasUsageInAccessorsOfClass.types
+++ b/tests/baselines/reference/aliasUsageInAccessorsOfClass.types
@@ -52,7 +52,7 @@ import Backbone = require("aliasUsage1_backbone");
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : unknown
+>Backbone : typeof Backbone
 >Model : Backbone.Model
 
     // interesting stuff here
diff --git a/tests/baselines/reference/aliasUsageInArray.types b/tests/baselines/reference/aliasUsageInArray.types
index 2e792d3960..f7e2beb49d 100644
--- a/tests/baselines/reference/aliasUsageInArray.types
+++ b/tests/baselines/reference/aliasUsageInArray.types
@@ -40,7 +40,7 @@ import Backbone = require("aliasUsageInArray_backbone");
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : unknown
+>Backbone : typeof Backbone
 >Model : Backbone.Model
 
     // interesting stuff here
diff --git a/tests/baselines/reference/aliasUsageInFunctionExpression.types b/tests/baselines/reference/aliasUsageInFunctionExpression.types
index ba66a0f1c7..392481d2d0 100644
--- a/tests/baselines/reference/aliasUsageInFunctionExpression.types
+++ b/tests/baselines/reference/aliasUsageInFunctionExpression.types
@@ -41,7 +41,7 @@ import Backbone = require("aliasUsageInFunctionExpression_backbone");
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : unknown
+>Backbone : typeof Backbone
 >Model : Backbone.Model
 
     // interesting stuff here
diff --git a/tests/baselines/reference/aliasUsageInGenericFunction.types b/tests/baselines/reference/aliasUsageInGenericFunction.types
index cf63eba6a6..568e885f51 100644
--- a/tests/baselines/reference/aliasUsageInGenericFunction.types
+++ b/tests/baselines/reference/aliasUsageInGenericFunction.types
@@ -55,7 +55,7 @@ import Backbone = require("aliasUsageInGenericFunction_backbone");
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : unknown
+>Backbone : typeof Backbone
 >Model : Backbone.Model
 
     // interesting stuff here
diff --git a/tests/baselines/reference/aliasUsageInIndexerOfClass.types b/tests/baselines/reference/aliasUsageInIndexerOfClass.types
index cc4b237709..e968abe597 100644
--- a/tests/baselines/reference/aliasUsageInIndexerOfClass.types
+++ b/tests/baselines/reference/aliasUsageInIndexerOfClass.types
@@ -49,7 +49,7 @@ import Backbone = require("aliasUsageInIndexerOfClass_backbone");
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : unknown
+>Backbone : typeof Backbone
 >Model : Backbone.Model
 
     // interesting stuff here
diff --git a/tests/baselines/reference/aliasUsageInObjectLiteral.types b/tests/baselines/reference/aliasUsageInObjectLiteral.types
index b34a4300c5..2e631a41cd 100644
--- a/tests/baselines/reference/aliasUsageInObjectLiteral.types
+++ b/tests/baselines/reference/aliasUsageInObjectLiteral.types
@@ -54,7 +54,7 @@ import Backbone = require("aliasUsageInObjectLiteral_backbone");
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : unknown
+>Backbone : typeof Backbone
 >Model : Backbone.Model
 
     // interesting stuff here
diff --git a/tests/baselines/reference/aliasUsageInOrExpression.types b/tests/baselines/reference/aliasUsageInOrExpression.types
index c937187f04..1a4dae9035 100644
--- a/tests/baselines/reference/aliasUsageInOrExpression.types
+++ b/tests/baselines/reference/aliasUsageInOrExpression.types
@@ -75,7 +75,7 @@ import Backbone = require("aliasUsageInOrExpression_backbone");
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : unknown
+>Backbone : typeof Backbone
 >Model : Backbone.Model
 
     // interesting stuff here
diff --git a/tests/baselines/reference/aliasUsageInOrExpression.types.pull b/tests/baselines/reference/aliasUsageInOrExpression.types.pull
index cc45af29f8..3b138d1404 100644
--- a/tests/baselines/reference/aliasUsageInOrExpression.types.pull
+++ b/tests/baselines/reference/aliasUsageInOrExpression.types.pull
@@ -75,7 +75,7 @@ import Backbone = require("aliasUsageInOrExpression_backbone");
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : unknown
+>Backbone : typeof Backbone
 >Model : Backbone.Model
 
     // interesting stuff here
diff --git a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.types b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.types
index e2e8b57b94..72f0aaf9e2 100644
--- a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.types
+++ b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.types
@@ -45,7 +45,7 @@ import Backbone = require("aliasUsageInTypeArgumentOfExtendsClause_backbone");
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : unknown
+>Backbone : typeof Backbone
 >Model : Backbone.Model
 
     // interesting stuff here
diff --git a/tests/baselines/reference/aliasUsageInVarAssignment.types b/tests/baselines/reference/aliasUsageInVarAssignment.types
index 7ca745b3d2..6b1c097ad9 100644
--- a/tests/baselines/reference/aliasUsageInVarAssignment.types
+++ b/tests/baselines/reference/aliasUsageInVarAssignment.types
@@ -36,7 +36,7 @@ import Backbone = require("aliasUsageInVarAssignment_backbone");
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : unknown
+>Backbone : typeof Backbone
 >Model : Backbone.Model
 
     // interesting stuff here
diff --git a/tests/baselines/reference/circularImportAlias.types b/tests/baselines/reference/circularImportAlias.types
index ab8de414e3..b61f91d460 100644
--- a/tests/baselines/reference/circularImportAlias.types
+++ b/tests/baselines/reference/circularImportAlias.types
@@ -10,7 +10,7 @@ module B {
 
     export class D extends a.C {
 >D : D
->a : unknown
+>a : typeof a
 >C : a.C
 
         id: number;
diff --git a/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.types b/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.types
index b39d65c3d6..623515a7ec 100644
--- a/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.types
+++ b/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.types
@@ -18,7 +18,7 @@ module M {
 
     export class O extends M.N {
 >O : O
->M : unknown
+>M : typeof M
 >N : N
     }
 }
diff --git a/tests/baselines/reference/classExpression.errors.txt b/tests/baselines/reference/classExpression.errors.txt
index f5028814ac..c8266d0e87 100644
--- a/tests/baselines/reference/classExpression.errors.txt
+++ b/tests/baselines/reference/classExpression.errors.txt
@@ -1,36 +1,24 @@
-tests/cases/conformance/classes/classExpression.ts(1,9): error TS1109: Expression expected.
-tests/cases/conformance/classes/classExpression.ts(5,10): error TS1109: Expression expected.
-tests/cases/conformance/classes/classExpression.ts(5,16): error TS1005: ':' expected.
-tests/cases/conformance/classes/classExpression.ts(5,16): error TS2304: Cannot find name 'C2'.
-tests/cases/conformance/classes/classExpression.ts(5,19): error TS1005: ',' expected.
-tests/cases/conformance/classes/classExpression.ts(7,1): error TS1128: Declaration or statement expected.
-tests/cases/conformance/classes/classExpression.ts(10,13): error TS1109: Expression expected.
+tests/cases/conformance/classes/classExpression.ts(1,15): error TS9003: 'class' expressions are not currently supported.
+tests/cases/conformance/classes/classExpression.ts(5,16): error TS9003: 'class' expressions are not currently supported.
+tests/cases/conformance/classes/classExpression.ts(10,19): error TS9003: 'class' expressions are not currently supported.
 
 
-==== tests/cases/conformance/classes/classExpression.ts (7 errors) ====
+==== tests/cases/conformance/classes/classExpression.ts (3 errors) ====
     var x = class C {
-            ~~~~~
-!!! error TS1109: Expression expected.
+                  ~
+!!! error TS9003: 'class' expressions are not currently supported.
     }
     
     var y = {
         foo: class C2 {
-             ~~~~~
-!!! error TS1109: Expression expected.
                    ~~
-!!! error TS1005: ':' expected.
-                   ~~
-!!! error TS2304: Cannot find name 'C2'.
-                      ~
-!!! error TS1005: ',' expected.
+!!! error TS9003: 'class' expressions are not currently supported.
         }
     }
-    ~
-!!! error TS1128: Declaration or statement expected.
     
     module M {
         var z = class C4 {
-                ~~~~~
-!!! error TS1109: Expression expected.
+                      ~~
+!!! error TS9003: 'class' expressions are not currently supported.
         }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/classExpression.js b/tests/baselines/reference/classExpression.js
index 6bcf0f46f7..8f3270d13e 100644
--- a/tests/baselines/reference/classExpression.js
+++ b/tests/baselines/reference/classExpression.js
@@ -13,18 +13,21 @@ module M {
 }
 
 //// [classExpression.js]
-var x = ;
-var C = (function () {
+var x = (function () {
     function C() {
     }
     return C;
 })();
 var y = {
-    foo: , class: C2 }, _a = void 0;
+    foo: (function () {
+        function C2() {
+        }
+        return C2;
+    })()
+};
 var M;
 (function (M) {
-    var z = ;
-    var C4 = (function () {
+    var z = (function () {
         function C4() {
         }
         return C4;
diff --git a/tests/baselines/reference/classExpression1.errors.txt b/tests/baselines/reference/classExpression1.errors.txt
new file mode 100644
index 0000000000..9d7d14d857
--- /dev/null
+++ b/tests/baselines/reference/classExpression1.errors.txt
@@ -0,0 +1,7 @@
+tests/cases/conformance/classes/classExpressions/classExpression1.ts(1,15): error TS9003: 'class' expressions are not currently supported.
+
+
+==== tests/cases/conformance/classes/classExpressions/classExpression1.ts (1 errors) ====
+    var v = class C {};
+                  ~
+!!! error TS9003: 'class' expressions are not currently supported.
\ No newline at end of file
diff --git a/tests/baselines/reference/classExpression1.js b/tests/baselines/reference/classExpression1.js
new file mode 100644
index 0000000000..68c7bc5e1e
--- /dev/null
+++ b/tests/baselines/reference/classExpression1.js
@@ -0,0 +1,9 @@
+//// [classExpression1.ts]
+var v = class C {};
+
+//// [classExpression1.js]
+var v = (function () {
+    function C() {
+    }
+    return C;
+})();
diff --git a/tests/baselines/reference/classExpression2.errors.txt b/tests/baselines/reference/classExpression2.errors.txt
new file mode 100644
index 0000000000..e2f3ccd77c
--- /dev/null
+++ b/tests/baselines/reference/classExpression2.errors.txt
@@ -0,0 +1,8 @@
+tests/cases/conformance/classes/classExpressions/classExpression2.ts(2,15): error TS9003: 'class' expressions are not currently supported.
+
+
+==== tests/cases/conformance/classes/classExpressions/classExpression2.ts (1 errors) ====
+    class D { }
+    var v = class C extends D {};
+                  ~
+!!! error TS9003: 'class' expressions are not currently supported.
\ No newline at end of file
diff --git a/tests/baselines/reference/classExpression2.js b/tests/baselines/reference/classExpression2.js
new file mode 100644
index 0000000000..4220b88fb1
--- /dev/null
+++ b/tests/baselines/reference/classExpression2.js
@@ -0,0 +1,17 @@
+//// [classExpression2.ts]
+class D { }
+var v = class C extends D {};
+
+//// [classExpression2.js]
+var D = (function () {
+    function D() {
+    }
+    return D;
+})();
+var v = (function (_super) {
+    __extends(C, _super);
+    function C() {
+        _super.apply(this, arguments);
+    }
+    return C;
+})(D);
diff --git a/tests/baselines/reference/classExpressionES61.errors.txt b/tests/baselines/reference/classExpressionES61.errors.txt
new file mode 100644
index 0000000000..abaa5ab893
--- /dev/null
+++ b/tests/baselines/reference/classExpressionES61.errors.txt
@@ -0,0 +1,7 @@
+tests/cases/conformance/es6/classExpressions/classExpressionES61.ts(1,15): error TS9003: 'class' expressions are not currently supported.
+
+
+==== tests/cases/conformance/es6/classExpressions/classExpressionES61.ts (1 errors) ====
+    var v = class C {};
+                  ~
+!!! error TS9003: 'class' expressions are not currently supported.
\ No newline at end of file
diff --git a/tests/baselines/reference/classExpressionES61.js b/tests/baselines/reference/classExpressionES61.js
new file mode 100644
index 0000000000..afef090903
--- /dev/null
+++ b/tests/baselines/reference/classExpressionES61.js
@@ -0,0 +1,7 @@
+//// [classExpressionES61.ts]
+var v = class C {};
+
+//// [classExpressionES61.js]
+var v = class C {
+}
+;
diff --git a/tests/baselines/reference/classExpressionES62.errors.txt b/tests/baselines/reference/classExpressionES62.errors.txt
new file mode 100644
index 0000000000..1e28367a17
--- /dev/null
+++ b/tests/baselines/reference/classExpressionES62.errors.txt
@@ -0,0 +1,8 @@
+tests/cases/conformance/es6/classExpressions/classExpressionES62.ts(2,15): error TS9003: 'class' expressions are not currently supported.
+
+
+==== tests/cases/conformance/es6/classExpressions/classExpressionES62.ts (1 errors) ====
+    class D { }
+    var v = class C extends D {};
+                  ~
+!!! error TS9003: 'class' expressions are not currently supported.
\ No newline at end of file
diff --git a/tests/baselines/reference/classExpressionES62.js b/tests/baselines/reference/classExpressionES62.js
new file mode 100644
index 0000000000..79cede7300
--- /dev/null
+++ b/tests/baselines/reference/classExpressionES62.js
@@ -0,0 +1,10 @@
+//// [classExpressionES62.ts]
+class D { }
+var v = class C extends D {};
+
+//// [classExpressionES62.js]
+class D {
+}
+var v = class C extends D {
+}
+;
diff --git a/tests/baselines/reference/classExpressionTest1.errors.txt b/tests/baselines/reference/classExpressionTest1.errors.txt
new file mode 100644
index 0000000000..4d7e1cda63
--- /dev/null
+++ b/tests/baselines/reference/classExpressionTest1.errors.txt
@@ -0,0 +1,18 @@
+tests/cases/compiler/classExpressionTest1.ts(2,11): error TS9004: 'class' declarations are only supported directly inside a module or as a top level declaration.
+
+
+==== tests/cases/compiler/classExpressionTest1.ts (1 errors) ====
+    function M() {
+        class C<X> {
+              ~
+!!! error TS9004: 'class' declarations are only supported directly inside a module or as a top level declaration.
+            f<T>() {
+                var t: T;
+                var x: X;
+                return { t, x };
+            }
+        }
+    
+        var v = new C<number>();
+        return v.f<string>();
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/classExpressionTest1.js b/tests/baselines/reference/classExpressionTest1.js
new file mode 100644
index 0000000000..e91cdebb8c
--- /dev/null
+++ b/tests/baselines/reference/classExpressionTest1.js
@@ -0,0 +1,29 @@
+//// [classExpressionTest1.ts]
+function M() {
+    class C<X> {
+        f<T>() {
+            var t: T;
+            var x: X;
+            return { t, x };
+        }
+    }
+
+    var v = new C<number>();
+    return v.f<string>();
+}
+
+//// [classExpressionTest1.js]
+function M() {
+    var C = (function () {
+        function C() {
+        }
+        C.prototype.f = function () {
+            var t;
+            var x;
+            return { t: t, x: x };
+        };
+        return C;
+    })();
+    var v = new C();
+    return v.f();
+}
diff --git a/tests/baselines/reference/classExpressionTest2.errors.txt b/tests/baselines/reference/classExpressionTest2.errors.txt
new file mode 100644
index 0000000000..424eb59061
--- /dev/null
+++ b/tests/baselines/reference/classExpressionTest2.errors.txt
@@ -0,0 +1,21 @@
+tests/cases/compiler/classExpressionTest2.ts(2,19): error TS9003: 'class' expressions are not currently supported.
+tests/cases/compiler/classExpressionTest2.ts(5,20): error TS2304: Cannot find name 'X'.
+
+
+==== tests/cases/compiler/classExpressionTest2.ts (2 errors) ====
+    function M() {
+        var m = class C<X> {
+                      ~
+!!! error TS9003: 'class' expressions are not currently supported.
+            f<T>() {
+                var t: T;
+                var x: X;
+                       ~
+!!! error TS2304: Cannot find name 'X'.
+                return { t, x };
+            }
+        }
+    
+        var v = new m<number>();
+        return v.f<string>();
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/classExpressionTest2.js b/tests/baselines/reference/classExpressionTest2.js
new file mode 100644
index 0000000000..ebb5c1e21b
--- /dev/null
+++ b/tests/baselines/reference/classExpressionTest2.js
@@ -0,0 +1,29 @@
+//// [classExpressionTest2.ts]
+function M() {
+    var m = class C<X> {
+        f<T>() {
+            var t: T;
+            var x: X;
+            return { t, x };
+        }
+    }
+
+    var v = new m<number>();
+    return v.f<string>();
+}
+
+//// [classExpressionTest2.js]
+function M() {
+    var m = (function () {
+        function C() {
+        }
+        C.prototype.f = function () {
+            var t;
+            var x;
+            return { t: t, x: x };
+        };
+        return C;
+    })();
+    var v = new m();
+    return v.f();
+}
diff --git a/tests/baselines/reference/classExtendingPrimitive.errors.txt b/tests/baselines/reference/classExtendingPrimitive.errors.txt
index d46439eba1..ae039640e9 100644
--- a/tests/baselines/reference/classExtendingPrimitive.errors.txt
+++ b/tests/baselines/reference/classExtendingPrimitive.errors.txt
@@ -2,16 +2,15 @@ tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/cla
 tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive.ts(4,18): error TS2304: Cannot find name 'string'.
 tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive.ts(5,18): error TS2304: Cannot find name 'boolean'.
 tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive.ts(6,18): error TS2304: Cannot find name 'Void'.
-tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive.ts(7,19): error TS1133: Type reference expected.
+tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive.ts(7,19): error TS1109: Expression expected.
 tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive.ts(8,18): error TS2304: Cannot find name 'Null'.
-tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive.ts(9,19): error TS1133: Type reference expected.
-tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive.ts(9,24): error TS1005: ';' expected.
+tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive.ts(9,19): error TS9002: Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses.
 tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive.ts(10,18): error TS2304: Cannot find name 'undefined'.
 tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive.ts(11,18): error TS2304: Cannot find name 'Undefined'.
 tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive.ts(14,18): error TS2311: A class may only extend another class.
 
 
-==== tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive.ts (11 errors) ====
+==== tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive.ts (10 errors) ====
     // classes cannot extend primitives
     
     class C extends number { }
@@ -28,15 +27,13 @@ tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/cla
 !!! error TS2304: Cannot find name 'Void'.
     class C4a extends void {}
                       ~~~~
-!!! error TS1133: Type reference expected.
+!!! error TS1109: Expression expected.
     class C5 extends Null { }
                      ~~~~
 !!! error TS2304: Cannot find name 'Null'.
     class C5a extends null { }
                       ~~~~
-!!! error TS1133: Type reference expected.
-                           ~
-!!! error TS1005: ';' expected.
+!!! error TS9002: Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses.
     class C6 extends undefined { }
                      ~~~~~~~~~
 !!! error TS2304: Cannot find name 'undefined'.
diff --git a/tests/baselines/reference/classExtendingPrimitive.js b/tests/baselines/reference/classExtendingPrimitive.js
index 8130181891..45e92dde5f 100644
--- a/tests/baselines/reference/classExtendingPrimitive.js
+++ b/tests/baselines/reference/classExtendingPrimitive.js
@@ -63,13 +63,13 @@ var C5 = (function (_super) {
     }
     return C5;
 })(Null);
-var C5a = (function () {
+var C5a = (function (_super) {
+    __extends(C5a, _super);
     function C5a() {
+        _super.apply(this, arguments);
     }
     return C5a;
-})();
-null;
-{ }
+})(null);
 var C6 = (function (_super) {
     __extends(C6, _super);
     function C6() {
diff --git a/tests/baselines/reference/classExtendingPrimitive2.errors.txt b/tests/baselines/reference/classExtendingPrimitive2.errors.txt
index cc7da5de82..3bba9b9e04 100644
--- a/tests/baselines/reference/classExtendingPrimitive2.errors.txt
+++ b/tests/baselines/reference/classExtendingPrimitive2.errors.txt
@@ -1,16 +1,13 @@
-tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive2.ts(3,19): error TS1133: Type reference expected.
-tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive2.ts(4,19): error TS1133: Type reference expected.
-tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive2.ts(4,24): error TS1005: ';' expected.
+tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive2.ts(3,19): error TS1109: Expression expected.
+tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive2.ts(4,19): error TS9002: Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses.
 
 
-==== tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive2.ts (3 errors) ====
+==== tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive2.ts (2 errors) ====
     // classes cannot extend primitives
     
     class C4a extends void {}
                       ~~~~
-!!! error TS1133: Type reference expected.
+!!! error TS1109: Expression expected.
     class C5a extends null { }
                       ~~~~
-!!! error TS1133: Type reference expected.
-                           ~
-!!! error TS1005: ';' expected.
\ No newline at end of file
+!!! error TS9002: Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses.
\ No newline at end of file
diff --git a/tests/baselines/reference/classExtendingPrimitive2.js b/tests/baselines/reference/classExtendingPrimitive2.js
index 06b481dbbf..4ac6b14121 100644
--- a/tests/baselines/reference/classExtendingPrimitive2.js
+++ b/tests/baselines/reference/classExtendingPrimitive2.js
@@ -6,16 +6,22 @@ class C5a extends null { }
 
 //// [classExtendingPrimitive2.js]
 // classes cannot extend primitives
+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 C4a = (function () {
     function C4a() {
     }
     return C4a;
 })();
 void {};
-var C5a = (function () {
+var C5a = (function (_super) {
+    __extends(C5a, _super);
     function C5a() {
+        _super.apply(this, arguments);
     }
     return C5a;
-})();
-null;
-{ }
+})(null);
diff --git a/tests/baselines/reference/classExtendingQualifiedName2.types b/tests/baselines/reference/classExtendingQualifiedName2.types
index 7706f6bada..ba96058d9b 100644
--- a/tests/baselines/reference/classExtendingQualifiedName2.types
+++ b/tests/baselines/reference/classExtendingQualifiedName2.types
@@ -8,7 +8,7 @@ module M {
 
     class D extends M.C {
 >D : D
->M : unknown
+>M : typeof M
 >C : C
     }
 }
diff --git a/tests/baselines/reference/classExtendsEveryObjectType.errors.txt b/tests/baselines/reference/classExtendsEveryObjectType.errors.txt
index f1870d7139..75eced5313 100644
--- a/tests/baselines/reference/classExtendsEveryObjectType.errors.txt
+++ b/tests/baselines/reference/classExtendsEveryObjectType.errors.txt
@@ -1,12 +1,13 @@
 tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType.ts(4,17): error TS2311: A class may only extend another class.
+tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType.ts(6,18): error TS9002: Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses.
+tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType.ts(6,31): error TS1005: ',' expected.
 tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType.ts(8,18): error TS2304: Cannot find name 'x'.
 tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType.ts(11,18): error TS2304: Cannot find name 'M'.
 tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType.ts(14,18): error TS2304: Cannot find name 'foo'.
-tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType.ts(16,18): error TS1133: Type reference expected.
-tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType.ts(16,20): error TS1005: ';' expected.
+tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType.ts(16,18): error TS9002: Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses.
 
 
-==== tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType.ts (6 errors) ====
+==== tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType.ts (7 errors) ====
     interface I {
         foo: string;
     }
@@ -15,6 +16,10 @@ tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/cla
 !!! error TS2311: A class may only extend another class.
     
     class C2 extends { foo: string; } { } // error
+                     ~~~~~~~~~~~~~~~~
+!!! error TS9002: Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses.
+                                  ~
+!!! error TS1005: ',' expected.
     var x: { foo: string; }
     class C3 extends x { } // error
                      ~
@@ -31,7 +36,5 @@ tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/cla
 !!! error TS2304: Cannot find name 'foo'.
     
     class C6 extends []{ } // error
-                     ~
-!!! error TS1133: Type reference expected.
-                       ~
-!!! error TS1005: ';' expected.
\ No newline at end of file
+                     ~~
+!!! error TS9002: Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses.
\ No newline at end of file
diff --git a/tests/baselines/reference/classExtendsEveryObjectType.js b/tests/baselines/reference/classExtendsEveryObjectType.js
index 2ae7ea71ce..30966fedaf 100644
--- a/tests/baselines/reference/classExtendsEveryObjectType.js
+++ b/tests/baselines/reference/classExtendsEveryObjectType.js
@@ -30,12 +30,13 @@ var C = (function (_super) {
     }
     return C;
 })(I); // error
-var C2 = (function () {
+var C2 = (function (_super) {
+    __extends(C2, _super);
     function C2() {
+        _super.apply(this, arguments);
     }
     return C2;
-})();
-{ } // error
+})({ foo: string }); // error
 var x;
 var C3 = (function (_super) {
     __extends(C3, _super);
@@ -63,10 +64,10 @@ var C5 = (function (_super) {
     }
     return C5;
 })(foo); // error
-var C6 = (function () {
+var C6 = (function (_super) {
+    __extends(C6, _super);
     function C6() {
+        _super.apply(this, arguments);
     }
     return C6;
-})();
-[];
-{ } // error
+})([]); // error
diff --git a/tests/baselines/reference/classExtendsEveryObjectType2.errors.txt b/tests/baselines/reference/classExtendsEveryObjectType2.errors.txt
index ce5d8aed7a..45a63030d0 100644
--- a/tests/baselines/reference/classExtendsEveryObjectType2.errors.txt
+++ b/tests/baselines/reference/classExtendsEveryObjectType2.errors.txt
@@ -1,12 +1,15 @@
-tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType2.ts(3,18): error TS1133: Type reference expected.
-tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType2.ts(3,20): error TS1005: ';' expected.
+tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType2.ts(1,18): error TS9002: Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses.
+tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType2.ts(1,31): error TS1005: ',' expected.
+tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType2.ts(3,18): error TS9002: Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses.
 
 
-==== tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType2.ts (2 errors) ====
+==== tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType2.ts (3 errors) ====
     class C2 extends { foo: string; } { } // error
+                     ~~~~~~~~~~~~~~~~
+!!! error TS9002: Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses.
+                                  ~
+!!! error TS1005: ',' expected.
     
     class C6 extends []{ } // error
-                     ~
-!!! error TS1133: Type reference expected.
-                       ~
-!!! error TS1005: ';' expected.
\ No newline at end of file
+                     ~~
+!!! error TS9002: Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses.
\ No newline at end of file
diff --git a/tests/baselines/reference/classExtendsEveryObjectType2.js b/tests/baselines/reference/classExtendsEveryObjectType2.js
index 7be1313776..37c0861f5e 100644
--- a/tests/baselines/reference/classExtendsEveryObjectType2.js
+++ b/tests/baselines/reference/classExtendsEveryObjectType2.js
@@ -4,16 +4,23 @@ class C2 extends { foo: string; } { } // error
 class C6 extends []{ } // error
 
 //// [classExtendsEveryObjectType2.js]
-var C2 = (function () {
+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 C2 = (function (_super) {
+    __extends(C2, _super);
     function C2() {
+        _super.apply(this, arguments);
     }
     return C2;
-})();
-{ } // error
-var C6 = (function () {
+})({ foo: string }); // error
+var C6 = (function (_super) {
+    __extends(C6, _super);
     function C6() {
+        _super.apply(this, arguments);
     }
     return C6;
-})();
-[];
-{ } // error
+})([]); // error
diff --git a/tests/baselines/reference/classInsideBlock.errors.txt b/tests/baselines/reference/classInsideBlock.errors.txt
new file mode 100644
index 0000000000..369e77735e
--- /dev/null
+++ b/tests/baselines/reference/classInsideBlock.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/classes/classDeclarations/classInsideBlock.ts(2,11): error TS9004: 'class' declarations are only supported directly inside a module or as a top level declaration.
+
+
+==== tests/cases/conformance/classes/classDeclarations/classInsideBlock.ts (1 errors) ====
+    function foo() {
+        class C { }
+              ~
+!!! error TS9004: 'class' declarations are only supported directly inside a module or as a top level declaration.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/classInsideBlock.js b/tests/baselines/reference/classInsideBlock.js
new file mode 100644
index 0000000000..55b3b0bbea
--- /dev/null
+++ b/tests/baselines/reference/classInsideBlock.js
@@ -0,0 +1,13 @@
+//// [classInsideBlock.ts]
+function foo() {
+    class C { }
+}
+
+//// [classInsideBlock.js]
+function foo() {
+    var C = (function () {
+        function C() {
+        }
+        return C;
+    })();
+}
diff --git a/tests/baselines/reference/classWithSemicolonClassElement1.js b/tests/baselines/reference/classWithSemicolonClassElement1.js
new file mode 100644
index 0000000000..3838316e11
--- /dev/null
+++ b/tests/baselines/reference/classWithSemicolonClassElement1.js
@@ -0,0 +1,12 @@
+//// [classWithSemicolonClassElement1.ts]
+class C {
+    ;
+}
+
+//// [classWithSemicolonClassElement1.js]
+var C = (function () {
+    function C() {
+    }
+    ;
+    return C;
+})();
diff --git a/tests/baselines/reference/classWithSemicolonClassElement1.types b/tests/baselines/reference/classWithSemicolonClassElement1.types
new file mode 100644
index 0000000000..d3315c4cd0
--- /dev/null
+++ b/tests/baselines/reference/classWithSemicolonClassElement1.types
@@ -0,0 +1,6 @@
+=== tests/cases/conformance/classes/classDeclarations/classWithSemicolonClassElement1.ts ===
+class C {
+>C : C
+
+    ;
+}
diff --git a/tests/baselines/reference/classWithSemicolonClassElement2.js b/tests/baselines/reference/classWithSemicolonClassElement2.js
new file mode 100644
index 0000000000..77af51bce6
--- /dev/null
+++ b/tests/baselines/reference/classWithSemicolonClassElement2.js
@@ -0,0 +1,14 @@
+//// [classWithSemicolonClassElement2.ts]
+class C {
+    ;
+    ;
+}
+
+//// [classWithSemicolonClassElement2.js]
+var C = (function () {
+    function C() {
+    }
+    ;
+    ;
+    return C;
+})();
diff --git a/tests/baselines/reference/classWithSemicolonClassElement2.types b/tests/baselines/reference/classWithSemicolonClassElement2.types
new file mode 100644
index 0000000000..ce638e79fc
--- /dev/null
+++ b/tests/baselines/reference/classWithSemicolonClassElement2.types
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/classes/classDeclarations/classWithSemicolonClassElement2.ts ===
+class C {
+>C : C
+
+    ;
+    ;
+}
diff --git a/tests/baselines/reference/classWithSemicolonClassElementES61.js b/tests/baselines/reference/classWithSemicolonClassElementES61.js
new file mode 100644
index 0000000000..27f020257f
--- /dev/null
+++ b/tests/baselines/reference/classWithSemicolonClassElementES61.js
@@ -0,0 +1,9 @@
+//// [classWithSemicolonClassElementES61.ts]
+class C {
+    ;
+}
+
+//// [classWithSemicolonClassElementES61.js]
+class C {
+    ;
+}
diff --git a/tests/baselines/reference/classWithSemicolonClassElementES61.types b/tests/baselines/reference/classWithSemicolonClassElementES61.types
new file mode 100644
index 0000000000..974f269d33
--- /dev/null
+++ b/tests/baselines/reference/classWithSemicolonClassElementES61.types
@@ -0,0 +1,6 @@
+=== tests/cases/conformance/es6/classDeclaration/classWithSemicolonClassElementES61.ts ===
+class C {
+>C : C
+
+    ;
+}
diff --git a/tests/baselines/reference/classWithSemicolonClassElementES62.js b/tests/baselines/reference/classWithSemicolonClassElementES62.js
new file mode 100644
index 0000000000..068286c25c
--- /dev/null
+++ b/tests/baselines/reference/classWithSemicolonClassElementES62.js
@@ -0,0 +1,11 @@
+//// [classWithSemicolonClassElementES62.ts]
+class C {
+    ;
+    ;
+}
+
+//// [classWithSemicolonClassElementES62.js]
+class C {
+    ;
+    ;
+}
diff --git a/tests/baselines/reference/classWithSemicolonClassElementES62.types b/tests/baselines/reference/classWithSemicolonClassElementES62.types
new file mode 100644
index 0000000000..9f96fbb5eb
--- /dev/null
+++ b/tests/baselines/reference/classWithSemicolonClassElementES62.types
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/es6/classDeclaration/classWithSemicolonClassElementES62.ts ===
+class C {
+>C : C
+
+    ;
+    ;
+}
diff --git a/tests/baselines/reference/commentOnAmbientModule.types b/tests/baselines/reference/commentOnAmbientModule.types
index bf57d9d11b..f0056decc2 100644
--- a/tests/baselines/reference/commentOnAmbientModule.types
+++ b/tests/baselines/reference/commentOnAmbientModule.types
@@ -5,7 +5,7 @@ declare module E {
 
     class foobar extends D.bar {
 >foobar : foobar
->D : unknown
+>D : typeof D
 >bar : D.bar
 
         foo();
diff --git a/tests/baselines/reference/declFileGenericType.types b/tests/baselines/reference/declFileGenericType.types
index 284ce8f475..50026cc3ae 100644
--- a/tests/baselines/reference/declFileGenericType.types
+++ b/tests/baselines/reference/declFileGenericType.types
@@ -147,14 +147,14 @@ export var g = C.F5<C.A<C.B>>();
 
 export class h extends C.A<C.B>{ }
 >h : h
->C : unknown
+>C : typeof C
 >A : C.A<T>
 >C : unknown
 >B : C.B
 
 export interface i extends C.A<C.B> { }
 >i : i
->C : unknown
+>C : typeof C
 >A : C.A<T>
 >C : unknown
 >B : C.B
diff --git a/tests/baselines/reference/declFileGenericType2.types b/tests/baselines/reference/declFileGenericType2.types
index f9345b5ff1..fed2caca7a 100644
--- a/tests/baselines/reference/declFileGenericType2.types
+++ b/tests/baselines/reference/declFileGenericType2.types
@@ -30,7 +30,7 @@ declare module templa.mvc {
 >templa : unknown
 >mvc : unknown
 >IModel : IModel
->mvc : unknown
+>mvc : typeof mvc
 >IController : IController<ModelType>
 >ModelType : ModelType
     }
@@ -42,7 +42,7 @@ declare module templa.mvc.composite {
 
     interface ICompositeControllerModel extends mvc.IModel {
 >ICompositeControllerModel : ICompositeControllerModel
->mvc : unknown
+>mvc : typeof mvc
 >IModel : IModel
 
         getControllers(): mvc.IController<mvc.IModel>[];
@@ -64,8 +64,8 @@ module templa.dom.mvc {
 >templa : unknown
 >mvc : unknown
 >IModel : templa.mvc.IModel
->templa : unknown
->mvc : unknown
+>templa : typeof templa
+>mvc : typeof templa.mvc
 >IController : templa.mvc.IController<ModelType>
 >ModelType : ModelType
     }
@@ -82,8 +82,8 @@ module templa.dom.mvc {
 >templa : unknown
 >mvc : unknown
 >IModel : templa.mvc.IModel
->templa : unknown
->mvc : unknown
+>templa : typeof templa
+>mvc : typeof templa.mvc
 >AbstractController : templa.mvc.AbstractController<ModelType>
 >ModelType : ModelType
 >IElementController : IElementController<ModelType>
@@ -110,9 +110,9 @@ module templa.dom.mvc.composite {
 >mvc : unknown
 >composite : unknown
 >ICompositeControllerModel : templa.mvc.composite.ICompositeControllerModel
->templa : unknown
->dom : unknown
->mvc : unknown
+>templa : typeof templa
+>dom : typeof dom
+>mvc : typeof mvc
 >AbstractElementController : AbstractElementController<ModelType>
 >ModelType : ModelType
 
diff --git a/tests/baselines/reference/declFileModuleContinuation.types b/tests/baselines/reference/declFileModuleContinuation.types
index 671d9e6923..0080d7cbbf 100644
--- a/tests/baselines/reference/declFileModuleContinuation.types
+++ b/tests/baselines/reference/declFileModuleContinuation.types
@@ -15,7 +15,7 @@ module A.B.C {
 
     export class W implements A.C.Z {
 >W : W
->A : unknown
+>A : typeof A
 >C : unknown
 >Z : A.C.Z
     }
diff --git a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.types b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.types
index 34d263ef6b..818a31b26d 100644
--- a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.types
+++ b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.types
@@ -19,9 +19,9 @@ module X.Y.base {
 
     export class W extends A.B.Base.W {
 >W : W
->A : unknown
->B : unknown
->Base : unknown
+>A : typeof A
+>B : typeof A.B
+>Base : typeof A.B.Base
 >W : A.B.Base.W
 
         name: string;
@@ -38,9 +38,9 @@ module X.Y.base.Z {
     export class W<TValue> extends X.Y.base.W {
 >W : W<TValue>
 >TValue : TValue
->X : unknown
->Y : unknown
->base : unknown
+>X : typeof X
+>Y : typeof Y
+>base : typeof base
 >W : base.W
 
         value: boolean;
diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.types b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.types
index 8c5c4169cb..b2a1c15441 100644
--- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.types
+++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.types
@@ -20,8 +20,8 @@ module X.A.B.C {
     }
     export class W implements X.A.C.Z { // This needs to be refered as X.A.C.Z as A has conflict
 >W : W
->X : unknown
->A : unknown
+>X : typeof X
+>A : typeof A
 >C : unknown
 >Z : X.A.C.Z
     }
diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.types b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.types
index 11afd69d94..e43d0b78f5 100644
--- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.types
+++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.types
@@ -17,7 +17,7 @@ module X.A.B.C {
 
     export class W implements A.C.Z { // This can refer to it as A.C.Z
 >W : W
->A : unknown
+>A : typeof A
 >C : unknown
 >Z : A.C.Z
     }
diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.types b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.types
index 0b17b2ce78..d45c2cf052 100644
--- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.types
+++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.types
@@ -17,8 +17,8 @@ module X.A.B.C {
 
     export class W implements X.A.C.Z { // This needs to be refered as X.A.C.Z as A has conflict
 >W : W
->X : unknown
->A : unknown
+>X : typeof X
+>A : typeof A
 >C : unknown
 >Z : X.A.C.Z
     }
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts.types b/tests/baselines/reference/declarationEmit_nameConflicts.types
index f07a7fbb2a..e38c831493 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts.types
+++ b/tests/baselines/reference/declarationEmit_nameConflicts.types
@@ -119,13 +119,13 @@ export module M.Q {
     }
     export interface b extends M.b { } // ok
 >b : b
->M : unknown
+>M : typeof M
 >b : M.C
 
     export interface I extends M.c.I { } // ok
 >I : I
->M : unknown
->c : unknown
+>M : typeof M
+>c : typeof M.N
 >I : M.c.I
 
     export module c {
@@ -133,8 +133,8 @@ export module M.Q {
 
         export interface I extends M.c.I { } // ok
 >I : I
->M : unknown
->c : unknown
+>M : typeof M
+>c : typeof M.N
 >I : M.c.I
     }
 }
diff --git a/tests/baselines/reference/declareDottedExtend.types b/tests/baselines/reference/declareDottedExtend.types
index 5efcea51b2..6b529b5e00 100644
--- a/tests/baselines/reference/declareDottedExtend.types
+++ b/tests/baselines/reference/declareDottedExtend.types
@@ -14,12 +14,12 @@ import ab = A.B;
 
 class D extends ab.C{ }
 >D : D
->ab : unknown
+>ab : typeof ab
 >C : ab.C
 
 class E extends A.B.C{ }
 >E : E
->A : unknown
->B : unknown
+>A : typeof A
+>B : typeof ab
 >C : ab.C
 
diff --git a/tests/baselines/reference/es6ClassTest3.errors.txt b/tests/baselines/reference/es6ClassTest3.errors.txt
deleted file mode 100644
index 5eb310f338..0000000000
--- a/tests/baselines/reference/es6ClassTest3.errors.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-tests/cases/compiler/es6ClassTest3.ts(3,22): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
-tests/cases/compiler/es6ClassTest3.ts(4,23): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
-
-
-==== tests/cases/compiler/es6ClassTest3.ts (2 errors) ====
-    module M {	
-    	class Visibility {
-    	    public foo() { };
-    	                    ~
-!!! error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
-    	    private bar() { };
-    	                     ~
-!!! error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
-            private x: number;
-    	    public y: number;
-    	    public z: number;
-    
-    	    constructor() {
-    	        this.x = 1;
-    	        this.y = 2;
-    	    }
-    	}
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ClassTest3.js b/tests/baselines/reference/es6ClassTest3.js
index dc9f1c6715..572bd07963 100644
--- a/tests/baselines/reference/es6ClassTest3.js
+++ b/tests/baselines/reference/es6ClassTest3.js
@@ -23,7 +23,9 @@ var M;
             this.y = 2;
         }
         Visibility.prototype.foo = function () { };
+        ;
         Visibility.prototype.bar = function () { };
+        ;
         return Visibility;
     })();
 })(M || (M = {}));
diff --git a/tests/baselines/reference/es6ClassTest3.types b/tests/baselines/reference/es6ClassTest3.types
new file mode 100644
index 0000000000..ba0f2036f0
--- /dev/null
+++ b/tests/baselines/reference/es6ClassTest3.types
@@ -0,0 +1,37 @@
+=== tests/cases/compiler/es6ClassTest3.ts ===
+module M {	
+>M : typeof M
+
+	class Visibility {
+>Visibility : Visibility
+
+	    public foo() { };
+>foo : () => void
+
+	    private bar() { };
+>bar : () => void
+
+        private x: number;
+>x : number
+
+	    public y: number;
+>y : number
+
+	    public z: number;
+>z : number
+
+	    constructor() {
+	        this.x = 1;
+>this.x = 1 : number
+>this.x : number
+>this : Visibility
+>x : number
+
+	        this.y = 2;
+>this.y = 2 : number
+>this.y : number
+>this : Visibility
+>y : number
+	    }
+	}
+}
diff --git a/tests/baselines/reference/es6ClassTest7.types b/tests/baselines/reference/es6ClassTest7.types
index 9ac4a65b30..2ad5e88179 100644
--- a/tests/baselines/reference/es6ClassTest7.types
+++ b/tests/baselines/reference/es6ClassTest7.types
@@ -9,7 +9,7 @@ declare module M {
 
 class Bar extends M.Foo {
 >Bar : Bar
->M : unknown
+>M : typeof M
 >Foo : M.Foo
 }
 
diff --git a/tests/baselines/reference/exportAssignNonIdentifier.errors.txt b/tests/baselines/reference/exportAssignNonIdentifier.errors.txt
index 9c9f1aa687..2935308909 100644
--- a/tests/baselines/reference/exportAssignNonIdentifier.errors.txt
+++ b/tests/baselines/reference/exportAssignNonIdentifier.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/externalModules/foo1.ts(2,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
-tests/cases/conformance/externalModules/foo3.ts(1,10): error TS1109: Expression expected.
+tests/cases/conformance/externalModules/foo3.ts(1,16): error TS9003: 'class' expressions are not currently supported.
 tests/cases/conformance/externalModules/foo6.ts(1,14): error TS1109: Expression expected.
 
 
@@ -14,8 +14,8 @@ tests/cases/conformance/externalModules/foo6.ts(1,14): error TS1109: Expression
     
 ==== tests/cases/conformance/externalModules/foo3.ts (1 errors) ====
     export = class Foo3 {}; // Error, not an expression
-             ~~~~~
-!!! error TS1109: Expression expected.
+                   ~~~~
+!!! error TS9003: 'class' expressions are not currently supported.
     
 ==== tests/cases/conformance/externalModules/foo4.ts (0 errors) ====
     export = true; // Ok
diff --git a/tests/baselines/reference/exportAssignNonIdentifier.js b/tests/baselines/reference/exportAssignNonIdentifier.js
index ffa2fb9ba5..343405c862 100644
--- a/tests/baselines/reference/exportAssignNonIdentifier.js
+++ b/tests/baselines/reference/exportAssignNonIdentifier.js
@@ -33,12 +33,11 @@ module.exports = typeof x;
 //// [foo2.js]
 module.exports = "sausages";
 //// [foo3.js]
-var Foo3 = (function () {
+module.exports = (function () {
     function Foo3() {
     }
     return Foo3;
 })();
-; // Error, not an expression
 //// [foo4.js]
 module.exports = true;
 //// [foo5.js]
diff --git a/tests/baselines/reference/exportDeclareClass1.errors.txt b/tests/baselines/reference/exportDeclareClass1.errors.txt
index c93dc5d0b0..247b0511ed 100644
--- a/tests/baselines/reference/exportDeclareClass1.errors.txt
+++ b/tests/baselines/reference/exportDeclareClass1.errors.txt
@@ -1,15 +1,15 @@
-tests/cases/compiler/exportDeclareClass1.ts(2,24): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
-tests/cases/compiler/exportDeclareClass1.ts(3,34): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
+tests/cases/compiler/exportDeclareClass1.ts(2,21): error TS1184: An implementation cannot be declared in ambient contexts.
+tests/cases/compiler/exportDeclareClass1.ts(3,31): error TS1184: An implementation cannot be declared in ambient contexts.
 
 
 ==== tests/cases/compiler/exportDeclareClass1.ts (2 errors) ====
         export declare class eaC {
             static tF() { };
-                           ~
-!!! error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
+                        ~
+!!! error TS1184: An implementation cannot be declared in ambient contexts.
             static tsF(param:any) { };
-                                     ~
-!!! error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
+                                  ~
+!!! error TS1184: An implementation cannot be declared in ambient contexts.
         };
     	
     	export declare class eaC2 {
diff --git a/tests/baselines/reference/extBaseClass1.types b/tests/baselines/reference/extBaseClass1.types
index 16f89ab5a2..d160db9a06 100644
--- a/tests/baselines/reference/extBaseClass1.types
+++ b/tests/baselines/reference/extBaseClass1.types
@@ -29,7 +29,7 @@ module N {
 
     export class C3 extends M.B {
 >C3 : C3
->M : unknown
+>M : typeof M
 >B : M.B
     }
 }
diff --git a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types
index 6525f201f5..769f6f5a60 100644
--- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types
+++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types
@@ -60,7 +60,7 @@ import Backbone = require("extendingClassFromAliasAndUsageInIndexer_backbone");
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : unknown
+>Backbone : typeof Backbone
 >Model : Backbone.Model
 
     // interesting stuff here
@@ -72,7 +72,7 @@ import Backbone = require("extendingClassFromAliasAndUsageInIndexer_backbone");
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : unknown
+>Backbone : typeof Backbone
 >Model : Backbone.Model
 
     // different interesting stuff here
diff --git a/tests/baselines/reference/externModule.errors.txt b/tests/baselines/reference/externModule.errors.txt
index eff17eb858..d16c71ab05 100644
--- a/tests/baselines/reference/externModule.errors.txt
+++ b/tests/baselines/reference/externModule.errors.txt
@@ -2,18 +2,15 @@ tests/cases/compiler/externModule.ts(1,1): error TS2304: Cannot find name 'decla
 tests/cases/compiler/externModule.ts(1,9): error TS1005: ';' expected.
 tests/cases/compiler/externModule.ts(1,9): error TS2304: Cannot find name 'module'.
 tests/cases/compiler/externModule.ts(1,16): error TS1005: ';' expected.
-tests/cases/compiler/externModule.ts(2,5): error TS1129: Statement expected.
-tests/cases/compiler/externModule.ts(2,18): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
 tests/cases/compiler/externModule.ts(3,10): error TS2391: Function implementation is missing or not immediately following the declaration.
 tests/cases/compiler/externModule.ts(4,10): error TS2391: Function implementation is missing or not immediately following the declaration.
 tests/cases/compiler/externModule.ts(18,6): error TS2390: Constructor implementation is missing.
 tests/cases/compiler/externModule.ts(20,13): error TS2391: Function implementation is missing or not immediately following the declaration.
 tests/cases/compiler/externModule.ts(26,13): error TS2391: Function implementation is missing or not immediately following the declaration.
 tests/cases/compiler/externModule.ts(28,13): error TS2391: Function implementation is missing or not immediately following the declaration.
-tests/cases/compiler/externModule.ts(30,1): error TS1128: Declaration or statement expected.
 
 
-==== tests/cases/compiler/externModule.ts (13 errors) ====
+==== tests/cases/compiler/externModule.ts (10 errors) ====
     declare module {
     ~~~~~~~
 !!! error TS2304: Cannot find name 'declare'.
@@ -24,10 +21,6 @@ tests/cases/compiler/externModule.ts(30,1): error TS1128: Declaration or stateme
                    ~
 !!! error TS1005: ';' expected.
         export class XDate {
-        ~~~~~~
-!!! error TS1129: Statement expected.
-                     ~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
     		public getDay():number;
     		       ~~~~~~
 !!! error TS2391: Function implementation is missing or not immediately following the declaration.
@@ -68,8 +61,6 @@ tests/cases/compiler/externModule.ts(30,1): error TS1128: Declaration or stateme
 !!! error TS2391: Function implementation is missing or not immediately following the declaration.
         }
     }
-    ~
-!!! error TS1128: Declaration or statement expected.
     
     var d=new XDate();
     d.getDay();
diff --git a/tests/baselines/reference/externModule.js b/tests/baselines/reference/externModule.js
index 719b68451a..bf175f0eef 100644
--- a/tests/baselines/reference/externModule.js
+++ b/tests/baselines/reference/externModule.js
@@ -42,13 +42,14 @@ n=XDate.UTC(1964,2,1);
 //// [externModule.js]
 declare;
 module;
-{ }
-var XDate = (function () {
-    function XDate() {
-    }
-    return XDate;
-})();
-exports.XDate = XDate;
+{
+    var XDate = (function () {
+        function XDate() {
+        }
+        return XDate;
+    })();
+    exports.XDate = XDate;
+}
 var d = new XDate();
 d.getDay();
 d = new XDate(1978, 2);
diff --git a/tests/baselines/reference/externalModuleImmutableBindings.errors.txt b/tests/baselines/reference/externalModuleImmutableBindings.errors.txt
index 09cc7b3329..8ab07c2685 100644
--- a/tests/baselines/reference/externalModuleImmutableBindings.errors.txt
+++ b/tests/baselines/reference/externalModuleImmutableBindings.errors.txt
@@ -1,164 +1,82 @@
-tests/cases/compiler/f2.ts(5,1): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/compiler/f2.ts(6,1): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/compiler/f2.ts(7,1): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/compiler/f2.ts(7,7): error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'.
-tests/cases/compiler/f2.ts(8,1): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/compiler/f2.ts(10,1): error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer.
-tests/cases/compiler/f2.ts(11,1): error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer.
-tests/cases/compiler/f2.ts(12,1): error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer.
-tests/cases/compiler/f2.ts(13,1): error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer.
-tests/cases/compiler/f2.ts(15,1): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/compiler/f2.ts(16,1): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/compiler/f2.ts(17,1): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/compiler/f2.ts(17,8): error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'.
-tests/cases/compiler/f2.ts(18,1): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/compiler/f2.ts(20,1): error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer.
-tests/cases/compiler/f2.ts(21,1): error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer.
-tests/cases/compiler/f2.ts(22,1): error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer.
-tests/cases/compiler/f2.ts(23,1): error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer.
-tests/cases/compiler/f2.ts(25,6): error TS2405: The left-hand side of a 'for...in' statement must be of type 'string' or 'any'.
-tests/cases/compiler/f2.ts(26,6): error TS2487: Invalid left-hand side in 'for...of' statement.
+tests/cases/compiler/f2.ts(9,7): error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'.
+tests/cases/compiler/f2.ts(19,8): error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'.
 tests/cases/compiler/f2.ts(27,6): error TS2405: The left-hand side of a 'for...in' statement must be of type 'string' or 'any'.
-tests/cases/compiler/f2.ts(28,6): error TS2487: Invalid left-hand side in 'for...of' statement.
-tests/cases/compiler/f2.ts(29,6): error TS2406: Invalid left-hand side in 'for...in' statement.
-tests/cases/compiler/f2.ts(29,12): error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'.
-tests/cases/compiler/f2.ts(30,6): error TS2487: Invalid left-hand side in 'for...of' statement.
-tests/cases/compiler/f2.ts(30,12): error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'.
-tests/cases/compiler/f2.ts(31,6): error TS2406: Invalid left-hand side in 'for...in' statement.
-tests/cases/compiler/f2.ts(32,6): error TS2487: Invalid left-hand side in 'for...of' statement.
-tests/cases/compiler/f2.ts(34,6): error TS2405: The left-hand side of a 'for...in' statement must be of type 'string' or 'any'.
-tests/cases/compiler/f2.ts(35,6): error TS2487: Invalid left-hand side in 'for...of' statement.
+tests/cases/compiler/f2.ts(29,6): error TS2405: The left-hand side of a 'for...in' statement must be of type 'string' or 'any'.
+tests/cases/compiler/f2.ts(31,12): error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'.
+tests/cases/compiler/f2.ts(32,12): error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'.
 tests/cases/compiler/f2.ts(36,6): error TS2405: The left-hand side of a 'for...in' statement must be of type 'string' or 'any'.
-tests/cases/compiler/f2.ts(37,6): error TS2487: Invalid left-hand side in 'for...of' statement.
-tests/cases/compiler/f2.ts(38,6): error TS2406: Invalid left-hand side in 'for...in' statement.
-tests/cases/compiler/f2.ts(38,13): error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'.
-tests/cases/compiler/f2.ts(39,6): error TS2487: Invalid left-hand side in 'for...of' statement.
-tests/cases/compiler/f2.ts(39,13): error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'.
-tests/cases/compiler/f2.ts(40,6): error TS2406: Invalid left-hand side in 'for...in' statement.
-tests/cases/compiler/f2.ts(41,6): error TS2487: Invalid left-hand side in 'for...of' statement.
+tests/cases/compiler/f2.ts(38,6): error TS2405: The left-hand side of a 'for...in' statement must be of type 'string' or 'any'.
+tests/cases/compiler/f2.ts(40,13): error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'.
+tests/cases/compiler/f2.ts(41,13): error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'.
 
 
 ==== tests/cases/compiler/f1.ts (0 errors) ====
     export var x = 1;
     
-==== tests/cases/compiler/f2.ts (38 errors) ====
+==== tests/cases/compiler/f2.ts (10 errors) ====
+    
+    // all mutations below are illegal and should be fixed
     import * as stuff from 'f1';
     
     var n = 'baz';
     
     stuff.x = 0;
-    ~~~~~~~
-!!! error TS2364: Invalid left-hand side of assignment expression.
     stuff['x'] = 1;
-    ~~~~~~~~~~
-!!! error TS2364: Invalid left-hand side of assignment expression.
     stuff.blah = 2;
-    ~~~~~~~~~~
-!!! error TS2364: Invalid left-hand side of assignment expression.
           ~~~~
 !!! error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'.
     stuff[n] = 3;
-    ~~~~~~~~
-!!! error TS2364: Invalid left-hand side of assignment expression.
     
     stuff.x++;
-    ~~~~~~~
-!!! error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer.
     stuff['x']++;
-    ~~~~~~~~~~
-!!! error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer.
     stuff['blah']++;
-    ~~~~~~~~~~~~~
-!!! error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer.
     stuff[n]++;
-    ~~~~~~~~
-!!! error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer.
     
     (stuff.x) = 0;
-    ~~~~~~~~~
-!!! error TS2364: Invalid left-hand side of assignment expression.
     (stuff['x']) = 1;
-    ~~~~~~~~~~~~
-!!! error TS2364: Invalid left-hand side of assignment expression.
     (stuff.blah) = 2;
-    ~~~~~~~~~~~~
-!!! error TS2364: Invalid left-hand side of assignment expression.
            ~~~~
 !!! error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'.
     (stuff[n]) = 3;
-    ~~~~~~~~~~
-!!! error TS2364: Invalid left-hand side of assignment expression.
     
     (stuff.x)++;
-    ~~~~~~~~~
-!!! error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer.
     (stuff['x'])++;
-    ~~~~~~~~~~~~
-!!! error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer.
     (stuff['blah'])++;
-    ~~~~~~~~~~~~~~~
-!!! error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer.
     (stuff[n])++;
-    ~~~~~~~~~~
-!!! error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer.
     
     for (stuff.x in []) {}
          ~~~~~~~
 !!! error TS2405: The left-hand side of a 'for...in' statement must be of type 'string' or 'any'.
     for (stuff.x of []) {}
-         ~~~~~~~
-!!! error TS2487: Invalid left-hand side in 'for...of' statement.
     for (stuff['x'] in []) {}
          ~~~~~~~~~~
 !!! error TS2405: The left-hand side of a 'for...in' statement must be of type 'string' or 'any'.
     for (stuff['x'] of []) {}
-         ~~~~~~~~~~
-!!! error TS2487: Invalid left-hand side in 'for...of' statement.
     for (stuff.blah in []) {}
-         ~~~~~~~~~~
-!!! error TS2406: Invalid left-hand side in 'for...in' statement.
                ~~~~
 !!! error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'.
     for (stuff.blah of []) {}
-         ~~~~~~~~~~
-!!! error TS2487: Invalid left-hand side in 'for...of' statement.
                ~~~~
 !!! error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'.
     for (stuff[n] in []) {}
-         ~~~~~~~~
-!!! error TS2406: Invalid left-hand side in 'for...in' statement.
     for (stuff[n] of []) {}
-         ~~~~~~~~
-!!! error TS2487: Invalid left-hand side in 'for...of' statement.
     
     for ((stuff.x) in []) {}
          ~~~~~~~~~
 !!! error TS2405: The left-hand side of a 'for...in' statement must be of type 'string' or 'any'.
     for ((stuff.x) of []) {}
-         ~~~~~~~~~
-!!! error TS2487: Invalid left-hand side in 'for...of' statement.
     for ((stuff['x']) in []) {}
          ~~~~~~~~~~~~
 !!! error TS2405: The left-hand side of a 'for...in' statement must be of type 'string' or 'any'.
     for ((stuff['x']) of []) {}
-         ~~~~~~~~~~~~
-!!! error TS2487: Invalid left-hand side in 'for...of' statement.
     for ((stuff.blah) in []) {}
-         ~~~~~~~~~~~~
-!!! error TS2406: Invalid left-hand side in 'for...in' statement.
                 ~~~~
 !!! error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'.
     for ((stuff.blah) of []) {}
-         ~~~~~~~~~~~~
-!!! error TS2487: Invalid left-hand side in 'for...of' statement.
                 ~~~~
 !!! error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'.
     for ((stuff[n]) in []) {}
-         ~~~~~~~~~~
-!!! error TS2406: Invalid left-hand side in 'for...in' statement.
     for ((stuff[n]) of []) {}
-         ~~~~~~~~~~
-!!! error TS2487: Invalid left-hand side in 'for...of' statement.
     
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/externalModuleImmutableBindings.js b/tests/baselines/reference/externalModuleImmutableBindings.js
index ed9b4c00af..5e5ba6c229 100644
--- a/tests/baselines/reference/externalModuleImmutableBindings.js
+++ b/tests/baselines/reference/externalModuleImmutableBindings.js
@@ -4,6 +4,8 @@
 export var x = 1;
 
 //// [f2.ts]
+
+// all mutations below are illegal and should be fixed
 import * as stuff from 'f1';
 
 var n = 'baz';
@@ -52,6 +54,7 @@ for ((stuff[n]) of []) {}
 //// [f1.js]
 exports.x = 1;
 //// [f2.js]
+// all mutations below are illegal and should be fixed
 var stuff = require('f1');
 var n = 'baz';
 stuff.x = 0;
diff --git a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types
index 2d39c0a465..1867d39070 100644
--- a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types
+++ b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types
@@ -191,9 +191,9 @@ module PortalFx.ViewModels.Controls.Validators {
     export class Validator<TValue> extends Portal.Controls.Validators.Validator<TValue> {
 >Validator : Validator<TValue>
 >TValue : TValue
->Portal : unknown
->Controls : unknown
->Validators : unknown
+>Portal : typeof Portal
+>Controls : typeof Portal.Controls
+>Validators : typeof Portal.Controls.Validators
 >Validator : Portal.Controls.Validators.Validator<TValue>
 >TValue : TValue
 
diff --git a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.types b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.types
index 1e744ce25c..eadf43d226 100644
--- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.types
+++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.types
@@ -12,7 +12,7 @@ declare module EndGate {
 
 interface Number extends EndGate.ICloneable { }
 >Number : Number
->EndGate : unknown
+>EndGate : typeof EndGate
 >ICloneable : EndGate.ICloneable
 
 module EndGate.Tweening {
diff --git a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.types b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.types
index ad3182f62e..80e1a963d5 100644
--- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.types
+++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.types
@@ -12,7 +12,7 @@ module EndGate {
 
 interface Number extends EndGate.ICloneable { }
 >Number : Number
->EndGate : unknown
+>EndGate : typeof EndGate
 >ICloneable : EndGate.ICloneable
 
 module EndGate.Tweening {
diff --git a/tests/baselines/reference/importUsedInExtendsList1.types b/tests/baselines/reference/importUsedInExtendsList1.types
index 7261c34e75..623b14e36a 100644
--- a/tests/baselines/reference/importUsedInExtendsList1.types
+++ b/tests/baselines/reference/importUsedInExtendsList1.types
@@ -5,7 +5,7 @@ import foo = require('importUsedInExtendsList1_require');
 
 class Sub extends foo.Super { }
 >Sub : Sub
->foo : unknown
+>foo : typeof foo
 >Super : foo.Super
 
 var s: Sub;
diff --git a/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.types b/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.types
index 2a71136613..69b2ebb608 100644
--- a/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.types
+++ b/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.types
@@ -14,13 +14,13 @@ module N {
 
    export class D1 extends M.C1 { }
 >D1 : D1
->M : unknown
+>M : typeof M
 >C1 : M.C1
 
    export class D2<T> extends M.C2<T> { }
 >D2 : D2<T>
 >T : T
->M : unknown
+>M : typeof M
 >C2 : M.C2<T>
 >T : T
 }
diff --git a/tests/baselines/reference/interfaceMayNotBeExtendedWitACall.errors.txt b/tests/baselines/reference/interfaceMayNotBeExtendedWitACall.errors.txt
index 06abf0987d..f6ec9e02bb 100644
--- a/tests/baselines/reference/interfaceMayNotBeExtendedWitACall.errors.txt
+++ b/tests/baselines/reference/interfaceMayNotBeExtendedWitACall.errors.txt
@@ -1,15 +1,12 @@
-tests/cases/compiler/interfaceMayNotBeExtendedWitACall.ts(3,29): error TS1005: ',' expected.
-tests/cases/compiler/interfaceMayNotBeExtendedWitACall.ts(3,32): error TS1005: '=>' expected.
+tests/cases/compiler/interfaceMayNotBeExtendedWitACall.ts(3,24): error TS2499: An interface can only extend an identifier/qualified-name with optional type arguments.
 
 
-==== tests/cases/compiler/interfaceMayNotBeExtendedWitACall.ts (2 errors) ====
+==== tests/cases/compiler/interfaceMayNotBeExtendedWitACall.ts (1 errors) ====
     interface color {}
     
     interface blue extends color() { // error
-                                ~
-!!! error TS1005: ',' expected.
-                                   ~
-!!! error TS1005: '=>' expected.
+                           ~~~~~~~
+!!! error TS2499: An interface can only extend an identifier/qualified-name with optional type arguments.
     
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/interfaceMayNotBeExtendedWitACall.js b/tests/baselines/reference/interfaceMayNotBeExtendedWitACall.js
index a283722d6a..f2660dd64f 100644
--- a/tests/baselines/reference/interfaceMayNotBeExtendedWitACall.js
+++ b/tests/baselines/reference/interfaceMayNotBeExtendedWitACall.js
@@ -7,5 +7,3 @@ interface blue extends color() { // error
 
 
 //// [interfaceMayNotBeExtendedWitACall.js]
-(function () {
-});
diff --git a/tests/baselines/reference/nestedClassDeclaration.errors.txt b/tests/baselines/reference/nestedClassDeclaration.errors.txt
index f5c5e41ad9..f897c38d68 100644
--- a/tests/baselines/reference/nestedClassDeclaration.errors.txt
+++ b/tests/baselines/reference/nestedClassDeclaration.errors.txt
@@ -1,14 +1,12 @@
 tests/cases/conformance/classes/nestedClassDeclaration.ts(5,5): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
 tests/cases/conformance/classes/nestedClassDeclaration.ts(7,1): error TS1128: Declaration or statement expected.
-tests/cases/conformance/classes/nestedClassDeclaration.ts(10,5): error TS1129: Statement expected.
-tests/cases/conformance/classes/nestedClassDeclaration.ts(12,1): error TS1128: Declaration or statement expected.
 tests/cases/conformance/classes/nestedClassDeclaration.ts(15,11): error TS1005: ':' expected.
 tests/cases/conformance/classes/nestedClassDeclaration.ts(15,11): error TS2304: Cannot find name 'C4'.
 tests/cases/conformance/classes/nestedClassDeclaration.ts(15,14): error TS1005: ',' expected.
 tests/cases/conformance/classes/nestedClassDeclaration.ts(17,1): error TS1128: Declaration or statement expected.
 
 
-==== tests/cases/conformance/classes/nestedClassDeclaration.ts (8 errors) ====
+==== tests/cases/conformance/classes/nestedClassDeclaration.ts (6 errors) ====
     // nested classes are not allowed
     
     class C {
@@ -23,12 +21,8 @@ tests/cases/conformance/classes/nestedClassDeclaration.ts(17,1): error TS1128: D
     
     function foo() {
         class C3 {
-        ~~~~~
-!!! error TS1129: Statement expected.
         }
     }
-    ~
-!!! error TS1128: Declaration or statement expected.
     
     var x = {
         class C4 {
diff --git a/tests/baselines/reference/nestedClassDeclaration.js b/tests/baselines/reference/nestedClassDeclaration.js
index 70445b3372..2fee6f08ab 100644
--- a/tests/baselines/reference/nestedClassDeclaration.js
+++ b/tests/baselines/reference/nestedClassDeclaration.js
@@ -30,11 +30,12 @@ var C2 = (function () {
     }
     return C2;
 })();
-function foo() { }
-var C3 = (function () {
-    function C3() {
-    }
-    return C3;
-})();
+function foo() {
+    var C3 = (function () {
+        function C3() {
+        }
+        return C3;
+    })();
+}
 var x = {
     class: C4 }, _a = void 0;
diff --git a/tests/baselines/reference/parser0_004152.errors.txt b/tests/baselines/reference/parser0_004152.errors.txt
index 97b9bfe34a..43a8945ffe 100644
--- a/tests/baselines/reference/parser0_004152.errors.txt
+++ b/tests/baselines/reference/parser0_004152.errors.txt
@@ -32,11 +32,10 @@ tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts(2,86): error T
 tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts(2,94): error TS1005: ';' expected.
 tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts(2,96): error TS2300: Duplicate identifier '0'.
 tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts(2,97): error TS1005: ';' expected.
-tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts(2,98): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
 tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts(3,25): error TS2304: Cannot find name 'SeedCoords'.
 
 
-==== tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts (36 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts (35 errors) ====
     export class Game {
                  ~~~~
 !!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
@@ -107,8 +106,6 @@ tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts(3,25): error T
 !!! error TS2300: Duplicate identifier '0'.
                                                                                                     ~
 !!! error TS1005: ';' expected.
-                                                                                                     ~
-!!! error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
         private prevConfig: SeedCoords[][];
                             ~~~~~~~~~~
 !!! error TS2304: Cannot find name 'SeedCoords'.
diff --git a/tests/baselines/reference/parser0_004152.js b/tests/baselines/reference/parser0_004152.js
index cce49f68fc..cd6a20742a 100644
--- a/tests/baselines/reference/parser0_004152.js
+++ b/tests/baselines/reference/parser0_004152.js
@@ -9,6 +9,7 @@ var Game = (function () {
     function Game() {
         this.position = new DisplayPosition([]);
     }
+    ;
     return Game;
 })();
 exports.Game = Game;
diff --git a/tests/baselines/reference/parserErrantSemicolonInClass1.errors.txt b/tests/baselines/reference/parserErrantSemicolonInClass1.errors.txt
index 7e71ec8fc6..aec80ad934 100644
--- a/tests/baselines/reference/parserErrantSemicolonInClass1.errors.txt
+++ b/tests/baselines/reference/parserErrantSemicolonInClass1.errors.txt
@@ -1,7 +1,10 @@
-tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserErrantSemicolonInClass1.ts(9,21): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
+tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserErrantSemicolonInClass1.ts(12,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserErrantSemicolonInClass1.ts(15,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserErrantSemicolonInClass1.ts(18,23): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserErrantSemicolonInClass1.ts(24,24): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 
 
-==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserErrantSemicolonInClass1.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserErrantSemicolonInClass1.ts (4 errors) ====
     class a {
         //constructor ();
         constructor (n: number);
@@ -11,23 +14,29 @@ tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserErrantSemicolonIn
         }
     
         public pgF() { };
-                        ~
-!!! error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
     
         public pv;
         public get d() {
+                   ~
+!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
             return 30;
         }
         public set d() {
+                   ~
+!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
         }
     
         public static get p2() {
+                          ~~
+!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
             return { x: 30, y: 40 };
         }
     
         private static d2() {
         }
         private static get p3() {
+                           ~~
+!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
             return "string";
         }
         private pv3;
diff --git a/tests/baselines/reference/parserErrantSemicolonInClass1.js b/tests/baselines/reference/parserErrantSemicolonInClass1.js
index f761b04ca7..f3834da7e7 100644
--- a/tests/baselines/reference/parserErrantSemicolonInClass1.js
+++ b/tests/baselines/reference/parserErrantSemicolonInClass1.js
@@ -40,6 +40,7 @@ var a = (function () {
     function a(ns) {
     }
     a.prototype.pgF = function () { };
+    ;
     Object.defineProperty(a.prototype, "d", {
         get: function () {
             return 30;
diff --git a/tests/baselines/reference/parserErrorRecovery_SwitchStatement2.errors.txt b/tests/baselines/reference/parserErrorRecovery_SwitchStatement2.errors.txt
index 12e8c8b650..86bc6fbfd7 100644
--- a/tests/baselines/reference/parserErrorRecovery_SwitchStatement2.errors.txt
+++ b/tests/baselines/reference/parserErrorRecovery_SwitchStatement2.errors.txt
@@ -1,8 +1,9 @@
 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/SwitchStatements/parserErrorRecovery_SwitchStatement2.ts(3,13): error TS2304: Cannot find name 'e'.
 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/SwitchStatements/parserErrorRecovery_SwitchStatement2.ts(5,1): error TS1130: 'case' or 'default' expected.
+tests/cases/conformance/parser/ecmascript5/ErrorRecovery/SwitchStatements/parserErrorRecovery_SwitchStatement2.ts(6,2): error TS1005: '}' expected.
 
 
-==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/SwitchStatements/parserErrorRecovery_SwitchStatement2.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/SwitchStatements/parserErrorRecovery_SwitchStatement2.ts (3 errors) ====
     class C {
       constructor() {
         switch (e) {
@@ -12,4 +13,6 @@ tests/cases/conformance/parser/ecmascript5/ErrorRecovery/SwitchStatements/parser
     class D {
     ~~~~~
 !!! error TS1130: 'case' or 'default' expected.
-    }
\ No newline at end of file
+    }
+     
+!!! error TS1005: '}' expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserErrorRecovery_SwitchStatement2.js b/tests/baselines/reference/parserErrorRecovery_SwitchStatement2.js
index d7000bc23d..0fd532dde1 100644
--- a/tests/baselines/reference/parserErrorRecovery_SwitchStatement2.js
+++ b/tests/baselines/reference/parserErrorRecovery_SwitchStatement2.js
@@ -11,11 +11,11 @@ var C = (function () {
     function C() {
         switch (e) {
         }
+        var D = (function () {
+            function D() {
+            }
+            return D;
+        })();
     }
     return C;
 })();
-var D = (function () {
-    function D() {
-    }
-    return D;
-})();
diff --git a/tests/baselines/reference/parserInvalidIdentifiersInVariableStatements1.errors.txt b/tests/baselines/reference/parserInvalidIdentifiersInVariableStatements1.errors.txt
index c57ca1e302..35b279b443 100644
--- a/tests/baselines/reference/parserInvalidIdentifiersInVariableStatements1.errors.txt
+++ b/tests/baselines/reference/parserInvalidIdentifiersInVariableStatements1.errors.txt
@@ -1,8 +1,9 @@
 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/VariableLists/parserInvalidIdentifiersInVariableStatements1.ts(1,5): error TS1134: Variable declaration expected.
 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/VariableLists/parserInvalidIdentifiersInVariableStatements1.ts(3,5): error TS1134: Variable declaration expected.
+tests/cases/conformance/parser/ecmascript5/ErrorRecovery/VariableLists/parserInvalidIdentifiersInVariableStatements1.ts(3,10): error TS1003: Identifier expected.
 
 
-==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/VariableLists/parserInvalidIdentifiersInVariableStatements1.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/VariableLists/parserInvalidIdentifiersInVariableStatements1.ts (3 errors) ====
     var export;
         ~~~~~~
 !!! error TS1134: Variable declaration expected.
@@ -10,5 +11,7 @@ tests/cases/conformance/parser/ecmascript5/ErrorRecovery/VariableLists/parserInv
     var class;
         ~~~~~
 !!! error TS1134: Variable declaration expected.
+             ~
+!!! error TS1003: Identifier expected.
     var bar;
     
\ No newline at end of file
diff --git a/tests/baselines/reference/parserInvalidIdentifiersInVariableStatements1.js b/tests/baselines/reference/parserInvalidIdentifiersInVariableStatements1.js
index 09fcffc1b0..422b012246 100644
--- a/tests/baselines/reference/parserInvalidIdentifiersInVariableStatements1.js
+++ b/tests/baselines/reference/parserInvalidIdentifiersInVariableStatements1.js
@@ -9,4 +9,10 @@ var bar;
 var ;
 var foo;
 var ;
+var  = (function () {
+    function () {
+    }
+    return ;
+})();
+;
 var bar;
diff --git a/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.errors.txt b/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.errors.txt
deleted file mode 100644
index 09eabb5b58..0000000000
--- a/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-tests/cases/compiler/parsingClassRecoversWhenHittingUnexpectedSemicolon.ts(2,19): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
-
-
-==== tests/cases/compiler/parsingClassRecoversWhenHittingUnexpectedSemicolon.ts (1 errors) ====
-    class C {
-        public f() { };
-                      ~
-!!! error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
-        private m;
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.js b/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.js
index 8b197fd35a..59129f91b9 100644
--- a/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.js
+++ b/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.js
@@ -10,5 +10,6 @@ var C = (function () {
     function C() {
     }
     C.prototype.f = function () { };
+    ;
     return C;
 })();
diff --git a/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.types b/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.types
new file mode 100644
index 0000000000..6fdfccfa7f
--- /dev/null
+++ b/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.types
@@ -0,0 +1,11 @@
+=== tests/cases/compiler/parsingClassRecoversWhenHittingUnexpectedSemicolon.ts ===
+class C {
+>C : C
+
+    public f() { };
+>f : () => void
+
+    private m;
+>m : any
+}
+
diff --git a/tests/baselines/reference/primitiveMembers.errors.txt b/tests/baselines/reference/primitiveMembers.errors.txt
index 801d3fac45..da8b75f9bc 100644
--- a/tests/baselines/reference/primitiveMembers.errors.txt
+++ b/tests/baselines/reference/primitiveMembers.errors.txt
@@ -1,10 +1,8 @@
 tests/cases/compiler/primitiveMembers.ts(5,3): error TS2339: Property 'toBAZ' does not exist on type 'number'.
 tests/cases/compiler/primitiveMembers.ts(11,1): error TS2322: Type 'Number' is not assignable to type 'number'.
-tests/cases/compiler/primitiveMembers.ts(24,35): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
-tests/cases/compiler/primitiveMembers.ts(25,56): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
 
 
-==== tests/cases/compiler/primitiveMembers.ts (4 errors) ====
+==== tests/cases/compiler/primitiveMembers.ts (2 errors) ====
     var x = 5;
     var r = /yo/;
     r.source;
@@ -33,11 +31,7 @@ tests/cases/compiler/primitiveMembers.ts(25,56): error TS1068: Unexpected token.
     
     
     class baz { public bar(): void { }; }
-                                      ~
-!!! error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
     class foo extends baz { public bar(){ return undefined}; }
-                                                           ~
-!!! error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
     
     
     
diff --git a/tests/baselines/reference/primitiveMembers.js b/tests/baselines/reference/primitiveMembers.js
index bf3f1a1710..629d55ed0f 100644
--- a/tests/baselines/reference/primitiveMembers.js
+++ b/tests/baselines/reference/primitiveMembers.js
@@ -58,6 +58,7 @@ var baz = (function () {
     function baz() {
     }
     baz.prototype.bar = function () { };
+    ;
     return baz;
 })();
 var foo = (function (_super) {
@@ -66,5 +67,6 @@ var foo = (function (_super) {
         _super.apply(this, arguments);
     }
     foo.prototype.bar = function () { return undefined; };
+    ;
     return foo;
 })(baz);
diff --git a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.types b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.types
index 7f0163cf1e..c4aec3ea8c 100644
--- a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.types
+++ b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.types
@@ -4,7 +4,7 @@ module rionegrensis {
 
   export class caniventer extends Lanthanum.nitidus<petrophilus.minutilla, julianae.sumatrana> {
 >caniventer : caniventer
->Lanthanum : unknown
+>Lanthanum : typeof Lanthanum
 >nitidus : Lanthanum.nitidus<T0, T1>
 >petrophilus : unknown
 >minutilla : petrophilus.minutilla
@@ -89,7 +89,7 @@ module rionegrensis {
 >veraecrucis : veraecrucis<T0, T1>
 >T0 : T0
 >T1 : T1
->trivirgatus : unknown
+>trivirgatus : typeof trivirgatus
 >mixtus : trivirgatus.mixtus<T0, T1>
 >gabriellae : unknown
 >amicus : gabriellae.amicus
@@ -514,7 +514,7 @@ module julianae {
 >oralis : oralis<T0, T1>
 >T0 : T0
 >T1 : T1
->caurinus : unknown
+>caurinus : typeof caurinus
 >psilurus : caurinus.psilurus
 
     cepapi() : caurinus.psilurus { var x : caurinus.psilurus; () => { var y = this; }; return x; }
@@ -751,7 +751,7 @@ module julianae {
   }
   export class sumatrana extends Lanthanum.jugularis {
 >sumatrana : sumatrana
->Lanthanum : unknown
+>Lanthanum : typeof Lanthanum
 >jugularis : Lanthanum.jugularis
 
     wolffsohni() : Lanthanum.suillus<dammermani.melanops, quasiater.carolinensis> { var x : Lanthanum.suillus<dammermani.melanops, quasiater.carolinensis>; () => { var y = this; }; return x; }
@@ -1276,7 +1276,7 @@ module julianae {
   }
   export class durangae extends dogramacii.aurata {
 >durangae : durangae
->dogramacii : unknown
+>dogramacii : typeof dogramacii
 >aurata : dogramacii.aurata
 
     Californium() : panamensis.setulosus<lutreolus.punicus, dammermani.melanops> { var x : panamensis.setulosus<lutreolus.punicus, dammermani.melanops>; () => { var y = this; }; return x; }
@@ -1429,7 +1429,7 @@ module Lanthanum {
 >nitidus : nitidus<T0, T1>
 >T0 : T0
 >T1 : T1
->argurus : unknown
+>argurus : typeof argurus
 >gilbertii : argurus.gilbertii<T0, T1>
 >lavali : unknown
 >thaeleri : lavali.thaeleri
@@ -1598,7 +1598,7 @@ module Lanthanum {
   }
   export class megalonyx extends caurinus.johorensis<caurinus.megaphyllus, julianae.steerii> {
 >megalonyx : megalonyx
->caurinus : unknown
+>caurinus : typeof caurinus
 >johorensis : caurinus.johorensis<T0, T1>
 >caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
@@ -1984,7 +1984,7 @@ module rendalli {
 
   export class zuluensis extends julianae.steerii {
 >zuluensis : zuluensis
->julianae : unknown
+>julianae : typeof julianae
 >steerii : julianae.steerii
 
     telfairi() : argurus.wetmorei<Lanthanum.megalonyx, provocax.melanoleuca> { var x : argurus.wetmorei<Lanthanum.megalonyx, provocax.melanoleuca>; () => { var y = this; }; return x; }
@@ -2418,7 +2418,7 @@ module rendalli {
 >crenulata : crenulata<T0, T1>
 >T0 : T0
 >T1 : T1
->trivirgatus : unknown
+>trivirgatus : typeof trivirgatus
 >falconeri : trivirgatus.falconeri
 
     salvanius() : howi.coludo<howi.marcanoi, rionegrensis.caniventer> { var x : howi.coludo<howi.marcanoi, rionegrensis.caniventer>; () => { var y = this; }; return x; }
@@ -2612,7 +2612,7 @@ module trivirgatus {
 >mixtus : mixtus<T0, T1>
 >T0 : T0
 >T1 : T1
->argurus : unknown
+>argurus : typeof argurus
 >pygmaea : argurus.pygmaea<T0, T1>
 >argurus : unknown
 >oreas : argurus.oreas
@@ -3349,7 +3349,7 @@ module ruatanica {
 
   export class americanus extends imperfecta.ciliolabrum<argurus.germaini, lutreolus.foina> {
 >americanus : americanus
->imperfecta : unknown
+>imperfecta : typeof imperfecta
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >argurus : unknown
 >germaini : argurus.germaini
@@ -3418,7 +3418,7 @@ module lavali {
 
   export class wilsoni extends Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis> {
 >wilsoni : wilsoni
->Lanthanum : unknown
+>Lanthanum : typeof Lanthanum
 >nitidus : Lanthanum.nitidus<T0, T1>
 >rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
@@ -3638,7 +3638,7 @@ module lavali {
   }
   export class otion extends howi.coludo<argurus.oreas, howi.marcanoi> {
 >otion : otion
->howi : unknown
+>howi : typeof howi
 >coludo : howi.coludo<T0, T1>
 >argurus : unknown
 >oreas : argurus.oreas
@@ -4112,7 +4112,7 @@ module lavali {
   }
   export class thaeleri extends argurus.oreas {
 >thaeleri : thaeleri
->argurus : unknown
+>argurus : typeof argurus
 >oreas : argurus.oreas
 
     coromandra() : julianae.galapagoensis { var x : julianae.galapagoensis; () => { var y = this; }; return x; }
@@ -4275,7 +4275,7 @@ module lavali {
   }
   export class lepturus extends Lanthanum.suillus<dammermani.melanops, quasiater.carolinensis> {
 >lepturus : lepturus
->Lanthanum : unknown
+>Lanthanum : typeof Lanthanum
 >suillus : Lanthanum.suillus<T0, T1>
 >dammermani : unknown
 >melanops : dammermani.melanops
@@ -4350,7 +4350,7 @@ module dogramacii {
 
   export class robustulus extends lavali.wilsoni {
 >robustulus : robustulus
->lavali : unknown
+>lavali : typeof lavali
 >wilsoni : lavali.wilsoni
 
     fossor() : minutus.inez<argurus.peninsulae, julianae.nudicaudus> { var x : minutus.inez<argurus.peninsulae, julianae.nudicaudus>; () => { var y = this; }; return x; }
@@ -4924,7 +4924,7 @@ module lutreolus {
 
   export class schlegeli extends lavali.beisa {
 >schlegeli : schlegeli
->lavali : unknown
+>lavali : typeof lavali
 >beisa : lavali.beisa
 
     mittendorfi() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; }
@@ -5661,7 +5661,7 @@ module panglima {
 >amphibius : amphibius<T0, T1>
 >T0 : T0
 >T1 : T1
->caurinus : unknown
+>caurinus : typeof caurinus
 >johorensis : caurinus.johorensis<T0, T1>
 >Lanthanum : unknown
 >nitidus : Lanthanum.nitidus<T0, T1>
@@ -5794,7 +5794,7 @@ module panglima {
 >fundatus : fundatus<T0, T1>
 >T0 : T0
 >T1 : T1
->lutreolus : unknown
+>lutreolus : typeof lutreolus
 >schlegeli : lutreolus.schlegeli
 
         crassulus(): nigra.gracilis<provocax.melanoleuca, provocax.melanoleuca> { var x: nigra.gracilis<provocax.melanoleuca, provocax.melanoleuca>; () => { var y = this; }; return x; }
@@ -5899,7 +5899,7 @@ module panglima {
 >abidi : abidi<T0, T1>
 >T0 : T0
 >T1 : T1
->argurus : unknown
+>argurus : typeof argurus
 >dauricus : argurus.dauricus<T0, T1>
 >argurus : unknown
 >germaini : argurus.germaini
@@ -6113,7 +6113,7 @@ module minutus {
 >himalayana : himalayana<T0, T1>
 >T0 : T0
 >T1 : T1
->lutreolus : unknown
+>lutreolus : typeof lutreolus
 >punicus : lutreolus.punicus
 
         simoni(): argurus.netscheri<lavali.lepturus, argurus.dauricus<argurus.oreas, quasiater.carolinensis>> { var x: argurus.netscheri<lavali.lepturus, argurus.dauricus<argurus.oreas, quasiater.carolinensis>>; () => { var y = this; }; return x; }
@@ -6356,7 +6356,7 @@ module caurinus {
 >mahaganus : mahaganus<T0, T1>
 >T0 : T0
 >T1 : T1
->panglima : unknown
+>panglima : typeof panglima
 >fundatus : panglima.fundatus<T0, T1>
 >quasiater : unknown
 >carolinensis : quasiater.carolinensis
@@ -6584,7 +6584,7 @@ module howi {
 >angulatus : angulatus<T0, T1>
 >T0 : T0
 >T1 : T1
->sagitta : unknown
+>sagitta : typeof sagitta
 >stolzmanni : sagitta.stolzmanni
 
         pennatus(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; }
@@ -6791,7 +6791,7 @@ module sagitta {
 
     export class walkeri extends minutus.portoricensis {
 >walkeri : walkeri
->minutus : unknown
+>minutus : typeof minutus
 >portoricensis : minutus.portoricensis
 
         maracajuensis(): samarensis.cahirinus<Lanthanum.jugularis, ruatanica.americanus> { var x: samarensis.cahirinus<Lanthanum.jugularis, ruatanica.americanus>; () => { var y = this; }; return x; }
@@ -6822,7 +6822,7 @@ module minutus {
 >inez : inez<T0, T1>
 >T0 : T0
 >T1 : T1
->samarensis : unknown
+>samarensis : typeof samarensis
 >pelurus : samarensis.pelurus<T0, T1>
 >argurus : unknown
 >germaini : argurus.germaini
@@ -6855,7 +6855,7 @@ module macrorhinos {
 
     export class konganensis extends imperfecta.lasiurus<caurinus.psilurus, caurinus.psilurus> {
 >konganensis : konganensis
->imperfecta : unknown
+>imperfecta : typeof imperfecta
 >lasiurus : imperfecta.lasiurus<T0, T1>
 >caurinus : unknown
 >psilurus : caurinus.psilurus
@@ -6870,7 +6870,7 @@ module panamensis {
 >linulus : linulus<T0, T1>
 >T0 : T0
 >T1 : T1
->ruatanica : unknown
+>ruatanica : typeof ruatanica
 >hector : ruatanica.hector<T0, T1>
 >julianae : unknown
 >sumatrana : julianae.sumatrana
@@ -7330,7 +7330,7 @@ module samarensis {
 >pelurus : pelurus<T0, T1>
 >T0 : T0
 >T1 : T1
->sagitta : unknown
+>sagitta : typeof sagitta
 >stolzmanni : sagitta.stolzmanni
 
         Palladium(): panamensis.linulus<macrorhinos.konganensis, rionegrensis.caniventer> { var x: panamensis.linulus<macrorhinos.konganensis, rionegrensis.caniventer>; () => { var y = this; }; return x; }
@@ -7587,7 +7587,7 @@ module samarensis {
 >fuscus : fuscus<T0, T1>
 >T0 : T0
 >T1 : T1
->macrorhinos : unknown
+>macrorhinos : typeof macrorhinos
 >daphaenodon : macrorhinos.daphaenodon
 
         planifrons(): nigra.gracilis<julianae.nudicaudus, dogramacii.aurata> { var x: nigra.gracilis<julianae.nudicaudus, dogramacii.aurata>; () => { var y = this; }; return x; }
@@ -8064,7 +8064,7 @@ module sagitta {
 >leptoceros : leptoceros<T0, T1>
 >T0 : T0
 >T1 : T1
->caurinus : unknown
+>caurinus : typeof caurinus
 >johorensis : caurinus.johorensis<T0, T1>
 >argurus : unknown
 >peninsulae : argurus.peninsulae
@@ -8175,7 +8175,7 @@ module daubentonii {
 >nigricans : nigricans<T0, T1>
 >T0 : T0
 >T1 : T1
->sagitta : unknown
+>sagitta : typeof sagitta
 >stolzmanni : sagitta.stolzmanni
 
         woosnami(): dogramacii.robustulus { var x: dogramacii.robustulus; () => { var y = this; }; return x; }
@@ -8207,7 +8207,7 @@ module argurus {
 >pygmaea : pygmaea<T0, T1>
 >T0 : T0
 >T1 : T1
->rendalli : unknown
+>rendalli : typeof rendalli
 >moojeni : rendalli.moojeni<T0, T1>
 >macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
@@ -8258,7 +8258,7 @@ module chrysaeolus {
 >sarasinorum : sarasinorum<T0, T1>
 >T0 : T0
 >T1 : T1
->caurinus : unknown
+>caurinus : typeof caurinus
 >psilurus : caurinus.psilurus
 
         belzebul(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; }
@@ -8500,7 +8500,7 @@ module argurus {
 
     export class oreas extends lavali.wilsoni {
 >oreas : oreas
->lavali : unknown
+>lavali : typeof lavali
 >wilsoni : lavali.wilsoni
 
         salamonis(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; }
@@ -9129,7 +9129,7 @@ module provocax {
 
     export class melanoleuca extends lavali.wilsoni {
 >melanoleuca : melanoleuca
->lavali : unknown
+>lavali : typeof lavali
 >wilsoni : lavali.wilsoni
 
         Neodymium(): macrorhinos.marmosurus<petrophilus.sodyi<trivirgatus.falconeri, quasiater.bobrinskoi>, lutreolus.foina> { var x: macrorhinos.marmosurus<petrophilus.sodyi<trivirgatus.falconeri, quasiater.bobrinskoi>, lutreolus.foina>; () => { var y = this; }; return x; }
@@ -9275,7 +9275,7 @@ module howi {
 
     export class marcanoi extends Lanthanum.megalonyx {
 >marcanoi : marcanoi
->Lanthanum : unknown
+>Lanthanum : typeof Lanthanum
 >megalonyx : Lanthanum.megalonyx
 
         formosae(): Lanthanum.megalonyx { var x: Lanthanum.megalonyx; () => { var y = this; }; return x; }
@@ -10362,7 +10362,7 @@ module gabriellae {
 >klossii : klossii<T0, T1>
 >T0 : T0
 >T1 : T1
->imperfecta : unknown
+>imperfecta : typeof imperfecta
 >lasiurus : imperfecta.lasiurus<T0, T1>
 >dogramacii : unknown
 >robustulus : dogramacii.robustulus
@@ -10871,7 +10871,7 @@ module imperfecta {
 >ciliolabrum : ciliolabrum<T0, T1>
 >T0 : T0
 >T1 : T1
->dogramacii : unknown
+>dogramacii : typeof dogramacii
 >robustulus : dogramacii.robustulus
 
         leschenaultii(): argurus.dauricus<Lanthanum.jugularis, ruatanica.Praseodymium<argurus.germaini, caurinus.megaphyllus>> { var x: argurus.dauricus<Lanthanum.jugularis, ruatanica.Praseodymium<argurus.germaini, caurinus.megaphyllus>>; () => { var y = this; }; return x; }
@@ -11034,7 +11034,7 @@ module petrophilus {
 >sodyi : sodyi<T0, T1>
 >T0 : T0
 >T1 : T1
->quasiater : unknown
+>quasiater : typeof quasiater
 >bobrinskoi : quasiater.bobrinskoi
 
         saundersiae(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; }
@@ -11167,7 +11167,7 @@ module caurinus {
 
     export class megaphyllus extends imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>> {
 >megaphyllus : megaphyllus
->imperfecta : unknown
+>imperfecta : typeof imperfecta
 >lasiurus : imperfecta.lasiurus<T0, T1>
 >julianae : unknown
 >acariensis : julianae.acariensis
@@ -11600,7 +11600,7 @@ module lutreolus {
 >cor : cor<T0, T1>
 >T0 : T0
 >T1 : T1
->panglima : unknown
+>panglima : typeof panglima
 >fundatus : panglima.fundatus<T0, T1>
 >panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
@@ -11846,7 +11846,7 @@ module argurus {
 
     export class germaini extends gabriellae.amicus {
 >germaini : germaini
->gabriellae : unknown
+>gabriellae : typeof gabriellae
 >amicus : gabriellae.amicus
 
         sharpei(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; }
@@ -12058,7 +12058,7 @@ module dammermani {
 
     export class melanops extends minutus.inez<sagitta.stolzmanni, dammermani.melanops> {
 >melanops : melanops
->minutus : unknown
+>minutus : typeof minutus
 >inez : minutus.inez<T0, T1>
 >sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
@@ -12307,7 +12307,7 @@ module argurus {
 
     export class peninsulae extends patas.uralensis {
 >peninsulae : peninsulae
->patas : unknown
+>patas : typeof patas
 >uralensis : patas.uralensis
 
         aitkeni(): trivirgatus.mixtus<argurus.dauricus<dogramacii.aurata, dammermani.melanops>, panglima.amphibius<lavali.lepturus, quasiater.carolinensis>> { var x: trivirgatus.mixtus<argurus.dauricus<dogramacii.aurata, dammermani.melanops>, panglima.amphibius<lavali.lepturus, quasiater.carolinensis>>; () => { var y = this; }; return x; }
@@ -12771,7 +12771,7 @@ module ruatanica {
 >Praseodymium : Praseodymium<T0, T1>
 >T0 : T0
 >T1 : T1
->ruatanica : unknown
+>ruatanica : typeof ruatanica
 >hector : hector<T0, T1>
 >lutreolus : unknown
 >punicus : lutreolus.punicus
@@ -13118,7 +13118,7 @@ module caurinus {
 >johorensis : johorensis<T0, T1>
 >T0 : T0
 >T1 : T1
->lutreolus : unknown
+>lutreolus : typeof lutreolus
 >punicus : lutreolus.punicus
 
         maini(): ruatanica.Praseodymium<lavali.thaeleri, julianae.acariensis> { var x: ruatanica.Praseodymium<lavali.thaeleri, julianae.acariensis>; () => { var y = this; }; return x; }
@@ -13564,7 +13564,7 @@ module caurinus {
 
     export class psilurus extends lutreolus.punicus {
 >psilurus : psilurus
->lutreolus : unknown
+>lutreolus : typeof lutreolus
 >punicus : lutreolus.punicus
 
         socialis(): panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus> { var x: panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>; () => { var y = this; }; return x; }
diff --git a/tests/baselines/reference/thisInInvalidContexts.errors.txt b/tests/baselines/reference/thisInInvalidContexts.errors.txt
index c9ec44b8cd..481c4747c9 100644
--- a/tests/baselines/reference/thisInInvalidContexts.errors.txt
+++ b/tests/baselines/reference/thisInInvalidContexts.errors.txt
@@ -1,13 +1,12 @@
 tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(3,16): error TS2334: 'this' cannot be referenced in a static property initializer.
 tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(22,15): error TS2332: 'this' cannot be referenced in current location.
 tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(28,13): error TS2331: 'this' cannot be referenced in a module body.
-tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(38,25): error TS1133: Type reference expected.
-tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(38,30): error TS1005: ';' expected.
+tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(38,25): error TS9002: Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses.
 tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(44,9): error TS2332: 'this' cannot be referenced in current location.
 tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(45,9): error TS2332: 'this' cannot be referenced in current location.
 
 
-==== tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts (7 errors) ====
+==== tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts (6 errors) ====
     //'this' in static member initializer
     class ErrClass1 {
         static t = this; // Error
@@ -53,9 +52,7 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(45,9):
     
     class ErrClass3 extends this {
                             ~~~~
-!!! error TS1133: Type reference expected.
-                                 ~
-!!! error TS1005: ';' expected.
+!!! error TS9002: Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses.
     
     }
     
diff --git a/tests/baselines/reference/thisInInvalidContexts.js b/tests/baselines/reference/thisInInvalidContexts.js
index f21ebedc1e..5720156de0 100644
--- a/tests/baselines/reference/thisInInvalidContexts.js
+++ b/tests/baselines/reference/thisInInvalidContexts.js
@@ -94,14 +94,13 @@ var M;
 //'this' as a type argument
 function genericFunc(x) { }
 genericFunc < this > (undefined); // Should be an error
-var ErrClass3 = (function () {
+var ErrClass3 = (function (_super) {
+    __extends(ErrClass3, _super);
     function ErrClass3() {
+        _super.apply(this, arguments);
     }
     return ErrClass3;
-})();
-this;
-{
-}
+})(this);
 //'this' as a computed enum value
 var SomeEnum;
 (function (SomeEnum) {
diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt b/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt
index 0453d3ed31..a8bf99de27 100644
--- a/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt
+++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt
@@ -1,14 +1,13 @@
 tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(3,16): error TS2334: 'this' cannot be referenced in a static property initializer.
 tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(22,15): error TS2332: 'this' cannot be referenced in current location.
 tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(28,13): error TS2331: 'this' cannot be referenced in a module body.
-tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(38,25): error TS1133: Type reference expected.
-tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(38,30): error TS1005: ';' expected.
+tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(38,25): error TS9002: Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses.
 tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(44,9): error TS2332: 'this' cannot be referenced in current location.
 tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(45,9): error TS2332: 'this' cannot be referenced in current location.
 tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(48,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
 
 
-==== tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts (8 errors) ====
+==== tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts (7 errors) ====
     //'this' in static member initializer
     class ErrClass1 {
         static t = this; // Error
@@ -54,9 +53,7 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalMod
     
     class ErrClass3 extends this {
                             ~~~~
-!!! error TS1133: Type reference expected.
-                                 ~
-!!! error TS1005: ';' expected.
+!!! error TS9002: Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses.
     
     }
     
diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.js b/tests/baselines/reference/thisInInvalidContextsExternalModule.js
index e9fddd380b..eee8bcc848 100644
--- a/tests/baselines/reference/thisInInvalidContextsExternalModule.js
+++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.js
@@ -94,14 +94,13 @@ var M;
 //'this' as a type argument
 function genericFunc(x) { }
 genericFunc < this > (undefined); // Should be an error
-var ErrClass3 = (function () {
+var ErrClass3 = (function (_super) {
+    __extends(ErrClass3, _super);
     function ErrClass3() {
+        _super.apply(this, arguments);
     }
     return ErrClass3;
-})();
-this;
-{
-}
+})(this);
 //'this' as a computed enum value
 var SomeEnum;
 (function (SomeEnum) {
diff --git a/tests/baselines/reference/withStatementErrors.errors.txt b/tests/baselines/reference/withStatementErrors.errors.txt
index 623e35c855..ba399f5119 100644
--- a/tests/baselines/reference/withStatementErrors.errors.txt
+++ b/tests/baselines/reference/withStatementErrors.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/withStatementErrors.ts(3,7): error TS2410: All symbols within a 'with' block will be resolved to 'any'.
-tests/cases/compiler/withStatementErrors.ts(11,5): error TS1129: Statement expected.
+tests/cases/compiler/withStatementErrors.ts(13,5): error TS1129: Statement expected.
 tests/cases/compiler/withStatementErrors.ts(17,1): error TS1128: Declaration or statement expected.
 
 
@@ -17,10 +17,10 @@ tests/cases/compiler/withStatementErrors.ts(17,1): error TS1128: Declaration or
         bar(); // no error
     
         class C {} // error   
-        ~~~~~
-!!! error TS1129: Statement expected.
         
         interface I {} // error
+        ~~~~~~~~~
+!!! error TS1129: Statement expected.
         
         module M {} // error
             
diff --git a/tests/baselines/reference/withStatementErrors.js b/tests/baselines/reference/withStatementErrors.js
index 5a4e0635db..43236c94d8 100644
--- a/tests/baselines/reference/withStatementErrors.js
+++ b/tests/baselines/reference/withStatementErrors.js
@@ -23,10 +23,10 @@ with (ooo.eee.oo.ah_ah.ting.tang.walla.walla) {
     bing = true; // no error
     bang = true; // no error
     function bar() { } // no error
-    bar();
-} // no error
-var C = (function () {
-    function C() {
-    }
-    return C;
-})(); // error   
+    bar(); // no error
+    var C = (function () {
+        function C() {
+        }
+        return C;
+    })();
+} // error   
diff --git a/tests/cases/compiler/classExpressionTest1.ts b/tests/cases/compiler/classExpressionTest1.ts
new file mode 100644
index 0000000000..b299a2fd73
--- /dev/null
+++ b/tests/cases/compiler/classExpressionTest1.ts
@@ -0,0 +1,12 @@
+function M() {
+    class C<X> {
+        f<T>() {
+            var t: T;
+            var x: X;
+            return { t, x };
+        }
+    }
+
+    var v = new C<number>();
+    return v.f<string>();
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/classExpressionTest2.ts b/tests/cases/compiler/classExpressionTest2.ts
new file mode 100644
index 0000000000..c0b9792b82
--- /dev/null
+++ b/tests/cases/compiler/classExpressionTest2.ts
@@ -0,0 +1,12 @@
+function M() {
+    var m = class C<X> {
+        f<T>() {
+            var t: T;
+            var x: X;
+            return { t, x };
+        }
+    }
+
+    var v = new m<number>();
+    return v.f<string>();
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/externalModuleImmutableBindings.ts b/tests/cases/compiler/externalModuleImmutableBindings.ts
index 9ed3d278a3..2321961f6f 100644
--- a/tests/cases/compiler/externalModuleImmutableBindings.ts
+++ b/tests/cases/compiler/externalModuleImmutableBindings.ts
@@ -3,6 +3,8 @@
 export var x = 1;
 
 // @Filename: f2.ts
+
+// all mutations below are illegal and should be fixed
 import * as stuff from 'f1';
 
 var n = 'baz';
diff --git a/tests/cases/conformance/classes/classDeclarations/classInsideBlock.ts b/tests/cases/conformance/classes/classDeclarations/classInsideBlock.ts
new file mode 100644
index 0000000000..efc3ccff9a
--- /dev/null
+++ b/tests/cases/conformance/classes/classDeclarations/classInsideBlock.ts
@@ -0,0 +1,3 @@
+function foo() {
+    class C { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/classes/classDeclarations/classWithSemicolonClassElement1.ts b/tests/cases/conformance/classes/classDeclarations/classWithSemicolonClassElement1.ts
new file mode 100644
index 0000000000..6571258d9d
--- /dev/null
+++ b/tests/cases/conformance/classes/classDeclarations/classWithSemicolonClassElement1.ts
@@ -0,0 +1,3 @@
+class C {
+    ;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/classes/classDeclarations/classWithSemicolonClassElement2.ts b/tests/cases/conformance/classes/classDeclarations/classWithSemicolonClassElement2.ts
new file mode 100644
index 0000000000..716c8b58ae
--- /dev/null
+++ b/tests/cases/conformance/classes/classDeclarations/classWithSemicolonClassElement2.ts
@@ -0,0 +1,4 @@
+class C {
+    ;
+    ;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/classes/classExpressions/classExpression1.ts b/tests/cases/conformance/classes/classExpressions/classExpression1.ts
new file mode 100644
index 0000000000..809557f49a
--- /dev/null
+++ b/tests/cases/conformance/classes/classExpressions/classExpression1.ts
@@ -0,0 +1 @@
+var v = class C {};
\ No newline at end of file
diff --git a/tests/cases/conformance/classes/classExpressions/classExpression2.ts b/tests/cases/conformance/classes/classExpressions/classExpression2.ts
new file mode 100644
index 0000000000..6365cd07eb
--- /dev/null
+++ b/tests/cases/conformance/classes/classExpressions/classExpression2.ts
@@ -0,0 +1,2 @@
+class D { }
+var v = class C extends D {};
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/classDeclaration/classWithSemicolonClassElementES61.ts b/tests/cases/conformance/es6/classDeclaration/classWithSemicolonClassElementES61.ts
new file mode 100644
index 0000000000..e1c31c16ad
--- /dev/null
+++ b/tests/cases/conformance/es6/classDeclaration/classWithSemicolonClassElementES61.ts
@@ -0,0 +1,4 @@
+//@target: es6
+class C {
+    ;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/classDeclaration/classWithSemicolonClassElementES62.ts b/tests/cases/conformance/es6/classDeclaration/classWithSemicolonClassElementES62.ts
new file mode 100644
index 0000000000..d83200da62
--- /dev/null
+++ b/tests/cases/conformance/es6/classDeclaration/classWithSemicolonClassElementES62.ts
@@ -0,0 +1,5 @@
+//@target: es6
+class C {
+    ;
+    ;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/classExpressions/classExpressionES61.ts b/tests/cases/conformance/es6/classExpressions/classExpressionES61.ts
new file mode 100644
index 0000000000..611a2fd4bc
--- /dev/null
+++ b/tests/cases/conformance/es6/classExpressions/classExpressionES61.ts
@@ -0,0 +1,2 @@
+// @target: es6
+var v = class C {};
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/classExpressions/classExpressionES62.ts b/tests/cases/conformance/es6/classExpressions/classExpressionES62.ts
new file mode 100644
index 0000000000..97ca36a416
--- /dev/null
+++ b/tests/cases/conformance/es6/classExpressions/classExpressionES62.ts
@@ -0,0 +1,3 @@
+// @target: es6
+class D { }
+var v = class C extends D {};
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInExtendsClause.ts b/tests/cases/fourslash/completionListInExtendsClause.ts
index ee2acc6a12..b765f77d5d 100644
--- a/tests/cases/fourslash/completionListInExtendsClause.ts
+++ b/tests/cases/fourslash/completionListInExtendsClause.ts
@@ -17,9 +17,8 @@
 ////interface test3 extends IFoo./*3*/ {}
 
 ////interface test4 implements Foo./*4*/ {}
-
 goTo.marker("1");
-verify.completionListIsEmpty();
+verify.not.completionListIsEmpty();
 
 goTo.marker("2");
 verify.completionListIsEmpty();
@@ -28,4 +27,4 @@ goTo.marker("3");
 verify.completionListIsEmpty();
 
 goTo.marker("4");
-verify.completionListIsEmpty();
\ No newline at end of file
+verify.not.completionListIsEmpty();
\ No newline at end of file
diff --git a/tests/cases/fourslash/getOccurrencesPropertyInAliasedInterface.ts b/tests/cases/fourslash/getOccurrencesPropertyInAliasedInterface.ts
index 53840fc3bd..87ec260601 100644
--- a/tests/cases/fourslash/getOccurrencesPropertyInAliasedInterface.ts
+++ b/tests/cases/fourslash/getOccurrencesPropertyInAliasedInterface.ts
@@ -15,7 +15,6 @@
 ////}
 ////
 ////(new C()).[|abc|];
-
 test.ranges().forEach(r => {
     goTo.position(r.start);
 
diff --git a/tests/cases/fourslash/getOccurrencesReturnBroken.ts b/tests/cases/fourslash/getOccurrencesReturnBroken.ts
index 08ec794f7e..2327a62d12 100644
--- a/tests/cases/fourslash/getOccurrencesReturnBroken.ts
+++ b/tests/cases/fourslash/getOccurrencesReturnBroken.ts
@@ -44,11 +44,13 @@ for (var i = 1; i <= test.markers().length; i++) {
     switch (i) {
         case 0:
         case 1:
-        case 4:
             verify.occurrencesAtPositionCount(0);
             break;
         case 3:
             verify.occurrencesAtPositionCount(1); // 'return' is an instance member
             break;
+        case 4:
+            verify.occurrencesAtPositionCount(4);
+            break;
     }
 }
\ No newline at end of file
diff --git a/tests/cases/fourslash/identifierErrorRecovery.ts b/tests/cases/fourslash/identifierErrorRecovery.ts
index 3ba5d11469..cb266584b0 100644
--- a/tests/cases/fourslash/identifierErrorRecovery.ts
+++ b/tests/cases/fourslash/identifierErrorRecovery.ts
@@ -8,7 +8,7 @@
 
 verify.errorExistsBetweenMarkers("1", "2");
 verify.errorExistsBetweenMarkers("3", "4");
-verify.numberOfErrorsInCurrentFile(2);
+verify.numberOfErrorsInCurrentFile(3);
 goTo.eof();
 verify.completionListContains("foo");
 verify.completionListContains("bar");