diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 362e450466b66..6fdaac79cea00 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5,6 +5,12 @@ module ts {
     let nextNodeId = 1;
     let nextMergeId = 1;
 
+    // @internal
+    export function getNodeId(node: Node): number {
+        if (!node.id) node.id = nextNodeId++;
+        return node.id;
+    }
+
     /* @internal */ export let checkTime = 0;
 
     /* @internal */
@@ -109,11 +115,17 @@ module ts {
         let globalIterableType: ObjectType;
 
         let anyArrayType: Type;
-
+        let globalTypedPropertyDescriptorType: ObjectType;
+        let globalClassDecoratorType: ObjectType;
+        let globalParameterDecoratorType: ObjectType;
+        let globalPropertyDecoratorType: ObjectType;
+        let globalMethodDecoratorType: ObjectType;
+        
         let tupleTypes: Map<TupleType> = {};
         let unionTypes: Map<UnionType> = {};
         let stringLiteralTypes: Map<StringLiteralType> = {};
         let emitExtends = false;
+        let emitDecorate = false;
 
         let mergedSymbols: Symbol[] = [];
         let symbolLinks: SymbolLinks[] = [];
@@ -264,8 +276,8 @@ module ts {
         }
 
         function getNodeLinks(node: Node): NodeLinks {
-            if (!node.id) node.id = nextNodeId++;
-            return nodeLinks[node.id] || (nodeLinks[node.id] = {});
+            let nodeId = getNodeId(node);
+            return nodeLinks[nodeId] || (nodeLinks[nodeId] = {});
         }
 
         function getSourceFile(node: Node): SourceFile {
@@ -318,6 +330,7 @@ module ts {
             let lastLocation: Node;
             let propertyWithInvalidInitializer: Node;
             let errorLocation = location;
+            let grandparent: Node;
 
             loop: while (location) {
                 // Locals of a source file are not in scope (because they get merged into the global symbol table)
@@ -383,7 +396,7 @@ module ts {
                     //   }
                     //
                     case SyntaxKind.ComputedPropertyName:
-                        let grandparent = location.parent.parent;
+                        grandparent = location.parent.parent;
                         if (grandparent.kind === SyntaxKind.ClassDeclaration || grandparent.kind === SyntaxKind.InterfaceDeclaration) {
                             // A reference to this grandparent's type parameters would be an error
                             if (result = getSymbol(getSymbolOfNode(grandparent).members, name, meaning & SymbolFlags.Type)) {
@@ -415,6 +428,28 @@ module ts {
                             break loop;
                         }
                         break;
+                    case SyntaxKind.Decorator:
+                        // Decorators are resolved at the class declaration. Resolving at the parameter 
+                        // or member would result in looking up locals in the method.
+                        //
+                        //   function y() {}
+                        //   class C {
+                        //       method(@y x, y) {} // <-- decorator y should be resolved at the class declaration, not the parameter.
+                        //   }
+                        //
+                        if (location.parent && location.parent.kind === SyntaxKind.Parameter) {
+                            location = location.parent;
+                        }
+                        //
+                        //   function y() {}
+                        //   class C {
+                        //       @y method(x, y) {} // <-- decorator y should be resolved at the class declaration, not the method.
+                        //   }
+                        //
+                        if (location.parent && isClassElement(location.parent)) {
+                            location = location.parent;
+                        }
+                        break;
                 }
                 lastLocation = location;
                 location = location.parent;
@@ -7297,7 +7332,6 @@ module ts {
                     case SyntaxKind.ElementAccessExpression: {
                         let index = (<ElementAccessExpression>n).argumentExpression;
                         let symbol = findSymbol((<ElementAccessExpression>n).expression);
-
                         if (symbol && index && index.kind === SyntaxKind.StringLiteral) {
                             let name = (<LiteralExpression>index).text;
                             let prop = getPropertyOfType(getTypeOfSymbol(symbol), name);
@@ -7312,14 +7346,37 @@ 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;
             }
+
             if (isConstVariableReference(n)) {
                 error(n, constantVariableMessage);
                 return false;
             }
+
+            if (isImportedNameFromExternalModule(n)) {
+                error(n, invalidReferenceMessage);
+            }
+
             return true;
         }
 
@@ -7968,7 +8025,7 @@ module ts {
             // strict mode FunctionLikeDeclaration or FunctionExpression(13.1)
 
             // Grammar checking
-            checkGrammarModifiers(node) || checkGrammarEvalOrArgumentsInStrictMode(node, <Identifier>node.name);
+            checkGrammarDecorators(node) || checkGrammarModifiers(node) || checkGrammarEvalOrArgumentsInStrictMode(node, <Identifier>node.name);
 
             checkVariableLikeDeclaration(node);
             let func = getContainingFunction(node);
@@ -8070,7 +8127,7 @@ module ts {
 
         function checkPropertyDeclaration(node: PropertyDeclaration) {
             // Grammar checking
-            checkGrammarModifiers(node) || checkGrammarProperty(node) || checkGrammarComputedPropertyName(node.name);
+            checkGrammarDecorators(node) || checkGrammarModifiers(node) || checkGrammarProperty(node) || checkGrammarComputedPropertyName(node.name);
 
             checkVariableLikeDeclaration(node);
         }
@@ -8209,6 +8266,10 @@ module ts {
             checkFunctionLikeDeclaration(node);
         }
 
+        function checkMissingDeclaration(node: Node) {
+            checkDecorators(node);
+        }
+
         function checkTypeReference(node: TypeReferenceNode) {
             // Grammar checking
             checkGrammarTypeArguments(node, node.typeArguments);
@@ -8600,6 +8661,60 @@ module ts {
             }
         }
 
+        /** Check a decorator */
+        function checkDecorator(node: Decorator): void {
+            let expression: Expression = node.expression;
+            let exprType = checkExpression(expression);
+
+            switch (node.parent.kind) {
+                case SyntaxKind.ClassDeclaration:
+                    let classSymbol = getSymbolOfNode(node.parent);
+                    let classConstructorType = getTypeOfSymbol(classSymbol);
+                    let classDecoratorType = instantiateSingleCallFunctionType(globalClassDecoratorType, [classConstructorType]);
+                    checkTypeAssignableTo(exprType, classDecoratorType, node);
+                    break;
+
+                case SyntaxKind.PropertyDeclaration:
+                    checkTypeAssignableTo(exprType, globalPropertyDecoratorType, node);
+                    break;
+
+                case SyntaxKind.MethodDeclaration:
+                case SyntaxKind.GetAccessor:
+                case SyntaxKind.SetAccessor:
+                    let methodType = getTypeOfNode(node.parent);
+                    let methodDecoratorType = instantiateSingleCallFunctionType(globalMethodDecoratorType, [methodType]);
+                    checkTypeAssignableTo(exprType, methodDecoratorType, node);
+                    break;
+
+                case SyntaxKind.Parameter:
+                    checkTypeAssignableTo(exprType, globalParameterDecoratorType, node);
+                    break;
+            }
+        }
+
+        /** Check the decorators of a node */
+        function checkDecorators(node: Node): void {
+            if (!node.decorators) {
+                return;
+            }            
+
+            switch (node.kind) {
+                case SyntaxKind.ClassDeclaration:
+                case SyntaxKind.MethodDeclaration:
+                case SyntaxKind.GetAccessor:
+                case SyntaxKind.SetAccessor:
+                case SyntaxKind.PropertyDeclaration:
+                case SyntaxKind.Parameter:
+                    emitDecorate = true;
+                    break;
+
+                default:
+                    return;
+            }
+
+            forEach(node.decorators, checkDecorator);
+        }
+
         function checkFunctionDeclaration(node: FunctionDeclaration): void {
             if (produceDiagnostics) {
                 checkFunctionLikeDeclaration(node) ||
@@ -8614,6 +8729,7 @@ module ts {
         }
 
         function checkFunctionLikeDeclaration(node: FunctionLikeDeclaration): void {
+            checkDecorators(node);
             checkSignatureDeclaration(node);
 
             // Do not use hasDynamicName here, because that returns false for well known symbols.
@@ -8896,6 +9012,7 @@ module ts {
 
         // Check variable, parameter, or property declaration
         function checkVariableLikeDeclaration(node: VariableLikeDeclaration) {
+            checkDecorators(node);
             checkSourceElement(node.type);
             // For a computed property, just check the initializer and exit
             // Do not use hasDynamicName here, because that returns false for well known symbols.
@@ -8968,7 +9085,7 @@ module ts {
 
         function checkVariableStatement(node: VariableStatement) {
             // Grammar checking
-            checkGrammarDisallowedModifiersInBlockOrObjectLiteralExpression(node) || checkGrammarModifiers(node) || checkGrammarVariableDeclarationList(node.declarationList) || checkGrammarForDisallowedLetOrConstStatement(node);
+            checkGrammarDecorators(node) || checkGrammarDisallowedModifiersInBlockOrObjectLiteralExpression(node) || checkGrammarModifiers(node) || checkGrammarVariableDeclarationList(node.declarationList) || checkGrammarForDisallowedLetOrConstStatement(node);
 
             forEach(node.declarationList.declarations, checkSourceElement);
         }
@@ -9599,7 +9716,7 @@ module ts {
         function checkClassDeclaration(node: ClassDeclaration) {
             // Grammar checking
             checkGrammarClassDeclarationHeritageClauses(node);
-
+            checkDecorators(node);
             if (node.name) {
                 checkTypeNameIsReserved(node.name, Diagnostics.Class_name_cannot_be_0);
                 checkCollisionWithCapturedThisVariable(node, node.name);
@@ -9804,7 +9921,7 @@ module ts {
 
         function checkInterfaceDeclaration(node: InterfaceDeclaration) {
             // Grammar checking
-            checkGrammarModifiers(node) || checkGrammarInterfaceDeclaration(node);
+            checkGrammarDecorators(node) || checkGrammarModifiers(node) || checkGrammarInterfaceDeclaration(node);
 
             checkTypeParameters(node.typeParameters);
             if (produceDiagnostics) {
@@ -9841,7 +9958,7 @@ module ts {
 
         function checkTypeAliasDeclaration(node: TypeAliasDeclaration) {
             // Grammar checking
-            checkGrammarModifiers(node);
+            checkGrammarDecorators(node) || checkGrammarModifiers(node);
 
             checkTypeNameIsReserved(node.name, Diagnostics.Type_alias_name_cannot_be_0);
             checkSourceElement(node.type);
@@ -10023,7 +10140,7 @@ module ts {
             }
 
             // Grammar checking
-            checkGrammarModifiers(node) || checkGrammarEnumDeclaration(node);
+            checkGrammarDecorators(node) || checkGrammarModifiers(node) || checkGrammarEnumDeclaration(node);
 
             checkTypeNameIsReserved(node.name, Diagnostics.Enum_name_cannot_be_0);
             checkCollisionWithCapturedThisVariable(node, node.name);
@@ -10089,7 +10206,7 @@ module ts {
         function checkModuleDeclaration(node: ModuleDeclaration) {
             if (produceDiagnostics) {
                 // Grammar checking
-                if (!checkGrammarModifiers(node)) {
+                if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node)) {
                     if (!isInAmbientContext(node) && node.name.kind === SyntaxKind.StringLiteral) {
                         grammarErrorOnNode(node.name, Diagnostics.Only_ambient_modules_can_use_quoted_names);
                     }
@@ -10184,7 +10301,7 @@ module ts {
         }
 
         function checkImportDeclaration(node: ImportDeclaration) {
-            if (!checkGrammarModifiers(node) && (node.flags & NodeFlags.Modifier)) {
+            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & NodeFlags.Modifier)) {
                 grammarErrorOnFirstToken(node, Diagnostics.An_import_declaration_cannot_have_modifiers);
             }
             if (checkExternalImportOrExportDeclaration(node)) {
@@ -10206,7 +10323,7 @@ module ts {
         }
 
         function checkImportEqualsDeclaration(node: ImportEqualsDeclaration) {
-            checkGrammarModifiers(node);
+            checkGrammarDecorators(node) || checkGrammarModifiers(node);
             if (isInternalModuleImportEqualsDeclaration(node) || checkExternalImportOrExportDeclaration(node)) {
                 checkImportBinding(node);
                 if (node.flags & NodeFlags.Export) {
@@ -10237,7 +10354,7 @@ module ts {
         }
 
         function checkExportDeclaration(node: ExportDeclaration) {
-            if (!checkGrammarModifiers(node) && (node.flags & NodeFlags.Modifier)) {
+            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & NodeFlags.Modifier)) {
                 grammarErrorOnFirstToken(node, Diagnostics.An_export_declaration_cannot_have_modifiers);
             }
             if (!node.moduleSpecifier || checkExternalImportOrExportDeclaration(node)) {
@@ -10275,7 +10392,7 @@ module ts {
                 return;
             }
             // Grammar checking
-            if (!checkGrammarModifiers(node) && (node.flags & NodeFlags.Modifier)) {
+            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & NodeFlags.Modifier)) {
                 grammarErrorOnFirstToken(node, Diagnostics.An_export_assignment_cannot_have_modifiers);
             }
             if (node.expression) {
@@ -10436,6 +10553,8 @@ module ts {
                 case SyntaxKind.DebuggerStatement:
                     checkGrammarStatementInAmbientContext(node);
                     return;
+                case SyntaxKind.MissingDeclaration:
+                    return checkMissingDeclaration(node);
             }
         }
 
@@ -10562,6 +10681,10 @@ module ts {
                     links.flags |= NodeCheckFlags.EmitExtends;
                 }
 
+                if (emitDecorate) {
+                    links.flags |= NodeCheckFlags.EmitDecorate;
+                }
+
                 links.flags |= NodeCheckFlags.TypeChecked;
             }
         }
@@ -10605,7 +10728,55 @@ module ts {
         function getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[] {
             let symbols: SymbolTable = {};
             let memberFlags: NodeFlags = 0;
-            function copySymbol(symbol: Symbol, meaning: SymbolFlags) {
+
+            if (isInsideWithStatementBody(location)) {
+                // We cannot answer semantic questions within a with block, do not proceed any further
+                return [];
+            }
+
+            populateSymbols();
+
+            return symbolsToArray(symbols);
+
+            function populateSymbols() {
+                while (location) {
+                    if (location.locals && !isGlobalSourceFile(location)) {
+                        copySymbols(location.locals, meaning);
+                    }
+
+                    switch (location.kind) {
+                        case SyntaxKind.SourceFile:
+                            if (!isExternalModule(<SourceFile>location)) {
+                                break;
+                            }
+                        case SyntaxKind.ModuleDeclaration:
+                            copySymbols(getSymbolOfNode(location).exports, meaning & SymbolFlags.ModuleMember);
+                            break;
+                        case SyntaxKind.EnumDeclaration:
+                            copySymbols(getSymbolOfNode(location).exports, meaning & SymbolFlags.EnumMember);
+                            break;
+                        case SyntaxKind.ClassDeclaration:
+                        case SyntaxKind.InterfaceDeclaration:
+                            if (!(memberFlags & NodeFlags.Static)) {
+                                copySymbols(getSymbolOfNode(location).members, meaning & SymbolFlags.Type);
+                            }
+                            break;
+                        case SyntaxKind.FunctionExpression:
+                            if ((<FunctionExpression>location).name) {
+                                copySymbol(location.symbol, meaning);
+                            }
+                            break;
+                    }
+
+                    memberFlags = location.flags;
+                    location = location.parent;
+                }
+
+                copySymbols(globals, meaning);
+            }
+
+            // Returns 'true' if we should stop processing symbols.
+            function copySymbol(symbol: Symbol, meaning: SymbolFlags): void {
                 if (symbol.flags & meaning) {
                     let id = symbol.name;
                     if (!isReservedMemberName(id) && !hasProperty(symbols, id)) {
@@ -10613,7 +10784,8 @@ module ts {
                     }
                 }
             }
-            function copySymbols(source: SymbolTable, meaning: SymbolFlags) {
+
+            function copySymbols(source: SymbolTable, meaning: SymbolFlags): void {
                 if (meaning) {
                     for (let id in source) {
                         if (hasProperty(source, id)) {
@@ -11009,134 +11181,7 @@ module ts {
             return symbol.flags & SymbolFlags.ValueModule && symbol.declarations.length === 1 && symbol.declarations[0].kind === SyntaxKind.SourceFile;
         }
 
-        function isNodeDescendentOf(node: Node, ancestor: Node): boolean {
-            while (node) {
-                if (node === ancestor) return true;
-                node = node.parent;
-            }
-            return false;
-        }
-
-        function isUniqueLocalName(name: string, container: Node): boolean {
-            for (let node = container; isNodeDescendentOf(node, container); node = node.nextContainer) {
-                if (node.locals && hasProperty(node.locals, name)) {
-                    // We conservatively include alias symbols to cover cases where they're emitted as locals
-                    if (node.locals[name].flags & (SymbolFlags.Value | SymbolFlags.ExportValue | SymbolFlags.Alias)) {
-                        return false;
-                    }
-                }
-            }
-            return true;
-        }
-
-        function getGeneratedNamesForSourceFile(sourceFile: SourceFile): Map<string> {
-            let links = getNodeLinks(sourceFile);
-            let generatedNames = links.generatedNames;
-            if (!generatedNames) {
-                generatedNames = links.generatedNames = {};
-                generateNames(sourceFile);
-            }
-            return generatedNames;
-
-            function generateNames(node: Node) {
-                switch (node.kind) {
-                    case SyntaxKind.FunctionDeclaration:
-                    case SyntaxKind.ClassDeclaration:
-                        generateNameForFunctionOrClassDeclaration(<Declaration>node);
-                        break;
-                    case SyntaxKind.ModuleDeclaration:
-                        generateNameForModuleOrEnum(<ModuleDeclaration>node);
-                        generateNames((<ModuleDeclaration>node).body);
-                        break;
-                    case SyntaxKind.EnumDeclaration:
-                        generateNameForModuleOrEnum(<EnumDeclaration>node);
-                        break;
-                    case SyntaxKind.ImportDeclaration:
-                        generateNameForImportDeclaration(<ImportDeclaration>node);
-                        break;
-                    case SyntaxKind.ExportDeclaration:
-                        generateNameForExportDeclaration(<ExportDeclaration>node);
-                        break;
-                    case SyntaxKind.ExportAssignment:
-                        generateNameForExportAssignment(<ExportAssignment>node);
-                        break;
-                    case SyntaxKind.SourceFile:
-                    case SyntaxKind.ModuleBlock:
-                        forEach((<SourceFile | ModuleBlock>node).statements, generateNames);
-                        break;
-                }
-            }
-
-            function isExistingName(name: string) {
-                return hasProperty(globals, name) || hasProperty(sourceFile.identifiers, name) || hasProperty(generatedNames, name);
-            }
-
-            function makeUniqueName(baseName: string): string {
-                let name = generateUniqueName(baseName, isExistingName);
-                return generatedNames[name] = name;
-            }
-
-            function assignGeneratedName(node: Node, name: string) {
-                getNodeLinks(node).generatedName = unescapeIdentifier(name);
-            }
-
-            function generateNameForFunctionOrClassDeclaration(node: Declaration) {
-                if (!node.name) {
-                    assignGeneratedName(node, makeUniqueName("default"));
-                }
-            }
-
-            function generateNameForModuleOrEnum(node: ModuleDeclaration | EnumDeclaration) {
-                if (node.name.kind === SyntaxKind.Identifier) {
-                    let name = node.name.text;
-                    // Use module/enum name itself if it is unique, otherwise make a unique variation
-                    assignGeneratedName(node, isUniqueLocalName(name, node) ? name : makeUniqueName(name));
-                }
-            }
-
-            function generateNameForImportOrExportDeclaration(node: ImportDeclaration | ExportDeclaration) {
-                let expr = getExternalModuleName(node);
-                let baseName = expr.kind === SyntaxKind.StringLiteral ?
-                    escapeIdentifier(makeIdentifierFromModuleName((<LiteralExpression>expr).text)) : "module";
-                assignGeneratedName(node, makeUniqueName(baseName));
-            }
-
-            function generateNameForImportDeclaration(node: ImportDeclaration) {
-                if (node.importClause) {
-                    generateNameForImportOrExportDeclaration(node);
-                }
-            }
-
-            function generateNameForExportDeclaration(node: ExportDeclaration) {
-                if (node.moduleSpecifier) {
-                    generateNameForImportOrExportDeclaration(node);
-                }
-            }
-
-            function generateNameForExportAssignment(node: ExportAssignment) {
-                if (node.expression && node.expression.kind !== SyntaxKind.Identifier) {
-                    assignGeneratedName(node, makeUniqueName("default"));
-                }
-            }
-        }
-
-        function getGeneratedNameForNode(node: Node) {
-            let links = getNodeLinks(node);
-            if (!links.generatedName) {
-                getGeneratedNamesForSourceFile(getSourceFile(node));
-            }
-            return links.generatedName;
-        }
-
-        function getLocalNameOfContainer(container: ModuleDeclaration | EnumDeclaration): string {
-            return getGeneratedNameForNode(container);
-        }
-
-        function getLocalNameForImportDeclaration(node: ImportDeclaration): string {
-            return getGeneratedNameForNode(node);
-        }
-
-        function getAliasNameSubstitution(symbol: Symbol): string {
+        function getAliasNameSubstitution(symbol: Symbol, getGeneratedNameForNode: (node: Node) => string): string {
             // If this is es6 or higher, just use the name of the export
             // no need to qualify it.
             if (languageVersion >= ScriptTarget.ES6) {
@@ -11156,7 +11201,7 @@ module ts {
             }
         }
 
-        function getExportNameSubstitution(symbol: Symbol, location: Node): string {
+        function getExportNameSubstitution(symbol: Symbol, location: Node, getGeneratedNameForNode: (Node: Node) => string): string {
             if (isExternalModuleSymbol(symbol.parent)) {
                 // If this is es6 or higher, just use the name of the export
                 // no need to qualify it.
@@ -11175,24 +11220,24 @@ module ts {
             }
         }
 
-        function getExpressionNameSubstitution(node: Identifier): string {
+        function getExpressionNameSubstitution(node: Identifier, getGeneratedNameForNode: (Node: Node) => string): string {
             let symbol = getNodeLinks(node).resolvedSymbol || (isDeclarationName(node) ? getSymbolOfNode(node.parent) : undefined);
             if (symbol) {
                 // Whan an identifier resolves to a parented symbol, it references an exported entity from
                 // another declaration of the same internal module.
                 if (symbol.parent) {
-                    return getExportNameSubstitution(symbol, node.parent);
+                    return getExportNameSubstitution(symbol, node.parent, getGeneratedNameForNode);
                 }
                 // If we reference an exported entity within the same module declaration, then whether
                 // we prefix depends on the kind of entity. SymbolFlags.ExportHasLocal encompasses all the
                 // kinds that we do NOT prefix.
                 let exportSymbol = getExportSymbolOfValueSymbolIfExported(symbol);
                 if (symbol !== exportSymbol && !(exportSymbol.flags & SymbolFlags.ExportHasLocal)) {
-                    return getExportNameSubstitution(exportSymbol, node.parent);
+                    return getExportNameSubstitution(exportSymbol, node.parent, getGeneratedNameForNode);
                 }
                 // Named imports from ES6 import declarations are rewritten
                 if (symbol.flags & SymbolFlags.Alias) {
-                    return getAliasNameSubstitution(symbol);
+                    return getAliasNameSubstitution(symbol, getGeneratedNameForNode);
                 }
             }
         }
@@ -11312,10 +11357,13 @@ module ts {
             getSymbolDisplayBuilder().buildTypeDisplay(type, writer, enclosingDeclaration, flags);
         }
 
-        function isUnknownIdentifier(location: Node, name: string): boolean {
-            Debug.assert(!nodeIsSynthesized(location), "isUnknownIdentifier called with a synthesized location");
-            return !resolveName(location, name, SymbolFlags.Value, /*nodeNotFoundMessage*/ undefined, /*nameArg*/ undefined) &&
-                !hasProperty(getGeneratedNamesForSourceFile(getSourceFile(location)), name);
+        function hasGlobalName(name: string): boolean {
+            return hasProperty(globals, name);
+        }
+
+        function resolvesToSomeValue(location: Node, name: string): boolean {
+            Debug.assert(!nodeIsSynthesized(location), "resolvesToSomeValue called with a synthesized location");
+            return !!resolveName(location, name, SymbolFlags.Value, /*nodeNotFoundMessage*/ undefined, /*nameArg*/ undefined);
         }
 
         function getBlockScopedVariableId(n: Identifier): number {
@@ -11343,11 +11391,25 @@ module ts {
             return undefined;
         }
 
+        function instantiateSingleCallFunctionType(functionType: Type, typeArguments: Type[]): Type {
+            if (functionType === unknownType) {
+                return unknownType;
+            }
+
+            let signature = getSingleCallSignature(functionType);
+            if (!signature) {
+                return unknownType;
+            }
+            
+            let instantiatedSignature = getSignatureInstantiation(signature, typeArguments);
+            return getOrCreateTypeFromSignature(instantiatedSignature);
+        }
+
         function createResolver(): EmitResolver {
             return {
-                getGeneratedNameForNode,
                 getExpressionNameSubstitution,
                 isValueAliasDeclaration,
+                hasGlobalName,
                 isReferencedAliasDeclaration,
                 getNodeCheckFlags,
                 isTopLevelValueImportEqualsWithEntityName,
@@ -11359,7 +11421,7 @@ module ts {
                 isSymbolAccessible,
                 isEntityNameVisible,
                 getConstantValue,
-                isUnknownIdentifier,
+                resolvesToSomeValue,
                 collectLinkedAliases,
                 getBlockScopedVariableId,
             };
@@ -11392,6 +11454,11 @@ module ts {
             globalNumberType = getGlobalType("Number");
             globalBooleanType = getGlobalType("Boolean");
             globalRegExpType = getGlobalType("RegExp");
+            globalTypedPropertyDescriptorType = getTypeOfGlobalSymbol(getGlobalTypeSymbol("TypedPropertyDescriptor"), 1);
+            globalClassDecoratorType = getGlobalType("ClassDecorator");
+            globalPropertyDecoratorType = getGlobalType("PropertyDecorator");
+            globalMethodDecoratorType = getGlobalType("MethodDecorator");
+            globalParameterDecoratorType = getGlobalType("ParameterDecorator");
 
             // If we're in ES6 mode, load the TemplateStringsArray.
             // Otherwise, default to 'unknown' for the purposes of type checking in LS scenarios.
@@ -11416,6 +11483,25 @@ module ts {
 
 
         // GRAMMAR CHECKING
+        function checkGrammarDecorators(node: Node): boolean {
+            if (!node.decorators) {
+                return false;
+            }
+            if (!nodeCanBeDecorated(node)) {
+                return grammarErrorOnNode(node, Diagnostics.Decorators_are_not_valid_here);
+            }
+            else if (languageVersion < ScriptTarget.ES5) {
+                return grammarErrorOnNode(node, Diagnostics.Decorators_are_only_available_when_targeting_ECMAScript_5_and_higher);
+            }
+            else if (node.kind === SyntaxKind.GetAccessor || node.kind === SyntaxKind.SetAccessor) {
+                let accessors = getAllAccessorDeclarations((<ClassDeclaration>node.parent).members, <AccessorDeclaration>node);
+                if (accessors.firstAccessor.decorators && node === accessors.secondAccessor) {
+                    return grammarErrorOnNode(node, Diagnostics.Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name);
+                }
+            }
+            return false;
+        }
+
         function checkGrammarModifiers(node: Node): boolean {
             switch (node.kind) {
                 case SyntaxKind.GetAccessor:
@@ -11612,7 +11698,7 @@ module ts {
         function checkGrammarFunctionLikeDeclaration(node: FunctionLikeDeclaration): boolean {
             // Prevent cascading error by short-circuit
             let file = getSourceFileOfNode(node);
-            return checkGrammarModifiers(node) || checkGrammarTypeParameterList(node, node.typeParameters, file) ||
+            return checkGrammarDecorators(node) || checkGrammarModifiers(node) || checkGrammarTypeParameterList(node, node.typeParameters, file) ||
                 checkGrammarParameterList(node.parameters) || checkGrammarArrowFunction(node, file);
         }
 
@@ -11669,7 +11755,7 @@ module ts {
 
         function checkGrammarIndexSignature(node: SignatureDeclaration) {
             // Prevent cascading error by short-circuit
-            checkGrammarModifiers(node) || checkGrammarIndexSignatureParameters(node) || checkGrammarForIndexSignatureModifier(node);
+            return checkGrammarDecorators(node) || checkGrammarModifiers(node) || checkGrammarIndexSignatureParameters(node) || checkGrammarForIndexSignatureModifier(node);
         }
 
         function checkGrammarForAtLeastOneTypeArgument(node: Node, typeArguments: NodeArray<TypeNode>): boolean {
@@ -11718,7 +11804,7 @@ module ts {
             let seenExtendsClause = false;
             let seenImplementsClause = false;
 
-            if (!checkGrammarModifiers(node) && node.heritageClauses) {
+            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && node.heritageClauses) {
                 for (let heritageClause of node.heritageClauses) {
                     if (heritageClause.token === SyntaxKind.ExtendsKeyword) {
                         if (seenExtendsClause) {
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index d25cb5637ca8f..4b93081dc3133 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -162,6 +162,39 @@ module ts {
         return ~low;
     }
 
+    export function reduceLeft<T>(array: T[], f: (a: T, x: T) => T): T;
+    export function reduceLeft<T, U>(array: T[], f: (a: U, x: T) => U, initial: U): U;
+    export function reduceLeft<T, U>(array: T[], f: (a: U, x: T) => U, initial?: U): U {
+        if (array) {
+            var count = array.length;
+            if (count > 0) {
+                var pos = 0;
+                var result = arguments.length <= 2 ? array[pos++] : initial;
+                while (pos < count) {
+                    result = f(<U>result, array[pos++]);
+                }
+                return <U>result;
+            }
+        }
+        return initial;
+    }
+
+    export function reduceRight<T>(array: T[], f: (a: T, x: T) => T): T;
+    export function reduceRight<T, U>(array: T[], f: (a: U, x: T) => U, initial: U): U;
+    export function reduceRight<T, U>(array: T[], f: (a: U, x: T) => U, initial?: U): U {
+        if (array) {
+            var pos = array.length - 1;
+            if (pos >= 0) {
+                var result = arguments.length <= 2 ? array[pos--] : initial;
+                while (pos >= 0) {
+                    result = f(<U>result, array[pos--]);
+                }
+                return <U>result;
+            }
+        }
+        return initial;
+    }
+
     let hasOwnProperty = Object.prototype.hasOwnProperty;
 
     export function hasProperty<T>(map: Map<T>, key: string): boolean {
diff --git a/src/compiler/diagnosticInformationMap.generated.ts b/src/compiler/diagnosticInformationMap.generated.ts
index d4b5f8230b695..967afd171bac8 100644
--- a/src/compiler/diagnosticInformationMap.generated.ts
+++ b/src/compiler/diagnosticInformationMap.generated.ts
@@ -162,6 +162,9 @@ module ts {
         Import_assignment_cannot_be_used_when_targeting_ECMAScript_6_or_higher_Consider_using_import_Asterisk_as_ns_from_mod_import_a_from_mod_or_import_d_from_mod_instead: { code: 1202, category: DiagnosticCategory.Error, key: "Import assignment cannot be used when targeting ECMAScript 6 or higher. Consider using 'import * as ns from \"mod\"', 'import {a} from \"mod\"' or 'import d from \"mod\"' instead." },
         Export_assignment_cannot_be_used_when_targeting_ECMAScript_6_or_higher_Consider_using_export_default_instead: { code: 1203, category: DiagnosticCategory.Error, key: "Export assignment cannot be used when targeting ECMAScript 6 or higher. Consider using 'export default' instead." },
         Cannot_compile_external_modules_into_amd_or_commonjs_when_targeting_es6_or_higher: { code: 1204, category: DiagnosticCategory.Error, key: "Cannot compile external modules into amd or commonjs when targeting es6 or higher." },
+        Decorators_are_only_available_when_targeting_ECMAScript_5_and_higher: { code: 1205, category: DiagnosticCategory.Error, key: "Decorators are only available when targeting ECMAScript 5 and higher." },
+        Decorators_are_not_valid_here: { code: 1206, category: DiagnosticCategory.Error, key: "Decorators are not valid here." },
+        Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name: { code: 1207, category: DiagnosticCategory.Error, key: "Decorators cannot be applied to multiple get/set accessors of the same name." },
         Duplicate_identifier_0: { code: 2300, category: DiagnosticCategory.Error, key: "Duplicate identifier '{0}'." },
         Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: { code: 2301, category: DiagnosticCategory.Error, key: "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor." },
         Static_members_cannot_reference_class_type_parameters: { code: 2302, category: DiagnosticCategory.Error, key: "Static members cannot reference class type parameters." },
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 5c4aea844b994..6e24afad80c4a 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -639,6 +639,18 @@
         "category": "Error",
         "code": 1204
     },
+    "Decorators are only available when targeting ECMAScript 5 and higher.": {
+        "category": "Error",
+        "code": 1205
+    },
+    "Decorators are not valid here.": {
+        "category": "Error",
+        "code": 1206
+    },
+    "Decorators cannot be applied to multiple get/set accessors of the same name.": {
+        "category": "Error",
+        "code": 1207
+    },
 
     "Duplicate identifier '{0}'.": {
         "category": "Error",
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 1b939980e9ab0..02531593de6ff 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -12,6 +12,14 @@ module ts {
         return isExternalModule(sourceFile) || isDeclarationFile(sourceFile);
     }
 
+    // flag enum used to request and track usages of few dedicated temp variables
+    // enum values are used to set/check bit values and thus should not have bit collisions.
+    const enum TempVariableKind {
+        auto = 0,
+        _i = 1,
+        _n = 2,
+    }
+
     // @internal
     // targetSourceFile is when users only want one file in entire project to be emitted. This is used in compileOnSave feature
     export function emitFiles(resolver: EmitResolver, host: EmitHost, targetSourceFile: SourceFile): EmitResult {
@@ -53,6 +61,26 @@ module ts {
             sourceMaps: sourceMapDataList
         };
 
+        function isNodeDescendentOf(node: Node, ancestor: Node): boolean {
+            while (node) {
+                if (node === ancestor) return true;
+                node = node.parent;
+            }
+            return false;
+        }
+
+        function isUniqueLocalName(name: string, container: Node): boolean {
+            for (let node = container; isNodeDescendentOf(node, container); node = node.nextContainer) {
+                if (node.locals && hasProperty(node.locals, name)) {
+                    // We conservatively include alias symbols to cover cases where they're emitted as locals
+                    if (node.locals[name].flags & (SymbolFlags.Value | SymbolFlags.ExportValue | SymbolFlags.Alias)) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+
         function emitJavaScript(jsFilePath: string, root?: SourceFile) {
             let writer = createTextWriter(newLine);
             let write = writer.write;
@@ -64,16 +92,18 @@ module ts {
 
             let currentSourceFile: SourceFile;
 
-            let lastFrame: ScopeFrame;
-            let currentScopeNames: Map<string>;
-
-            let generatedBlockScopeNames: string[];
+            let generatedNameSet: Map<string>;
+            let nodeToGeneratedName: string[];
+            let blockScopedVariableToGeneratedName: string[];
+            let computedPropertyNamesToGeneratedNames: string[];
 
             let extendsEmitted = false;
+            let decorateEmitted = false;
             let tempCount = 0;
             let tempVariables: Identifier[];
             let tempParameters: Identifier[];
             let externalImports: (ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration)[];
+            let predefinedTempsInUse = TempVariableKind.auto;
             let exportSpecifiers: Map<ExportSpecifier[]>;
             let exportEquals: ExportAssignment;
             let hasExportStars: boolean;
@@ -138,81 +168,197 @@ module ts {
                 emit(sourceFile);
             }
 
-            // enters the new lexical environment
-            // return value should be passed to matching call to exitNameScope.
-            function enterNameScope(): boolean {
-                let names = currentScopeNames;
-                currentScopeNames = undefined;
-                if (names) {
-                    lastFrame = { names, previous: lastFrame };
-                    return true;
+            function generateNameForNode(node: Node) {
+                switch (node.kind) {
+                    case SyntaxKind.FunctionDeclaration:
+                    case SyntaxKind.ClassDeclaration:
+                        generateNameForFunctionOrClassDeclaration(<Declaration>node);
+                        break;
+                    case SyntaxKind.ModuleDeclaration:
+                        generateNameForModuleOrEnum(<ModuleDeclaration>node);
+                        generateNameForNode((<ModuleDeclaration>node).body);
+                        break;
+                    case SyntaxKind.EnumDeclaration:
+                        generateNameForModuleOrEnum(<EnumDeclaration>node);
+                        break;
+                    case SyntaxKind.ImportDeclaration:
+                        generateNameForImportDeclaration(<ImportDeclaration>node);
+                        break;
+                    case SyntaxKind.ExportDeclaration:
+                        generateNameForExportDeclaration(<ExportDeclaration>node);
+                        break;
+                    case SyntaxKind.ExportAssignment:
+                        generateNameForExportAssignment(<ExportAssignment>node);
+                        break;
+                    case SyntaxKind.SourceFile:
+                    case SyntaxKind.ModuleBlock:
+                        forEach((<SourceFile | ModuleBlock>node).statements, generateNameForNode);
+                        break;
                 }
-                return false;
             }
 
-            function exitNameScope(popFrame: boolean): void {
-                if (popFrame) {
-                    currentScopeNames = lastFrame.names;
-                    lastFrame = lastFrame.previous;
+            function isUniqueName(name: string): boolean {
+                return !resolver.hasGlobalName(name) &&
+                    !hasProperty(currentSourceFile.identifiers, name) &&
+                    (!generatedNameSet || !hasProperty(generatedNameSet, name))
+            }
+
+            // in cases like
+            // for (var x of []) {
+            //     _i;
+            // }
+            // we should be able to detect if let _i was shadowed by some temp variable that was allocated in scope
+            function nameConflictsWithSomeTempVariable(name: string): boolean {
+                // temp variable names always start with '_'
+                if (name.length < 2 || name.charCodeAt(0) !== CharacterCodes._) {
+                    return false;
+                }
+
+                if (name === "_i") {
+                    return !!(predefinedTempsInUse & TempVariableKind._i);
+                }
+
+                if (name === "_n") {
+                    return !!(predefinedTempsInUse & TempVariableKind._n);
+                }
+
+                if (name.length === 2 && name.charCodeAt(1) >= CharacterCodes.a && name.charCodeAt(1) <= CharacterCodes.z) {
+                    // handles _a .. _z
+                    let n = name.charCodeAt(1) - CharacterCodes.a;
+                    return n < tempCount;
                 }
                 else {
-                    currentScopeNames = undefined;
+                    // handles _1, _2...
+                    let n = +name.substring(1);
+                    return !isNaN(n) && n >= 0 && n < (tempCount - 26);
                 }
             }
 
-            function generateUniqueNameForLocation(location: Node, baseName: string): string {
-                let name: string
-                // first try to check if base name can be used as is
-                if (!isExistingName(location, baseName)) {
-                    name = baseName;
+            // This function generates a name using the following pattern:
+            // _a .. _h, _j ... _z, _0, _1, ...
+            // It is guaranteed that generated name will not shadow any existing user-defined names,
+            // however it can hide another name generated by this function higher in the scope.
+            // NOTE: names generated by 'makeTempVariableName' and 'makeUniqueName' will never conflict.
+            // see comment for 'makeTempVariableName' for more information.
+            function makeTempVariableName(location: Node, tempVariableKind: TempVariableKind): string {
+                let tempName: string;
+                if (tempVariableKind !== TempVariableKind.auto && !(predefinedTempsInUse & tempVariableKind)) {
+                    tempName = tempVariableKind === TempVariableKind._i ? "_i" : "_n";
+                    if (!resolver.resolvesToSomeValue(location, tempName)) {
+                        predefinedTempsInUse |= tempVariableKind;
+                        return tempName;
+                    }
                 }
-                else {
-                    name = generateUniqueName(baseName, n => isExistingName(location, n));
+
+                do {
+                    // Note: we avoid generating _i and _n as those are common names we want in other places.
+                    var char = CharacterCodes.a + tempCount;
+                    if (char !== CharacterCodes.i && char !== CharacterCodes.n) {
+                        if (tempCount < 26) {
+                            tempName = "_" + String.fromCharCode(char);
+                        }
+                        else {
+                            tempName = "_" + (tempCount - 26);
+                        }
+                    }
+
+                    tempCount++;
                 }
+                while (resolver.resolvesToSomeValue(location, tempName));
 
-                return recordNameInCurrentScope(name);
+                return tempName;
             }
 
-            function recordNameInCurrentScope(name: string): string {
-                if (!currentScopeNames) {
-                    currentScopeNames = {};
+            // Generates a name that is unique within current file and does not collide with
+            // any names in global scope.
+            // NOTE: names generated by 'makeTempVariableName' and 'makeUniqueName' will never conflict
+            // because of the way how these names are generated
+            // - makeUniqueName builds a name by picking a base name (which should not be empty string)
+            //   and appending suffix '_<number>'
+            // - makeTempVariableName creates a name using the following pattern:
+            //   _a .. _h, _j ... _z, _0, _1, ...
+            // This means that names from 'makeTempVariableName' will have only one underscore at the beginning
+            // and names from 'makeUniqieName' will have at least one underscore in the middle 
+            // so they will never collide.
+            function makeUniqueName(baseName: string): string {
+                Debug.assert(!!baseName);
+
+                // Find the first unique 'name_n', where n is a positive number
+                if (baseName.charCodeAt(baseName.length - 1) !== CharacterCodes._) {
+                    baseName += "_";
                 }
 
-                return currentScopeNames[name] = name;
+                let i = 1;
+                let generatedName: string;
+                while (true) {
+                    generatedName = baseName + i;
+                    if (isUniqueName(generatedName)) {
+                        break;
+                    }
+                    i++;
+                }
+
+                if (!generatedNameSet) {
+                    generatedNameSet = {};
+                }
+                return generatedNameSet[generatedName] = generatedName;
             }
 
-            function isExistingName(location: Node, name: string) {
-                // check if resolver is aware of this name (if name was seen during the typecheck)
-                if (!resolver.isUnknownIdentifier(location, name)) {
-                    return true;
+            function renameNode(node: Node, name: string): string {
+                var nodeId = getNodeId(node);
+
+                if (!nodeToGeneratedName) {
+                    nodeToGeneratedName = [];
                 }
 
-                // check if name is present in generated names that were introduced by the emitter
-                if (currentScopeNames && hasProperty(currentScopeNames, name)) {
-                    return true;
+                return nodeToGeneratedName[nodeId] = unescapeIdentifier(name);
+            }
+
+            function generateNameForFunctionOrClassDeclaration(node: Declaration) {
+                if (!node.name) {
+                    renameNode(node, makeUniqueName("default"));
                 }
+            }
 
-                // check generated names in outer scopes
-                // let x;
-                // function foo() {
-                //    let x; // 1
-                //    function bar() {
-                //        {
-                //            let x; // 2
-                //        }
-                //        console.log(x); // 3
-                //    }
-                //}
-                // here both x(1) and x(2) should be renamed and their names should be different
-                // so x in (3) will refer to x(1)
-                let frame = lastFrame;
-                while (frame) {
-                    if (hasProperty(frame.names, name)) {
-                        return true;
-                    }
-                    frame = frame.previous;
+            function generateNameForModuleOrEnum(node: ModuleDeclaration | EnumDeclaration) {
+                if (node.name.kind === SyntaxKind.Identifier) {
+                    let name = node.name.text;
+                    // Use module/enum name itself if it is unique, otherwise make a unique variation
+                    renameNode(node, isUniqueLocalName(name, node) ? name : makeUniqueName(name));
                 }
-                return false;
+            }
+
+            function generateNameForImportOrExportDeclaration(node: ImportDeclaration | ExportDeclaration) {
+                let expr = getExternalModuleName(node);
+                let baseName = expr.kind === SyntaxKind.StringLiteral ?
+                    escapeIdentifier(makeIdentifierFromModuleName((<LiteralExpression>expr).text)) : "module";
+                renameNode(node, makeUniqueName(baseName));
+            }
+
+            function generateNameForImportDeclaration(node: ImportDeclaration) {
+                if (node.importClause) {
+                    generateNameForImportOrExportDeclaration(node);
+                }
+            }
+
+            function generateNameForExportDeclaration(node: ExportDeclaration) {
+                if (node.moduleSpecifier) {
+                    generateNameForImportOrExportDeclaration(node);
+                }
+            }
+
+            function generateNameForExportAssignment(node: ExportAssignment) {
+                if (node.expression && node.expression.kind !== SyntaxKind.Identifier) {
+                    renameNode(node, makeUniqueName("default"));
+                }
+            }
+
+            function getGeneratedNameForNode(node: Node) {
+                let nodeId = getNodeId(node);
+                if (!nodeToGeneratedName || !nodeToGeneratedName[nodeId]) {
+                    generateNameForNode(node);
+                }
+                return nodeToGeneratedName ? nodeToGeneratedName[nodeId] : undefined;
             }
 
             function initializeEmitterWithSourceMaps() {
@@ -579,32 +725,10 @@ module ts {
                 writeFile(host, diagnostics, jsFilePath, emitOutput, writeByteOrderMark);
             }
 
-            // Create a temporary variable with a unique unused name. The forLoopVariable parameter signals that the
-            // name should be one that is appropriate for a for loop variable.
-            function createTempVariable(location: Node, preferredName?: string): Identifier {
-                for (var name = preferredName; !name || isExistingName(location, name); tempCount++) {
-                    // _a .. _h, _j ... _z, _0, _1, ...
-
-                    // Note: we avoid generating _i and _n as those are common names we want in other places.
-                    var char = CharacterCodes.a + tempCount;
-                    if (char === CharacterCodes.i || char === CharacterCodes.n) {
-                        continue;
-                    }
-
-                    if (tempCount < 26) {
-                        name = "_" + String.fromCharCode(char);
-                    }
-                    else {
-                        name = "_" + (tempCount - 26);
-                    }
-                }
-                
-                // This is necessary so that a name generated via renameNonTopLevelLetAndConst will see the name
-                // we just generated.
-                recordNameInCurrentScope(name);
-
+            // Create a temporary variable with a unique unused name.
+            function createTempVariable(location: Node, tempVariableKind = TempVariableKind.auto): Identifier {
                 let result = <Identifier>createSynthesizedNode(SyntaxKind.Identifier);
-                result.text = name;
+                result.text = makeTempVariableName(location, tempVariableKind);
                 return result;
             }
 
@@ -615,8 +739,8 @@ module ts {
                 tempVariables.push(name);
             }
 
-            function createAndRecordTempVariable(location: Node, preferredName?: string): Identifier {
-                let temp = createTempVariable(location, preferredName);
+            function createAndRecordTempVariable(location: Node, tempVariableKind?: TempVariableKind): Identifier {
+                let temp = createTempVariable(location, tempVariableKind);
                 recordTempDeclaration(temp);
 
                 return temp;
@@ -1030,6 +1154,38 @@ module ts {
                     emitLiteral(<LiteralExpression>node);
                 }
                 else if (node.kind === SyntaxKind.ComputedPropertyName) {
+                    // if this is a decorated computed property, we will need to capture the result
+                    // of the property expression so that we can apply decorators later. This is to ensure 
+                    // we don't introduce unintended side effects:
+                    //
+                    //   class C {
+                    //     [_a = x]() { }
+                    //   }
+                    //
+                    // The emit for the decorated computed property decorator is:
+                    //
+                    //   Object.defineProperty(C.prototype, _a, __decorate([dec], C.prototype, _a, Object.getOwnPropertyDescriptor(C.prototype, _a)));
+                    //
+                    if (nodeIsDecorated(node.parent)) {
+                        if (!computedPropertyNamesToGeneratedNames) {
+                            computedPropertyNamesToGeneratedNames = [];
+                        }
+
+                        let generatedName = computedPropertyNamesToGeneratedNames[node.id];
+                        if (generatedName) {
+                            // we have already generated a variable for this node, write that value instead.
+                            write(generatedName);
+                            return;
+                        }
+
+                        let generatedVariable = createTempVariable(node);
+                        generatedName = generatedVariable.text;
+                        recordTempDeclaration(generatedVariable);
+                        computedPropertyNamesToGeneratedNames[node.id] = generatedName;
+                        write(generatedName);
+                        write(" = ");
+                    }
+
                     emit((<ComputedPropertyName>node).expression);
                 }
                 else {
@@ -1084,7 +1240,7 @@ module ts {
             }
 
             function emitExpressionIdentifier(node: Identifier) {
-                let substitution = resolver.getExpressionNameSubstitution(node);
+                let substitution = resolver.getExpressionNameSubstitution(node, getGeneratedNameForNode);
                 if (substitution) {
                     write(substitution);
                 }
@@ -1094,7 +1250,7 @@ module ts {
             }
 
             function getGeneratedNameForIdentifier(node: Identifier): string {
-                if (nodeIsSynthesized(node) || !generatedBlockScopeNames) {
+                if (nodeIsSynthesized(node) || !blockScopedVariableToGeneratedName) {
                     return undefined;
                 }
 
@@ -1103,7 +1259,7 @@ module ts {
                     return undefined;
                 }
 
-                return generatedBlockScopeNames[variableId];
+                return blockScopedVariableToGeneratedName[variableId];
             }
 
             function emitIdentifier(node: Identifier, allowGeneratedIdentifiers: boolean) {
@@ -1331,7 +1487,7 @@ module ts {
                         // manage by just emitting strings (which is a lot more performant).
                         //let prefix = createIdentifier(resolver.getExpressionNamePrefix((<ShorthandPropertyAssignment>property).name));
                         //return createPropertyAccessExpression(prefix, (<ShorthandPropertyAssignment>property).name);
-                        return createIdentifier(resolver.getExpressionNameSubstitution((<ShorthandPropertyAssignment>property).name));
+                        return createIdentifier(resolver.getExpressionNameSubstitution((<ShorthandPropertyAssignment>property).name, getGeneratedNameForNode));
 
                     case SyntaxKind.MethodDeclaration:
                         return createFunctionExpression((<MethodDeclaration>property).parameters, (<MethodDeclaration>property).body);
@@ -1504,7 +1660,7 @@ module ts {
 
             function emitComputedPropertyName(node: ComputedPropertyName) {
                 write("[");
-                emit(node.expression);
+                emitExpressionForPropertyName(node);
                 write("]");
             }
 
@@ -1545,7 +1701,7 @@ module ts {
                         emitExpressionIdentifier(node.name);
                     }
                 }
-                else if (resolver.getExpressionNameSubstitution(node.name)) {
+                else if (resolver.getExpressionNameSubstitution(node.name, getGeneratedNameForNode)) {
                     // Emit identifier as an identifier
                     write(": ");
                     // Even though this is stored as identifier treat it as an expression
@@ -2078,10 +2234,10 @@ module ts {
                 //
                 // we don't want to emit a temporary variable for the RHS, just use it directly.
                 let rhsIsIdentifier = node.expression.kind === SyntaxKind.Identifier;
-                let counter = createTempVariable(node, /*preferredName*/ "_i");
+                let counter = createTempVariable(node, TempVariableKind._i);
                 let rhsReference = rhsIsIdentifier ? <Identifier>node.expression : createTempVariable(node);
 
-                var cachedLength = compilerOptions.cacheDownlevelForOfLength ? createTempVariable(node, /*preferredName:*/ "_n") : undefined;
+                var cachedLength = compilerOptions.cacheDownlevelForOfLength ? createTempVariable(node, TempVariableKind._n) : undefined;
 
                 // This is the let keyword for the counter and rhsReference. The let keyword for
                 // the LHS will be emitted inside the body.
@@ -2322,7 +2478,7 @@ module ts {
 
             function emitContainingModuleName(node: Node) {
                 let container = getContainingModule(node);
-                write(container ? resolver.getGeneratedNameForNode(container) : "exports");
+                write(container ? getGeneratedNameForNode(container) : "exports");
             }
 
             function emitModuleMemberName(node: Declaration) {
@@ -2330,7 +2486,7 @@ module ts {
                 if (getCombinedNodeFlags(node) & NodeFlags.Export) {
                     var container = getContainingModule(node);
                     if (container) {
-                        write(resolver.getGeneratedNameForNode(container));
+                        write(getGeneratedNameForNode(container));
                         write(".");
                     }
                     else if (languageVersion < ScriptTarget.ES6) {
@@ -2689,9 +2845,14 @@ module ts {
 
                 // here it is known that node is a block scoped variable
                 let list = getAncestor(node, SyntaxKind.VariableDeclarationList);
-                if (list.parent.kind === SyntaxKind.VariableStatement && list.parent.parent.kind === SyntaxKind.SourceFile) {
-                    // do not rename variables that are defined on source file level
-                    return;
+                if (list.parent.kind === SyntaxKind.VariableStatement) {
+                    let isSourceFileLevelBinding = list.parent.parent.kind === SyntaxKind.SourceFile;
+                    let isModuleLevelBinding = list.parent.parent.kind === SyntaxKind.ModuleBlock;
+                    let isFunctionLevelBinding =
+                        list.parent.parent.kind === SyntaxKind.Block && isFunctionLike(list.parent.parent.parent);
+                    if (isSourceFileLevelBinding || isModuleLevelBinding || isFunctionLevelBinding) {
+                        return;
+                    }
                 }
 
                 let blockScopeContainer = getEnclosingBlockScopeContainer(node);
@@ -2699,12 +2860,19 @@ module ts {
                     ? blockScopeContainer
                     : blockScopeContainer.parent;
 
-                let generatedName = generateUniqueNameForLocation(parent, (<Identifier>node).text);
-                let variableId = resolver.getBlockScopedVariableId(<Identifier>node);
-                if (!generatedBlockScopeNames) {
-                    generatedBlockScopeNames = [];
+                var hasConflictsInEnclosingScope =
+                    resolver.resolvesToSomeValue(parent, (<Identifier>node).text) ||
+                    nameConflictsWithSomeTempVariable((<Identifier>node).text);
+
+                if (hasConflictsInEnclosingScope) {
+                    let variableId = resolver.getBlockScopedVariableId(<Identifier>node);
+                    if (!blockScopedVariableToGeneratedName) {
+                        blockScopedVariableToGeneratedName = [];
+                    }
+
+                    let generatedName = makeUniqueName((<Identifier>node).text);
+                    blockScopedVariableToGeneratedName[variableId] = generatedName;
                 }
-                generatedBlockScopeNames[variableId] = generatedName;
             }
 
             function isES6ExportedDeclaration(node: Node) {
@@ -2786,7 +2954,7 @@ module ts {
                 if (languageVersion < ScriptTarget.ES6 && hasRestParameters(node)) {
                     let restIndex = node.parameters.length - 1;
                     let restParam = node.parameters[restIndex];
-                    let tempName = createTempVariable(node, /*preferredName:*/ "_i").text;
+                    let tempName = createTempVariable(node, TempVariableKind._i).text;
                     writeLine();
                     emitLeadingComments(restParam);
                     emitStart(restParam);
@@ -2836,7 +3004,7 @@ module ts {
                     emitNodeWithoutSourceMap(node.name);
                 }
                 else {
-                    write(resolver.getGeneratedNameForNode(node));
+                    write(getGeneratedNameForNode(node));
                 }
             }
 
@@ -2922,11 +3090,12 @@ module ts {
                 let saveTempCount = tempCount;
                 let saveTempVariables = tempVariables;
                 let saveTempParameters = tempParameters;
+                let savePredefinedTempsInUse = predefinedTempsInUse;
+
                 tempCount = 0;
                 tempVariables = undefined;
                 tempParameters = undefined;
-
-                let popFrame = enterNameScope()
+                predefinedTempsInUse = TempVariableKind.auto;
 
                 // When targeting ES6, emit arrow function natively in ES6
                 if (shouldEmitAsArrowFunction(node)) {
@@ -2953,8 +3122,7 @@ module ts {
                     emitExportMemberAssignment(node);
                 }
 
-                exitNameScope(popFrame);
-
+                predefinedTempsInUse = savePredefinedTempsInUse;
                 tempCount = saveTempCount;
                 tempVariables = saveTempVariables;
                 tempParameters = saveTempParameters;
@@ -3155,10 +3323,7 @@ module ts {
                         emitLeadingComments(member);
                         emitStart(member);
                         emitStart((<MethodDeclaration>member).name);
-                        emitDeclarationName(node);
-                        if (!(member.flags & NodeFlags.Static)) {
-                            write(".prototype");
-                        }
+                        emitClassMemberPrefix(node, member);
                         emitMemberAccessForPropertyName((<MethodDeclaration>member).name);
                         emitEnd((<MethodDeclaration>member).name);
                         write(" = ");
@@ -3176,10 +3341,7 @@ module ts {
                             emitStart(member);
                             write("Object.defineProperty(");
                             emitStart((<AccessorDeclaration>member).name);
-                            emitDeclarationName(node);
-                            if (!(member.flags & NodeFlags.Static)) {
-                                write(".prototype");
-                            }
+                            emitClassMemberPrefix(node, member);
                             write(", ");
                             emitExpressionForPropertyName((<AccessorDeclaration>member).name);
                             emitEnd((<AccessorDeclaration>member).name);
@@ -3251,11 +3413,12 @@ module ts {
                 let saveTempCount = tempCount;
                 let saveTempVariables = tempVariables;
                 let saveTempParameters = tempParameters;
+                let savePredefinedTempsInUse = predefinedTempsInUse;
                 tempCount = 0;
                 tempVariables = undefined;
                 tempParameters = undefined;
+                predefinedTempsInUse = TempVariableKind.auto;
 
-                let popFrame = enterNameScope();
                 // Check if we have property assignment inside class declaration.
                 // If there is property assignment, we need to emit constructor whether users define it or not
                 // If there is no property assignment, we can omit constructor if users do not define it
@@ -3364,32 +3527,105 @@ module ts {
                     emitTrailingComments(ctor);
                 }
 
-                exitNameScope(popFrame);
-
+                predefinedTempsInUse = savePredefinedTempsInUse;
                 tempCount = saveTempCount;
                 tempVariables = saveTempVariables;
                 tempParameters = saveTempParameters;
             }
 
+            function emitClassDeclaration(node: ClassDeclaration) {
+                if (languageVersion < ScriptTarget.ES6) {
+                    emitClassDeclarationBelowES6(<ClassDeclaration>node);
+                }
+                else {
+                    emitClassDeclarationForES6AndHigher(<ClassDeclaration>node);
+                }
+            }
+            
             function emitClassDeclarationForES6AndHigher(node: ClassDeclaration) {
-                if (isES6ExportedDeclaration(node)) {
-                    write("export ");
+                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 ");
+                    }
 
+                    write("let ");
+                    emitDeclarationName(node);
+                    write(" = ");
+                }
+                else if (isES6ExportedDeclaration(node)) {                    
+                    write("export ");
                     if (node.flags & NodeFlags.Default) {
                         write("default ");
                     }
                 }
 
-                write("class ");
-                // check if this is an "export default class" as it may not have a name
-                if (node.name || !(node.flags & NodeFlags.Default)) {
+                write("class");
+
+                // check if this is an "export default class" as it may not have a name. Do not emit the name if the class is decorated.
+                if ((node.name || !(node.flags & NodeFlags.Default)) && !thisNodeIsDecorated) {
+                    write(" ");
                     emitDeclarationName(node);
                 }
+
                 var baseTypeNode = getClassBaseTypeNode(node);
                 if (baseTypeNode) {
                     write(" extends ");
                     emit(baseTypeNode.typeName);
                 }
+
                 write(" {");
                 increaseIndent();
                 scopeEmitStart(node);
@@ -3401,6 +3637,26 @@ module ts {
                 emitToken(SyntaxKind.CloseBraceToken, node.members.end);
                 scopeEmitEnd();
 
+                // For a decorated class, we need to assign its name (if it has one). This is because we emit
+                // the class as a class expression to avoid the double-binding of the identifier:
+                //
+                //   let C = class {
+                //   }
+                //   Object.defineProperty(C, "name", { value: "C", configurable: true });
+                //
+                if (thisNodeIsDecorated) {
+                    write(";");
+                    if (node.name) {
+                        writeLine();
+                        write("Object.defineProperty(");
+                        emitDeclarationName(node);
+                        write(", \"name\", { value: \"");
+                        emitDeclarationName(node);
+                        write("\", configurable: true });");
+                        writeLine();
+                    }
+                }
+
                 // Emit static property assignment. Because classDeclaration is lexically evaluated,
                 // it is safe to emit static property assignment after classDeclaration
                 // From ES6 specification:
@@ -3408,6 +3664,7 @@ module ts {
                 //                                  a lexical declaration such as a LexicalDeclaration or a ClassDeclaration.
                 writeLine();
                 emitMemberAssignments(node, NodeFlags.Static);
+                emitDecoratorsOfClass(node);
 
                 // If this is an exported class, but not on the top level (i.e. on an internal
                 // module), export it
@@ -3420,6 +3677,13 @@ module ts {
                     emitEnd(node);
                     write(";");
                 }
+                else if (isES6ExportedDeclaration(node) && (node.flags & NodeFlags.Default) && thisNodeIsDecorated) {
+                    // if this is a top level default export of decorated class, write the export after the declaration.
+                    writeLine();
+                    write("export default ");
+                    emitDeclarationName(node);
+                    write(";");
+                }
             }
 
             function emitClassDeclarationBelowES6(node: ClassDeclaration) {
@@ -3431,6 +3695,14 @@ module ts {
                     write("_super");
                 }
                 write(") {");
+                let saveTempCount = tempCount;
+                let saveTempVariables = tempVariables;
+                let saveTempParameters = tempParameters;
+                let saveComputedPropertyNamesToGeneratedNames = computedPropertyNamesToGeneratedNames;
+                tempCount = 0;
+                tempVariables = undefined;
+                tempParameters = undefined;
+                computedPropertyNamesToGeneratedNames = undefined;
                 increaseIndent();
                 scopeEmitStart(node);
                 if (baseTypeNode) {
@@ -3446,11 +3718,18 @@ module ts {
                 emitMemberFunctionsForES5AndLower(node);
                 emitMemberAssignments(node, NodeFlags.Static);
                 writeLine();
+                emitDecoratorsOfClass(node);
+                writeLine();
                 emitToken(SyntaxKind.CloseBraceToken, node.members.end, () => {
                     write("return ");
                     emitDeclarationName(node);
                 });
                 write(";");
+                emitTempDeclarations(/*newLine*/ true);
+                tempCount = saveTempCount;
+                tempVariables = saveTempVariables;
+                tempParameters = saveTempParameters;
+                computedPropertyNamesToGeneratedNames = saveComputedPropertyNamesToGeneratedNames;
                 decreaseIndent();
                 writeLine();
                 emitToken(SyntaxKind.CloseBraceToken, node.members.end);
@@ -3470,6 +3749,225 @@ module ts {
                 }
             }
 
+            function emitClassMemberPrefix(node: ClassDeclaration, member: Node) {
+                emitDeclarationName(node);
+                if (!(member.flags & NodeFlags.Static)) {
+                    write(".prototype");
+                }
+            }
+            
+            function emitDecoratorsOfClass(node: ClassDeclaration) {
+                if (languageVersion < ScriptTarget.ES5) {
+                    return;
+                }
+
+                emitDecoratorsOfMembers(node, /*staticFlag*/ 0);
+                emitDecoratorsOfMembers(node, NodeFlags.Static);
+                emitDecoratorsOfConstructor(node);
+            }
+
+            function emitDecoratorsOfConstructor(node: ClassDeclaration) {
+                let constructor = getFirstConstructorWithBody(node);
+                if (constructor) {
+                    emitDecoratorsOfParameters(node, constructor);
+                }
+
+                if (!nodeIsDecorated(node)) {
+                    return;
+                }
+
+                // Emit the call to __decorate. Given the class:
+                //
+                //   @dec
+                //   class C {
+                //   }
+                //
+                // The emit for the class is:
+                //
+                //   C = __decorate([dec], C);
+                //
+
+                writeLine();
+                emitStart(node);
+                emitDeclarationName(node);
+                write(" = ");
+                emitDecorateStart(node.decorators);
+                emitDeclarationName(node);
+                write(");");
+                emitEnd(node);
+                writeLine();
+            }
+
+            function emitDecoratorsOfMembers(node: ClassDeclaration, staticFlag: NodeFlags) {
+                forEach(node.members, member => {
+                    if ((member.flags & NodeFlags.Static) !== staticFlag) {
+                        return;
+                    }
+
+                    let decorators: NodeArray<Decorator>;
+                    switch (member.kind) {
+                        case SyntaxKind.MethodDeclaration:
+                            // emit decorators of the method's parameters
+                            emitDecoratorsOfParameters(node, <MethodDeclaration>member);
+                            decorators = member.decorators;
+                            break;
+
+                        case SyntaxKind.GetAccessor:
+                        case SyntaxKind.SetAccessor:
+                            let accessors = getAllAccessorDeclarations(node.members, <AccessorDeclaration>member);
+                            if (member !== accessors.firstAccessor) {
+                                // skip the second accessor as we processed it with the first.
+                                return;
+                            }
+
+                            if (accessors.setAccessor) {
+                                // emit decorators of the set accessor parameter
+                                emitDecoratorsOfParameters(node, <AccessorDeclaration>accessors.setAccessor);
+                            }
+
+                            // get the decorators from the first decorated accessor.
+                            decorators = accessors.firstAccessor.decorators;
+                            if (!decorators && accessors.secondAccessor) {
+                                decorators = accessors.secondAccessor.decorators;
+                            }
+                            break;
+
+                        case SyntaxKind.PropertyDeclaration:
+                            decorators = member.decorators;
+                            break;
+
+                        default:
+                            // Constructor cannot be decorated, and its parameters are handled in emitDecoratorsOfConstructor
+                            // Other members (i.e. IndexSignature) cannot be decorated.
+                            return;
+                    }
+
+                    if (!decorators) {
+                        return;
+                    }
+
+                    // Emit the call to __decorate. Given the following:
+                    //
+                    //   class C {
+                    //     @dec method() {}
+                    //     @dec get accessor() {}
+                    //     @dec prop;
+                    //   }
+                    //
+                    // The emit for a method is:
+                    //
+                    //   Object.defineProperty(C.prototype, "method", __decorate([dec], C.prototype, "method", Object.getOwnPropertyDescriptor(C.prototype, "method")));
+                    // 
+                    // The emit for an accessor is:
+                    //
+                    //   Object.defineProperty(C.prototype, "accessor", __decorate([dec], C.prototype, "accessor", Object.getOwnPropertyDescriptor(C.prototype, "accessor")));
+                    //
+                    // The emit for a property is:
+                    //
+                    //   __decorate([dec], C.prototype, "prop");
+                    //
+
+                    writeLine();
+                    emitStart(member);
+                    if (member.kind !== SyntaxKind.PropertyDeclaration) {
+                        write("Object.defineProperty(");
+                        emitStart(member.name);
+                        emitClassMemberPrefix(node, member);
+                        write(", ");
+                        emitExpressionForPropertyName(member.name);
+                        emitEnd(member.name);
+                        write(", ");
+                    }
+
+                    emitDecorateStart(decorators);
+                    emitStart(member.name);
+                    emitClassMemberPrefix(node, member);
+                    write(", ");
+                    emitExpressionForPropertyName(member.name);
+                    emitEnd(member.name);
+
+                    if (member.kind !== SyntaxKind.PropertyDeclaration) {
+                        write(", Object.getOwnPropertyDescriptor(");
+                        emitStart(member.name);
+                        emitClassMemberPrefix(node, member);
+                        write(", ");
+                        emitExpressionForPropertyName(member.name);
+                        emitEnd(member.name);
+                        write("))");
+                    }
+
+                    write(");");
+                    emitEnd(member);
+                    writeLine();
+                });
+            }
+            
+            function emitDecoratorsOfParameters(node: ClassDeclaration, member: FunctionLikeDeclaration) {
+                forEach(member.parameters, (parameter, parameterIndex) => {
+                    if (!nodeIsDecorated(parameter)) {
+                        return;
+                    }
+
+                    // Emit the decorators for a parameter. Given the following:
+                    //
+                    //   class C {
+                    //     constructor(@dec p) { }
+                    //     method(@dec p) { }
+                    //     set accessor(@dec value) { }
+                    //   }
+                    //
+                    // The emit for a constructor is:
+                    //
+                    //   __decorate([dec], C, void 0, 0);
+                    //
+                    // The emit for a parameter is:
+                    //
+                    //   __decorate([dec], C.prototype, "method", 0);
+                    //
+                    // The emit for an accessor is:
+                    //
+                    //   __decorate([dec], C.prototype, "accessor", 0);
+                    //
+
+                    writeLine();
+                    emitStart(parameter);
+                    emitDecorateStart(parameter.decorators);
+                    emitStart(parameter.name);
+
+                    if (member.kind === SyntaxKind.Constructor) {
+                        emitDeclarationName(node);
+                        write(", void 0");
+                    }
+                    else {
+                        emitClassMemberPrefix(node, member);
+                        write(", ");
+                        emitExpressionForPropertyName(member.name);
+                    }
+
+                    write(", ");
+                    write(String(parameterIndex));
+                    emitEnd(parameter.name);
+                    write(");");
+                    emitEnd(parameter);
+                    writeLine();
+                });
+            }
+
+            function emitDecorateStart(decorators: Decorator[]): void {
+                write("__decorate([");
+                let decoratorCount = decorators.length;
+                for (let i = 0; i < decoratorCount; i++) {
+                    if (i > 0) {
+                        write(", ");
+                    }
+                    let decorator = decorators[i];
+                    emitStart(decorator);
+                    emit(decorator.expression);
+                    emitEnd(decorator);
+                }
+                write("], ");
+            }
+
             function emitInterfaceDeclaration(node: InterfaceDeclaration) {
                 emitOnlyPinnedOrTripleSlashComments(node);
             }
@@ -3499,7 +3997,7 @@ module ts {
                 emitStart(node);
                 write("(function (");
                 emitStart(node.name);
-                write(resolver.getGeneratedNameForNode(node));
+                write(getGeneratedNameForNode(node));
                 emitEnd(node.name);
                 write(") {");
                 increaseIndent();
@@ -3533,9 +4031,9 @@ module ts {
             function emitEnumMember(node: EnumMember) {
                 let enumParent = <EnumDeclaration>node.parent;
                 emitStart(node);
-                write(resolver.getGeneratedNameForNode(enumParent));
+                write(getGeneratedNameForNode(enumParent));
                 write("[");
-                write(resolver.getGeneratedNameForNode(enumParent));
+                write(getGeneratedNameForNode(enumParent));
                 write("[");
                 emitExpressionForPropertyName(node.name);
                 write("] = ");
@@ -3591,19 +4089,20 @@ module ts {
                 emitStart(node);
                 write("(function (");
                 emitStart(node.name);
-                write(resolver.getGeneratedNameForNode(node));
+                write(getGeneratedNameForNode(node));
                 emitEnd(node.name);
                 write(") ");
                 if (node.body.kind === SyntaxKind.ModuleBlock) {
                     let saveTempCount = tempCount;
                     let saveTempVariables = tempVariables;
+                    let savePredefinedTempsInUse = predefinedTempsInUse;
                     tempCount = 0;
                     tempVariables = undefined;
-                    let popFrame = enterNameScope();
+                    predefinedTempsInUse = TempVariableKind.auto;
 
                     emit(node.body);
 
-                    exitNameScope(popFrame);
+                    predefinedTempsInUse = savePredefinedTempsInUse;
                     tempCount = saveTempCount;
                     tempVariables = saveTempVariables;
                 }
@@ -3741,7 +4240,7 @@ module ts {
                             let isNakedImport = SyntaxKind.ImportDeclaration && !(<ImportDeclaration>node).importClause;
                             if (!isNakedImport) {
                                 write("var ");
-                                write(resolver.getGeneratedNameForNode(<ImportDeclaration>node));
+                                write(getGeneratedNameForNode(<ImportDeclaration>node));
                                 write(" = ");
                             }
                         }
@@ -3751,7 +4250,7 @@ module ts {
                             write(", ");
                             emitModuleMemberName(namespaceDeclaration);
                             write(" = ");
-                            write(resolver.getGeneratedNameForNode(<ImportDeclaration>node));
+                            write(getGeneratedNameForNode(<ImportDeclaration>node));
                         }
                         write(";");
                         emitEnd(node);
@@ -3770,7 +4269,7 @@ module ts {
                             write("var ");
                             emitModuleMemberName(namespaceDeclaration);
                             write(" = ");
-                            write(resolver.getGeneratedNameForNode(<ImportDeclaration>node));
+                            write(getGeneratedNameForNode(<ImportDeclaration>node));
                             write(";");
                         }
                         emitExportImportAssignments(node);
@@ -3811,7 +4310,7 @@ module ts {
                 if (languageVersion < ScriptTarget.ES6) {
                     if (node.moduleSpecifier && (!node.exportClause || resolver.isValueAliasDeclaration(node))) {
                         emitStart(node);
-                        let generatedName = resolver.getGeneratedNameForNode(node);
+                        let generatedName = getGeneratedNameForNode(node);
                         if (node.exportClause) {
                             // export { x, y, ... } from "foo"
                             if (compilerOptions.module !== ModuleKind.AMD) {
@@ -4033,7 +4532,7 @@ module ts {
                         emit(namespaceDeclaration.name);
                     }
                     else {
-                        write(resolver.getGeneratedNameForNode(<ImportDeclaration | ExportDeclaration>importNode));
+                        write(getGeneratedNameForNode(<ImportDeclaration | ExportDeclaration>importNode));
                     }
                 }
                 for (let amdDependency of node.amdDependencies) {
@@ -4102,6 +4601,17 @@ module ts {
                 return statements.length;
             }
 
+            function writeHelper(text: string): void {
+                let lines = text.split(/\r\n|\r|\n/g);
+                for (let i = 0; i < lines.length; ++i) {
+                    let line = lines[i];
+                    if (line.length) {
+                        writeLine();
+                        write(line);
+                    }
+                }
+            }
+
             function emitSourceFileNode(node: SourceFile) {
                 // Start new file on new line
                 writeLine();
@@ -4128,6 +4638,23 @@ module ts {
                     write("};");
                     extendsEmitted = true;
                 }
+                if (!decorateEmitted && resolver.getNodeCheckFlags(node) & NodeCheckFlags.EmitDecorate) {
+                    writeHelper(`
+var __decorate = this.__decorate || function (decorators, target, key, value) {
+    var kind = typeof (arguments.length == 2 ? value = target : value);
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        switch (kind) {
+            case "function": value = decorator(value) || value; break;
+            case "number": decorator(target, key, value); break;
+            case "undefined": decorator(target, key); break;
+            case "object": value = decorator(target, key, value) || value; break;
+        }
+    }
+    return value;
+};`);
+                    decorateEmitted = true;
+                }
                 if (isExternalModule(node)) {
                     if (languageVersion >= ScriptTarget.ES6) {
                         emitES6Module(node, startIndex);
@@ -4347,7 +4874,7 @@ module ts {
                     case SyntaxKind.VariableDeclaration:
                         return emitVariableDeclaration(<VariableDeclaration>node);
                     case SyntaxKind.ClassDeclaration:
-                        return languageVersion < ScriptTarget.ES6 ? emitClassDeclarationBelowES6(<ClassDeclaration>node) : emitClassDeclarationForES6AndHigher(<ClassDeclaration>node);
+                        return emitClassDeclaration(<ClassDeclaration>node);
                     case SyntaxKind.InterfaceDeclaration:
                         return emitInterfaceDeclaration(<InterfaceDeclaration>node);
                     case SyntaxKind.EnumDeclaration:
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index ea767b258a51f..14311ccbc52bc 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -64,7 +64,8 @@ module ts {
             case SyntaxKind.ShorthandPropertyAssignment:
             case SyntaxKind.VariableDeclaration:
             case SyntaxKind.BindingElement:
-                return visitNodes(cbNodes, node.modifiers) ||
+                return visitNodes(cbNodes, node.decorators) ||
+                    visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, (<VariableLikeDeclaration>node).propertyName) ||
                     visitNode(cbNode, (<VariableLikeDeclaration>node).dotDotDotToken) ||
                     visitNode(cbNode, (<VariableLikeDeclaration>node).name) ||
@@ -76,7 +77,8 @@ module ts {
             case SyntaxKind.CallSignature:
             case SyntaxKind.ConstructSignature:
             case SyntaxKind.IndexSignature:
-                return visitNodes(cbNodes, node.modifiers) ||
+                return visitNodes(cbNodes, node.decorators) ||
+                    visitNodes(cbNodes, node.modifiers) ||
                     visitNodes(cbNodes, (<SignatureDeclaration>node).typeParameters) ||
                     visitNodes(cbNodes, (<SignatureDeclaration>node).parameters) ||
                     visitNode(cbNode, (<SignatureDeclaration>node).type);
@@ -88,7 +90,8 @@ module ts {
             case SyntaxKind.FunctionExpression:
             case SyntaxKind.FunctionDeclaration:
             case SyntaxKind.ArrowFunction:
-                return visitNodes(cbNodes, node.modifiers) ||
+                return visitNodes(cbNodes, node.decorators) ||
+                    visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, (<FunctionLikeDeclaration>node).asteriskToken) ||
                     visitNode(cbNode, (<FunctionLikeDeclaration>node).name) ||
                     visitNode(cbNode, (<FunctionLikeDeclaration>node).questionToken) ||
@@ -171,7 +174,8 @@ module ts {
                 return visitNodes(cbNodes, (<SourceFile>node).statements) ||
                     visitNode(cbNode, (<SourceFile>node).endOfFileToken);
             case SyntaxKind.VariableStatement:
-                return visitNodes(cbNodes, node.modifiers) ||
+                return visitNodes(cbNodes, node.decorators) ||
+                    visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, (<VariableStatement>node).declarationList);
             case SyntaxKind.VariableDeclarationList:
                 return visitNodes(cbNodes, (<VariableDeclarationList>node).declarations);
@@ -230,39 +234,48 @@ module ts {
             case SyntaxKind.CatchClause:
                 return visitNode(cbNode, (<CatchClause>node).variableDeclaration) ||
                     visitNode(cbNode, (<CatchClause>node).block);
+            case SyntaxKind.Decorator:
+                return visitNode(cbNode, (<Decorator>node).expression);
             case SyntaxKind.ClassDeclaration:
-                return visitNodes(cbNodes, node.modifiers) ||
+                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);
             case SyntaxKind.InterfaceDeclaration:
-                return visitNodes(cbNodes, node.modifiers) ||
+                return visitNodes(cbNodes, node.decorators) ||
+                    visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, (<InterfaceDeclaration>node).name) ||
                     visitNodes(cbNodes, (<InterfaceDeclaration>node).typeParameters) ||
                     visitNodes(cbNodes, (<ClassDeclaration>node).heritageClauses) ||
                     visitNodes(cbNodes, (<InterfaceDeclaration>node).members);
             case SyntaxKind.TypeAliasDeclaration:
-                return visitNodes(cbNodes, node.modifiers) ||
+                return visitNodes(cbNodes, node.decorators) ||
+                    visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, (<TypeAliasDeclaration>node).name) ||
                     visitNode(cbNode, (<TypeAliasDeclaration>node).type);
             case SyntaxKind.EnumDeclaration:
-                return visitNodes(cbNodes, node.modifiers) ||
+                return visitNodes(cbNodes, node.decorators) ||
+                    visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, (<EnumDeclaration>node).name) ||
                     visitNodes(cbNodes, (<EnumDeclaration>node).members);
             case SyntaxKind.EnumMember:
                 return visitNode(cbNode, (<EnumMember>node).name) ||
                     visitNode(cbNode, (<EnumMember>node).initializer);
             case SyntaxKind.ModuleDeclaration:
-                return visitNodes(cbNodes, node.modifiers) ||
+                return visitNodes(cbNodes, node.decorators) ||
+                    visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, (<ModuleDeclaration>node).name) ||
                     visitNode(cbNode, (<ModuleDeclaration>node).body);
             case SyntaxKind.ImportEqualsDeclaration:
-                return visitNodes(cbNodes, node.modifiers) ||
+                return visitNodes(cbNodes, node.decorators) ||
+                    visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, (<ImportEqualsDeclaration>node).name) ||
                     visitNode(cbNode, (<ImportEqualsDeclaration>node).moduleReference);
             case SyntaxKind.ImportDeclaration:
-                return visitNodes(cbNodes, node.modifiers) ||
+                return visitNodes(cbNodes, node.decorators) ||
+                    visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, (<ImportDeclaration>node).importClause) ||
                     visitNode(cbNode, (<ImportDeclaration>node).moduleSpecifier);
             case SyntaxKind.ImportClause:
@@ -274,7 +287,8 @@ module ts {
             case SyntaxKind.NamedExports:
                 return visitNodes(cbNodes, (<NamedImportsOrExports>node).elements);
             case SyntaxKind.ExportDeclaration:
-                return visitNodes(cbNodes, node.modifiers) ||
+                return visitNodes(cbNodes, node.decorators) ||
+                    visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, (<ExportDeclaration>node).exportClause) ||
                     visitNode(cbNode, (<ExportDeclaration>node).moduleSpecifier);
             case SyntaxKind.ImportSpecifier:
@@ -282,7 +296,8 @@ module ts {
                 return visitNode(cbNode, (<ImportOrExportSpecifier>node).propertyName) ||
                     visitNode(cbNode, (<ImportOrExportSpecifier>node).name);
             case SyntaxKind.ExportAssignment:
-                return visitNodes(cbNodes, node.modifiers) ||
+                return visitNodes(cbNodes, node.decorators) ||
+                    visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, (<ExportAssignment>node).expression) ||
                     visitNode(cbNode, (<ExportAssignment>node).type);
             case SyntaxKind.TemplateExpression:
@@ -295,6 +310,8 @@ module ts {
                 return visitNodes(cbNodes, (<HeritageClause>node).types);
             case SyntaxKind.ExternalModuleReference:
                 return visitNode(cbNode, (<ExternalModuleReference>node).expression);
+            case SyntaxKind.MissingDeclaration:
+                return visitNodes(cbNodes, node.decorators);
         }
     }
 
@@ -987,6 +1004,8 @@ module ts {
     }
 
     function parseSourceFile(fileName: string, sourceText: string, languageVersion: ScriptTarget, syntaxCursor: SyntaxCursor, setParentNodes = false): SourceFile {
+        const disallowInAndDecoratorContext = ParserContextFlags.DisallowIn | ParserContextFlags.Decorator;
+
         let parsingContext: ParsingContext = 0;
         let identifiers: Map<string> = {};
         let identifierCount = 0;
@@ -1130,6 +1149,23 @@ module ts {
             setContextFlag(val, ParserContextFlags.GeneratorParameter);
         }
 
+        function setDecoratorContext(val: boolean) {
+            setContextFlag(val, ParserContextFlags.Decorator);
+        }
+
+        function doOutsideOfContext<T>(flags: ParserContextFlags, func: () => T): T {
+            let currentContextFlags = contextFlags & flags;
+            if (currentContextFlags) {
+                setContextFlag(false, currentContextFlags);
+                let result = func();
+                setContextFlag(true, currentContextFlags);
+                return result;
+            }
+
+            // no need to do anything special as we are not in any of the requested contexts
+            return func();
+        }
+
         function allowInAnd<T>(func: () => T): T {
             if (contextFlags & ParserContextFlags.DisallowIn) {
                 setDisallowInContext(false);
@@ -1178,6 +1214,18 @@ module ts {
             return func();
         }
 
+        function doInDecoratorContext<T>(func: () => T): T {
+            if (contextFlags & ParserContextFlags.Decorator) {
+                // no need to do anything special if we're already in the [Decorator] context.
+                return func();
+            }
+
+            setDecoratorContext(true);
+            let result = func();
+            setDecoratorContext(false);
+            return result;
+        }
+
         function inYieldContext() {
             return (contextFlags & ParserContextFlags.Yield) !== 0;
         }
@@ -1194,6 +1242,10 @@ module ts {
             return (contextFlags & ParserContextFlags.DisallowIn) !== 0;
         }
 
+        function inDecoratorContext() {
+            return (contextFlags & ParserContextFlags.Decorator) !== 0;
+        }
+
         function parseErrorAtCurrentToken(message: DiagnosticMessage, arg0?: any): void {
             let start = scanner.getTokenPos();
             let length = scanner.getTextPos() - start;
@@ -1403,7 +1455,7 @@ module ts {
 
             return node;
         }
-
+        
         function createMissingNode(kind: SyntaxKind, reportAtCurrentPosition: boolean, diagnosticMessage: DiagnosticMessage, arg0?: any): Node {
             if (reportAtCurrentPosition) {
                 parseErrorAtPosition(scanner.getStartPos(), 0, diagnosticMessage, arg0);
@@ -2273,7 +2325,7 @@ module ts {
         }
 
         function isStartOfParameter(): boolean {
-            return token === SyntaxKind.DotDotDotToken || isIdentifierOrPattern() || isModifier(token);
+            return token === SyntaxKind.DotDotDotToken || isIdentifierOrPattern() || isModifier(token) || token === SyntaxKind.AtToken;
         }
 
         function setModifiers(node: Node, modifiers: ModifiersArray) {
@@ -2285,6 +2337,7 @@ module ts {
 
         function parseParameter(): ParameterDeclaration {
             let node = <ParameterDeclaration>createNode(SyntaxKind.Parameter);
+            node.decorators = parseDecorators();
             setModifiers(node, parseModifiers());
             node.dotDotDotToken = parseOptionalToken(SyntaxKind.DotDotDotToken);
 
@@ -2473,9 +2526,9 @@ module ts {
             return token === SyntaxKind.ColonToken || token === SyntaxKind.CommaToken || token === SyntaxKind.CloseBracketToken;
         }
 
-        function parseIndexSignatureDeclaration(modifiers: ModifiersArray): IndexSignatureDeclaration {
-            let fullStart = modifiers ? modifiers.pos : scanner.getStartPos();
+        function parseIndexSignatureDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): IndexSignatureDeclaration {
             let node = <IndexSignatureDeclaration>createNode(SyntaxKind.IndexSignature, fullStart);
+            node.decorators = decorators;
             setModifiers(node, modifiers);
             node.parameters = parseBracketedList(ParsingContext.Parameters, parseParameter, SyntaxKind.OpenBracketToken, SyntaxKind.CloseBracketToken);
             node.type = parseTypeAnnotation();
@@ -2552,7 +2605,7 @@ module ts {
                 case SyntaxKind.OpenBracketToken:
                     // Indexer or computed property
                     return isIndexSignature()
-                        ? parseIndexSignatureDeclaration(/*modifiers:*/ undefined)
+                        ? parseIndexSignatureDeclaration(scanner.getStartPos(), /*decorators*/ undefined, /*modifiers:*/ undefined)
                         : parsePropertyOrMethodSignature();
                 case SyntaxKind.NewKeyword:
                     if (lookAhead(isStartOfConstructSignature)) {
@@ -2583,9 +2636,11 @@ module ts {
         }
 
         function parseIndexSignatureWithModifiers() {
+            let fullStart = scanner.getStartPos();
+            let decorators = parseDecorators();
             let modifiers = parseModifiers();
             return isIndexSignature()
-                ? parseIndexSignatureDeclaration(modifiers)
+                ? parseIndexSignatureDeclaration(fullStart, decorators, modifiers)
                 : undefined;
         }
 
@@ -2841,7 +2896,7 @@ module ts {
 
         function isStartOfExpressionStatement(): boolean {
             // As per the grammar, neither '{' nor 'function' can start an expression statement.
-            return token !== SyntaxKind.OpenBraceToken && token !== SyntaxKind.FunctionKeyword && isStartOfExpression();
+            return token !== SyntaxKind.OpenBraceToken && token !== SyntaxKind.FunctionKeyword && token !== SyntaxKind.AtToken && isStartOfExpression();
         }
 
         function parseExpression(): Expression {
@@ -2849,11 +2904,21 @@ module ts {
             //      AssignmentExpression[in]
             //      Expression[in] , AssignmentExpression[in]
 
+            // clear the decorator context when parsing Expression, as it should be unambiguous when parsing a decorator
+            let saveDecoratorContext = inDecoratorContext();
+            if (saveDecoratorContext) {
+                setDecoratorContext(false);
+            }
+
             let expr = parseAssignmentExpressionOrHigher();
             let operatorToken: Node;
             while ((operatorToken = parseOptionalToken(SyntaxKind.CommaToken))) {
                 expr = makeBinaryExpression(expr, operatorToken, parseAssignmentExpressionOrHigher());
             }
+
+            if (saveDecoratorContext) {
+                setDecoratorContext(true);
+            }
             return expr;
         }
 
@@ -3209,7 +3274,7 @@ module ts {
             let node = <ConditionalExpression>createNode(SyntaxKind.ConditionalExpression, leftOperand.pos);
             node.condition = leftOperand;
             node.questionToken = questionToken;
-            node.whenTrue = allowInAnd(parseAssignmentExpressionOrHigher);
+            node.whenTrue = doOutsideOfContext(disallowInAndDecoratorContext, parseAssignmentExpressionOrHigher);
             node.colonToken = parseExpectedToken(SyntaxKind.ColonToken, /*reportAtCurrentPosition:*/ false,
                 Diagnostics._0_expected, tokenToString(SyntaxKind.ColonToken));
             node.whenFalse = parseAssignmentExpressionOrHigher();
@@ -3500,7 +3565,8 @@ module ts {
                     continue;
                 }
 
-                if (parseOptional(SyntaxKind.OpenBracketToken)) {
+                // when in the [Decorator] context, we do not parse ElementAccess as it could be part of a ComputedPropertyName                
+                if (!inDecoratorContext() && parseOptional(SyntaxKind.OpenBracketToken)) {
                     let indexedAccess = <ElementAccessExpression>createNode(SyntaxKind.ElementAccessExpression, expression.pos);
                     indexedAccess.expression = expression;
 
@@ -3536,7 +3602,6 @@ module ts {
         function parseCallExpressionRest(expression: LeftHandSideExpression): LeftHandSideExpression {
             while (true) {
                 expression = parseMemberExpressionRest(expression);
-
                 if (token === SyntaxKind.LessThanToken) {
                     // See if this is the start of a generic invocation.  If so, consume it and
                     // keep checking for postfix expressions.  Otherwise, it's just a '<' that's
@@ -3683,7 +3748,7 @@ module ts {
         }
 
         function parseArgumentExpression(): Expression {
-            return allowInAnd(parseArgumentOrArrayLiteralElement);
+            return doOutsideOfContext(disallowInAndDecoratorContext, parseArgumentOrArrayLiteralElement);
         }
 
         function parseArrayLiteralExpression(): ArrayLiteralExpression {
@@ -3695,12 +3760,12 @@ module ts {
             return finishNode(node);
         }
 
-        function tryParseAccessorDeclaration(fullStart: number, modifiers: ModifiersArray): AccessorDeclaration {
+        function tryParseAccessorDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): AccessorDeclaration {
             if (parseContextualModifier(SyntaxKind.GetKeyword)) {
-                return parseAccessorDeclaration(SyntaxKind.GetAccessor, fullStart, modifiers);
+                return parseAccessorDeclaration(SyntaxKind.GetAccessor, fullStart, decorators, modifiers);
             }
             else if (parseContextualModifier(SyntaxKind.SetKeyword)) {
-                return parseAccessorDeclaration(SyntaxKind.SetAccessor, fullStart, modifiers);
+                return parseAccessorDeclaration(SyntaxKind.SetAccessor, fullStart, decorators, modifiers);
             }
 
             return undefined;
@@ -3708,9 +3773,10 @@ module ts {
 
         function parseObjectLiteralElement(): ObjectLiteralElement {
             let fullStart = scanner.getStartPos();
+            let decorators = parseDecorators();
             let modifiers = parseModifiers();
 
-            let accessor = tryParseAccessorDeclaration(fullStart, modifiers);
+            let accessor = tryParseAccessorDeclaration(fullStart, decorators, modifiers);
             if (accessor) {
                 return accessor;
             }
@@ -3723,7 +3789,7 @@ module ts {
             // Disallowing of optional property assignments happens in the grammar checker.
             let questionToken = parseOptionalToken(SyntaxKind.QuestionToken);
             if (asteriskToken || token === SyntaxKind.OpenParenToken || token === SyntaxKind.LessThanToken) {
-                return parseMethodDeclaration(fullStart, modifiers, asteriskToken, propertyName, questionToken);
+                return parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, propertyName, questionToken);
             }
 
             // Parse to check if it is short-hand property assignment or normal property assignment
@@ -3760,12 +3826,19 @@ module ts {
             //      function * BindingIdentifier[Yield]opt (FormalParameters[Yield, GeneratorParameter]) { GeneratorBody[Yield] }
             // FunctionExpression:
             //      function BindingIdentifieropt(FormalParameters) { FunctionBody }
+            let saveDecoratorContext = inDecoratorContext();
+            if (saveDecoratorContext) {
+                setDecoratorContext(false);
+            }
             let node = <FunctionExpression>createNode(SyntaxKind.FunctionExpression);
             parseExpected(SyntaxKind.FunctionKeyword);
             node.asteriskToken = parseOptionalToken(SyntaxKind.AsteriskToken);
             node.name = node.asteriskToken ? doInYieldContext(parseOptionalIdentifier) : parseOptionalIdentifier();
             fillSignature(SyntaxKind.ColonToken, /*yieldAndGeneratorParameterContext:*/ !!node.asteriskToken, /*requireCompleteParameterList:*/ false, node);
             node.body = parseFunctionBlock(/*allowYield:*/ !!node.asteriskToken, /* ignoreMissingOpenBrace */ false);
+            if (saveDecoratorContext) {
+                setDecoratorContext(true);
+            }
             return finishNode(node);
         }
 
@@ -3802,8 +3875,19 @@ module ts {
             let savedYieldContext = inYieldContext();
             setYieldContext(allowYield);
 
+            // We may be in a [Decorator] context when parsing a function expression or 
+            // arrow function. The body of the function is not in [Decorator] context.
+            let saveDecoratorContext = inDecoratorContext();
+            if (saveDecoratorContext) {
+                setDecoratorContext(false);
+            }
+
             let block = parseBlock(ignoreMissingOpenBrace, /*checkForStrictMode*/ true, diagnosticMessage);
 
+            if (saveDecoratorContext) {
+                setDecoratorContext(true);
+            }
+
             setYieldContext(savedYieldContext);
 
             return block;
@@ -4051,7 +4135,7 @@ module ts {
             // 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.
             if (isModifier(token)) {
-                let result = lookAhead(parseVariableStatementOrFunctionDeclarationWithModifiers);
+                let result = lookAhead(parseVariableStatementOrFunctionDeclarationWithDecoratorsOrModifiers);
                 if (result) {
                     return true;
                 }
@@ -4135,9 +4219,9 @@ module ts {
                 case SyntaxKind.VarKeyword:
                 case SyntaxKind.ConstKeyword:
                     // const here should always be parsed as const declaration because of check in 'isStatement'
-                    return parseVariableStatement(scanner.getStartPos(), /*modifiers:*/ undefined);
+                    return parseVariableStatement(scanner.getStartPos(), /*decorators*/ undefined, /*modifiers:*/ undefined);
                 case SyntaxKind.FunctionKeyword:
-                    return parseFunctionDeclaration(scanner.getStartPos(), /*modifiers:*/ undefined);
+                    return parseFunctionDeclaration(scanner.getStartPos(), /*decorators*/ undefined, /*modifiers:*/ undefined);
                 case SyntaxKind.SemicolonToken:
                     return parseEmptyStatement();
                 case SyntaxKind.IfKeyword:
@@ -4170,7 +4254,7 @@ module ts {
                 case SyntaxKind.LetKeyword:
                     // If let follows identifier on the same line, it is declaration parse it as variable statement
                     if (isLetDeclaration()) {
-                        return parseVariableStatement(scanner.getStartPos(), /*modifiers:*/ undefined);
+                        return parseVariableStatement(scanner.getStartPos(), /*decorators*/ undefined, /*modifiers:*/ undefined);
                     }
                 // Else parse it like identifier - fall through
                 default:
@@ -4180,8 +4264,10 @@ module ts {
                     // 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.
-                    if (isModifier(token)) {
-                        let result = tryParse(parseVariableStatementOrFunctionDeclarationWithModifiers);
+                    // 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);
                         if (result) {
                             return result;
                         }
@@ -4191,8 +4277,9 @@ module ts {
             }
         }
 
-        function parseVariableStatementOrFunctionDeclarationWithModifiers(): FunctionDeclaration | VariableStatement {
+        function parseVariableStatementOrFunctionDeclarationWithDecoratorsOrModifiers(): FunctionDeclaration | VariableStatement {
             let start = scanner.getStartPos();
+            let decorators = parseDecorators();
             let modifiers = parseModifiers();
             switch (token) {
                 case SyntaxKind.ConstKeyword:
@@ -4200,18 +4287,18 @@ module ts {
                     if (nextTokenIsEnum) {
                         return undefined;
                     }
-                    return parseVariableStatement(start, modifiers);
+                    return parseVariableStatement(start, decorators, modifiers);
 
                 case SyntaxKind.LetKeyword:
                     if (!isLetDeclaration()) {
                         return undefined;
                     }
-                    return parseVariableStatement(start, modifiers);
+                    return parseVariableStatement(start, decorators, modifiers);
 
                 case SyntaxKind.VarKeyword:
-                    return parseVariableStatement(start, modifiers);
+                    return parseVariableStatement(start, decorators, modifiers);
                 case SyntaxKind.FunctionKeyword:
-                    return parseFunctionDeclaration(start, modifiers);
+                    return parseFunctionDeclaration(start, decorators, modifiers);
             }
 
             return undefined;
@@ -4341,16 +4428,18 @@ module ts {
             return nextTokenIsIdentifier() && nextToken() === SyntaxKind.CloseParenToken;
         }
 
-        function parseVariableStatement(fullStart: number, modifiers: ModifiersArray): VariableStatement {
+        function parseVariableStatement(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): VariableStatement {
             let node = <VariableStatement>createNode(SyntaxKind.VariableStatement, fullStart);
+            node.decorators = decorators;
             setModifiers(node, modifiers);
             node.declarationList = parseVariableDeclarationList(/*inForStatementInitializer:*/ false);
             parseSemicolon();
             return finishNode(node);
         }
 
-        function parseFunctionDeclaration(fullStart: number, modifiers: ModifiersArray): FunctionDeclaration {
+        function parseFunctionDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): FunctionDeclaration {
             let node = <FunctionDeclaration>createNode(SyntaxKind.FunctionDeclaration, fullStart);
+            node.decorators = decorators;
             setModifiers(node, modifiers);
             parseExpected(SyntaxKind.FunctionKeyword);
             node.asteriskToken = parseOptionalToken(SyntaxKind.AsteriskToken);
@@ -4360,8 +4449,9 @@ module ts {
             return finishNode(node);
         }
 
-        function parseConstructorDeclaration(pos: number, modifiers: ModifiersArray): ConstructorDeclaration {
+        function parseConstructorDeclaration(pos: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): ConstructorDeclaration {
             let node = <ConstructorDeclaration>createNode(SyntaxKind.Constructor, pos);
+            node.decorators = decorators;
             setModifiers(node, modifiers);
             parseExpected(SyntaxKind.ConstructorKeyword);
             fillSignature(SyntaxKind.ColonToken, /*yieldAndGeneratorParameterContext:*/ false, /*requireCompleteParameterList:*/ false, node);
@@ -4369,8 +4459,9 @@ module ts {
             return finishNode(node);
         }
 
-        function parseMethodDeclaration(fullStart: number, modifiers: ModifiersArray, asteriskToken: Node, name: DeclarationName, questionToken: Node, diagnosticMessage?: DiagnosticMessage): MethodDeclaration {
+        function parseMethodDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray, asteriskToken: Node, name: DeclarationName, questionToken: Node, diagnosticMessage?: DiagnosticMessage): MethodDeclaration {
             let method = <MethodDeclaration>createNode(SyntaxKind.MethodDeclaration, fullStart);
+            method.decorators = decorators;
             setModifiers(method, modifiers);
             method.asteriskToken = asteriskToken;
             method.name = name;
@@ -4380,25 +4471,30 @@ module ts {
             return finishNode(method);
         }
 
-        function parsePropertyOrMethodDeclaration(fullStart: number, modifiers: ModifiersArray): ClassElement {
+        function parsePropertyDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray, name: DeclarationName, questionToken: Node): ClassElement {
+            let property = <PropertyDeclaration>createNode(SyntaxKind.PropertyDeclaration, fullStart);
+            property.decorators = decorators;
+            setModifiers(property, modifiers);
+            property.name = name;
+            property.questionToken = questionToken;
+            property.type = parseTypeAnnotation();
+            property.initializer = allowInAnd(parseNonParameterInitializer);
+            parseSemicolon();
+            return finishNode(property);
+        }
+
+        function parsePropertyOrMethodDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): ClassElement {
             let asteriskToken = parseOptionalToken(SyntaxKind.AsteriskToken);
             let name = parsePropertyName();
-
+            
             // Note: this is not legal as per the grammar.  But we allow it in the parser and
             // report an error in the grammar checker.
             let questionToken = parseOptionalToken(SyntaxKind.QuestionToken);
             if (asteriskToken || token === SyntaxKind.OpenParenToken || token === SyntaxKind.LessThanToken) {
-                return parseMethodDeclaration(fullStart, modifiers, asteriskToken, name, questionToken, Diagnostics.or_expected);
+                return parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, name, questionToken, Diagnostics.or_expected);
             }
             else {
-                let property = <PropertyDeclaration>createNode(SyntaxKind.PropertyDeclaration, fullStart);
-                setModifiers(property, modifiers);
-                property.name = name;
-                property.questionToken = questionToken;
-                property.type = parseTypeAnnotation();
-                property.initializer = allowInAnd(parseNonParameterInitializer);
-                parseSemicolon();
-                return finishNode(property);
+                return parsePropertyDeclaration(fullStart, decorators, modifiers, name, questionToken);
             }
         }
 
@@ -4406,8 +4502,9 @@ module ts {
             return parseInitializer(/*inParameter*/ false);
         }
 
-        function parseAccessorDeclaration(kind: SyntaxKind, fullStart: number, modifiers: ModifiersArray): AccessorDeclaration {
+        function parseAccessorDeclaration(kind: SyntaxKind, fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): AccessorDeclaration {
             let node = <AccessorDeclaration>createNode(kind, fullStart);
+            node.decorators = decorators;
             setModifiers(node, modifiers);
             node.name = parsePropertyName();
             fillSignature(SyntaxKind.ColonToken, /*yieldAndGeneratorParameterContext:*/ false, /*requireCompleteParameterList:*/ false, node);
@@ -4418,6 +4515,10 @@ module ts {
         function isClassMemberStart(): boolean {
             let idToken: SyntaxKind;
 
+            if (token === SyntaxKind.AtToken) {
+                return true;
+            }
+
             // Eat up all modifiers, but hold on to the last one in case it is actually an identifier.
             while (isModifier(token)) {
                 idToken = token;
@@ -4469,6 +4570,29 @@ module ts {
             return false;
         }
 
+        function parseDecorators(): NodeArray<Decorator> {
+            let decorators: NodeArray<Decorator>;
+            while (true) {
+                let decoratorStart = getNodePos();
+                if (!parseOptional(SyntaxKind.AtToken)) {
+                    break;
+                }
+
+                if (!decorators) {
+                    decorators = <NodeArray<Decorator>>[];
+                    decorators.pos = scanner.getStartPos();
+                }
+
+                let decorator = <Decorator>createNode(SyntaxKind.Decorator, decoratorStart);
+                decorator.expression = doInDecoratorContext(parseLeftHandSideExpressionOrHigher);
+                decorators.push(finishNode(decorator));
+            }
+            if (decorators) {
+                decorators.end = getNodeEnd();
+            }
+            return decorators;
+        }
+
         function parseModifiers(): ModifiersArray {
             let flags = 0;
             let modifiers: ModifiersArray;
@@ -4496,19 +4620,20 @@ module ts {
 
         function parseClassElement(): ClassElement {
             let fullStart = getNodePos();
+            let decorators = parseDecorators();
             let modifiers = parseModifiers();
 
-            let accessor = tryParseAccessorDeclaration(fullStart, modifiers);
+            let accessor = tryParseAccessorDeclaration(fullStart, decorators, modifiers);
             if (accessor) {
                 return accessor;
             }
 
             if (token === SyntaxKind.ConstructorKeyword) {
-                return parseConstructorDeclaration(fullStart, modifiers);
+                return parseConstructorDeclaration(fullStart, decorators, modifiers);
             }
 
             if (isIndexSignature()) {
-                return parseIndexSignatureDeclaration(modifiers);
+                return parseIndexSignatureDeclaration(fullStart, decorators, modifiers);
             }
 
             // It is very important that we check this *after* checking indexers because
@@ -4519,14 +4644,20 @@ module ts {
                 token === SyntaxKind.AsteriskToken ||
                 token === SyntaxKind.OpenBracketToken) {
 
-                return parsePropertyOrMethodDeclaration(fullStart, modifiers);
+                return parsePropertyOrMethodDeclaration(fullStart, decorators, modifiers);
+            }
+
+            if (decorators) {
+                // treat this as a property declaration with a missing name.
+                let name = <Identifier>createMissingNode(SyntaxKind.Identifier, /*reportAtCurrentPosition*/ true, Diagnostics.Declaration_expected);
+                return parsePropertyDeclaration(fullStart, decorators, modifiers, name, /*questionToken*/ undefined);
             }
 
             // 'isClassMemberStart' should have hinted not to attempt parsing.
             Debug.fail("Should not have attempted to parse class member declaration.");
         }
 
-        function parseClassDeclaration(fullStart: number, modifiers: ModifiersArray): ClassDeclaration {
+        function parseClassDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): ClassDeclaration {
             // In ES6 specification, All parts of a ClassDeclaration or a ClassExpression are strict mode code
             let savedStrictModeContext = inStrictModeContext();
             if (languageVersion >= ScriptTarget.ES6) {
@@ -4534,6 +4665,7 @@ module ts {
             }
 
             var node = <ClassDeclaration>createNode(SyntaxKind.ClassDeclaration, fullStart);
+            node.decorators = decorators;
             setModifiers(node, modifiers);
             parseExpected(SyntaxKind.ClassKeyword);
             node.name = node.flags & NodeFlags.Default ? parseOptionalIdentifier() : parseIdentifier();
@@ -4597,8 +4729,9 @@ module ts {
             return parseList(ParsingContext.ClassMembers, /*checkForStrictMode*/ false, parseClassElement);
         }
 
-        function parseInterfaceDeclaration(fullStart: number, modifiers: ModifiersArray): InterfaceDeclaration {
+        function parseInterfaceDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): InterfaceDeclaration {
             let node = <InterfaceDeclaration>createNode(SyntaxKind.InterfaceDeclaration, fullStart);
+            node.decorators = decorators;
             setModifiers(node, modifiers);
             parseExpected(SyntaxKind.InterfaceKeyword);
             node.name = parseIdentifier();
@@ -4608,8 +4741,9 @@ module ts {
             return finishNode(node);
         }
 
-        function parseTypeAliasDeclaration(fullStart: number, modifiers: ModifiersArray): TypeAliasDeclaration {
+        function parseTypeAliasDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): TypeAliasDeclaration {
             let node = <TypeAliasDeclaration>createNode(SyntaxKind.TypeAliasDeclaration, fullStart);
+            node.decorators = decorators;
             setModifiers(node, modifiers);
             parseExpected(SyntaxKind.TypeKeyword);
             node.name = parseIdentifier();
@@ -4630,8 +4764,9 @@ module ts {
             return finishNode(node);
         }
 
-        function parseEnumDeclaration(fullStart: number, modifiers: ModifiersArray): EnumDeclaration {
+        function parseEnumDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): EnumDeclaration {
             let node = <EnumDeclaration>createNode(SyntaxKind.EnumDeclaration, fullStart);
+            node.decorators = decorators;
             setModifiers(node, modifiers);
             parseExpected(SyntaxKind.EnumKeyword);
             node.name = parseIdentifier();
@@ -4657,30 +4792,32 @@ module ts {
             return finishNode(node);
         }
 
-        function parseInternalModuleTail(fullStart: number, modifiers: ModifiersArray, flags: NodeFlags): ModuleDeclaration {
+        function parseInternalModuleTail(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray, flags: NodeFlags): ModuleDeclaration {
             let node = <ModuleDeclaration>createNode(SyntaxKind.ModuleDeclaration, fullStart);
+            node.decorators = decorators;
             setModifiers(node, modifiers);
             node.flags |= flags;
             node.name = parseIdentifier();
             node.body = parseOptional(SyntaxKind.DotToken)
-                ? parseInternalModuleTail(getNodePos(), /*modifiers:*/undefined, NodeFlags.Export)
+                ? parseInternalModuleTail(getNodePos(), /*decorators*/ undefined, /*modifiers:*/undefined, NodeFlags.Export)
                 : parseModuleBlock();
             return finishNode(node);
         }
 
-        function parseAmbientExternalModuleDeclaration(fullStart: number, modifiers: ModifiersArray): ModuleDeclaration {
+        function parseAmbientExternalModuleDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): ModuleDeclaration {
             let node = <ModuleDeclaration>createNode(SyntaxKind.ModuleDeclaration, fullStart);
+            node.decorators = decorators;
             setModifiers(node, modifiers);
             node.name = parseLiteralNode(/*internName:*/ true);
             node.body = parseModuleBlock();
             return finishNode(node);
         }
 
-        function parseModuleDeclaration(fullStart: number, modifiers: ModifiersArray): ModuleDeclaration {
+        function parseModuleDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): ModuleDeclaration {
             parseExpected(SyntaxKind.ModuleKeyword);
             return token === SyntaxKind.StringLiteral
-                ? parseAmbientExternalModuleDeclaration(fullStart, modifiers)
-                : parseInternalModuleTail(fullStart, modifiers, modifiers ? modifiers.flags : 0);
+                ? parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers)
+                : parseInternalModuleTail(fullStart, decorators, modifiers, modifiers ? modifiers.flags : 0);
         }
 
         function isExternalModuleReference() {
@@ -4698,7 +4835,7 @@ module ts {
                 token === SyntaxKind.FromKeyword;
         }
 
-        function parseImportDeclarationOrImportEqualsDeclaration(fullStart: number, modifiers: ModifiersArray): ImportEqualsDeclaration | ImportDeclaration {
+        function parseImportDeclarationOrImportEqualsDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): ImportEqualsDeclaration | ImportDeclaration {
             parseExpected(SyntaxKind.ImportKeyword);
             let afterImportPos = scanner.getStartPos();
 
@@ -4710,6 +4847,7 @@ module ts {
                     // import x = require("mod"); or
                     // import x = M.x;
                     let importEqualsDeclaration = <ImportEqualsDeclaration>createNode(SyntaxKind.ImportEqualsDeclaration, fullStart);
+                    importEqualsDeclaration.decorators = decorators;
                     setModifiers(importEqualsDeclaration, modifiers);
                     importEqualsDeclaration.name = identifier;
                     parseExpected(SyntaxKind.EqualsToken);
@@ -4721,6 +4859,7 @@ module ts {
 
             // Import statement
             let importDeclaration = <ImportDeclaration>createNode(SyntaxKind.ImportDeclaration, fullStart);
+            importDeclaration.decorators = decorators;
             setModifiers(importDeclaration, modifiers);
 
             // ImportDeclaration:
@@ -4856,8 +4995,9 @@ module ts {
             return finishNode(node);
         }
 
-        function parseExportDeclaration(fullStart: number, modifiers: ModifiersArray): ExportDeclaration {
+        function parseExportDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): ExportDeclaration {
             let node = <ExportDeclaration>createNode(SyntaxKind.ExportDeclaration, fullStart);
+            node.decorators = decorators;
             setModifiers(node, modifiers);
             if (parseOptional(SyntaxKind.AsteriskToken)) {
                 parseExpected(SyntaxKind.FromKeyword);
@@ -4873,8 +5013,9 @@ module ts {
             return finishNode(node);
         }
 
-        function parseExportAssignment(fullStart: number, modifiers: ModifiersArray): ExportAssignment {
+        function parseExportAssignment(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): ExportAssignment {
             let node = <ExportAssignment>createNode(SyntaxKind.ExportAssignment, fullStart);
+            node.decorators = decorators;
             setModifiers(node, modifiers);
             if (parseOptional(SyntaxKind.EqualsToken)) {
                 node.isExportEquals = true;
@@ -4899,7 +5040,7 @@ module ts {
             return inStrictModeContext() || lookAhead(nextTokenIsIdentifierOrStartOfDestructuringOnTheSameLine);
         }
 
-        function isDeclarationStart(): boolean {
+        function isDeclarationStart(followsModifier?: boolean): boolean {
             switch (token) {
                 case SyntaxKind.VarKeyword:
                 case SyntaxKind.ConstKeyword:
@@ -4929,6 +5070,10 @@ module ts {
                 case SyntaxKind.StaticKeyword:
                     // Check for modifier on source element
                     return lookAhead(nextTokenIsDeclarationStart);
+                case SyntaxKind.AtToken:
+                    // a lookahead here is too costly, and decorators are only valid on a declaration. 
+                    // We will assume we are parsing a declaration here and report an error later
+                    return !followsModifier;
             }
         }
 
@@ -4955,12 +5100,12 @@ module ts {
         function nextTokenCanFollowExportKeyword() {
             nextToken();
             return token === SyntaxKind.EqualsToken || token === SyntaxKind.AsteriskToken ||
-                token === SyntaxKind.OpenBraceToken || token === SyntaxKind.DefaultKeyword || isDeclarationStart();
+                token === SyntaxKind.OpenBraceToken || token === SyntaxKind.DefaultKeyword || isDeclarationStart(/*followsModifier*/ true);
         }
 
         function nextTokenIsDeclarationStart() {
             nextToken();
-            return isDeclarationStart();
+            return isDeclarationStart(/*followsModifier*/ true);
         }
 
         function nextTokenIsAsKeyword() {
@@ -4969,14 +5114,15 @@ module ts {
 
         function parseDeclaration(): ModuleElement {
             let fullStart = getNodePos();
+            let decorators = parseDecorators();
             let modifiers = parseModifiers();
             if (token === SyntaxKind.ExportKeyword) {
                 nextToken();
                 if (token === SyntaxKind.DefaultKeyword || token === SyntaxKind.EqualsToken) {
-                    return parseExportAssignment(fullStart, modifiers);
+                    return parseExportAssignment(fullStart, decorators, modifiers);
                 }
                 if (token === SyntaxKind.AsteriskToken || token === SyntaxKind.OpenBraceToken) {
-                    return parseExportDeclaration(fullStart, modifiers);
+                    return parseExportDeclaration(fullStart, decorators, modifiers);
                 }
             }
 
@@ -4984,22 +5130,31 @@ module ts {
                 case SyntaxKind.VarKeyword:
                 case SyntaxKind.LetKeyword:
                 case SyntaxKind.ConstKeyword:
-                    return parseVariableStatement(fullStart, modifiers);
+                    return parseVariableStatement(fullStart, decorators, modifiers);
                 case SyntaxKind.FunctionKeyword:
-                    return parseFunctionDeclaration(fullStart, modifiers);
+                    return parseFunctionDeclaration(fullStart, decorators, modifiers);
                 case SyntaxKind.ClassKeyword:
-                    return parseClassDeclaration(fullStart, modifiers);
+                    return parseClassDeclaration(fullStart, decorators, modifiers);
                 case SyntaxKind.InterfaceKeyword:
-                    return parseInterfaceDeclaration(fullStart, modifiers);
+                    return parseInterfaceDeclaration(fullStart, decorators, modifiers);
                 case SyntaxKind.TypeKeyword:
-                    return parseTypeAliasDeclaration(fullStart, modifiers);
+                    return parseTypeAliasDeclaration(fullStart, decorators, modifiers);
                 case SyntaxKind.EnumKeyword:
-                    return parseEnumDeclaration(fullStart, modifiers);
+                    return parseEnumDeclaration(fullStart, decorators, modifiers);
                 case SyntaxKind.ModuleKeyword:
-                    return parseModuleDeclaration(fullStart, modifiers);
+                    return parseModuleDeclaration(fullStart, decorators, modifiers);
                 case SyntaxKind.ImportKeyword:
-                    return parseImportDeclarationOrImportEqualsDeclaration(fullStart, modifiers);
+                    return parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers);
                 default:
+                    if (decorators) {
+                        // We reached this point because we encountered an AtToken and assumed a declaration would
+                        // follow. For recovery and error reporting purposes, return an incomplete declaration.                        
+                        let node = <ModuleElement>createMissingNode(SyntaxKind.MissingDeclaration, /*reportAtCurrentPosition*/ true, Diagnostics.Declaration_expected);
+                        node.pos = fullStart;
+                        node.decorators = decorators;
+                        setModifiers(node, modifiers);
+                        return finishNode(node);
+                    }
                     Debug.fail("Mismatch between isDeclarationStart and parseDeclaration");
             }
         }
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
index 9e5e65db935f2..3a208698c25f4 100644
--- a/src/compiler/scanner.ts
+++ b/src/compiler/scanner.ts
@@ -148,6 +148,7 @@ module ts {
         "&=": SyntaxKind.AmpersandEqualsToken,
         "|=": SyntaxKind.BarEqualsToken,
         "^=": SyntaxKind.CaretEqualsToken,
+        "@": SyntaxKind.AtToken,
     };
 
     /*
@@ -256,6 +257,11 @@ module ts {
         return tokenStrings[t];
     }
 
+    /* @internal */
+    export function stringToToken(s: string): SyntaxKind {
+        return textToToken[s];
+    }
+
     export function computeLineStarts(text: string): number[] {
         let result: number[] = new Array();
         let pos = 0;
@@ -1279,6 +1285,8 @@ module ts {
                         return pos++, token = SyntaxKind.CloseBraceToken;
                     case CharacterCodes.tilde:
                         return pos++, token = SyntaxKind.TildeToken;
+                    case CharacterCodes.at:
+                        return pos++, token = SyntaxKind.AtToken;
                     case CharacterCodes.backslash:
                         let cookedChar = peekUnicodeEscape();
                         if (cookedChar >= 0 && isIdentifierStart(cookedChar)) {
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 63db8e6be0a81..e5697f9f37239 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -67,6 +67,7 @@ module ts {
         BarBarToken,
         QuestionToken,
         ColonToken,
+        AtToken,
         // Assignments
         EqualsToken,
         PlusEqualsToken,
@@ -154,6 +155,7 @@ module ts {
         // Signature elements
         TypeParameter,
         Parameter,
+        Decorator,
         // TypeMember
         PropertySignature,
         PropertyDeclaration,
@@ -244,6 +246,7 @@ module ts {
         ExportDeclaration,
         NamedExports,
         ExportSpecifier,
+        MissingDeclaration,
 
         // Module references
         ExternalModuleReference,
@@ -328,22 +331,25 @@ module ts {
         // If this node was parsed in the parameters of a generator.
         GeneratorParameter = 1 << 3,
 
+        // If this node was parsed as part of a decorator
+        Decorator = 1 << 4,
+
         // If the parser encountered an error when parsing the code that created this node.  Note
         // the parser only sets this directly on the node it creates right after encountering the
         // error.
-        ThisNodeHasError = 1 << 4,
+        ThisNodeHasError = 1 << 5,
 
         // Context flags set directly by the parser.
-        ParserGeneratedFlags = StrictMode | DisallowIn | Yield | GeneratorParameter | ThisNodeHasError,
+        ParserGeneratedFlags = StrictMode | DisallowIn | Yield | GeneratorParameter | Decorator | ThisNodeHasError,
 
         // Context flags computed by aggregating child flags upwards.
 
         // Used during incremental parsing to determine if this node or any of its children had an
         // error.  Computed only once and then cached.
-        ThisNodeOrAnySubNodesHasError = 1 << 5,
+        ThisNodeOrAnySubNodesHasError = 1 << 6,
 
         // Used to know if we've computed data from children and cached it in this node.
-        HasAggregatedChildData = 1 << 6
+        HasAggregatedChildData = 1 << 7
     }
 
     export const enum RelationComparisonResult {
@@ -358,13 +364,14 @@ module ts {
         // Specific context the parser was in when this node was created.  Normally undefined.
         // Only set when the parser was in some interesting context (like async/yield).
         parserContextFlags?: ParserContextFlags;
-        modifiers?: ModifiersArray;   // Array of modifiers
-        id?: number;                  // Unique id (used to look up NodeLinks)
-        parent?: Node;                // Parent node (initialized by binding)
-        symbol?: Symbol;              // Symbol declared by node (initialized by binding)
-        locals?: SymbolTable;         // Locals associated with node (initialized by binding)
-        nextContainer?: Node;         // Next container in declaration order (initialized by binding)
-        localSymbol?: Symbol;         // Local symbol declared by node (initialized by binding only for exported nodes)
+        decorators?: NodeArray<Decorator>;  // Array of decorators (in document order)
+        modifiers?: ModifiersArray;         // Array of modifiers
+        id?: number;                        // Unique id (used to look up NodeLinks)
+        parent?: Node;                      // Parent node (initialized by binding)
+        symbol?: Symbol;                    // Symbol declared by node (initialized by binding)
+        locals?: SymbolTable;               // Locals associated with node (initialized by binding)
+        nextContainer?: Node;               // Next container in declaration order (initialized by binding)
+        localSymbol?: Symbol;               // Local symbol declared by node (initialized by binding only for exported nodes)
     }
 
     export interface NodeArray<T> extends Array<T>, TextRange {
@@ -398,6 +405,10 @@ module ts {
         expression: Expression;
     }
 
+    export interface Decorator extends Node {
+        expression: LeftHandSideExpression;
+    }
+
     export interface TypeParameterDeclaration extends Declaration {
         name: Identifier;
         constraint?: TypeNode;
@@ -1093,6 +1104,9 @@ module ts {
         getSignaturesOfType(type: Type, kind: SignatureKind): Signature[];
         getIndexTypeOfType(type: Type, kind: IndexKind): Type;
         getReturnTypeOfSignature(signature: Signature): Type;
+
+        // If 'predicate' is supplied, then only the first symbol in scope matching the predicate 
+        // will be returned.  Otherwise, all symbols in scope will be returned.
         getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[];
         getSymbolAtLocation(node: Node): Symbol;
         getShorthandAssignmentValueSymbol(location: Node): Symbol;
@@ -1204,8 +1218,8 @@ module ts {
     }
 
     export interface EmitResolver {
-        getGeneratedNameForNode(node: Node): string;
-        getExpressionNameSubstitution(node: Identifier): string;
+        hasGlobalName(name: string): boolean;
+        getExpressionNameSubstitution(node: Identifier, getGeneratedNameForNode: (node: Node) => string): string;
         isValueAliasDeclaration(node: Node): boolean;
         isReferencedAliasDeclaration(node: Node, checkChildren?: boolean): boolean;
         isTopLevelValueImportEqualsWithEntityName(node: ImportEqualsDeclaration): boolean;
@@ -1220,7 +1234,7 @@ module ts {
         isEntityNameVisible(entityName: EntityName, enclosingDeclaration: Node): SymbolVisibilityResult;
         // Returns the constant value this property access resolves to, or 'undefined' for a non-constant
         getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;
-        isUnknownIdentifier(location: Node, name: string): boolean;
+        resolvesToSomeValue(location: Node, name: string): boolean;
         getBlockScopedVariableId(node: Identifier): number;
     }
 
@@ -1335,17 +1349,18 @@ module ts {
     }
 
     export const enum NodeCheckFlags {
-        TypeChecked         = 0x00000001,  // Node has been type checked
-        LexicalThis         = 0x00000002,  // Lexical 'this' reference
-        CaptureThis         = 0x00000004,  // Lexical 'this' used in body
-        EmitExtends         = 0x00000008,  // Emit __extends
-        SuperInstance       = 0x00000010,  // Instance 'super' reference
-        SuperStatic         = 0x00000020,  // Static 'super' reference
-        ContextChecked      = 0x00000040,  // Contextual types have been assigned
+        TypeChecked                 = 0x00000001,  // Node has been type checked
+        LexicalThis                 = 0x00000002,  // Lexical 'this' reference
+        CaptureThis                 = 0x00000004,  // Lexical 'this' used in body
+        EmitExtends                 = 0x00000008,  // Emit __extends
+        SuperInstance               = 0x00000010,  // Instance 'super' reference
+        SuperStatic                 = 0x00000020,  // Static 'super' reference
+        ContextChecked              = 0x00000040,  // Contextual types have been assigned
 
         // Values for enum members have been computed, and any errors have been reported for them.
-        EnumValuesComputed  = 0x00000080,
-        BlockScopedBindingInLoop = 0x00000100,
+        EnumValuesComputed          = 0x00000080,
+        BlockScopedBindingInLoop    = 0x00000100,
+        EmitDecorate                = 0x00000200,  // Emit __decorate
     }
 
     export interface NodeLinks {
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 5e72529a48027..9fa0674c25c07 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -1,4 +1,4 @@
-/// <reference path="types.ts" />
+/// <reference path="binder.ts" />
 
 module ts {
     export interface ReferencePathMatchResult {
@@ -575,6 +575,83 @@ module ts {
         return (<CallExpression>node).expression;
     }
 
+    export function nodeCanBeDecorated(node: Node): boolean {
+        switch (node.kind) {
+            case SyntaxKind.ClassDeclaration:
+                // classes are valid targets
+                return true;
+
+            case SyntaxKind.PropertyDeclaration:
+                // property declarations are valid if their parent is a class declaration.
+                return node.parent.kind === SyntaxKind.ClassDeclaration;
+
+            case SyntaxKind.Parameter:
+                // if the parameter's parent has a body and its grandparent is a class declaration, this is a valid target;
+                return (<FunctionLikeDeclaration>node.parent).body && node.parent.parent.kind === SyntaxKind.ClassDeclaration;
+
+            case SyntaxKind.GetAccessor:
+            case SyntaxKind.SetAccessor:
+            case SyntaxKind.MethodDeclaration:
+                // if this method has a body and its parent is a class declaration, this is a valid target.
+                return (<FunctionLikeDeclaration>node).body && node.parent.kind === SyntaxKind.ClassDeclaration;
+        }
+
+        return false;
+    }
+
+    export function nodeIsDecorated(node: Node): boolean {
+        switch (node.kind) {
+            case SyntaxKind.ClassDeclaration:
+                if (node.decorators) {
+                    return true;
+                }
+
+                return false;
+
+            case SyntaxKind.PropertyDeclaration:
+            case SyntaxKind.Parameter:
+                if (node.decorators) {
+                    return true;
+                }
+
+                return false;
+
+            case SyntaxKind.GetAccessor:
+                if ((<FunctionLikeDeclaration>node).body && node.decorators) {
+                    return true;
+                }
+
+                return false;
+
+            case SyntaxKind.MethodDeclaration:
+            case SyntaxKind.SetAccessor:
+                if ((<FunctionLikeDeclaration>node).body && node.decorators) {
+                    return true;
+                }
+
+                return false;
+        }
+
+        return false;
+    }
+    
+    export function childIsDecorated(node: Node): boolean {
+        switch (node.kind) {
+            case SyntaxKind.ClassDeclaration:
+                return forEach((<ClassDeclaration>node).members, nodeOrChildIsDecorated);
+
+            case SyntaxKind.MethodDeclaration:
+            case SyntaxKind.SetAccessor:
+                return forEach((<FunctionLikeDeclaration>node).parameters, nodeIsDecorated);
+        }
+
+        return false;
+    }
+
+    export function nodeOrChildIsDecorated(node: Node): boolean {
+        return nodeIsDecorated(node) || childIsDecorated(node);
+    }
+
     export function isExpression(node: Node): boolean {
         switch (node.kind) {
             case SyntaxKind.ThisKeyword:
@@ -814,6 +891,20 @@ module ts {
         }
     }
 
+    export function isClassElement(n: Node): boolean {
+        switch (n.kind) {
+            case SyntaxKind.Constructor:
+            case SyntaxKind.PropertyDeclaration:
+            case SyntaxKind.MethodDeclaration:
+            case SyntaxKind.GetAccessor:
+            case SyntaxKind.SetAccessor:
+            case SyntaxKind.IndexSignature:
+                return true;
+            default:
+                return false;
+        }
+    }
+
     // True if the given identifier, string literal, or number literal is the name of a declaration node
     export function isDeclarationName(name: Node): boolean {
         if (name.kind !== SyntaxKind.Identifier && name.kind !== SyntaxKind.StringLiteral && name.kind !== SyntaxKind.NumericLiteral) {
@@ -1229,28 +1320,6 @@ module ts {
         return node;
     }
 
-    export function generateUniqueName(baseName: string, isExistingName: (name: string) => boolean): string {
-        // First try '_name'
-        if (baseName.charCodeAt(0) !== CharacterCodes._) {
-            baseName = "_" + baseName;
-            if (!isExistingName(baseName)) {
-                return baseName;
-            }
-        }
-        // Find the first unique '_name_n', where n is a positive number
-        if (baseName.charCodeAt(baseName.length - 1) !== CharacterCodes._) {
-            baseName += "_";
-        }
-        let i = 1;
-        while (true) {
-            let name = baseName + i;
-            if (!isExistingName(name)) {
-                return name;
-            }
-            i++;
-        }
-    }
-
     // @internal
     export function createDiagnosticCollection(): DiagnosticCollection {
         let nonFileDiagnostics: Diagnostic[] = [];
@@ -1524,6 +1593,7 @@ module ts {
 
     export function getAllAccessorDeclarations(declarations: NodeArray<Declaration>, accessor: AccessorDeclaration) {
         let firstAccessor: AccessorDeclaration;
+        let secondAccessor: AccessorDeclaration;
         let getAccessor: AccessorDeclaration;
         let setAccessor: AccessorDeclaration;
         if (hasDynamicName(accessor)) {
@@ -1548,6 +1618,9 @@ module ts {
                         if (!firstAccessor) {
                             firstAccessor = <AccessorDeclaration>member;
                         }
+                        else if (!secondAccessor) {
+                            secondAccessor = <AccessorDeclaration>member;
+                        }
 
                         if (member.kind === SyntaxKind.GetAccessor && !getAccessor) {
                             getAccessor = <AccessorDeclaration>member;
@@ -1562,6 +1635,7 @@ module ts {
         }
         return {
             firstAccessor,
+            secondAccessor,
             getAccessor,
             setAccessor
         };
diff --git a/src/lib/core.d.ts b/src/lib/core.d.ts
index 040eb69ae9613..2096fa839dfcc 100644
--- a/src/lib/core.d.ts
+++ b/src/lib/core.d.ts
@@ -1155,3 +1155,17 @@ interface ArrayConstructor {
 }
 
 declare var Array: ArrayConstructor;
+
+interface TypedPropertyDescriptor<T> {
+    enumerable?: boolean;
+    configurable?: boolean;
+    writable?: boolean;
+    value?: T;
+    get?: () => T;
+    set?: (value: T) => void;
+}
+
+declare type ClassDecorator = <TFunction extends Function>(target: TFunction) => TFunction | void;
+declare type PropertyDecorator = (target: Object, propertyKey: string | symbol) => void;
+declare type MethodDecorator = <T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T> | void;
+declare type ParameterDecorator = (target: Function, propertyKey: string | symbol, parameterIndex: number) => void;
diff --git a/src/services/formatting/formatting.ts b/src/services/formatting/formatting.ts
index 23a392d7718c2..6a5ed25459e9d 100644
--- a/src/services/formatting/formatting.ts
+++ b/src/services/formatting/formatting.ts
@@ -419,6 +419,29 @@ module ts.formatting {
             }
         }
 
+        function getFirstNonDecoratorTokenOfNode(node: Node) {
+            if (node.modifiers && node.modifiers.length) {
+                return node.modifiers[0].kind;
+            }
+            switch (node.kind) {
+                case SyntaxKind.ClassDeclaration: return SyntaxKind.ClassKeyword;
+                case SyntaxKind.InterfaceDeclaration: return SyntaxKind.InterfaceKeyword;
+                case SyntaxKind.FunctionDeclaration: return SyntaxKind.FunctionKeyword;
+                case SyntaxKind.EnumDeclaration: return SyntaxKind.EnumDeclaration;
+                case SyntaxKind.GetAccessor: return SyntaxKind.GetKeyword;
+                case SyntaxKind.SetAccessor: return SyntaxKind.SetKeyword;
+                case SyntaxKind.MethodDeclaration:
+                    if ((<MethodDeclaration>node).asteriskToken) {
+                        return SyntaxKind.AsteriskToken;
+                    }
+                    // fall-through
+
+                case SyntaxKind.PropertyDeclaration:
+                case SyntaxKind.Parameter:
+                    return (<Declaration>node).name.kind;
+            }
+        }
+
         function getDynamicIndentation(node: Node, nodeStartLine: number, indentation: number, delta: number): DynamicIndentation {
             return {
                 getIndentationForComment: kind => {
@@ -434,6 +457,12 @@ module ts.formatting {
                     return indentation;
                 },
                 getIndentationForToken: (line, kind) => {
+                    if (nodeStartLine !== line && node.decorators) {
+                        if (kind === getFirstNonDecoratorTokenOfNode(node)) {
+                            // if this token is the first token following the list of decorators, we do not need to indent
+                            return indentation;
+                        }
+                    }
                     switch (kind) {
                         // open and close brace, 'else' and 'while' (in do statement) tokens has indentation of the parent
                         case SyntaxKind.OpenBraceToken:
@@ -442,6 +471,7 @@ module ts.formatting {
                         case SyntaxKind.CloseBracketToken:
                         case SyntaxKind.ElseKeyword:
                         case SyntaxKind.WhileKeyword:
+                        case SyntaxKind.AtToken:
                             return indentation;
                         default:
                             // if token line equals to the line of containing node (this is a first token in the node) - use node indentation
diff --git a/src/services/services.ts b/src/services/services.ts
index 658f29f5ae78a..58fba22a71f07 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -418,7 +418,10 @@ module ts {
 
             function pushDocCommentLineText(docComments: SymbolDisplayPart[], text: string, blankLineCount: number) {
                 // Add the empty lines in between texts
-                while (blankLineCount--) docComments.push(textPart(""));
+                while (blankLineCount--) {
+                    docComments.push(textPart(""));
+                }
+
                 docComments.push(textPart(text));
             }
 
@@ -1415,14 +1418,6 @@ module ts {
 
     /// Language Service
 
-    interface CompletionSession {
-        fileName: string;           // the file where the completion was requested
-        position: number;           // position in the file where the completion was requested
-        entries: CompletionEntry[]; // entries for this completion
-        symbols: Map<Symbol>;       // symbols by entry name map
-        typeChecker: TypeChecker;   // the typeChecker used to generate this completion
-    }
-
     interface FormattingOptions {
         useTabs: boolean;
         spacesPerTab: number;
@@ -2186,7 +2181,6 @@ module ts {
         let typeInfoResolver: TypeChecker;
         let useCaseSensitivefileNames = false;
         let cancellationToken = new CancellationTokenObject(host.getCancellationToken && host.getCancellationToken());
-        let activeCompletionSession: CompletionSession;         // The current active completion session, used to get the completion entry details
 
         // Check if the localized messages json is set, otherwise query the host for it
         if (!localizedDiagnosticMessages && host.getLocalizedDiagnosticMessages) {
@@ -2404,43 +2398,51 @@ module ts {
         }
 
         /// Completion
-        function getValidCompletionEntryDisplayName(symbol: Symbol, target: ScriptTarget): string {
+        function getCompletionEntryDisplayName(symbol: Symbol, target: ScriptTarget, performCharacterChecks: boolean): string {
             let displayName = symbol.getName();
-            if (displayName && displayName.length > 0) {
-                let firstCharCode = displayName.charCodeAt(0);
-                // First check of the displayName is not external module; if it is an external module, it is not valid entry
-                if ((symbol.flags & SymbolFlags.Namespace) && (firstCharCode === CharacterCodes.singleQuote || firstCharCode === CharacterCodes.doubleQuote)) {
-                    // If the symbol is external module, don't show it in the completion list
-                    // (i.e declare module "http" { let x; } | // <= request completion here, "http" should not be there)
-                    return undefined;
-                }
+            if (!displayName) {
+                return undefined;
+            }
 
-                if (displayName && displayName.length >= 2 && firstCharCode === displayName.charCodeAt(displayName.length - 1) &&
-                    (firstCharCode === CharacterCodes.singleQuote || firstCharCode === CharacterCodes.doubleQuote)) {
-                    // If the user entered name for the symbol was quoted, removing the quotes is not enough, as the name could be an
-                    // invalid identifier name. We need to check if whatever was inside the quotes is actually a valid identifier name.
-                    displayName = displayName.substring(1, displayName.length - 1);
-                }
+            let firstCharCode = displayName.charCodeAt(0);
+            // First check of the displayName is not external module; if it is an external module, it is not valid entry
+            if ((symbol.flags & SymbolFlags.Namespace) && (firstCharCode === CharacterCodes.singleQuote || firstCharCode === CharacterCodes.doubleQuote)) {
+                // If the symbol is external module, don't show it in the completion list
+                // (i.e declare module "http" { let x; } | // <= request completion here, "http" should not be there)
+                return undefined;
+            }
 
-                let isValid = isIdentifierStart(displayName.charCodeAt(0), target);
-                for (let i = 1, n = displayName.length; isValid && i < n; i++) {
-                    isValid = isIdentifierPart(displayName.charCodeAt(i), target);
-                }
+            if (displayName && displayName.length >= 2 && firstCharCode === displayName.charCodeAt(displayName.length - 1) &&
+                (firstCharCode === CharacterCodes.singleQuote || firstCharCode === CharacterCodes.doubleQuote)) {
+                // If the user entered name for the symbol was quoted, removing the quotes is not enough, as the name could be an
+                // invalid identifier name. We need to check if whatever was inside the quotes is actually a valid identifier name.
+                displayName = displayName.substring(1, displayName.length - 1);
+            }
 
+            if (!displayName) {
+                return undefined;
+            }
 
-                if (isValid) {
-                    return unescapeIdentifier(displayName);
+            if (performCharacterChecks) {
+                if (!isIdentifierStart(displayName.charCodeAt(0), target)) {
+                    return undefined;
+                }
+
+                for (let i = 1, n = displayName.length; i < n; i++) {
+                    if (!isIdentifierPart(displayName.charCodeAt(i), target)) {
+                        return undefined;
+                    }
                 }
             }
 
-            return undefined;
+            return unescapeIdentifier(displayName);
         }
 
         function createCompletionEntry(symbol: Symbol, typeChecker: TypeChecker, location: Node): CompletionEntry {
             // Try to get a valid display name for this symbol, if we could not find one, then ignore it. 
             // We would like to only show things that can be added after a dot, so for instance numeric properties can
             // not be accessed with a dot (a.1 <- invalid)
-            let displayName = getValidCompletionEntryDisplayName(symbol, program.getCompilerOptions().target);
+            let displayName = getCompletionEntryDisplayName(symbol, program.getCompilerOptions().target, /*performCharacterChecks:*/ true);
             if (!displayName) {
                 return undefined;
             }
@@ -2456,20 +2458,18 @@ module ts {
             };
         }
 
-        function getCompletionsAtPosition(fileName: string, position: number) {
-            synchronizeHostData();
-
+        function getCompletionData(fileName: string, position: number) {
             let syntacticStart = new Date().getTime();
             let sourceFile = getValidSourceFile(fileName);
 
             let start = new Date().getTime();
             let currentToken = getTokenAtPosition(sourceFile, position);
-            log("getCompletionsAtPosition: Get current token: " + (new Date().getTime() - start));
+            log("getCompletionData: Get current token: " + (new Date().getTime() - start));
 
             start = new Date().getTime();
             // Completion not allowed inside comments, bail out if this is the case
             let insideComment = isInsideComment(sourceFile, currentToken, position);
-            log("getCompletionsAtPosition: Is inside comment: " + (new Date().getTime() - start));
+            log("getCompletionData: Is inside comment: " + (new Date().getTime() - start));
 
             if (insideComment) {
                 log("Returning an empty list because completion was inside a comment.");
@@ -2480,14 +2480,14 @@ module ts {
             // Note: previousToken can be undefined if we are the beginning of the file
             start = new Date().getTime();
             let previousToken = findPrecedingToken(position, sourceFile);
-            log("getCompletionsAtPosition: Get previous token 1: " + (new Date().getTime() - start));
+            log("getCompletionData: Get previous token 1: " + (new Date().getTime() - start));
 
             // The caret is at the end of an identifier; this is a partial identifier that we want to complete: e.g. a.toS|
             // Skip this partial identifier to the previous token
             if (previousToken && position <= previousToken.end && previousToken.kind === SyntaxKind.Identifier) {
                 let start = new Date().getTime();
                 previousToken = findPrecedingToken(previousToken.pos, sourceFile);
-                log("getCompletionsAtPosition: Get previous token 2: " + (new Date().getTime() - start));
+                log("getCompletionData: Get previous token 2: " + (new Date().getTime() - start));
             }
 
             // Check if this is a valid completion location
@@ -2498,8 +2498,8 @@ module ts {
 
             // Find the node where completion is requested on, in the case of a completion after a dot, it is the member access expression
             // other wise, it is a request for all visible symbols in the scope, and the node is the current location
-            let node: Node;
-            let isRightOfDot: boolean;
+            let node = currentToken;
+            let isRightOfDot = false;
             if (previousToken && previousToken.kind === SyntaxKind.DotToken && previousToken.parent.kind === SyntaxKind.PropertyAccessExpression) {
                 node = (<PropertyAccessExpression>previousToken.parent).expression;
                 isRightOfDot = true;
@@ -2508,30 +2508,18 @@ module ts {
                 node = (<QualifiedName>previousToken.parent).left;
                 isRightOfDot = true;
             }
-            else {
-                node = currentToken;
-                isRightOfDot = false;
-            }
-
-            // Clear the current activeCompletionSession for this session
-            activeCompletionSession = {
-                fileName: fileName,
-                position: position,
-                entries: [],
-                symbols: {},
-                typeChecker: typeInfoResolver
-            };
-            log("getCompletionsAtPosition: Syntactic work: " + (new Date().getTime() - syntacticStart));
 
             let location = getTouchingPropertyName(sourceFile, position);
-            // Populate the completion list
+            var target = program.getCompilerOptions().target;
+
             let semanticStart = new Date().getTime();
             let isMemberCompletion: boolean;
             let isNewIdentifierLocation: boolean;
+            let symbols: Symbol[];
 
             if (isRightOfDot) {
                 // Right of dot member completion list
-                let symbols: Symbol[] = [];
+                symbols = [];
                 isMemberCompletion = true;
                 isNewIdentifierLocation = false;
 
@@ -2562,8 +2550,6 @@ module ts {
                         }
                     });
                 }
-
-                getCompletionEntriesFromSymbols(symbols, activeCompletionSession);
             }
             else {
                 let containingObjectLiteral = getContainingObjectLiteralApplicableForCompletion(previousToken);
@@ -2580,8 +2566,7 @@ module ts {
                     let contextualTypeMembers = typeInfoResolver.getPropertiesOfType(contextualType);
                     if (contextualTypeMembers && contextualTypeMembers.length > 0) {
                         // Add filtered items to the completion list
-                        let filteredMembers = filterContextualMembersList(contextualTypeMembers, containingObjectLiteral.properties);
-                        getCompletionEntriesFromSymbols(filteredMembers, activeCompletionSession);
+                        symbols = filterContextualMembersList(contextualTypeMembers, containingObjectLiteral.properties);
                     }
                 }
                 else if (getAncestor(previousToken, SyntaxKind.ImportClause)) {
@@ -2593,8 +2578,7 @@ module ts {
                         let importDeclaration = <ImportDeclaration>getAncestor(previousToken, SyntaxKind.ImportDeclaration);
                         Debug.assert(importDeclaration !== undefined);
                         let exports = typeInfoResolver.getExportsOfExternalModule(importDeclaration);
-                        let filteredExports = filterModuleExports(exports, importDeclaration);
-                        getCompletionEntriesFromSymbols(filteredExports, activeCompletionSession);
+                        symbols = filterModuleExports(exports, importDeclaration);
                     }
                 }
                 else {
@@ -2605,24 +2589,14 @@ module ts {
                     /// TODO filter meaning based on the current context
                     let scopeNode = getScopeNode(previousToken, position, sourceFile);
                     let symbolMeanings = SymbolFlags.Type | SymbolFlags.Value | SymbolFlags.Namespace | SymbolFlags.Alias;
-                    let symbols = typeInfoResolver.getSymbolsInScope(scopeNode, symbolMeanings);
-
-                    getCompletionEntriesFromSymbols(symbols, activeCompletionSession);
+                    
+                    symbols = typeInfoResolver.getSymbolsInScope(scopeNode, symbolMeanings);
                 }
             }
 
-            // Add keywords if this is not a member completion list
-            if (!isMemberCompletion) {
-                Array.prototype.push.apply(activeCompletionSession.entries, keywordCompletions);
-            }
-            log("getCompletionsAtPosition: Semantic work: " + (new Date().getTime() - semanticStart));
+            log("getCompletionData: Semantic work: " + (new Date().getTime() - semanticStart));
 
-            return {
-                isMemberCompletion,
-                isNewIdentifierLocation,
-                isBuilder: isNewIdentifierDefinitionLocation,  // temporary property used to match VS implementation
-                entries: activeCompletionSession.entries
-            };
+            return { symbols, isMemberCompletion, isNewIdentifierLocation, location };
 
             /**
              * Finds the first node that "embraces" the position, so that one may
@@ -2636,21 +2610,6 @@ module ts {
                 return scope;
             }
 
-            function getCompletionEntriesFromSymbols(symbols: Symbol[], session: CompletionSession): void {
-                let start = new Date().getTime();
-                forEach(symbols, symbol => {
-                    let entry = createCompletionEntry(symbol, session.typeChecker, location);
-                    if (entry) {
-                        let id = escapeIdentifier(entry.name);
-                        if (!lookUp(session.symbols, id)) {
-                            session.entries.push(entry);
-                            session.symbols[id] = symbol;
-                        }
-                    }
-                });
-                log("getCompletionsAtPosition: getCompletionEntriesFromSymbols: " + (new Date().getTime() - start));
-            }
-
             function isCompletionListBlocker(previousToken: Node): boolean {
                 let start = new Date().getTime();
                 let result = isInStringOrRegularExpressionOrTemplateLiteral(previousToken) ||
@@ -2704,7 +2663,7 @@ module ts {
 
                         case SyntaxKind.EqualsToken:
                             return containingNodeKind === SyntaxKind.VariableDeclaration // let x = a|
-                            || containingNodeKind === SyntaxKind.BinaryExpression;       // x = a|
+                                || containingNodeKind === SyntaxKind.BinaryExpression;   // x = a|
 
                         case SyntaxKind.TemplateHead:
                             return containingNodeKind === SyntaxKind.TemplateExpression; // `aa ${|
@@ -2821,7 +2780,7 @@ module ts {
                         case SyntaxKind.SemicolonToken:
                             return containingNodeKind === SyntaxKind.PropertySignature &&
                                 (previousToken.parent.parent.kind === SyntaxKind.InterfaceDeclaration ||    // interface a { f; |
-                                 previousToken.parent.parent.kind === SyntaxKind.TypeLiteral);           //  let x : { a; |
+                                    previousToken.parent.parent.kind === SyntaxKind.TypeLiteral);           //  let x : { a; |
 
                         case SyntaxKind.LessThanToken:
                             return containingNodeKind === SyntaxKind.ClassDeclaration ||        // class A< |
@@ -2937,38 +2896,78 @@ module ts {
             }
         }
 
-        function getCompletionEntryDetails(fileName: string, position: number, entryName: string): CompletionEntryDetails {
-            // Note: No need to call synchronizeHostData, as we have captured all the data we need
-            //       in the getCompletionsAtPosition earlier
-            let sourceFile = getValidSourceFile(fileName);
-
-            let session = activeCompletionSession;
+        function getCompletionsAtPosition(fileName: string, position: number): CompletionInfo {
+            synchronizeHostData();
+            
+            let completionData = getCompletionData(fileName, position);
+            if (!completionData) {
+                return undefined;
+            }
 
-            // Ensure that the current active completion session is still valid for this request
-            if (!session || session.fileName !== fileName || session.position !== position) {
+            let { symbols, isMemberCompletion, isNewIdentifierLocation, location } = completionData;
+            if (!symbols || symbols.length === 0) {
                 return undefined;
             }
 
-            let symbol = lookUp(activeCompletionSession.symbols, escapeIdentifier(entryName));
-            if (symbol) {
-                let location = getTouchingPropertyName(sourceFile, position);
-                let completionEntry = createCompletionEntry(symbol, session.typeChecker, location);
-                // TODO(drosen): Right now we just permit *all* semantic meanings when calling 'getSymbolKind'
-                //               which is permissible given that it is backwards compatible; but really we should consider
-                //               passing the meaning for the node so that we don't report that a suggestion for a value is an interface.
-                //               We COULD also just do what 'getSymbolModifiers' does, which is to use the first declaration.
-                Debug.assert(session.typeChecker.getTypeOfSymbolAtLocation(symbol, location) !== undefined, "Could not find type for symbol");
-                let displayPartsDocumentationsAndSymbolKind = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, getValidSourceFile(fileName), location, session.typeChecker, location, SemanticMeaning.All);
-                return {
-                    name: entryName,
-                    kind: displayPartsDocumentationsAndSymbolKind.symbolKind,
-                    kindModifiers: completionEntry.kindModifiers,
-                    displayParts: displayPartsDocumentationsAndSymbolKind.displayParts,
-                    documentation: displayPartsDocumentationsAndSymbolKind.documentation
-                };
+            var entries = getCompletionEntriesFromSymbols(symbols);
+
+            // Add keywords if this is not a member completion list
+            if (!isMemberCompletion) {
+                addRange(entries, keywordCompletions);
             }
-            else {
-                // No symbol, it is a keyword
+
+            return { isMemberCompletion, isNewIdentifierLocation, entries };
+
+            function getCompletionEntriesFromSymbols(symbols: Symbol[]): CompletionEntry[] {
+                let start = new Date().getTime();
+                var entries: CompletionEntry[] = [];
+                var nameToSymbol: Map<Symbol> = {};
+
+                for (let symbol of symbols) {
+                    let entry = createCompletionEntry(symbol, typeInfoResolver, location);
+                    if (entry) {
+                        let id = escapeIdentifier(entry.name);
+                        if (!lookUp(nameToSymbol, id)) {
+                            entries.push(entry);
+                            nameToSymbol[id] = symbol;
+                        }
+                    }
+                }
+                log("getCompletionsAtPosition: getCompletionEntriesFromSymbols: " + (new Date().getTime() - start));
+                return entries;
+            }
+        }
+
+        function getCompletionEntryDetails(fileName: string, position: number, entryName: string): CompletionEntryDetails {
+            synchronizeHostData();
+
+            // Compute all the completion symbols again.
+            let completionData = getCompletionData(fileName, position);
+            if (completionData) {
+                let { symbols, location } = completionData;
+
+                // Find the symbol with the matching entry name.
+                let target = program.getCompilerOptions().target;
+                // We don't need to perform character checks here because we're only comparing the 
+                // name against 'entryName' (which is known to be good), not building a new 
+                // completion entry.
+                let symbol = forEach(symbols, s => getCompletionEntryDisplayName(s, target, /*performCharacterChecks:*/ false) === entryName ? s : undefined);
+
+                if (symbol) {
+                    let displayPartsDocumentationsAndSymbolKind = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, getValidSourceFile(fileName), location, typeInfoResolver, location, SemanticMeaning.All);
+                    return {
+                        name: entryName,
+                        kind: displayPartsDocumentationsAndSymbolKind.symbolKind,
+                        kindModifiers: getSymbolModifiers(symbol),
+                        displayParts: displayPartsDocumentationsAndSymbolKind.displayParts,
+                        documentation: displayPartsDocumentationsAndSymbolKind.documentation
+                    };
+                }
+            }
+            
+            // Didn't find a symbol with this name.  See if we can find a keyword instead.
+            let keywordCompletion = forEach(keywordCompletions, c => c.name === entryName);
+            if (keywordCompletion) {
                 return {
                     name: entryName,
                     kind: ScriptElementKind.keyword,
@@ -2977,6 +2976,8 @@ module ts {
                     documentation: undefined
                 };
             }
+
+            return undefined;
         }
 
         // TODO(drosen): use contextual SemanticMeaning.
@@ -3075,12 +3076,14 @@ module ts {
             typeResolver: TypeChecker, location: Node,
             // TODO(drosen): Currently completion entry details passes the SemanticMeaning.All instead of using semanticMeaning of location
             semanticMeaning = getMeaningFromLocation(location)) {
+
             let displayParts: SymbolDisplayPart[] = [];
             let documentation: SymbolDisplayPart[];
             let symbolFlags = symbol.flags;
             let symbolKind = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(symbol, symbolFlags, typeResolver, location);
             let hasAddedSymbolInfo: boolean;
             let type: Type;
+
             // Class at constructor site need to be shown as constructor apart from property,method, vars
             if (symbolKind !== ScriptElementKind.unknown || symbolFlags & SymbolFlags.Class || symbolFlags & SymbolFlags.Alias) {
                 // If it is accessor they are allowed only if location is at name of the accessor
@@ -3132,9 +3135,7 @@ module ts {
                             }
                             else if (symbolFlags & SymbolFlags.Alias) {
                                 symbolKind = ScriptElementKind.alias;
-                                displayParts.push(punctuationPart(SyntaxKind.OpenParenToken));
-                                displayParts.push(textPart(symbolKind));
-                                displayParts.push(punctuationPart(SyntaxKind.CloseParenToken));
+                                pushTypePart(symbolKind);
                                 displayParts.push(spacePart());
                                 if (useConstructSignatures) {
                                     displayParts.push(keywordPart(SyntaxKind.NewKeyword));
@@ -3370,14 +3371,29 @@ module ts {
             function addPrefixForAnyFunctionOrVar(symbol: Symbol, symbolKind: string) {
                 addNewLineIfDisplayPartsExist();
                 if (symbolKind) {
-                    displayParts.push(punctuationPart(SyntaxKind.OpenParenToken));
-                    displayParts.push(textPart(symbolKind));
-                    displayParts.push(punctuationPart(SyntaxKind.CloseParenToken));
+                    pushTypePart(symbolKind);
                     displayParts.push(spacePart());
                     addFullSymbolName(symbol);
                 }
             }
 
+            function pushTypePart(symbolKind: string) {
+                switch (symbolKind) {
+                    case ScriptElementKind.variableElement:
+                    case ScriptElementKind.functionElement:
+                    case ScriptElementKind.letElement:
+                    case ScriptElementKind.constElement:
+                    case ScriptElementKind.constructorImplementationElement:
+                        displayParts.push(textOrKeywordPart(symbolKind));
+                        return;
+                    default:
+                        displayParts.push(punctuationPart(SyntaxKind.OpenParenToken));
+                        displayParts.push(textOrKeywordPart(symbolKind));
+                        displayParts.push(punctuationPart(SyntaxKind.CloseParenToken));
+                        return;
+                }
+            }
+
             function addSignatureDisplayParts(signature: Signature, allSignatures: Signature[], flags?: TypeFormatFlags) {
                 displayParts.push.apply(displayParts, signatureToDisplayParts(typeResolver, signature, enclosingDeclaration, flags | TypeFormatFlags.WriteTypeArgumentsOfSignature));
                 if (allSignatures.length > 1) {
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
index 2a9af04409e89..756fbb42597f6 100644
--- a/src/services/utilities.ts
+++ b/src/services/utilities.ts
@@ -611,6 +611,13 @@ module ts {
         return displayPart(tokenToString(kind), SymbolDisplayPartKind.operator);
     }
 
+    export function textOrKeywordPart(text: string) {
+        var kind = stringToToken(text);
+        return kind === undefined
+            ? textPart(text)
+            : keywordPart(kind);
+    }
+
     export function textPart(text: string) {
         return displayPart(text, SymbolDisplayPartKind.text);
     }
diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js
index 6508de7a92520..07d5e4337a69e 100644
--- a/tests/baselines/reference/APISample_compile.js
+++ b/tests/baselines/reference/APISample_compile.js
@@ -111,192 +111,195 @@ declare module "typescript" {
         BarBarToken = 49,
         QuestionToken = 50,
         ColonToken = 51,
-        EqualsToken = 52,
-        PlusEqualsToken = 53,
-        MinusEqualsToken = 54,
-        AsteriskEqualsToken = 55,
-        SlashEqualsToken = 56,
-        PercentEqualsToken = 57,
-        LessThanLessThanEqualsToken = 58,
-        GreaterThanGreaterThanEqualsToken = 59,
-        GreaterThanGreaterThanGreaterThanEqualsToken = 60,
-        AmpersandEqualsToken = 61,
-        BarEqualsToken = 62,
-        CaretEqualsToken = 63,
-        Identifier = 64,
-        BreakKeyword = 65,
-        CaseKeyword = 66,
-        CatchKeyword = 67,
-        ClassKeyword = 68,
-        ConstKeyword = 69,
-        ContinueKeyword = 70,
-        DebuggerKeyword = 71,
-        DefaultKeyword = 72,
-        DeleteKeyword = 73,
-        DoKeyword = 74,
-        ElseKeyword = 75,
-        EnumKeyword = 76,
-        ExportKeyword = 77,
-        ExtendsKeyword = 78,
-        FalseKeyword = 79,
-        FinallyKeyword = 80,
-        ForKeyword = 81,
-        FunctionKeyword = 82,
-        IfKeyword = 83,
-        ImportKeyword = 84,
-        InKeyword = 85,
-        InstanceOfKeyword = 86,
-        NewKeyword = 87,
-        NullKeyword = 88,
-        ReturnKeyword = 89,
-        SuperKeyword = 90,
-        SwitchKeyword = 91,
-        ThisKeyword = 92,
-        ThrowKeyword = 93,
-        TrueKeyword = 94,
-        TryKeyword = 95,
-        TypeOfKeyword = 96,
-        VarKeyword = 97,
-        VoidKeyword = 98,
-        WhileKeyword = 99,
-        WithKeyword = 100,
-        AsKeyword = 101,
-        ImplementsKeyword = 102,
-        InterfaceKeyword = 103,
-        LetKeyword = 104,
-        PackageKeyword = 105,
-        PrivateKeyword = 106,
-        ProtectedKeyword = 107,
-        PublicKeyword = 108,
-        StaticKeyword = 109,
-        YieldKeyword = 110,
-        AnyKeyword = 111,
-        BooleanKeyword = 112,
-        ConstructorKeyword = 113,
-        DeclareKeyword = 114,
-        GetKeyword = 115,
-        ModuleKeyword = 116,
-        RequireKeyword = 117,
-        NumberKeyword = 118,
-        SetKeyword = 119,
-        StringKeyword = 120,
-        SymbolKeyword = 121,
-        TypeKeyword = 122,
-        FromKeyword = 123,
-        OfKeyword = 124,
-        QualifiedName = 125,
-        ComputedPropertyName = 126,
-        TypeParameter = 127,
-        Parameter = 128,
-        PropertySignature = 129,
-        PropertyDeclaration = 130,
-        MethodSignature = 131,
-        MethodDeclaration = 132,
-        Constructor = 133,
-        GetAccessor = 134,
-        SetAccessor = 135,
-        CallSignature = 136,
-        ConstructSignature = 137,
-        IndexSignature = 138,
-        TypeReference = 139,
-        FunctionType = 140,
-        ConstructorType = 141,
-        TypeQuery = 142,
-        TypeLiteral = 143,
-        ArrayType = 144,
-        TupleType = 145,
-        UnionType = 146,
-        ParenthesizedType = 147,
-        ObjectBindingPattern = 148,
-        ArrayBindingPattern = 149,
-        BindingElement = 150,
-        ArrayLiteralExpression = 151,
-        ObjectLiteralExpression = 152,
-        PropertyAccessExpression = 153,
-        ElementAccessExpression = 154,
-        CallExpression = 155,
-        NewExpression = 156,
-        TaggedTemplateExpression = 157,
-        TypeAssertionExpression = 158,
-        ParenthesizedExpression = 159,
-        FunctionExpression = 160,
-        ArrowFunction = 161,
-        DeleteExpression = 162,
-        TypeOfExpression = 163,
-        VoidExpression = 164,
-        PrefixUnaryExpression = 165,
-        PostfixUnaryExpression = 166,
-        BinaryExpression = 167,
-        ConditionalExpression = 168,
-        TemplateExpression = 169,
-        YieldExpression = 170,
-        SpreadElementExpression = 171,
-        OmittedExpression = 172,
-        TemplateSpan = 173,
-        Block = 174,
-        VariableStatement = 175,
-        EmptyStatement = 176,
-        ExpressionStatement = 177,
-        IfStatement = 178,
-        DoStatement = 179,
-        WhileStatement = 180,
-        ForStatement = 181,
-        ForInStatement = 182,
-        ForOfStatement = 183,
-        ContinueStatement = 184,
-        BreakStatement = 185,
-        ReturnStatement = 186,
-        WithStatement = 187,
-        SwitchStatement = 188,
-        LabeledStatement = 189,
-        ThrowStatement = 190,
-        TryStatement = 191,
-        DebuggerStatement = 192,
-        VariableDeclaration = 193,
-        VariableDeclarationList = 194,
-        FunctionDeclaration = 195,
-        ClassDeclaration = 196,
-        InterfaceDeclaration = 197,
-        TypeAliasDeclaration = 198,
-        EnumDeclaration = 199,
-        ModuleDeclaration = 200,
-        ModuleBlock = 201,
-        CaseBlock = 202,
-        ImportEqualsDeclaration = 203,
-        ImportDeclaration = 204,
-        ImportClause = 205,
-        NamespaceImport = 206,
-        NamedImports = 207,
-        ImportSpecifier = 208,
-        ExportAssignment = 209,
-        ExportDeclaration = 210,
-        NamedExports = 211,
-        ExportSpecifier = 212,
-        ExternalModuleReference = 213,
-        CaseClause = 214,
-        DefaultClause = 215,
-        HeritageClause = 216,
-        CatchClause = 217,
-        PropertyAssignment = 218,
-        ShorthandPropertyAssignment = 219,
-        EnumMember = 220,
-        SourceFile = 221,
-        SyntaxList = 222,
-        Count = 223,
-        FirstAssignment = 52,
-        LastAssignment = 63,
-        FirstReservedWord = 65,
-        LastReservedWord = 100,
-        FirstKeyword = 65,
-        LastKeyword = 124,
-        FirstFutureReservedWord = 102,
-        LastFutureReservedWord = 110,
-        FirstTypeNode = 139,
-        LastTypeNode = 147,
+        AtToken = 52,
+        EqualsToken = 53,
+        PlusEqualsToken = 54,
+        MinusEqualsToken = 55,
+        AsteriskEqualsToken = 56,
+        SlashEqualsToken = 57,
+        PercentEqualsToken = 58,
+        LessThanLessThanEqualsToken = 59,
+        GreaterThanGreaterThanEqualsToken = 60,
+        GreaterThanGreaterThanGreaterThanEqualsToken = 61,
+        AmpersandEqualsToken = 62,
+        BarEqualsToken = 63,
+        CaretEqualsToken = 64,
+        Identifier = 65,
+        BreakKeyword = 66,
+        CaseKeyword = 67,
+        CatchKeyword = 68,
+        ClassKeyword = 69,
+        ConstKeyword = 70,
+        ContinueKeyword = 71,
+        DebuggerKeyword = 72,
+        DefaultKeyword = 73,
+        DeleteKeyword = 74,
+        DoKeyword = 75,
+        ElseKeyword = 76,
+        EnumKeyword = 77,
+        ExportKeyword = 78,
+        ExtendsKeyword = 79,
+        FalseKeyword = 80,
+        FinallyKeyword = 81,
+        ForKeyword = 82,
+        FunctionKeyword = 83,
+        IfKeyword = 84,
+        ImportKeyword = 85,
+        InKeyword = 86,
+        InstanceOfKeyword = 87,
+        NewKeyword = 88,
+        NullKeyword = 89,
+        ReturnKeyword = 90,
+        SuperKeyword = 91,
+        SwitchKeyword = 92,
+        ThisKeyword = 93,
+        ThrowKeyword = 94,
+        TrueKeyword = 95,
+        TryKeyword = 96,
+        TypeOfKeyword = 97,
+        VarKeyword = 98,
+        VoidKeyword = 99,
+        WhileKeyword = 100,
+        WithKeyword = 101,
+        AsKeyword = 102,
+        ImplementsKeyword = 103,
+        InterfaceKeyword = 104,
+        LetKeyword = 105,
+        PackageKeyword = 106,
+        PrivateKeyword = 107,
+        ProtectedKeyword = 108,
+        PublicKeyword = 109,
+        StaticKeyword = 110,
+        YieldKeyword = 111,
+        AnyKeyword = 112,
+        BooleanKeyword = 113,
+        ConstructorKeyword = 114,
+        DeclareKeyword = 115,
+        GetKeyword = 116,
+        ModuleKeyword = 117,
+        RequireKeyword = 118,
+        NumberKeyword = 119,
+        SetKeyword = 120,
+        StringKeyword = 121,
+        SymbolKeyword = 122,
+        TypeKeyword = 123,
+        FromKeyword = 124,
+        OfKeyword = 125,
+        QualifiedName = 126,
+        ComputedPropertyName = 127,
+        TypeParameter = 128,
+        Parameter = 129,
+        Decorator = 130,
+        PropertySignature = 131,
+        PropertyDeclaration = 132,
+        MethodSignature = 133,
+        MethodDeclaration = 134,
+        Constructor = 135,
+        GetAccessor = 136,
+        SetAccessor = 137,
+        CallSignature = 138,
+        ConstructSignature = 139,
+        IndexSignature = 140,
+        TypeReference = 141,
+        FunctionType = 142,
+        ConstructorType = 143,
+        TypeQuery = 144,
+        TypeLiteral = 145,
+        ArrayType = 146,
+        TupleType = 147,
+        UnionType = 148,
+        ParenthesizedType = 149,
+        ObjectBindingPattern = 150,
+        ArrayBindingPattern = 151,
+        BindingElement = 152,
+        ArrayLiteralExpression = 153,
+        ObjectLiteralExpression = 154,
+        PropertyAccessExpression = 155,
+        ElementAccessExpression = 156,
+        CallExpression = 157,
+        NewExpression = 158,
+        TaggedTemplateExpression = 159,
+        TypeAssertionExpression = 160,
+        ParenthesizedExpression = 161,
+        FunctionExpression = 162,
+        ArrowFunction = 163,
+        DeleteExpression = 164,
+        TypeOfExpression = 165,
+        VoidExpression = 166,
+        PrefixUnaryExpression = 167,
+        PostfixUnaryExpression = 168,
+        BinaryExpression = 169,
+        ConditionalExpression = 170,
+        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,
+        FirstAssignment = 53,
+        LastAssignment = 64,
+        FirstReservedWord = 66,
+        LastReservedWord = 101,
+        FirstKeyword = 66,
+        LastKeyword = 125,
+        FirstFutureReservedWord = 103,
+        LastFutureReservedWord = 111,
+        FirstTypeNode = 141,
+        LastTypeNode = 149,
         FirstPunctuation = 14,
-        LastPunctuation = 63,
+        LastPunctuation = 64,
         FirstToken = 0,
-        LastToken = 124,
+        LastToken = 125,
         FirstTriviaToken = 2,
         LastTriviaToken = 6,
         FirstLiteralToken = 7,
@@ -304,8 +307,8 @@ declare module "typescript" {
         FirstTemplateToken = 10,
         LastTemplateToken = 13,
         FirstBinaryOperator = 24,
-        LastBinaryOperator = 63,
-        FirstNode = 125,
+        LastBinaryOperator = 64,
+        FirstNode = 126,
     }
     const enum NodeFlags {
         Export = 1,
@@ -331,10 +334,11 @@ declare module "typescript" {
         DisallowIn = 2,
         Yield = 4,
         GeneratorParameter = 8,
-        ThisNodeHasError = 16,
-        ParserGeneratedFlags = 31,
-        ThisNodeOrAnySubNodesHasError = 32,
-        HasAggregatedChildData = 64,
+        Decorator = 16,
+        ThisNodeHasError = 32,
+        ParserGeneratedFlags = 63,
+        ThisNodeOrAnySubNodesHasError = 64,
+        HasAggregatedChildData = 128,
     }
     const enum RelationComparisonResult {
         Succeeded = 1,
@@ -345,6 +349,7 @@ declare module "typescript" {
         kind: SyntaxKind;
         flags: NodeFlags;
         parserContextFlags?: ParserContextFlags;
+        decorators?: NodeArray<Decorator>;
         modifiers?: ModifiersArray;
         id?: number;
         parent?: Node;
@@ -375,6 +380,9 @@ declare module "typescript" {
     interface ComputedPropertyName extends Node {
         expression: Expression;
     }
+    interface Decorator extends Node {
+        expression: LeftHandSideExpression;
+    }
     interface TypeParameterDeclaration extends Declaration {
         name: Identifier;
         constraint?: TypeNode;
@@ -939,8 +947,8 @@ declare module "typescript" {
         errorModuleName?: string;
     }
     interface EmitResolver {
-        getGeneratedNameForNode(node: Node): string;
-        getExpressionNameSubstitution(node: Identifier): string;
+        hasGlobalName(name: string): boolean;
+        getExpressionNameSubstitution(node: Identifier, getGeneratedNameForNode: (node: Node) => string): string;
         isValueAliasDeclaration(node: Node): boolean;
         isReferencedAliasDeclaration(node: Node, checkChildren?: boolean): boolean;
         isTopLevelValueImportEqualsWithEntityName(node: ImportEqualsDeclaration): boolean;
@@ -954,7 +962,7 @@ declare module "typescript" {
         isSymbolAccessible(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags): SymbolAccessiblityResult;
         isEntityNameVisible(entityName: EntityName, enclosingDeclaration: Node): SymbolVisibilityResult;
         getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;
-        isUnknownIdentifier(location: Node, name: string): boolean;
+        resolvesToSomeValue(location: Node, name: string): boolean;
         getBlockScopedVariableId(node: Identifier): number;
     }
     const enum SymbolFlags {
@@ -1061,6 +1069,7 @@ declare module "typescript" {
         ContextChecked = 64,
         EnumValuesComputed = 128,
         BlockScopedBindingInLoop = 256,
+        EmitDecorate = 512,
     }
     interface NodeLinks {
         resolvedType?: Type;
diff --git a/tests/baselines/reference/APISample_compile.types b/tests/baselines/reference/APISample_compile.types
index 28f10e7bf780a..eff47a4cb7bf1 100644
--- a/tests/baselines/reference/APISample_compile.types
+++ b/tests/baselines/reference/APISample_compile.types
@@ -351,562 +351,571 @@ declare module "typescript" {
         ColonToken = 51,

 >ColonToken : SyntaxKind
 
-        EqualsToken = 52,

+        AtToken = 52,

+>AtToken : SyntaxKind
+
+        EqualsToken = 53,

 >EqualsToken : SyntaxKind
 
-        PlusEqualsToken = 53,

+        PlusEqualsToken = 54,

 >PlusEqualsToken : SyntaxKind
 
-        MinusEqualsToken = 54,

+        MinusEqualsToken = 55,

 >MinusEqualsToken : SyntaxKind
 
-        AsteriskEqualsToken = 55,

+        AsteriskEqualsToken = 56,

 >AsteriskEqualsToken : SyntaxKind
 
-        SlashEqualsToken = 56,

+        SlashEqualsToken = 57,

 >SlashEqualsToken : SyntaxKind
 
-        PercentEqualsToken = 57,

+        PercentEqualsToken = 58,

 >PercentEqualsToken : SyntaxKind
 
-        LessThanLessThanEqualsToken = 58,

+        LessThanLessThanEqualsToken = 59,

 >LessThanLessThanEqualsToken : SyntaxKind
 
-        GreaterThanGreaterThanEqualsToken = 59,

+        GreaterThanGreaterThanEqualsToken = 60,

 >GreaterThanGreaterThanEqualsToken : SyntaxKind
 
-        GreaterThanGreaterThanGreaterThanEqualsToken = 60,

+        GreaterThanGreaterThanGreaterThanEqualsToken = 61,

 >GreaterThanGreaterThanGreaterThanEqualsToken : SyntaxKind
 
-        AmpersandEqualsToken = 61,

+        AmpersandEqualsToken = 62,

 >AmpersandEqualsToken : SyntaxKind
 
-        BarEqualsToken = 62,

+        BarEqualsToken = 63,

 >BarEqualsToken : SyntaxKind
 
-        CaretEqualsToken = 63,

+        CaretEqualsToken = 64,

 >CaretEqualsToken : SyntaxKind
 
-        Identifier = 64,

+        Identifier = 65,

 >Identifier : SyntaxKind
 
-        BreakKeyword = 65,

+        BreakKeyword = 66,

 >BreakKeyword : SyntaxKind
 
-        CaseKeyword = 66,

+        CaseKeyword = 67,

 >CaseKeyword : SyntaxKind
 
-        CatchKeyword = 67,

+        CatchKeyword = 68,

 >CatchKeyword : SyntaxKind
 
-        ClassKeyword = 68,

+        ClassKeyword = 69,

 >ClassKeyword : SyntaxKind
 
-        ConstKeyword = 69,

+        ConstKeyword = 70,

 >ConstKeyword : SyntaxKind
 
-        ContinueKeyword = 70,

+        ContinueKeyword = 71,

 >ContinueKeyword : SyntaxKind
 
-        DebuggerKeyword = 71,

+        DebuggerKeyword = 72,

 >DebuggerKeyword : SyntaxKind
 
-        DefaultKeyword = 72,

+        DefaultKeyword = 73,

 >DefaultKeyword : SyntaxKind
 
-        DeleteKeyword = 73,

+        DeleteKeyword = 74,

 >DeleteKeyword : SyntaxKind
 
-        DoKeyword = 74,

+        DoKeyword = 75,

 >DoKeyword : SyntaxKind
 
-        ElseKeyword = 75,

+        ElseKeyword = 76,

 >ElseKeyword : SyntaxKind
 
-        EnumKeyword = 76,

+        EnumKeyword = 77,

 >EnumKeyword : SyntaxKind
 
-        ExportKeyword = 77,

+        ExportKeyword = 78,

 >ExportKeyword : SyntaxKind
 
-        ExtendsKeyword = 78,

+        ExtendsKeyword = 79,

 >ExtendsKeyword : SyntaxKind
 
-        FalseKeyword = 79,

+        FalseKeyword = 80,

 >FalseKeyword : SyntaxKind
 
-        FinallyKeyword = 80,

+        FinallyKeyword = 81,

 >FinallyKeyword : SyntaxKind
 
-        ForKeyword = 81,

+        ForKeyword = 82,

 >ForKeyword : SyntaxKind
 
-        FunctionKeyword = 82,

+        FunctionKeyword = 83,

 >FunctionKeyword : SyntaxKind
 
-        IfKeyword = 83,

+        IfKeyword = 84,

 >IfKeyword : SyntaxKind
 
-        ImportKeyword = 84,

+        ImportKeyword = 85,

 >ImportKeyword : SyntaxKind
 
-        InKeyword = 85,

+        InKeyword = 86,

 >InKeyword : SyntaxKind
 
-        InstanceOfKeyword = 86,

+        InstanceOfKeyword = 87,

 >InstanceOfKeyword : SyntaxKind
 
-        NewKeyword = 87,

+        NewKeyword = 88,

 >NewKeyword : SyntaxKind
 
-        NullKeyword = 88,

+        NullKeyword = 89,

 >NullKeyword : SyntaxKind
 
-        ReturnKeyword = 89,

+        ReturnKeyword = 90,

 >ReturnKeyword : SyntaxKind
 
-        SuperKeyword = 90,

+        SuperKeyword = 91,

 >SuperKeyword : SyntaxKind
 
-        SwitchKeyword = 91,

+        SwitchKeyword = 92,

 >SwitchKeyword : SyntaxKind
 
-        ThisKeyword = 92,

+        ThisKeyword = 93,

 >ThisKeyword : SyntaxKind
 
-        ThrowKeyword = 93,

+        ThrowKeyword = 94,

 >ThrowKeyword : SyntaxKind
 
-        TrueKeyword = 94,

+        TrueKeyword = 95,

 >TrueKeyword : SyntaxKind
 
-        TryKeyword = 95,

+        TryKeyword = 96,

 >TryKeyword : SyntaxKind
 
-        TypeOfKeyword = 96,

+        TypeOfKeyword = 97,

 >TypeOfKeyword : SyntaxKind
 
-        VarKeyword = 97,

+        VarKeyword = 98,

 >VarKeyword : SyntaxKind
 
-        VoidKeyword = 98,

+        VoidKeyword = 99,

 >VoidKeyword : SyntaxKind
 
-        WhileKeyword = 99,

+        WhileKeyword = 100,

 >WhileKeyword : SyntaxKind
 
-        WithKeyword = 100,

+        WithKeyword = 101,

 >WithKeyword : SyntaxKind
 
-        AsKeyword = 101,

+        AsKeyword = 102,

 >AsKeyword : SyntaxKind
 
-        ImplementsKeyword = 102,

+        ImplementsKeyword = 103,

 >ImplementsKeyword : SyntaxKind
 
-        InterfaceKeyword = 103,

+        InterfaceKeyword = 104,

 >InterfaceKeyword : SyntaxKind
 
-        LetKeyword = 104,

+        LetKeyword = 105,

 >LetKeyword : SyntaxKind
 
-        PackageKeyword = 105,

+        PackageKeyword = 106,

 >PackageKeyword : SyntaxKind
 
-        PrivateKeyword = 106,

+        PrivateKeyword = 107,

 >PrivateKeyword : SyntaxKind
 
-        ProtectedKeyword = 107,

+        ProtectedKeyword = 108,

 >ProtectedKeyword : SyntaxKind
 
-        PublicKeyword = 108,

+        PublicKeyword = 109,

 >PublicKeyword : SyntaxKind
 
-        StaticKeyword = 109,

+        StaticKeyword = 110,

 >StaticKeyword : SyntaxKind
 
-        YieldKeyword = 110,

+        YieldKeyword = 111,

 >YieldKeyword : SyntaxKind
 
-        AnyKeyword = 111,

+        AnyKeyword = 112,

 >AnyKeyword : SyntaxKind
 
-        BooleanKeyword = 112,

+        BooleanKeyword = 113,

 >BooleanKeyword : SyntaxKind
 
-        ConstructorKeyword = 113,

+        ConstructorKeyword = 114,

 >ConstructorKeyword : SyntaxKind
 
-        DeclareKeyword = 114,

+        DeclareKeyword = 115,

 >DeclareKeyword : SyntaxKind
 
-        GetKeyword = 115,

+        GetKeyword = 116,

 >GetKeyword : SyntaxKind
 
-        ModuleKeyword = 116,

+        ModuleKeyword = 117,

 >ModuleKeyword : SyntaxKind
 
-        RequireKeyword = 117,

+        RequireKeyword = 118,

 >RequireKeyword : SyntaxKind
 
-        NumberKeyword = 118,

+        NumberKeyword = 119,

 >NumberKeyword : SyntaxKind
 
-        SetKeyword = 119,

+        SetKeyword = 120,

 >SetKeyword : SyntaxKind
 
-        StringKeyword = 120,

+        StringKeyword = 121,

 >StringKeyword : SyntaxKind
 
-        SymbolKeyword = 121,

+        SymbolKeyword = 122,

 >SymbolKeyword : SyntaxKind
 
-        TypeKeyword = 122,

+        TypeKeyword = 123,

 >TypeKeyword : SyntaxKind
 
-        FromKeyword = 123,

+        FromKeyword = 124,

 >FromKeyword : SyntaxKind
 
-        OfKeyword = 124,

+        OfKeyword = 125,

 >OfKeyword : SyntaxKind
 
-        QualifiedName = 125,

+        QualifiedName = 126,

 >QualifiedName : SyntaxKind
 
-        ComputedPropertyName = 126,

+        ComputedPropertyName = 127,

 >ComputedPropertyName : SyntaxKind
 
-        TypeParameter = 127,

+        TypeParameter = 128,

 >TypeParameter : SyntaxKind
 
-        Parameter = 128,

+        Parameter = 129,

 >Parameter : SyntaxKind
 
-        PropertySignature = 129,

+        Decorator = 130,

+>Decorator : SyntaxKind
+
+        PropertySignature = 131,

 >PropertySignature : SyntaxKind
 
-        PropertyDeclaration = 130,

+        PropertyDeclaration = 132,

 >PropertyDeclaration : SyntaxKind
 
-        MethodSignature = 131,

+        MethodSignature = 133,

 >MethodSignature : SyntaxKind
 
-        MethodDeclaration = 132,

+        MethodDeclaration = 134,

 >MethodDeclaration : SyntaxKind
 
-        Constructor = 133,

+        Constructor = 135,

 >Constructor : SyntaxKind
 
-        GetAccessor = 134,

+        GetAccessor = 136,

 >GetAccessor : SyntaxKind
 
-        SetAccessor = 135,

+        SetAccessor = 137,

 >SetAccessor : SyntaxKind
 
-        CallSignature = 136,

+        CallSignature = 138,

 >CallSignature : SyntaxKind
 
-        ConstructSignature = 137,

+        ConstructSignature = 139,

 >ConstructSignature : SyntaxKind
 
-        IndexSignature = 138,

+        IndexSignature = 140,

 >IndexSignature : SyntaxKind
 
-        TypeReference = 139,

+        TypeReference = 141,

 >TypeReference : SyntaxKind
 
-        FunctionType = 140,

+        FunctionType = 142,

 >FunctionType : SyntaxKind
 
-        ConstructorType = 141,

+        ConstructorType = 143,

 >ConstructorType : SyntaxKind
 
-        TypeQuery = 142,

+        TypeQuery = 144,

 >TypeQuery : SyntaxKind
 
-        TypeLiteral = 143,

+        TypeLiteral = 145,

 >TypeLiteral : SyntaxKind
 
-        ArrayType = 144,

+        ArrayType = 146,

 >ArrayType : SyntaxKind
 
-        TupleType = 145,

+        TupleType = 147,

 >TupleType : SyntaxKind
 
-        UnionType = 146,

+        UnionType = 148,

 >UnionType : SyntaxKind
 
-        ParenthesizedType = 147,

+        ParenthesizedType = 149,

 >ParenthesizedType : SyntaxKind
 
-        ObjectBindingPattern = 148,

+        ObjectBindingPattern = 150,

 >ObjectBindingPattern : SyntaxKind
 
-        ArrayBindingPattern = 149,

+        ArrayBindingPattern = 151,

 >ArrayBindingPattern : SyntaxKind
 
-        BindingElement = 150,

+        BindingElement = 152,

 >BindingElement : SyntaxKind
 
-        ArrayLiteralExpression = 151,

+        ArrayLiteralExpression = 153,

 >ArrayLiteralExpression : SyntaxKind
 
-        ObjectLiteralExpression = 152,

+        ObjectLiteralExpression = 154,

 >ObjectLiteralExpression : SyntaxKind
 
-        PropertyAccessExpression = 153,

+        PropertyAccessExpression = 155,

 >PropertyAccessExpression : SyntaxKind
 
-        ElementAccessExpression = 154,

+        ElementAccessExpression = 156,

 >ElementAccessExpression : SyntaxKind
 
-        CallExpression = 155,

+        CallExpression = 157,

 >CallExpression : SyntaxKind
 
-        NewExpression = 156,

+        NewExpression = 158,

 >NewExpression : SyntaxKind
 
-        TaggedTemplateExpression = 157,

+        TaggedTemplateExpression = 159,

 >TaggedTemplateExpression : SyntaxKind
 
-        TypeAssertionExpression = 158,

+        TypeAssertionExpression = 160,

 >TypeAssertionExpression : SyntaxKind
 
-        ParenthesizedExpression = 159,

+        ParenthesizedExpression = 161,

 >ParenthesizedExpression : SyntaxKind
 
-        FunctionExpression = 160,

+        FunctionExpression = 162,

 >FunctionExpression : SyntaxKind
 
-        ArrowFunction = 161,

+        ArrowFunction = 163,

 >ArrowFunction : SyntaxKind
 
-        DeleteExpression = 162,

+        DeleteExpression = 164,

 >DeleteExpression : SyntaxKind
 
-        TypeOfExpression = 163,

+        TypeOfExpression = 165,

 >TypeOfExpression : SyntaxKind
 
-        VoidExpression = 164,

+        VoidExpression = 166,

 >VoidExpression : SyntaxKind
 
-        PrefixUnaryExpression = 165,

+        PrefixUnaryExpression = 167,

 >PrefixUnaryExpression : SyntaxKind
 
-        PostfixUnaryExpression = 166,

+        PostfixUnaryExpression = 168,

 >PostfixUnaryExpression : SyntaxKind
 
-        BinaryExpression = 167,

+        BinaryExpression = 169,

 >BinaryExpression : SyntaxKind
 
-        ConditionalExpression = 168,

+        ConditionalExpression = 170,

 >ConditionalExpression : SyntaxKind
 
-        TemplateExpression = 169,

+        TemplateExpression = 171,

 >TemplateExpression : SyntaxKind
 
-        YieldExpression = 170,

+        YieldExpression = 172,

 >YieldExpression : SyntaxKind
 
-        SpreadElementExpression = 171,

+        SpreadElementExpression = 173,

 >SpreadElementExpression : SyntaxKind
 
-        OmittedExpression = 172,

+        OmittedExpression = 174,

 >OmittedExpression : SyntaxKind
 
-        TemplateSpan = 173,

+        TemplateSpan = 175,

 >TemplateSpan : SyntaxKind
 
-        Block = 174,

+        Block = 176,

 >Block : SyntaxKind
 
-        VariableStatement = 175,

+        VariableStatement = 177,

 >VariableStatement : SyntaxKind
 
-        EmptyStatement = 176,

+        EmptyStatement = 178,

 >EmptyStatement : SyntaxKind
 
-        ExpressionStatement = 177,

+        ExpressionStatement = 179,

 >ExpressionStatement : SyntaxKind
 
-        IfStatement = 178,

+        IfStatement = 180,

 >IfStatement : SyntaxKind
 
-        DoStatement = 179,

+        DoStatement = 181,

 >DoStatement : SyntaxKind
 
-        WhileStatement = 180,

+        WhileStatement = 182,

 >WhileStatement : SyntaxKind
 
-        ForStatement = 181,

+        ForStatement = 183,

 >ForStatement : SyntaxKind
 
-        ForInStatement = 182,

+        ForInStatement = 184,

 >ForInStatement : SyntaxKind
 
-        ForOfStatement = 183,

+        ForOfStatement = 185,

 >ForOfStatement : SyntaxKind
 
-        ContinueStatement = 184,

+        ContinueStatement = 186,

 >ContinueStatement : SyntaxKind
 
-        BreakStatement = 185,

+        BreakStatement = 187,

 >BreakStatement : SyntaxKind
 
-        ReturnStatement = 186,

+        ReturnStatement = 188,

 >ReturnStatement : SyntaxKind
 
-        WithStatement = 187,

+        WithStatement = 189,

 >WithStatement : SyntaxKind
 
-        SwitchStatement = 188,

+        SwitchStatement = 190,

 >SwitchStatement : SyntaxKind
 
-        LabeledStatement = 189,

+        LabeledStatement = 191,

 >LabeledStatement : SyntaxKind
 
-        ThrowStatement = 190,

+        ThrowStatement = 192,

 >ThrowStatement : SyntaxKind
 
-        TryStatement = 191,

+        TryStatement = 193,

 >TryStatement : SyntaxKind
 
-        DebuggerStatement = 192,

+        DebuggerStatement = 194,

 >DebuggerStatement : SyntaxKind
 
-        VariableDeclaration = 193,

+        VariableDeclaration = 195,

 >VariableDeclaration : SyntaxKind
 
-        VariableDeclarationList = 194,

+        VariableDeclarationList = 196,

 >VariableDeclarationList : SyntaxKind
 
-        FunctionDeclaration = 195,

+        FunctionDeclaration = 197,

 >FunctionDeclaration : SyntaxKind
 
-        ClassDeclaration = 196,

+        ClassDeclaration = 198,

 >ClassDeclaration : SyntaxKind
 
-        InterfaceDeclaration = 197,

+        InterfaceDeclaration = 199,

 >InterfaceDeclaration : SyntaxKind
 
-        TypeAliasDeclaration = 198,

+        TypeAliasDeclaration = 200,

 >TypeAliasDeclaration : SyntaxKind
 
-        EnumDeclaration = 199,

+        EnumDeclaration = 201,

 >EnumDeclaration : SyntaxKind
 
-        ModuleDeclaration = 200,

+        ModuleDeclaration = 202,

 >ModuleDeclaration : SyntaxKind
 
-        ModuleBlock = 201,

+        ModuleBlock = 203,

 >ModuleBlock : SyntaxKind
 
-        CaseBlock = 202,

+        CaseBlock = 204,

 >CaseBlock : SyntaxKind
 
-        ImportEqualsDeclaration = 203,

+        ImportEqualsDeclaration = 205,

 >ImportEqualsDeclaration : SyntaxKind
 
-        ImportDeclaration = 204,

+        ImportDeclaration = 206,

 >ImportDeclaration : SyntaxKind
 
-        ImportClause = 205,

+        ImportClause = 207,

 >ImportClause : SyntaxKind
 
-        NamespaceImport = 206,

+        NamespaceImport = 208,

 >NamespaceImport : SyntaxKind
 
-        NamedImports = 207,

+        NamedImports = 209,

 >NamedImports : SyntaxKind
 
-        ImportSpecifier = 208,

+        ImportSpecifier = 210,

 >ImportSpecifier : SyntaxKind
 
-        ExportAssignment = 209,

+        ExportAssignment = 211,

 >ExportAssignment : SyntaxKind
 
-        ExportDeclaration = 210,

+        ExportDeclaration = 212,

 >ExportDeclaration : SyntaxKind
 
-        NamedExports = 211,

+        NamedExports = 213,

 >NamedExports : SyntaxKind
 
-        ExportSpecifier = 212,

+        ExportSpecifier = 214,

 >ExportSpecifier : SyntaxKind
 
-        ExternalModuleReference = 213,

+        MissingDeclaration = 215,

+>MissingDeclaration : SyntaxKind
+
+        ExternalModuleReference = 216,

 >ExternalModuleReference : SyntaxKind
 
-        CaseClause = 214,

+        CaseClause = 217,

 >CaseClause : SyntaxKind
 
-        DefaultClause = 215,

+        DefaultClause = 218,

 >DefaultClause : SyntaxKind
 
-        HeritageClause = 216,

+        HeritageClause = 219,

 >HeritageClause : SyntaxKind
 
-        CatchClause = 217,

+        CatchClause = 220,

 >CatchClause : SyntaxKind
 
-        PropertyAssignment = 218,

+        PropertyAssignment = 221,

 >PropertyAssignment : SyntaxKind
 
-        ShorthandPropertyAssignment = 219,

+        ShorthandPropertyAssignment = 222,

 >ShorthandPropertyAssignment : SyntaxKind
 
-        EnumMember = 220,

+        EnumMember = 223,

 >EnumMember : SyntaxKind
 
-        SourceFile = 221,

+        SourceFile = 224,

 >SourceFile : SyntaxKind
 
-        SyntaxList = 222,

+        SyntaxList = 225,

 >SyntaxList : SyntaxKind
 
-        Count = 223,

+        Count = 226,

 >Count : SyntaxKind
 
-        FirstAssignment = 52,

+        FirstAssignment = 53,

 >FirstAssignment : SyntaxKind
 
-        LastAssignment = 63,

+        LastAssignment = 64,

 >LastAssignment : SyntaxKind
 
-        FirstReservedWord = 65,

+        FirstReservedWord = 66,

 >FirstReservedWord : SyntaxKind
 
-        LastReservedWord = 100,

+        LastReservedWord = 101,

 >LastReservedWord : SyntaxKind
 
-        FirstKeyword = 65,

+        FirstKeyword = 66,

 >FirstKeyword : SyntaxKind
 
-        LastKeyword = 124,

+        LastKeyword = 125,

 >LastKeyword : SyntaxKind
 
-        FirstFutureReservedWord = 102,

+        FirstFutureReservedWord = 103,

 >FirstFutureReservedWord : SyntaxKind
 
-        LastFutureReservedWord = 110,

+        LastFutureReservedWord = 111,

 >LastFutureReservedWord : SyntaxKind
 
-        FirstTypeNode = 139,

+        FirstTypeNode = 141,

 >FirstTypeNode : SyntaxKind
 
-        LastTypeNode = 147,

+        LastTypeNode = 149,

 >LastTypeNode : SyntaxKind
 
         FirstPunctuation = 14,

 >FirstPunctuation : SyntaxKind
 
-        LastPunctuation = 63,

+        LastPunctuation = 64,

 >LastPunctuation : SyntaxKind
 
         FirstToken = 0,

 >FirstToken : SyntaxKind
 
-        LastToken = 124,

+        LastToken = 125,

 >LastToken : SyntaxKind
 
         FirstTriviaToken = 2,

@@ -930,10 +939,10 @@ declare module "typescript" {
         FirstBinaryOperator = 24,

 >FirstBinaryOperator : SyntaxKind
 
-        LastBinaryOperator = 63,

+        LastBinaryOperator = 64,

 >LastBinaryOperator : SyntaxKind
 
-        FirstNode = 125,

+        FirstNode = 126,

 >FirstNode : SyntaxKind
     }

     const enum NodeFlags {

@@ -1005,16 +1014,19 @@ declare module "typescript" {
         GeneratorParameter = 8,

 >GeneratorParameter : ParserContextFlags
 
-        ThisNodeHasError = 16,

+        Decorator = 16,

+>Decorator : ParserContextFlags
+
+        ThisNodeHasError = 32,

 >ThisNodeHasError : ParserContextFlags
 
-        ParserGeneratedFlags = 31,

+        ParserGeneratedFlags = 63,

 >ParserGeneratedFlags : ParserContextFlags
 
-        ThisNodeOrAnySubNodesHasError = 32,

+        ThisNodeOrAnySubNodesHasError = 64,

 >ThisNodeOrAnySubNodesHasError : ParserContextFlags
 
-        HasAggregatedChildData = 64,

+        HasAggregatedChildData = 128,

 >HasAggregatedChildData : ParserContextFlags
     }

     const enum RelationComparisonResult {

@@ -1045,6 +1057,11 @@ declare module "typescript" {
 >parserContextFlags : ParserContextFlags
 >ParserContextFlags : ParserContextFlags
 
+        decorators?: NodeArray<Decorator>;

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

 >modifiers : ModifiersArray
 >ModifiersArray : ModifiersArray
@@ -1139,6 +1156,14 @@ declare module "typescript" {
         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
@@ -3006,15 +3031,17 @@ declare module "typescript" {
     interface EmitResolver {

 >EmitResolver : EmitResolver
 
-        getGeneratedNameForNode(node: Node): string;

->getGeneratedNameForNode : (node: Node) => string
->node : Node
->Node : Node
+        hasGlobalName(name: string): boolean;

+>hasGlobalName : (name: string) => boolean
+>name : string
 
-        getExpressionNameSubstitution(node: Identifier): string;

->getExpressionNameSubstitution : (node: Identifier) => 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
@@ -3113,8 +3140,8 @@ declare module "typescript" {
 >PropertyAccessExpression : PropertyAccessExpression
 >ElementAccessExpression : ElementAccessExpression
 
-        isUnknownIdentifier(location: Node, name: string): boolean;

->isUnknownIdentifier : (location: Node, name: string) => boolean
+        resolvesToSomeValue(location: Node, name: string): boolean;

+>resolvesToSomeValue : (location: Node, name: string) => boolean
 >location : Node
 >Node : Node
 >name : string
@@ -3436,6 +3463,9 @@ declare module "typescript" {
 
         BlockScopedBindingInLoop = 256,

 >BlockScopedBindingInLoop : NodeCheckFlags
+
+        EmitDecorate = 512,

+>EmitDecorate : NodeCheckFlags
     }

     interface NodeLinks {

 >NodeLinks : NodeLinks
diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js
index 6ac65082be027..b57acaf0e9c1b 100644
--- a/tests/baselines/reference/APISample_linter.js
+++ b/tests/baselines/reference/APISample_linter.js
@@ -142,192 +142,195 @@ declare module "typescript" {
         BarBarToken = 49,
         QuestionToken = 50,
         ColonToken = 51,
-        EqualsToken = 52,
-        PlusEqualsToken = 53,
-        MinusEqualsToken = 54,
-        AsteriskEqualsToken = 55,
-        SlashEqualsToken = 56,
-        PercentEqualsToken = 57,
-        LessThanLessThanEqualsToken = 58,
-        GreaterThanGreaterThanEqualsToken = 59,
-        GreaterThanGreaterThanGreaterThanEqualsToken = 60,
-        AmpersandEqualsToken = 61,
-        BarEqualsToken = 62,
-        CaretEqualsToken = 63,
-        Identifier = 64,
-        BreakKeyword = 65,
-        CaseKeyword = 66,
-        CatchKeyword = 67,
-        ClassKeyword = 68,
-        ConstKeyword = 69,
-        ContinueKeyword = 70,
-        DebuggerKeyword = 71,
-        DefaultKeyword = 72,
-        DeleteKeyword = 73,
-        DoKeyword = 74,
-        ElseKeyword = 75,
-        EnumKeyword = 76,
-        ExportKeyword = 77,
-        ExtendsKeyword = 78,
-        FalseKeyword = 79,
-        FinallyKeyword = 80,
-        ForKeyword = 81,
-        FunctionKeyword = 82,
-        IfKeyword = 83,
-        ImportKeyword = 84,
-        InKeyword = 85,
-        InstanceOfKeyword = 86,
-        NewKeyword = 87,
-        NullKeyword = 88,
-        ReturnKeyword = 89,
-        SuperKeyword = 90,
-        SwitchKeyword = 91,
-        ThisKeyword = 92,
-        ThrowKeyword = 93,
-        TrueKeyword = 94,
-        TryKeyword = 95,
-        TypeOfKeyword = 96,
-        VarKeyword = 97,
-        VoidKeyword = 98,
-        WhileKeyword = 99,
-        WithKeyword = 100,
-        AsKeyword = 101,
-        ImplementsKeyword = 102,
-        InterfaceKeyword = 103,
-        LetKeyword = 104,
-        PackageKeyword = 105,
-        PrivateKeyword = 106,
-        ProtectedKeyword = 107,
-        PublicKeyword = 108,
-        StaticKeyword = 109,
-        YieldKeyword = 110,
-        AnyKeyword = 111,
-        BooleanKeyword = 112,
-        ConstructorKeyword = 113,
-        DeclareKeyword = 114,
-        GetKeyword = 115,
-        ModuleKeyword = 116,
-        RequireKeyword = 117,
-        NumberKeyword = 118,
-        SetKeyword = 119,
-        StringKeyword = 120,
-        SymbolKeyword = 121,
-        TypeKeyword = 122,
-        FromKeyword = 123,
-        OfKeyword = 124,
-        QualifiedName = 125,
-        ComputedPropertyName = 126,
-        TypeParameter = 127,
-        Parameter = 128,
-        PropertySignature = 129,
-        PropertyDeclaration = 130,
-        MethodSignature = 131,
-        MethodDeclaration = 132,
-        Constructor = 133,
-        GetAccessor = 134,
-        SetAccessor = 135,
-        CallSignature = 136,
-        ConstructSignature = 137,
-        IndexSignature = 138,
-        TypeReference = 139,
-        FunctionType = 140,
-        ConstructorType = 141,
-        TypeQuery = 142,
-        TypeLiteral = 143,
-        ArrayType = 144,
-        TupleType = 145,
-        UnionType = 146,
-        ParenthesizedType = 147,
-        ObjectBindingPattern = 148,
-        ArrayBindingPattern = 149,
-        BindingElement = 150,
-        ArrayLiteralExpression = 151,
-        ObjectLiteralExpression = 152,
-        PropertyAccessExpression = 153,
-        ElementAccessExpression = 154,
-        CallExpression = 155,
-        NewExpression = 156,
-        TaggedTemplateExpression = 157,
-        TypeAssertionExpression = 158,
-        ParenthesizedExpression = 159,
-        FunctionExpression = 160,
-        ArrowFunction = 161,
-        DeleteExpression = 162,
-        TypeOfExpression = 163,
-        VoidExpression = 164,
-        PrefixUnaryExpression = 165,
-        PostfixUnaryExpression = 166,
-        BinaryExpression = 167,
-        ConditionalExpression = 168,
-        TemplateExpression = 169,
-        YieldExpression = 170,
-        SpreadElementExpression = 171,
-        OmittedExpression = 172,
-        TemplateSpan = 173,
-        Block = 174,
-        VariableStatement = 175,
-        EmptyStatement = 176,
-        ExpressionStatement = 177,
-        IfStatement = 178,
-        DoStatement = 179,
-        WhileStatement = 180,
-        ForStatement = 181,
-        ForInStatement = 182,
-        ForOfStatement = 183,
-        ContinueStatement = 184,
-        BreakStatement = 185,
-        ReturnStatement = 186,
-        WithStatement = 187,
-        SwitchStatement = 188,
-        LabeledStatement = 189,
-        ThrowStatement = 190,
-        TryStatement = 191,
-        DebuggerStatement = 192,
-        VariableDeclaration = 193,
-        VariableDeclarationList = 194,
-        FunctionDeclaration = 195,
-        ClassDeclaration = 196,
-        InterfaceDeclaration = 197,
-        TypeAliasDeclaration = 198,
-        EnumDeclaration = 199,
-        ModuleDeclaration = 200,
-        ModuleBlock = 201,
-        CaseBlock = 202,
-        ImportEqualsDeclaration = 203,
-        ImportDeclaration = 204,
-        ImportClause = 205,
-        NamespaceImport = 206,
-        NamedImports = 207,
-        ImportSpecifier = 208,
-        ExportAssignment = 209,
-        ExportDeclaration = 210,
-        NamedExports = 211,
-        ExportSpecifier = 212,
-        ExternalModuleReference = 213,
-        CaseClause = 214,
-        DefaultClause = 215,
-        HeritageClause = 216,
-        CatchClause = 217,
-        PropertyAssignment = 218,
-        ShorthandPropertyAssignment = 219,
-        EnumMember = 220,
-        SourceFile = 221,
-        SyntaxList = 222,
-        Count = 223,
-        FirstAssignment = 52,
-        LastAssignment = 63,
-        FirstReservedWord = 65,
-        LastReservedWord = 100,
-        FirstKeyword = 65,
-        LastKeyword = 124,
-        FirstFutureReservedWord = 102,
-        LastFutureReservedWord = 110,
-        FirstTypeNode = 139,
-        LastTypeNode = 147,
+        AtToken = 52,
+        EqualsToken = 53,
+        PlusEqualsToken = 54,
+        MinusEqualsToken = 55,
+        AsteriskEqualsToken = 56,
+        SlashEqualsToken = 57,
+        PercentEqualsToken = 58,
+        LessThanLessThanEqualsToken = 59,
+        GreaterThanGreaterThanEqualsToken = 60,
+        GreaterThanGreaterThanGreaterThanEqualsToken = 61,
+        AmpersandEqualsToken = 62,
+        BarEqualsToken = 63,
+        CaretEqualsToken = 64,
+        Identifier = 65,
+        BreakKeyword = 66,
+        CaseKeyword = 67,
+        CatchKeyword = 68,
+        ClassKeyword = 69,
+        ConstKeyword = 70,
+        ContinueKeyword = 71,
+        DebuggerKeyword = 72,
+        DefaultKeyword = 73,
+        DeleteKeyword = 74,
+        DoKeyword = 75,
+        ElseKeyword = 76,
+        EnumKeyword = 77,
+        ExportKeyword = 78,
+        ExtendsKeyword = 79,
+        FalseKeyword = 80,
+        FinallyKeyword = 81,
+        ForKeyword = 82,
+        FunctionKeyword = 83,
+        IfKeyword = 84,
+        ImportKeyword = 85,
+        InKeyword = 86,
+        InstanceOfKeyword = 87,
+        NewKeyword = 88,
+        NullKeyword = 89,
+        ReturnKeyword = 90,
+        SuperKeyword = 91,
+        SwitchKeyword = 92,
+        ThisKeyword = 93,
+        ThrowKeyword = 94,
+        TrueKeyword = 95,
+        TryKeyword = 96,
+        TypeOfKeyword = 97,
+        VarKeyword = 98,
+        VoidKeyword = 99,
+        WhileKeyword = 100,
+        WithKeyword = 101,
+        AsKeyword = 102,
+        ImplementsKeyword = 103,
+        InterfaceKeyword = 104,
+        LetKeyword = 105,
+        PackageKeyword = 106,
+        PrivateKeyword = 107,
+        ProtectedKeyword = 108,
+        PublicKeyword = 109,
+        StaticKeyword = 110,
+        YieldKeyword = 111,
+        AnyKeyword = 112,
+        BooleanKeyword = 113,
+        ConstructorKeyword = 114,
+        DeclareKeyword = 115,
+        GetKeyword = 116,
+        ModuleKeyword = 117,
+        RequireKeyword = 118,
+        NumberKeyword = 119,
+        SetKeyword = 120,
+        StringKeyword = 121,
+        SymbolKeyword = 122,
+        TypeKeyword = 123,
+        FromKeyword = 124,
+        OfKeyword = 125,
+        QualifiedName = 126,
+        ComputedPropertyName = 127,
+        TypeParameter = 128,
+        Parameter = 129,
+        Decorator = 130,
+        PropertySignature = 131,
+        PropertyDeclaration = 132,
+        MethodSignature = 133,
+        MethodDeclaration = 134,
+        Constructor = 135,
+        GetAccessor = 136,
+        SetAccessor = 137,
+        CallSignature = 138,
+        ConstructSignature = 139,
+        IndexSignature = 140,
+        TypeReference = 141,
+        FunctionType = 142,
+        ConstructorType = 143,
+        TypeQuery = 144,
+        TypeLiteral = 145,
+        ArrayType = 146,
+        TupleType = 147,
+        UnionType = 148,
+        ParenthesizedType = 149,
+        ObjectBindingPattern = 150,
+        ArrayBindingPattern = 151,
+        BindingElement = 152,
+        ArrayLiteralExpression = 153,
+        ObjectLiteralExpression = 154,
+        PropertyAccessExpression = 155,
+        ElementAccessExpression = 156,
+        CallExpression = 157,
+        NewExpression = 158,
+        TaggedTemplateExpression = 159,
+        TypeAssertionExpression = 160,
+        ParenthesizedExpression = 161,
+        FunctionExpression = 162,
+        ArrowFunction = 163,
+        DeleteExpression = 164,
+        TypeOfExpression = 165,
+        VoidExpression = 166,
+        PrefixUnaryExpression = 167,
+        PostfixUnaryExpression = 168,
+        BinaryExpression = 169,
+        ConditionalExpression = 170,
+        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,
+        FirstAssignment = 53,
+        LastAssignment = 64,
+        FirstReservedWord = 66,
+        LastReservedWord = 101,
+        FirstKeyword = 66,
+        LastKeyword = 125,
+        FirstFutureReservedWord = 103,
+        LastFutureReservedWord = 111,
+        FirstTypeNode = 141,
+        LastTypeNode = 149,
         FirstPunctuation = 14,
-        LastPunctuation = 63,
+        LastPunctuation = 64,
         FirstToken = 0,
-        LastToken = 124,
+        LastToken = 125,
         FirstTriviaToken = 2,
         LastTriviaToken = 6,
         FirstLiteralToken = 7,
@@ -335,8 +338,8 @@ declare module "typescript" {
         FirstTemplateToken = 10,
         LastTemplateToken = 13,
         FirstBinaryOperator = 24,
-        LastBinaryOperator = 63,
-        FirstNode = 125,
+        LastBinaryOperator = 64,
+        FirstNode = 126,
     }
     const enum NodeFlags {
         Export = 1,
@@ -362,10 +365,11 @@ declare module "typescript" {
         DisallowIn = 2,
         Yield = 4,
         GeneratorParameter = 8,
-        ThisNodeHasError = 16,
-        ParserGeneratedFlags = 31,
-        ThisNodeOrAnySubNodesHasError = 32,
-        HasAggregatedChildData = 64,
+        Decorator = 16,
+        ThisNodeHasError = 32,
+        ParserGeneratedFlags = 63,
+        ThisNodeOrAnySubNodesHasError = 64,
+        HasAggregatedChildData = 128,
     }
     const enum RelationComparisonResult {
         Succeeded = 1,
@@ -376,6 +380,7 @@ declare module "typescript" {
         kind: SyntaxKind;
         flags: NodeFlags;
         parserContextFlags?: ParserContextFlags;
+        decorators?: NodeArray<Decorator>;
         modifiers?: ModifiersArray;
         id?: number;
         parent?: Node;
@@ -406,6 +411,9 @@ declare module "typescript" {
     interface ComputedPropertyName extends Node {
         expression: Expression;
     }
+    interface Decorator extends Node {
+        expression: LeftHandSideExpression;
+    }
     interface TypeParameterDeclaration extends Declaration {
         name: Identifier;
         constraint?: TypeNode;
@@ -970,8 +978,8 @@ declare module "typescript" {
         errorModuleName?: string;
     }
     interface EmitResolver {
-        getGeneratedNameForNode(node: Node): string;
-        getExpressionNameSubstitution(node: Identifier): string;
+        hasGlobalName(name: string): boolean;
+        getExpressionNameSubstitution(node: Identifier, getGeneratedNameForNode: (node: Node) => string): string;
         isValueAliasDeclaration(node: Node): boolean;
         isReferencedAliasDeclaration(node: Node, checkChildren?: boolean): boolean;
         isTopLevelValueImportEqualsWithEntityName(node: ImportEqualsDeclaration): boolean;
@@ -985,7 +993,7 @@ declare module "typescript" {
         isSymbolAccessible(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags): SymbolAccessiblityResult;
         isEntityNameVisible(entityName: EntityName, enclosingDeclaration: Node): SymbolVisibilityResult;
         getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;
-        isUnknownIdentifier(location: Node, name: string): boolean;
+        resolvesToSomeValue(location: Node, name: string): boolean;
         getBlockScopedVariableId(node: Identifier): number;
     }
     const enum SymbolFlags {
@@ -1092,6 +1100,7 @@ declare module "typescript" {
         ContextChecked = 64,
         EnumValuesComputed = 128,
         BlockScopedBindingInLoop = 256,
+        EmitDecorate = 512,
     }
     interface NodeLinks {
         resolvedType?: Type;
@@ -2033,24 +2042,24 @@ function delint(sourceFile) {
     delintNode(sourceFile);
     function delintNode(node) {
         switch (node.kind) {
-            case 181 /* ForStatement */:
-            case 182 /* ForInStatement */:
-            case 180 /* WhileStatement */:
-            case 179 /* DoStatement */:
-                if (node.statement.kind !== 174 /* Block */) {
+            case 183 /* ForStatement */:
+            case 184 /* ForInStatement */:
+            case 182 /* WhileStatement */:
+            case 181 /* DoStatement */:
+                if (node.statement.kind !== 176 /* Block */) {
                     report(node, "A looping statement's contents should be wrapped in a block body.");
                 }
                 break;
-            case 178 /* IfStatement */:
+            case 180 /* IfStatement */:
                 var ifStatement = node;
-                if (ifStatement.thenStatement.kind !== 174 /* Block */) {
+                if (ifStatement.thenStatement.kind !== 176 /* Block */) {
                     report(ifStatement.thenStatement, "An if statement's contents should be wrapped in a block body.");
                 }
-                if (ifStatement.elseStatement && ifStatement.elseStatement.kind !== 174 /* Block */ && ifStatement.elseStatement.kind !== 178 /* IfStatement */) {
+                if (ifStatement.elseStatement && ifStatement.elseStatement.kind !== 176 /* Block */ && ifStatement.elseStatement.kind !== 180 /* IfStatement */) {
                     report(ifStatement.elseStatement, "An else statement's contents should be wrapped in a block body.");
                 }
                 break;
-            case 167 /* BinaryExpression */:
+            case 169 /* BinaryExpression */:
                 var op = node.operatorToken.kind;
                 if (op === 28 /* EqualsEqualsToken */ || op === 29 /* ExclamationEqualsToken */) {
                     report(node, "Use '===' and '!=='.");
diff --git a/tests/baselines/reference/APISample_linter.types b/tests/baselines/reference/APISample_linter.types
index ba374d4599248..600bf5c6adc72 100644
--- a/tests/baselines/reference/APISample_linter.types
+++ b/tests/baselines/reference/APISample_linter.types
@@ -497,562 +497,571 @@ declare module "typescript" {
         ColonToken = 51,

 >ColonToken : SyntaxKind
 
-        EqualsToken = 52,

+        AtToken = 52,

+>AtToken : SyntaxKind
+
+        EqualsToken = 53,

 >EqualsToken : SyntaxKind
 
-        PlusEqualsToken = 53,

+        PlusEqualsToken = 54,

 >PlusEqualsToken : SyntaxKind
 
-        MinusEqualsToken = 54,

+        MinusEqualsToken = 55,

 >MinusEqualsToken : SyntaxKind
 
-        AsteriskEqualsToken = 55,

+        AsteriskEqualsToken = 56,

 >AsteriskEqualsToken : SyntaxKind
 
-        SlashEqualsToken = 56,

+        SlashEqualsToken = 57,

 >SlashEqualsToken : SyntaxKind
 
-        PercentEqualsToken = 57,

+        PercentEqualsToken = 58,

 >PercentEqualsToken : SyntaxKind
 
-        LessThanLessThanEqualsToken = 58,

+        LessThanLessThanEqualsToken = 59,

 >LessThanLessThanEqualsToken : SyntaxKind
 
-        GreaterThanGreaterThanEqualsToken = 59,

+        GreaterThanGreaterThanEqualsToken = 60,

 >GreaterThanGreaterThanEqualsToken : SyntaxKind
 
-        GreaterThanGreaterThanGreaterThanEqualsToken = 60,

+        GreaterThanGreaterThanGreaterThanEqualsToken = 61,

 >GreaterThanGreaterThanGreaterThanEqualsToken : SyntaxKind
 
-        AmpersandEqualsToken = 61,

+        AmpersandEqualsToken = 62,

 >AmpersandEqualsToken : SyntaxKind
 
-        BarEqualsToken = 62,

+        BarEqualsToken = 63,

 >BarEqualsToken : SyntaxKind
 
-        CaretEqualsToken = 63,

+        CaretEqualsToken = 64,

 >CaretEqualsToken : SyntaxKind
 
-        Identifier = 64,

+        Identifier = 65,

 >Identifier : SyntaxKind
 
-        BreakKeyword = 65,

+        BreakKeyword = 66,

 >BreakKeyword : SyntaxKind
 
-        CaseKeyword = 66,

+        CaseKeyword = 67,

 >CaseKeyword : SyntaxKind
 
-        CatchKeyword = 67,

+        CatchKeyword = 68,

 >CatchKeyword : SyntaxKind
 
-        ClassKeyword = 68,

+        ClassKeyword = 69,

 >ClassKeyword : SyntaxKind
 
-        ConstKeyword = 69,

+        ConstKeyword = 70,

 >ConstKeyword : SyntaxKind
 
-        ContinueKeyword = 70,

+        ContinueKeyword = 71,

 >ContinueKeyword : SyntaxKind
 
-        DebuggerKeyword = 71,

+        DebuggerKeyword = 72,

 >DebuggerKeyword : SyntaxKind
 
-        DefaultKeyword = 72,

+        DefaultKeyword = 73,

 >DefaultKeyword : SyntaxKind
 
-        DeleteKeyword = 73,

+        DeleteKeyword = 74,

 >DeleteKeyword : SyntaxKind
 
-        DoKeyword = 74,

+        DoKeyword = 75,

 >DoKeyword : SyntaxKind
 
-        ElseKeyword = 75,

+        ElseKeyword = 76,

 >ElseKeyword : SyntaxKind
 
-        EnumKeyword = 76,

+        EnumKeyword = 77,

 >EnumKeyword : SyntaxKind
 
-        ExportKeyword = 77,

+        ExportKeyword = 78,

 >ExportKeyword : SyntaxKind
 
-        ExtendsKeyword = 78,

+        ExtendsKeyword = 79,

 >ExtendsKeyword : SyntaxKind
 
-        FalseKeyword = 79,

+        FalseKeyword = 80,

 >FalseKeyword : SyntaxKind
 
-        FinallyKeyword = 80,

+        FinallyKeyword = 81,

 >FinallyKeyword : SyntaxKind
 
-        ForKeyword = 81,

+        ForKeyword = 82,

 >ForKeyword : SyntaxKind
 
-        FunctionKeyword = 82,

+        FunctionKeyword = 83,

 >FunctionKeyword : SyntaxKind
 
-        IfKeyword = 83,

+        IfKeyword = 84,

 >IfKeyword : SyntaxKind
 
-        ImportKeyword = 84,

+        ImportKeyword = 85,

 >ImportKeyword : SyntaxKind
 
-        InKeyword = 85,

+        InKeyword = 86,

 >InKeyword : SyntaxKind
 
-        InstanceOfKeyword = 86,

+        InstanceOfKeyword = 87,

 >InstanceOfKeyword : SyntaxKind
 
-        NewKeyword = 87,

+        NewKeyword = 88,

 >NewKeyword : SyntaxKind
 
-        NullKeyword = 88,

+        NullKeyword = 89,

 >NullKeyword : SyntaxKind
 
-        ReturnKeyword = 89,

+        ReturnKeyword = 90,

 >ReturnKeyword : SyntaxKind
 
-        SuperKeyword = 90,

+        SuperKeyword = 91,

 >SuperKeyword : SyntaxKind
 
-        SwitchKeyword = 91,

+        SwitchKeyword = 92,

 >SwitchKeyword : SyntaxKind
 
-        ThisKeyword = 92,

+        ThisKeyword = 93,

 >ThisKeyword : SyntaxKind
 
-        ThrowKeyword = 93,

+        ThrowKeyword = 94,

 >ThrowKeyword : SyntaxKind
 
-        TrueKeyword = 94,

+        TrueKeyword = 95,

 >TrueKeyword : SyntaxKind
 
-        TryKeyword = 95,

+        TryKeyword = 96,

 >TryKeyword : SyntaxKind
 
-        TypeOfKeyword = 96,

+        TypeOfKeyword = 97,

 >TypeOfKeyword : SyntaxKind
 
-        VarKeyword = 97,

+        VarKeyword = 98,

 >VarKeyword : SyntaxKind
 
-        VoidKeyword = 98,

+        VoidKeyword = 99,

 >VoidKeyword : SyntaxKind
 
-        WhileKeyword = 99,

+        WhileKeyword = 100,

 >WhileKeyword : SyntaxKind
 
-        WithKeyword = 100,

+        WithKeyword = 101,

 >WithKeyword : SyntaxKind
 
-        AsKeyword = 101,

+        AsKeyword = 102,

 >AsKeyword : SyntaxKind
 
-        ImplementsKeyword = 102,

+        ImplementsKeyword = 103,

 >ImplementsKeyword : SyntaxKind
 
-        InterfaceKeyword = 103,

+        InterfaceKeyword = 104,

 >InterfaceKeyword : SyntaxKind
 
-        LetKeyword = 104,

+        LetKeyword = 105,

 >LetKeyword : SyntaxKind
 
-        PackageKeyword = 105,

+        PackageKeyword = 106,

 >PackageKeyword : SyntaxKind
 
-        PrivateKeyword = 106,

+        PrivateKeyword = 107,

 >PrivateKeyword : SyntaxKind
 
-        ProtectedKeyword = 107,

+        ProtectedKeyword = 108,

 >ProtectedKeyword : SyntaxKind
 
-        PublicKeyword = 108,

+        PublicKeyword = 109,

 >PublicKeyword : SyntaxKind
 
-        StaticKeyword = 109,

+        StaticKeyword = 110,

 >StaticKeyword : SyntaxKind
 
-        YieldKeyword = 110,

+        YieldKeyword = 111,

 >YieldKeyword : SyntaxKind
 
-        AnyKeyword = 111,

+        AnyKeyword = 112,

 >AnyKeyword : SyntaxKind
 
-        BooleanKeyword = 112,

+        BooleanKeyword = 113,

 >BooleanKeyword : SyntaxKind
 
-        ConstructorKeyword = 113,

+        ConstructorKeyword = 114,

 >ConstructorKeyword : SyntaxKind
 
-        DeclareKeyword = 114,

+        DeclareKeyword = 115,

 >DeclareKeyword : SyntaxKind
 
-        GetKeyword = 115,

+        GetKeyword = 116,

 >GetKeyword : SyntaxKind
 
-        ModuleKeyword = 116,

+        ModuleKeyword = 117,

 >ModuleKeyword : SyntaxKind
 
-        RequireKeyword = 117,

+        RequireKeyword = 118,

 >RequireKeyword : SyntaxKind
 
-        NumberKeyword = 118,

+        NumberKeyword = 119,

 >NumberKeyword : SyntaxKind
 
-        SetKeyword = 119,

+        SetKeyword = 120,

 >SetKeyword : SyntaxKind
 
-        StringKeyword = 120,

+        StringKeyword = 121,

 >StringKeyword : SyntaxKind
 
-        SymbolKeyword = 121,

+        SymbolKeyword = 122,

 >SymbolKeyword : SyntaxKind
 
-        TypeKeyword = 122,

+        TypeKeyword = 123,

 >TypeKeyword : SyntaxKind
 
-        FromKeyword = 123,

+        FromKeyword = 124,

 >FromKeyword : SyntaxKind
 
-        OfKeyword = 124,

+        OfKeyword = 125,

 >OfKeyword : SyntaxKind
 
-        QualifiedName = 125,

+        QualifiedName = 126,

 >QualifiedName : SyntaxKind
 
-        ComputedPropertyName = 126,

+        ComputedPropertyName = 127,

 >ComputedPropertyName : SyntaxKind
 
-        TypeParameter = 127,

+        TypeParameter = 128,

 >TypeParameter : SyntaxKind
 
-        Parameter = 128,

+        Parameter = 129,

 >Parameter : SyntaxKind
 
-        PropertySignature = 129,

+        Decorator = 130,

+>Decorator : SyntaxKind
+
+        PropertySignature = 131,

 >PropertySignature : SyntaxKind
 
-        PropertyDeclaration = 130,

+        PropertyDeclaration = 132,

 >PropertyDeclaration : SyntaxKind
 
-        MethodSignature = 131,

+        MethodSignature = 133,

 >MethodSignature : SyntaxKind
 
-        MethodDeclaration = 132,

+        MethodDeclaration = 134,

 >MethodDeclaration : SyntaxKind
 
-        Constructor = 133,

+        Constructor = 135,

 >Constructor : SyntaxKind
 
-        GetAccessor = 134,

+        GetAccessor = 136,

 >GetAccessor : SyntaxKind
 
-        SetAccessor = 135,

+        SetAccessor = 137,

 >SetAccessor : SyntaxKind
 
-        CallSignature = 136,

+        CallSignature = 138,

 >CallSignature : SyntaxKind
 
-        ConstructSignature = 137,

+        ConstructSignature = 139,

 >ConstructSignature : SyntaxKind
 
-        IndexSignature = 138,

+        IndexSignature = 140,

 >IndexSignature : SyntaxKind
 
-        TypeReference = 139,

+        TypeReference = 141,

 >TypeReference : SyntaxKind
 
-        FunctionType = 140,

+        FunctionType = 142,

 >FunctionType : SyntaxKind
 
-        ConstructorType = 141,

+        ConstructorType = 143,

 >ConstructorType : SyntaxKind
 
-        TypeQuery = 142,

+        TypeQuery = 144,

 >TypeQuery : SyntaxKind
 
-        TypeLiteral = 143,

+        TypeLiteral = 145,

 >TypeLiteral : SyntaxKind
 
-        ArrayType = 144,

+        ArrayType = 146,

 >ArrayType : SyntaxKind
 
-        TupleType = 145,

+        TupleType = 147,

 >TupleType : SyntaxKind
 
-        UnionType = 146,

+        UnionType = 148,

 >UnionType : SyntaxKind
 
-        ParenthesizedType = 147,

+        ParenthesizedType = 149,

 >ParenthesizedType : SyntaxKind
 
-        ObjectBindingPattern = 148,

+        ObjectBindingPattern = 150,

 >ObjectBindingPattern : SyntaxKind
 
-        ArrayBindingPattern = 149,

+        ArrayBindingPattern = 151,

 >ArrayBindingPattern : SyntaxKind
 
-        BindingElement = 150,

+        BindingElement = 152,

 >BindingElement : SyntaxKind
 
-        ArrayLiteralExpression = 151,

+        ArrayLiteralExpression = 153,

 >ArrayLiteralExpression : SyntaxKind
 
-        ObjectLiteralExpression = 152,

+        ObjectLiteralExpression = 154,

 >ObjectLiteralExpression : SyntaxKind
 
-        PropertyAccessExpression = 153,

+        PropertyAccessExpression = 155,

 >PropertyAccessExpression : SyntaxKind
 
-        ElementAccessExpression = 154,

+        ElementAccessExpression = 156,

 >ElementAccessExpression : SyntaxKind
 
-        CallExpression = 155,

+        CallExpression = 157,

 >CallExpression : SyntaxKind
 
-        NewExpression = 156,

+        NewExpression = 158,

 >NewExpression : SyntaxKind
 
-        TaggedTemplateExpression = 157,

+        TaggedTemplateExpression = 159,

 >TaggedTemplateExpression : SyntaxKind
 
-        TypeAssertionExpression = 158,

+        TypeAssertionExpression = 160,

 >TypeAssertionExpression : SyntaxKind
 
-        ParenthesizedExpression = 159,

+        ParenthesizedExpression = 161,

 >ParenthesizedExpression : SyntaxKind
 
-        FunctionExpression = 160,

+        FunctionExpression = 162,

 >FunctionExpression : SyntaxKind
 
-        ArrowFunction = 161,

+        ArrowFunction = 163,

 >ArrowFunction : SyntaxKind
 
-        DeleteExpression = 162,

+        DeleteExpression = 164,

 >DeleteExpression : SyntaxKind
 
-        TypeOfExpression = 163,

+        TypeOfExpression = 165,

 >TypeOfExpression : SyntaxKind
 
-        VoidExpression = 164,

+        VoidExpression = 166,

 >VoidExpression : SyntaxKind
 
-        PrefixUnaryExpression = 165,

+        PrefixUnaryExpression = 167,

 >PrefixUnaryExpression : SyntaxKind
 
-        PostfixUnaryExpression = 166,

+        PostfixUnaryExpression = 168,

 >PostfixUnaryExpression : SyntaxKind
 
-        BinaryExpression = 167,

+        BinaryExpression = 169,

 >BinaryExpression : SyntaxKind
 
-        ConditionalExpression = 168,

+        ConditionalExpression = 170,

 >ConditionalExpression : SyntaxKind
 
-        TemplateExpression = 169,

+        TemplateExpression = 171,

 >TemplateExpression : SyntaxKind
 
-        YieldExpression = 170,

+        YieldExpression = 172,

 >YieldExpression : SyntaxKind
 
-        SpreadElementExpression = 171,

+        SpreadElementExpression = 173,

 >SpreadElementExpression : SyntaxKind
 
-        OmittedExpression = 172,

+        OmittedExpression = 174,

 >OmittedExpression : SyntaxKind
 
-        TemplateSpan = 173,

+        TemplateSpan = 175,

 >TemplateSpan : SyntaxKind
 
-        Block = 174,

+        Block = 176,

 >Block : SyntaxKind
 
-        VariableStatement = 175,

+        VariableStatement = 177,

 >VariableStatement : SyntaxKind
 
-        EmptyStatement = 176,

+        EmptyStatement = 178,

 >EmptyStatement : SyntaxKind
 
-        ExpressionStatement = 177,

+        ExpressionStatement = 179,

 >ExpressionStatement : SyntaxKind
 
-        IfStatement = 178,

+        IfStatement = 180,

 >IfStatement : SyntaxKind
 
-        DoStatement = 179,

+        DoStatement = 181,

 >DoStatement : SyntaxKind
 
-        WhileStatement = 180,

+        WhileStatement = 182,

 >WhileStatement : SyntaxKind
 
-        ForStatement = 181,

+        ForStatement = 183,

 >ForStatement : SyntaxKind
 
-        ForInStatement = 182,

+        ForInStatement = 184,

 >ForInStatement : SyntaxKind
 
-        ForOfStatement = 183,

+        ForOfStatement = 185,

 >ForOfStatement : SyntaxKind
 
-        ContinueStatement = 184,

+        ContinueStatement = 186,

 >ContinueStatement : SyntaxKind
 
-        BreakStatement = 185,

+        BreakStatement = 187,

 >BreakStatement : SyntaxKind
 
-        ReturnStatement = 186,

+        ReturnStatement = 188,

 >ReturnStatement : SyntaxKind
 
-        WithStatement = 187,

+        WithStatement = 189,

 >WithStatement : SyntaxKind
 
-        SwitchStatement = 188,

+        SwitchStatement = 190,

 >SwitchStatement : SyntaxKind
 
-        LabeledStatement = 189,

+        LabeledStatement = 191,

 >LabeledStatement : SyntaxKind
 
-        ThrowStatement = 190,

+        ThrowStatement = 192,

 >ThrowStatement : SyntaxKind
 
-        TryStatement = 191,

+        TryStatement = 193,

 >TryStatement : SyntaxKind
 
-        DebuggerStatement = 192,

+        DebuggerStatement = 194,

 >DebuggerStatement : SyntaxKind
 
-        VariableDeclaration = 193,

+        VariableDeclaration = 195,

 >VariableDeclaration : SyntaxKind
 
-        VariableDeclarationList = 194,

+        VariableDeclarationList = 196,

 >VariableDeclarationList : SyntaxKind
 
-        FunctionDeclaration = 195,

+        FunctionDeclaration = 197,

 >FunctionDeclaration : SyntaxKind
 
-        ClassDeclaration = 196,

+        ClassDeclaration = 198,

 >ClassDeclaration : SyntaxKind
 
-        InterfaceDeclaration = 197,

+        InterfaceDeclaration = 199,

 >InterfaceDeclaration : SyntaxKind
 
-        TypeAliasDeclaration = 198,

+        TypeAliasDeclaration = 200,

 >TypeAliasDeclaration : SyntaxKind
 
-        EnumDeclaration = 199,

+        EnumDeclaration = 201,

 >EnumDeclaration : SyntaxKind
 
-        ModuleDeclaration = 200,

+        ModuleDeclaration = 202,

 >ModuleDeclaration : SyntaxKind
 
-        ModuleBlock = 201,

+        ModuleBlock = 203,

 >ModuleBlock : SyntaxKind
 
-        CaseBlock = 202,

+        CaseBlock = 204,

 >CaseBlock : SyntaxKind
 
-        ImportEqualsDeclaration = 203,

+        ImportEqualsDeclaration = 205,

 >ImportEqualsDeclaration : SyntaxKind
 
-        ImportDeclaration = 204,

+        ImportDeclaration = 206,

 >ImportDeclaration : SyntaxKind
 
-        ImportClause = 205,

+        ImportClause = 207,

 >ImportClause : SyntaxKind
 
-        NamespaceImport = 206,

+        NamespaceImport = 208,

 >NamespaceImport : SyntaxKind
 
-        NamedImports = 207,

+        NamedImports = 209,

 >NamedImports : SyntaxKind
 
-        ImportSpecifier = 208,

+        ImportSpecifier = 210,

 >ImportSpecifier : SyntaxKind
 
-        ExportAssignment = 209,

+        ExportAssignment = 211,

 >ExportAssignment : SyntaxKind
 
-        ExportDeclaration = 210,

+        ExportDeclaration = 212,

 >ExportDeclaration : SyntaxKind
 
-        NamedExports = 211,

+        NamedExports = 213,

 >NamedExports : SyntaxKind
 
-        ExportSpecifier = 212,

+        ExportSpecifier = 214,

 >ExportSpecifier : SyntaxKind
 
-        ExternalModuleReference = 213,

+        MissingDeclaration = 215,

+>MissingDeclaration : SyntaxKind
+
+        ExternalModuleReference = 216,

 >ExternalModuleReference : SyntaxKind
 
-        CaseClause = 214,

+        CaseClause = 217,

 >CaseClause : SyntaxKind
 
-        DefaultClause = 215,

+        DefaultClause = 218,

 >DefaultClause : SyntaxKind
 
-        HeritageClause = 216,

+        HeritageClause = 219,

 >HeritageClause : SyntaxKind
 
-        CatchClause = 217,

+        CatchClause = 220,

 >CatchClause : SyntaxKind
 
-        PropertyAssignment = 218,

+        PropertyAssignment = 221,

 >PropertyAssignment : SyntaxKind
 
-        ShorthandPropertyAssignment = 219,

+        ShorthandPropertyAssignment = 222,

 >ShorthandPropertyAssignment : SyntaxKind
 
-        EnumMember = 220,

+        EnumMember = 223,

 >EnumMember : SyntaxKind
 
-        SourceFile = 221,

+        SourceFile = 224,

 >SourceFile : SyntaxKind
 
-        SyntaxList = 222,

+        SyntaxList = 225,

 >SyntaxList : SyntaxKind
 
-        Count = 223,

+        Count = 226,

 >Count : SyntaxKind
 
-        FirstAssignment = 52,

+        FirstAssignment = 53,

 >FirstAssignment : SyntaxKind
 
-        LastAssignment = 63,

+        LastAssignment = 64,

 >LastAssignment : SyntaxKind
 
-        FirstReservedWord = 65,

+        FirstReservedWord = 66,

 >FirstReservedWord : SyntaxKind
 
-        LastReservedWord = 100,

+        LastReservedWord = 101,

 >LastReservedWord : SyntaxKind
 
-        FirstKeyword = 65,

+        FirstKeyword = 66,

 >FirstKeyword : SyntaxKind
 
-        LastKeyword = 124,

+        LastKeyword = 125,

 >LastKeyword : SyntaxKind
 
-        FirstFutureReservedWord = 102,

+        FirstFutureReservedWord = 103,

 >FirstFutureReservedWord : SyntaxKind
 
-        LastFutureReservedWord = 110,

+        LastFutureReservedWord = 111,

 >LastFutureReservedWord : SyntaxKind
 
-        FirstTypeNode = 139,

+        FirstTypeNode = 141,

 >FirstTypeNode : SyntaxKind
 
-        LastTypeNode = 147,

+        LastTypeNode = 149,

 >LastTypeNode : SyntaxKind
 
         FirstPunctuation = 14,

 >FirstPunctuation : SyntaxKind
 
-        LastPunctuation = 63,

+        LastPunctuation = 64,

 >LastPunctuation : SyntaxKind
 
         FirstToken = 0,

 >FirstToken : SyntaxKind
 
-        LastToken = 124,

+        LastToken = 125,

 >LastToken : SyntaxKind
 
         FirstTriviaToken = 2,

@@ -1076,10 +1085,10 @@ declare module "typescript" {
         FirstBinaryOperator = 24,

 >FirstBinaryOperator : SyntaxKind
 
-        LastBinaryOperator = 63,

+        LastBinaryOperator = 64,

 >LastBinaryOperator : SyntaxKind
 
-        FirstNode = 125,

+        FirstNode = 126,

 >FirstNode : SyntaxKind
     }

     const enum NodeFlags {

@@ -1151,16 +1160,19 @@ declare module "typescript" {
         GeneratorParameter = 8,

 >GeneratorParameter : ParserContextFlags
 
-        ThisNodeHasError = 16,

+        Decorator = 16,

+>Decorator : ParserContextFlags
+
+        ThisNodeHasError = 32,

 >ThisNodeHasError : ParserContextFlags
 
-        ParserGeneratedFlags = 31,

+        ParserGeneratedFlags = 63,

 >ParserGeneratedFlags : ParserContextFlags
 
-        ThisNodeOrAnySubNodesHasError = 32,

+        ThisNodeOrAnySubNodesHasError = 64,

 >ThisNodeOrAnySubNodesHasError : ParserContextFlags
 
-        HasAggregatedChildData = 64,

+        HasAggregatedChildData = 128,

 >HasAggregatedChildData : ParserContextFlags
     }

     const enum RelationComparisonResult {

@@ -1191,6 +1203,11 @@ declare module "typescript" {
 >parserContextFlags : ParserContextFlags
 >ParserContextFlags : ParserContextFlags
 
+        decorators?: NodeArray<Decorator>;

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

 >modifiers : ModifiersArray
 >ModifiersArray : ModifiersArray
@@ -1285,6 +1302,14 @@ declare module "typescript" {
         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
@@ -3152,15 +3177,17 @@ declare module "typescript" {
     interface EmitResolver {

 >EmitResolver : EmitResolver
 
-        getGeneratedNameForNode(node: Node): string;

->getGeneratedNameForNode : (node: Node) => string
->node : Node
->Node : Node
+        hasGlobalName(name: string): boolean;

+>hasGlobalName : (name: string) => boolean
+>name : string
 
-        getExpressionNameSubstitution(node: Identifier): string;

->getExpressionNameSubstitution : (node: Identifier) => 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
@@ -3259,8 +3286,8 @@ declare module "typescript" {
 >PropertyAccessExpression : PropertyAccessExpression
 >ElementAccessExpression : ElementAccessExpression
 
-        isUnknownIdentifier(location: Node, name: string): boolean;

->isUnknownIdentifier : (location: Node, name: string) => boolean
+        resolvesToSomeValue(location: Node, name: string): boolean;

+>resolvesToSomeValue : (location: Node, name: string) => boolean
 >location : Node
 >Node : Node
 >name : string
@@ -3582,6 +3609,9 @@ declare module "typescript" {
 
         BlockScopedBindingInLoop = 256,

 >BlockScopedBindingInLoop : NodeCheckFlags
+
+        EmitDecorate = 512,

+>EmitDecorate : NodeCheckFlags
     }

     interface NodeLinks {

 >NodeLinks : NodeLinks
diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js
index ce17389a4fe4c..4004007508ab0 100644
--- a/tests/baselines/reference/APISample_transform.js
+++ b/tests/baselines/reference/APISample_transform.js
@@ -143,192 +143,195 @@ declare module "typescript" {
         BarBarToken = 49,
         QuestionToken = 50,
         ColonToken = 51,
-        EqualsToken = 52,
-        PlusEqualsToken = 53,
-        MinusEqualsToken = 54,
-        AsteriskEqualsToken = 55,
-        SlashEqualsToken = 56,
-        PercentEqualsToken = 57,
-        LessThanLessThanEqualsToken = 58,
-        GreaterThanGreaterThanEqualsToken = 59,
-        GreaterThanGreaterThanGreaterThanEqualsToken = 60,
-        AmpersandEqualsToken = 61,
-        BarEqualsToken = 62,
-        CaretEqualsToken = 63,
-        Identifier = 64,
-        BreakKeyword = 65,
-        CaseKeyword = 66,
-        CatchKeyword = 67,
-        ClassKeyword = 68,
-        ConstKeyword = 69,
-        ContinueKeyword = 70,
-        DebuggerKeyword = 71,
-        DefaultKeyword = 72,
-        DeleteKeyword = 73,
-        DoKeyword = 74,
-        ElseKeyword = 75,
-        EnumKeyword = 76,
-        ExportKeyword = 77,
-        ExtendsKeyword = 78,
-        FalseKeyword = 79,
-        FinallyKeyword = 80,
-        ForKeyword = 81,
-        FunctionKeyword = 82,
-        IfKeyword = 83,
-        ImportKeyword = 84,
-        InKeyword = 85,
-        InstanceOfKeyword = 86,
-        NewKeyword = 87,
-        NullKeyword = 88,
-        ReturnKeyword = 89,
-        SuperKeyword = 90,
-        SwitchKeyword = 91,
-        ThisKeyword = 92,
-        ThrowKeyword = 93,
-        TrueKeyword = 94,
-        TryKeyword = 95,
-        TypeOfKeyword = 96,
-        VarKeyword = 97,
-        VoidKeyword = 98,
-        WhileKeyword = 99,
-        WithKeyword = 100,
-        AsKeyword = 101,
-        ImplementsKeyword = 102,
-        InterfaceKeyword = 103,
-        LetKeyword = 104,
-        PackageKeyword = 105,
-        PrivateKeyword = 106,
-        ProtectedKeyword = 107,
-        PublicKeyword = 108,
-        StaticKeyword = 109,
-        YieldKeyword = 110,
-        AnyKeyword = 111,
-        BooleanKeyword = 112,
-        ConstructorKeyword = 113,
-        DeclareKeyword = 114,
-        GetKeyword = 115,
-        ModuleKeyword = 116,
-        RequireKeyword = 117,
-        NumberKeyword = 118,
-        SetKeyword = 119,
-        StringKeyword = 120,
-        SymbolKeyword = 121,
-        TypeKeyword = 122,
-        FromKeyword = 123,
-        OfKeyword = 124,
-        QualifiedName = 125,
-        ComputedPropertyName = 126,
-        TypeParameter = 127,
-        Parameter = 128,
-        PropertySignature = 129,
-        PropertyDeclaration = 130,
-        MethodSignature = 131,
-        MethodDeclaration = 132,
-        Constructor = 133,
-        GetAccessor = 134,
-        SetAccessor = 135,
-        CallSignature = 136,
-        ConstructSignature = 137,
-        IndexSignature = 138,
-        TypeReference = 139,
-        FunctionType = 140,
-        ConstructorType = 141,
-        TypeQuery = 142,
-        TypeLiteral = 143,
-        ArrayType = 144,
-        TupleType = 145,
-        UnionType = 146,
-        ParenthesizedType = 147,
-        ObjectBindingPattern = 148,
-        ArrayBindingPattern = 149,
-        BindingElement = 150,
-        ArrayLiteralExpression = 151,
-        ObjectLiteralExpression = 152,
-        PropertyAccessExpression = 153,
-        ElementAccessExpression = 154,
-        CallExpression = 155,
-        NewExpression = 156,
-        TaggedTemplateExpression = 157,
-        TypeAssertionExpression = 158,
-        ParenthesizedExpression = 159,
-        FunctionExpression = 160,
-        ArrowFunction = 161,
-        DeleteExpression = 162,
-        TypeOfExpression = 163,
-        VoidExpression = 164,
-        PrefixUnaryExpression = 165,
-        PostfixUnaryExpression = 166,
-        BinaryExpression = 167,
-        ConditionalExpression = 168,
-        TemplateExpression = 169,
-        YieldExpression = 170,
-        SpreadElementExpression = 171,
-        OmittedExpression = 172,
-        TemplateSpan = 173,
-        Block = 174,
-        VariableStatement = 175,
-        EmptyStatement = 176,
-        ExpressionStatement = 177,
-        IfStatement = 178,
-        DoStatement = 179,
-        WhileStatement = 180,
-        ForStatement = 181,
-        ForInStatement = 182,
-        ForOfStatement = 183,
-        ContinueStatement = 184,
-        BreakStatement = 185,
-        ReturnStatement = 186,
-        WithStatement = 187,
-        SwitchStatement = 188,
-        LabeledStatement = 189,
-        ThrowStatement = 190,
-        TryStatement = 191,
-        DebuggerStatement = 192,
-        VariableDeclaration = 193,
-        VariableDeclarationList = 194,
-        FunctionDeclaration = 195,
-        ClassDeclaration = 196,
-        InterfaceDeclaration = 197,
-        TypeAliasDeclaration = 198,
-        EnumDeclaration = 199,
-        ModuleDeclaration = 200,
-        ModuleBlock = 201,
-        CaseBlock = 202,
-        ImportEqualsDeclaration = 203,
-        ImportDeclaration = 204,
-        ImportClause = 205,
-        NamespaceImport = 206,
-        NamedImports = 207,
-        ImportSpecifier = 208,
-        ExportAssignment = 209,
-        ExportDeclaration = 210,
-        NamedExports = 211,
-        ExportSpecifier = 212,
-        ExternalModuleReference = 213,
-        CaseClause = 214,
-        DefaultClause = 215,
-        HeritageClause = 216,
-        CatchClause = 217,
-        PropertyAssignment = 218,
-        ShorthandPropertyAssignment = 219,
-        EnumMember = 220,
-        SourceFile = 221,
-        SyntaxList = 222,
-        Count = 223,
-        FirstAssignment = 52,
-        LastAssignment = 63,
-        FirstReservedWord = 65,
-        LastReservedWord = 100,
-        FirstKeyword = 65,
-        LastKeyword = 124,
-        FirstFutureReservedWord = 102,
-        LastFutureReservedWord = 110,
-        FirstTypeNode = 139,
-        LastTypeNode = 147,
+        AtToken = 52,
+        EqualsToken = 53,
+        PlusEqualsToken = 54,
+        MinusEqualsToken = 55,
+        AsteriskEqualsToken = 56,
+        SlashEqualsToken = 57,
+        PercentEqualsToken = 58,
+        LessThanLessThanEqualsToken = 59,
+        GreaterThanGreaterThanEqualsToken = 60,
+        GreaterThanGreaterThanGreaterThanEqualsToken = 61,
+        AmpersandEqualsToken = 62,
+        BarEqualsToken = 63,
+        CaretEqualsToken = 64,
+        Identifier = 65,
+        BreakKeyword = 66,
+        CaseKeyword = 67,
+        CatchKeyword = 68,
+        ClassKeyword = 69,
+        ConstKeyword = 70,
+        ContinueKeyword = 71,
+        DebuggerKeyword = 72,
+        DefaultKeyword = 73,
+        DeleteKeyword = 74,
+        DoKeyword = 75,
+        ElseKeyword = 76,
+        EnumKeyword = 77,
+        ExportKeyword = 78,
+        ExtendsKeyword = 79,
+        FalseKeyword = 80,
+        FinallyKeyword = 81,
+        ForKeyword = 82,
+        FunctionKeyword = 83,
+        IfKeyword = 84,
+        ImportKeyword = 85,
+        InKeyword = 86,
+        InstanceOfKeyword = 87,
+        NewKeyword = 88,
+        NullKeyword = 89,
+        ReturnKeyword = 90,
+        SuperKeyword = 91,
+        SwitchKeyword = 92,
+        ThisKeyword = 93,
+        ThrowKeyword = 94,
+        TrueKeyword = 95,
+        TryKeyword = 96,
+        TypeOfKeyword = 97,
+        VarKeyword = 98,
+        VoidKeyword = 99,
+        WhileKeyword = 100,
+        WithKeyword = 101,
+        AsKeyword = 102,
+        ImplementsKeyword = 103,
+        InterfaceKeyword = 104,
+        LetKeyword = 105,
+        PackageKeyword = 106,
+        PrivateKeyword = 107,
+        ProtectedKeyword = 108,
+        PublicKeyword = 109,
+        StaticKeyword = 110,
+        YieldKeyword = 111,
+        AnyKeyword = 112,
+        BooleanKeyword = 113,
+        ConstructorKeyword = 114,
+        DeclareKeyword = 115,
+        GetKeyword = 116,
+        ModuleKeyword = 117,
+        RequireKeyword = 118,
+        NumberKeyword = 119,
+        SetKeyword = 120,
+        StringKeyword = 121,
+        SymbolKeyword = 122,
+        TypeKeyword = 123,
+        FromKeyword = 124,
+        OfKeyword = 125,
+        QualifiedName = 126,
+        ComputedPropertyName = 127,
+        TypeParameter = 128,
+        Parameter = 129,
+        Decorator = 130,
+        PropertySignature = 131,
+        PropertyDeclaration = 132,
+        MethodSignature = 133,
+        MethodDeclaration = 134,
+        Constructor = 135,
+        GetAccessor = 136,
+        SetAccessor = 137,
+        CallSignature = 138,
+        ConstructSignature = 139,
+        IndexSignature = 140,
+        TypeReference = 141,
+        FunctionType = 142,
+        ConstructorType = 143,
+        TypeQuery = 144,
+        TypeLiteral = 145,
+        ArrayType = 146,
+        TupleType = 147,
+        UnionType = 148,
+        ParenthesizedType = 149,
+        ObjectBindingPattern = 150,
+        ArrayBindingPattern = 151,
+        BindingElement = 152,
+        ArrayLiteralExpression = 153,
+        ObjectLiteralExpression = 154,
+        PropertyAccessExpression = 155,
+        ElementAccessExpression = 156,
+        CallExpression = 157,
+        NewExpression = 158,
+        TaggedTemplateExpression = 159,
+        TypeAssertionExpression = 160,
+        ParenthesizedExpression = 161,
+        FunctionExpression = 162,
+        ArrowFunction = 163,
+        DeleteExpression = 164,
+        TypeOfExpression = 165,
+        VoidExpression = 166,
+        PrefixUnaryExpression = 167,
+        PostfixUnaryExpression = 168,
+        BinaryExpression = 169,
+        ConditionalExpression = 170,
+        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,
+        FirstAssignment = 53,
+        LastAssignment = 64,
+        FirstReservedWord = 66,
+        LastReservedWord = 101,
+        FirstKeyword = 66,
+        LastKeyword = 125,
+        FirstFutureReservedWord = 103,
+        LastFutureReservedWord = 111,
+        FirstTypeNode = 141,
+        LastTypeNode = 149,
         FirstPunctuation = 14,
-        LastPunctuation = 63,
+        LastPunctuation = 64,
         FirstToken = 0,
-        LastToken = 124,
+        LastToken = 125,
         FirstTriviaToken = 2,
         LastTriviaToken = 6,
         FirstLiteralToken = 7,
@@ -336,8 +339,8 @@ declare module "typescript" {
         FirstTemplateToken = 10,
         LastTemplateToken = 13,
         FirstBinaryOperator = 24,
-        LastBinaryOperator = 63,
-        FirstNode = 125,
+        LastBinaryOperator = 64,
+        FirstNode = 126,
     }
     const enum NodeFlags {
         Export = 1,
@@ -363,10 +366,11 @@ declare module "typescript" {
         DisallowIn = 2,
         Yield = 4,
         GeneratorParameter = 8,
-        ThisNodeHasError = 16,
-        ParserGeneratedFlags = 31,
-        ThisNodeOrAnySubNodesHasError = 32,
-        HasAggregatedChildData = 64,
+        Decorator = 16,
+        ThisNodeHasError = 32,
+        ParserGeneratedFlags = 63,
+        ThisNodeOrAnySubNodesHasError = 64,
+        HasAggregatedChildData = 128,
     }
     const enum RelationComparisonResult {
         Succeeded = 1,
@@ -377,6 +381,7 @@ declare module "typescript" {
         kind: SyntaxKind;
         flags: NodeFlags;
         parserContextFlags?: ParserContextFlags;
+        decorators?: NodeArray<Decorator>;
         modifiers?: ModifiersArray;
         id?: number;
         parent?: Node;
@@ -407,6 +412,9 @@ declare module "typescript" {
     interface ComputedPropertyName extends Node {
         expression: Expression;
     }
+    interface Decorator extends Node {
+        expression: LeftHandSideExpression;
+    }
     interface TypeParameterDeclaration extends Declaration {
         name: Identifier;
         constraint?: TypeNode;
@@ -971,8 +979,8 @@ declare module "typescript" {
         errorModuleName?: string;
     }
     interface EmitResolver {
-        getGeneratedNameForNode(node: Node): string;
-        getExpressionNameSubstitution(node: Identifier): string;
+        hasGlobalName(name: string): boolean;
+        getExpressionNameSubstitution(node: Identifier, getGeneratedNameForNode: (node: Node) => string): string;
         isValueAliasDeclaration(node: Node): boolean;
         isReferencedAliasDeclaration(node: Node, checkChildren?: boolean): boolean;
         isTopLevelValueImportEqualsWithEntityName(node: ImportEqualsDeclaration): boolean;
@@ -986,7 +994,7 @@ declare module "typescript" {
         isSymbolAccessible(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags): SymbolAccessiblityResult;
         isEntityNameVisible(entityName: EntityName, enclosingDeclaration: Node): SymbolVisibilityResult;
         getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;
-        isUnknownIdentifier(location: Node, name: string): boolean;
+        resolvesToSomeValue(location: Node, name: string): boolean;
         getBlockScopedVariableId(node: Identifier): number;
     }
     const enum SymbolFlags {
@@ -1093,6 +1101,7 @@ declare module "typescript" {
         ContextChecked = 64,
         EnumValuesComputed = 128,
         BlockScopedBindingInLoop = 256,
+        EmitDecorate = 512,
     }
     interface NodeLinks {
         resolvedType?: Type;
diff --git a/tests/baselines/reference/APISample_transform.types b/tests/baselines/reference/APISample_transform.types
index 39a3fdd948226..4ea9c49d7587d 100644
--- a/tests/baselines/reference/APISample_transform.types
+++ b/tests/baselines/reference/APISample_transform.types
@@ -447,562 +447,571 @@ declare module "typescript" {
         ColonToken = 51,

 >ColonToken : SyntaxKind
 
-        EqualsToken = 52,

+        AtToken = 52,

+>AtToken : SyntaxKind
+
+        EqualsToken = 53,

 >EqualsToken : SyntaxKind
 
-        PlusEqualsToken = 53,

+        PlusEqualsToken = 54,

 >PlusEqualsToken : SyntaxKind
 
-        MinusEqualsToken = 54,

+        MinusEqualsToken = 55,

 >MinusEqualsToken : SyntaxKind
 
-        AsteriskEqualsToken = 55,

+        AsteriskEqualsToken = 56,

 >AsteriskEqualsToken : SyntaxKind
 
-        SlashEqualsToken = 56,

+        SlashEqualsToken = 57,

 >SlashEqualsToken : SyntaxKind
 
-        PercentEqualsToken = 57,

+        PercentEqualsToken = 58,

 >PercentEqualsToken : SyntaxKind
 
-        LessThanLessThanEqualsToken = 58,

+        LessThanLessThanEqualsToken = 59,

 >LessThanLessThanEqualsToken : SyntaxKind
 
-        GreaterThanGreaterThanEqualsToken = 59,

+        GreaterThanGreaterThanEqualsToken = 60,

 >GreaterThanGreaterThanEqualsToken : SyntaxKind
 
-        GreaterThanGreaterThanGreaterThanEqualsToken = 60,

+        GreaterThanGreaterThanGreaterThanEqualsToken = 61,

 >GreaterThanGreaterThanGreaterThanEqualsToken : SyntaxKind
 
-        AmpersandEqualsToken = 61,

+        AmpersandEqualsToken = 62,

 >AmpersandEqualsToken : SyntaxKind
 
-        BarEqualsToken = 62,

+        BarEqualsToken = 63,

 >BarEqualsToken : SyntaxKind
 
-        CaretEqualsToken = 63,

+        CaretEqualsToken = 64,

 >CaretEqualsToken : SyntaxKind
 
-        Identifier = 64,

+        Identifier = 65,

 >Identifier : SyntaxKind
 
-        BreakKeyword = 65,

+        BreakKeyword = 66,

 >BreakKeyword : SyntaxKind
 
-        CaseKeyword = 66,

+        CaseKeyword = 67,

 >CaseKeyword : SyntaxKind
 
-        CatchKeyword = 67,

+        CatchKeyword = 68,

 >CatchKeyword : SyntaxKind
 
-        ClassKeyword = 68,

+        ClassKeyword = 69,

 >ClassKeyword : SyntaxKind
 
-        ConstKeyword = 69,

+        ConstKeyword = 70,

 >ConstKeyword : SyntaxKind
 
-        ContinueKeyword = 70,

+        ContinueKeyword = 71,

 >ContinueKeyword : SyntaxKind
 
-        DebuggerKeyword = 71,

+        DebuggerKeyword = 72,

 >DebuggerKeyword : SyntaxKind
 
-        DefaultKeyword = 72,

+        DefaultKeyword = 73,

 >DefaultKeyword : SyntaxKind
 
-        DeleteKeyword = 73,

+        DeleteKeyword = 74,

 >DeleteKeyword : SyntaxKind
 
-        DoKeyword = 74,

+        DoKeyword = 75,

 >DoKeyword : SyntaxKind
 
-        ElseKeyword = 75,

+        ElseKeyword = 76,

 >ElseKeyword : SyntaxKind
 
-        EnumKeyword = 76,

+        EnumKeyword = 77,

 >EnumKeyword : SyntaxKind
 
-        ExportKeyword = 77,

+        ExportKeyword = 78,

 >ExportKeyword : SyntaxKind
 
-        ExtendsKeyword = 78,

+        ExtendsKeyword = 79,

 >ExtendsKeyword : SyntaxKind
 
-        FalseKeyword = 79,

+        FalseKeyword = 80,

 >FalseKeyword : SyntaxKind
 
-        FinallyKeyword = 80,

+        FinallyKeyword = 81,

 >FinallyKeyword : SyntaxKind
 
-        ForKeyword = 81,

+        ForKeyword = 82,

 >ForKeyword : SyntaxKind
 
-        FunctionKeyword = 82,

+        FunctionKeyword = 83,

 >FunctionKeyword : SyntaxKind
 
-        IfKeyword = 83,

+        IfKeyword = 84,

 >IfKeyword : SyntaxKind
 
-        ImportKeyword = 84,

+        ImportKeyword = 85,

 >ImportKeyword : SyntaxKind
 
-        InKeyword = 85,

+        InKeyword = 86,

 >InKeyword : SyntaxKind
 
-        InstanceOfKeyword = 86,

+        InstanceOfKeyword = 87,

 >InstanceOfKeyword : SyntaxKind
 
-        NewKeyword = 87,

+        NewKeyword = 88,

 >NewKeyword : SyntaxKind
 
-        NullKeyword = 88,

+        NullKeyword = 89,

 >NullKeyword : SyntaxKind
 
-        ReturnKeyword = 89,

+        ReturnKeyword = 90,

 >ReturnKeyword : SyntaxKind
 
-        SuperKeyword = 90,

+        SuperKeyword = 91,

 >SuperKeyword : SyntaxKind
 
-        SwitchKeyword = 91,

+        SwitchKeyword = 92,

 >SwitchKeyword : SyntaxKind
 
-        ThisKeyword = 92,

+        ThisKeyword = 93,

 >ThisKeyword : SyntaxKind
 
-        ThrowKeyword = 93,

+        ThrowKeyword = 94,

 >ThrowKeyword : SyntaxKind
 
-        TrueKeyword = 94,

+        TrueKeyword = 95,

 >TrueKeyword : SyntaxKind
 
-        TryKeyword = 95,

+        TryKeyword = 96,

 >TryKeyword : SyntaxKind
 
-        TypeOfKeyword = 96,

+        TypeOfKeyword = 97,

 >TypeOfKeyword : SyntaxKind
 
-        VarKeyword = 97,

+        VarKeyword = 98,

 >VarKeyword : SyntaxKind
 
-        VoidKeyword = 98,

+        VoidKeyword = 99,

 >VoidKeyword : SyntaxKind
 
-        WhileKeyword = 99,

+        WhileKeyword = 100,

 >WhileKeyword : SyntaxKind
 
-        WithKeyword = 100,

+        WithKeyword = 101,

 >WithKeyword : SyntaxKind
 
-        AsKeyword = 101,

+        AsKeyword = 102,

 >AsKeyword : SyntaxKind
 
-        ImplementsKeyword = 102,

+        ImplementsKeyword = 103,

 >ImplementsKeyword : SyntaxKind
 
-        InterfaceKeyword = 103,

+        InterfaceKeyword = 104,

 >InterfaceKeyword : SyntaxKind
 
-        LetKeyword = 104,

+        LetKeyword = 105,

 >LetKeyword : SyntaxKind
 
-        PackageKeyword = 105,

+        PackageKeyword = 106,

 >PackageKeyword : SyntaxKind
 
-        PrivateKeyword = 106,

+        PrivateKeyword = 107,

 >PrivateKeyword : SyntaxKind
 
-        ProtectedKeyword = 107,

+        ProtectedKeyword = 108,

 >ProtectedKeyword : SyntaxKind
 
-        PublicKeyword = 108,

+        PublicKeyword = 109,

 >PublicKeyword : SyntaxKind
 
-        StaticKeyword = 109,

+        StaticKeyword = 110,

 >StaticKeyword : SyntaxKind
 
-        YieldKeyword = 110,

+        YieldKeyword = 111,

 >YieldKeyword : SyntaxKind
 
-        AnyKeyword = 111,

+        AnyKeyword = 112,

 >AnyKeyword : SyntaxKind
 
-        BooleanKeyword = 112,

+        BooleanKeyword = 113,

 >BooleanKeyword : SyntaxKind
 
-        ConstructorKeyword = 113,

+        ConstructorKeyword = 114,

 >ConstructorKeyword : SyntaxKind
 
-        DeclareKeyword = 114,

+        DeclareKeyword = 115,

 >DeclareKeyword : SyntaxKind
 
-        GetKeyword = 115,

+        GetKeyword = 116,

 >GetKeyword : SyntaxKind
 
-        ModuleKeyword = 116,

+        ModuleKeyword = 117,

 >ModuleKeyword : SyntaxKind
 
-        RequireKeyword = 117,

+        RequireKeyword = 118,

 >RequireKeyword : SyntaxKind
 
-        NumberKeyword = 118,

+        NumberKeyword = 119,

 >NumberKeyword : SyntaxKind
 
-        SetKeyword = 119,

+        SetKeyword = 120,

 >SetKeyword : SyntaxKind
 
-        StringKeyword = 120,

+        StringKeyword = 121,

 >StringKeyword : SyntaxKind
 
-        SymbolKeyword = 121,

+        SymbolKeyword = 122,

 >SymbolKeyword : SyntaxKind
 
-        TypeKeyword = 122,

+        TypeKeyword = 123,

 >TypeKeyword : SyntaxKind
 
-        FromKeyword = 123,

+        FromKeyword = 124,

 >FromKeyword : SyntaxKind
 
-        OfKeyword = 124,

+        OfKeyword = 125,

 >OfKeyword : SyntaxKind
 
-        QualifiedName = 125,

+        QualifiedName = 126,

 >QualifiedName : SyntaxKind
 
-        ComputedPropertyName = 126,

+        ComputedPropertyName = 127,

 >ComputedPropertyName : SyntaxKind
 
-        TypeParameter = 127,

+        TypeParameter = 128,

 >TypeParameter : SyntaxKind
 
-        Parameter = 128,

+        Parameter = 129,

 >Parameter : SyntaxKind
 
-        PropertySignature = 129,

+        Decorator = 130,

+>Decorator : SyntaxKind
+
+        PropertySignature = 131,

 >PropertySignature : SyntaxKind
 
-        PropertyDeclaration = 130,

+        PropertyDeclaration = 132,

 >PropertyDeclaration : SyntaxKind
 
-        MethodSignature = 131,

+        MethodSignature = 133,

 >MethodSignature : SyntaxKind
 
-        MethodDeclaration = 132,

+        MethodDeclaration = 134,

 >MethodDeclaration : SyntaxKind
 
-        Constructor = 133,

+        Constructor = 135,

 >Constructor : SyntaxKind
 
-        GetAccessor = 134,

+        GetAccessor = 136,

 >GetAccessor : SyntaxKind
 
-        SetAccessor = 135,

+        SetAccessor = 137,

 >SetAccessor : SyntaxKind
 
-        CallSignature = 136,

+        CallSignature = 138,

 >CallSignature : SyntaxKind
 
-        ConstructSignature = 137,

+        ConstructSignature = 139,

 >ConstructSignature : SyntaxKind
 
-        IndexSignature = 138,

+        IndexSignature = 140,

 >IndexSignature : SyntaxKind
 
-        TypeReference = 139,

+        TypeReference = 141,

 >TypeReference : SyntaxKind
 
-        FunctionType = 140,

+        FunctionType = 142,

 >FunctionType : SyntaxKind
 
-        ConstructorType = 141,

+        ConstructorType = 143,

 >ConstructorType : SyntaxKind
 
-        TypeQuery = 142,

+        TypeQuery = 144,

 >TypeQuery : SyntaxKind
 
-        TypeLiteral = 143,

+        TypeLiteral = 145,

 >TypeLiteral : SyntaxKind
 
-        ArrayType = 144,

+        ArrayType = 146,

 >ArrayType : SyntaxKind
 
-        TupleType = 145,

+        TupleType = 147,

 >TupleType : SyntaxKind
 
-        UnionType = 146,

+        UnionType = 148,

 >UnionType : SyntaxKind
 
-        ParenthesizedType = 147,

+        ParenthesizedType = 149,

 >ParenthesizedType : SyntaxKind
 
-        ObjectBindingPattern = 148,

+        ObjectBindingPattern = 150,

 >ObjectBindingPattern : SyntaxKind
 
-        ArrayBindingPattern = 149,

+        ArrayBindingPattern = 151,

 >ArrayBindingPattern : SyntaxKind
 
-        BindingElement = 150,

+        BindingElement = 152,

 >BindingElement : SyntaxKind
 
-        ArrayLiteralExpression = 151,

+        ArrayLiteralExpression = 153,

 >ArrayLiteralExpression : SyntaxKind
 
-        ObjectLiteralExpression = 152,

+        ObjectLiteralExpression = 154,

 >ObjectLiteralExpression : SyntaxKind
 
-        PropertyAccessExpression = 153,

+        PropertyAccessExpression = 155,

 >PropertyAccessExpression : SyntaxKind
 
-        ElementAccessExpression = 154,

+        ElementAccessExpression = 156,

 >ElementAccessExpression : SyntaxKind
 
-        CallExpression = 155,

+        CallExpression = 157,

 >CallExpression : SyntaxKind
 
-        NewExpression = 156,

+        NewExpression = 158,

 >NewExpression : SyntaxKind
 
-        TaggedTemplateExpression = 157,

+        TaggedTemplateExpression = 159,

 >TaggedTemplateExpression : SyntaxKind
 
-        TypeAssertionExpression = 158,

+        TypeAssertionExpression = 160,

 >TypeAssertionExpression : SyntaxKind
 
-        ParenthesizedExpression = 159,

+        ParenthesizedExpression = 161,

 >ParenthesizedExpression : SyntaxKind
 
-        FunctionExpression = 160,

+        FunctionExpression = 162,

 >FunctionExpression : SyntaxKind
 
-        ArrowFunction = 161,

+        ArrowFunction = 163,

 >ArrowFunction : SyntaxKind
 
-        DeleteExpression = 162,

+        DeleteExpression = 164,

 >DeleteExpression : SyntaxKind
 
-        TypeOfExpression = 163,

+        TypeOfExpression = 165,

 >TypeOfExpression : SyntaxKind
 
-        VoidExpression = 164,

+        VoidExpression = 166,

 >VoidExpression : SyntaxKind
 
-        PrefixUnaryExpression = 165,

+        PrefixUnaryExpression = 167,

 >PrefixUnaryExpression : SyntaxKind
 
-        PostfixUnaryExpression = 166,

+        PostfixUnaryExpression = 168,

 >PostfixUnaryExpression : SyntaxKind
 
-        BinaryExpression = 167,

+        BinaryExpression = 169,

 >BinaryExpression : SyntaxKind
 
-        ConditionalExpression = 168,

+        ConditionalExpression = 170,

 >ConditionalExpression : SyntaxKind
 
-        TemplateExpression = 169,

+        TemplateExpression = 171,

 >TemplateExpression : SyntaxKind
 
-        YieldExpression = 170,

+        YieldExpression = 172,

 >YieldExpression : SyntaxKind
 
-        SpreadElementExpression = 171,

+        SpreadElementExpression = 173,

 >SpreadElementExpression : SyntaxKind
 
-        OmittedExpression = 172,

+        OmittedExpression = 174,

 >OmittedExpression : SyntaxKind
 
-        TemplateSpan = 173,

+        TemplateSpan = 175,

 >TemplateSpan : SyntaxKind
 
-        Block = 174,

+        Block = 176,

 >Block : SyntaxKind
 
-        VariableStatement = 175,

+        VariableStatement = 177,

 >VariableStatement : SyntaxKind
 
-        EmptyStatement = 176,

+        EmptyStatement = 178,

 >EmptyStatement : SyntaxKind
 
-        ExpressionStatement = 177,

+        ExpressionStatement = 179,

 >ExpressionStatement : SyntaxKind
 
-        IfStatement = 178,

+        IfStatement = 180,

 >IfStatement : SyntaxKind
 
-        DoStatement = 179,

+        DoStatement = 181,

 >DoStatement : SyntaxKind
 
-        WhileStatement = 180,

+        WhileStatement = 182,

 >WhileStatement : SyntaxKind
 
-        ForStatement = 181,

+        ForStatement = 183,

 >ForStatement : SyntaxKind
 
-        ForInStatement = 182,

+        ForInStatement = 184,

 >ForInStatement : SyntaxKind
 
-        ForOfStatement = 183,

+        ForOfStatement = 185,

 >ForOfStatement : SyntaxKind
 
-        ContinueStatement = 184,

+        ContinueStatement = 186,

 >ContinueStatement : SyntaxKind
 
-        BreakStatement = 185,

+        BreakStatement = 187,

 >BreakStatement : SyntaxKind
 
-        ReturnStatement = 186,

+        ReturnStatement = 188,

 >ReturnStatement : SyntaxKind
 
-        WithStatement = 187,

+        WithStatement = 189,

 >WithStatement : SyntaxKind
 
-        SwitchStatement = 188,

+        SwitchStatement = 190,

 >SwitchStatement : SyntaxKind
 
-        LabeledStatement = 189,

+        LabeledStatement = 191,

 >LabeledStatement : SyntaxKind
 
-        ThrowStatement = 190,

+        ThrowStatement = 192,

 >ThrowStatement : SyntaxKind
 
-        TryStatement = 191,

+        TryStatement = 193,

 >TryStatement : SyntaxKind
 
-        DebuggerStatement = 192,

+        DebuggerStatement = 194,

 >DebuggerStatement : SyntaxKind
 
-        VariableDeclaration = 193,

+        VariableDeclaration = 195,

 >VariableDeclaration : SyntaxKind
 
-        VariableDeclarationList = 194,

+        VariableDeclarationList = 196,

 >VariableDeclarationList : SyntaxKind
 
-        FunctionDeclaration = 195,

+        FunctionDeclaration = 197,

 >FunctionDeclaration : SyntaxKind
 
-        ClassDeclaration = 196,

+        ClassDeclaration = 198,

 >ClassDeclaration : SyntaxKind
 
-        InterfaceDeclaration = 197,

+        InterfaceDeclaration = 199,

 >InterfaceDeclaration : SyntaxKind
 
-        TypeAliasDeclaration = 198,

+        TypeAliasDeclaration = 200,

 >TypeAliasDeclaration : SyntaxKind
 
-        EnumDeclaration = 199,

+        EnumDeclaration = 201,

 >EnumDeclaration : SyntaxKind
 
-        ModuleDeclaration = 200,

+        ModuleDeclaration = 202,

 >ModuleDeclaration : SyntaxKind
 
-        ModuleBlock = 201,

+        ModuleBlock = 203,

 >ModuleBlock : SyntaxKind
 
-        CaseBlock = 202,

+        CaseBlock = 204,

 >CaseBlock : SyntaxKind
 
-        ImportEqualsDeclaration = 203,

+        ImportEqualsDeclaration = 205,

 >ImportEqualsDeclaration : SyntaxKind
 
-        ImportDeclaration = 204,

+        ImportDeclaration = 206,

 >ImportDeclaration : SyntaxKind
 
-        ImportClause = 205,

+        ImportClause = 207,

 >ImportClause : SyntaxKind
 
-        NamespaceImport = 206,

+        NamespaceImport = 208,

 >NamespaceImport : SyntaxKind
 
-        NamedImports = 207,

+        NamedImports = 209,

 >NamedImports : SyntaxKind
 
-        ImportSpecifier = 208,

+        ImportSpecifier = 210,

 >ImportSpecifier : SyntaxKind
 
-        ExportAssignment = 209,

+        ExportAssignment = 211,

 >ExportAssignment : SyntaxKind
 
-        ExportDeclaration = 210,

+        ExportDeclaration = 212,

 >ExportDeclaration : SyntaxKind
 
-        NamedExports = 211,

+        NamedExports = 213,

 >NamedExports : SyntaxKind
 
-        ExportSpecifier = 212,

+        ExportSpecifier = 214,

 >ExportSpecifier : SyntaxKind
 
-        ExternalModuleReference = 213,

+        MissingDeclaration = 215,

+>MissingDeclaration : SyntaxKind
+
+        ExternalModuleReference = 216,

 >ExternalModuleReference : SyntaxKind
 
-        CaseClause = 214,

+        CaseClause = 217,

 >CaseClause : SyntaxKind
 
-        DefaultClause = 215,

+        DefaultClause = 218,

 >DefaultClause : SyntaxKind
 
-        HeritageClause = 216,

+        HeritageClause = 219,

 >HeritageClause : SyntaxKind
 
-        CatchClause = 217,

+        CatchClause = 220,

 >CatchClause : SyntaxKind
 
-        PropertyAssignment = 218,

+        PropertyAssignment = 221,

 >PropertyAssignment : SyntaxKind
 
-        ShorthandPropertyAssignment = 219,

+        ShorthandPropertyAssignment = 222,

 >ShorthandPropertyAssignment : SyntaxKind
 
-        EnumMember = 220,

+        EnumMember = 223,

 >EnumMember : SyntaxKind
 
-        SourceFile = 221,

+        SourceFile = 224,

 >SourceFile : SyntaxKind
 
-        SyntaxList = 222,

+        SyntaxList = 225,

 >SyntaxList : SyntaxKind
 
-        Count = 223,

+        Count = 226,

 >Count : SyntaxKind
 
-        FirstAssignment = 52,

+        FirstAssignment = 53,

 >FirstAssignment : SyntaxKind
 
-        LastAssignment = 63,

+        LastAssignment = 64,

 >LastAssignment : SyntaxKind
 
-        FirstReservedWord = 65,

+        FirstReservedWord = 66,

 >FirstReservedWord : SyntaxKind
 
-        LastReservedWord = 100,

+        LastReservedWord = 101,

 >LastReservedWord : SyntaxKind
 
-        FirstKeyword = 65,

+        FirstKeyword = 66,

 >FirstKeyword : SyntaxKind
 
-        LastKeyword = 124,

+        LastKeyword = 125,

 >LastKeyword : SyntaxKind
 
-        FirstFutureReservedWord = 102,

+        FirstFutureReservedWord = 103,

 >FirstFutureReservedWord : SyntaxKind
 
-        LastFutureReservedWord = 110,

+        LastFutureReservedWord = 111,

 >LastFutureReservedWord : SyntaxKind
 
-        FirstTypeNode = 139,

+        FirstTypeNode = 141,

 >FirstTypeNode : SyntaxKind
 
-        LastTypeNode = 147,

+        LastTypeNode = 149,

 >LastTypeNode : SyntaxKind
 
         FirstPunctuation = 14,

 >FirstPunctuation : SyntaxKind
 
-        LastPunctuation = 63,

+        LastPunctuation = 64,

 >LastPunctuation : SyntaxKind
 
         FirstToken = 0,

 >FirstToken : SyntaxKind
 
-        LastToken = 124,

+        LastToken = 125,

 >LastToken : SyntaxKind
 
         FirstTriviaToken = 2,

@@ -1026,10 +1035,10 @@ declare module "typescript" {
         FirstBinaryOperator = 24,

 >FirstBinaryOperator : SyntaxKind
 
-        LastBinaryOperator = 63,

+        LastBinaryOperator = 64,

 >LastBinaryOperator : SyntaxKind
 
-        FirstNode = 125,

+        FirstNode = 126,

 >FirstNode : SyntaxKind
     }

     const enum NodeFlags {

@@ -1101,16 +1110,19 @@ declare module "typescript" {
         GeneratorParameter = 8,

 >GeneratorParameter : ParserContextFlags
 
-        ThisNodeHasError = 16,

+        Decorator = 16,

+>Decorator : ParserContextFlags
+
+        ThisNodeHasError = 32,

 >ThisNodeHasError : ParserContextFlags
 
-        ParserGeneratedFlags = 31,

+        ParserGeneratedFlags = 63,

 >ParserGeneratedFlags : ParserContextFlags
 
-        ThisNodeOrAnySubNodesHasError = 32,

+        ThisNodeOrAnySubNodesHasError = 64,

 >ThisNodeOrAnySubNodesHasError : ParserContextFlags
 
-        HasAggregatedChildData = 64,

+        HasAggregatedChildData = 128,

 >HasAggregatedChildData : ParserContextFlags
     }

     const enum RelationComparisonResult {

@@ -1141,6 +1153,11 @@ declare module "typescript" {
 >parserContextFlags : ParserContextFlags
 >ParserContextFlags : ParserContextFlags
 
+        decorators?: NodeArray<Decorator>;

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

 >modifiers : ModifiersArray
 >ModifiersArray : ModifiersArray
@@ -1235,6 +1252,14 @@ declare module "typescript" {
         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
@@ -3102,15 +3127,17 @@ declare module "typescript" {
     interface EmitResolver {

 >EmitResolver : EmitResolver
 
-        getGeneratedNameForNode(node: Node): string;

->getGeneratedNameForNode : (node: Node) => string
->node : Node
->Node : Node
+        hasGlobalName(name: string): boolean;

+>hasGlobalName : (name: string) => boolean
+>name : string
 
-        getExpressionNameSubstitution(node: Identifier): string;

->getExpressionNameSubstitution : (node: Identifier) => 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
@@ -3209,8 +3236,8 @@ declare module "typescript" {
 >PropertyAccessExpression : PropertyAccessExpression
 >ElementAccessExpression : ElementAccessExpression
 
-        isUnknownIdentifier(location: Node, name: string): boolean;

->isUnknownIdentifier : (location: Node, name: string) => boolean
+        resolvesToSomeValue(location: Node, name: string): boolean;

+>resolvesToSomeValue : (location: Node, name: string) => boolean
 >location : Node
 >Node : Node
 >name : string
@@ -3532,6 +3559,9 @@ declare module "typescript" {
 
         BlockScopedBindingInLoop = 256,

 >BlockScopedBindingInLoop : NodeCheckFlags
+
+        EmitDecorate = 512,

+>EmitDecorate : NodeCheckFlags
     }

     interface NodeLinks {

 >NodeLinks : NodeLinks
diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js
index 32cac96694831..34503a0d81a22 100644
--- a/tests/baselines/reference/APISample_watcher.js
+++ b/tests/baselines/reference/APISample_watcher.js
@@ -180,192 +180,195 @@ declare module "typescript" {
         BarBarToken = 49,
         QuestionToken = 50,
         ColonToken = 51,
-        EqualsToken = 52,
-        PlusEqualsToken = 53,
-        MinusEqualsToken = 54,
-        AsteriskEqualsToken = 55,
-        SlashEqualsToken = 56,
-        PercentEqualsToken = 57,
-        LessThanLessThanEqualsToken = 58,
-        GreaterThanGreaterThanEqualsToken = 59,
-        GreaterThanGreaterThanGreaterThanEqualsToken = 60,
-        AmpersandEqualsToken = 61,
-        BarEqualsToken = 62,
-        CaretEqualsToken = 63,
-        Identifier = 64,
-        BreakKeyword = 65,
-        CaseKeyword = 66,
-        CatchKeyword = 67,
-        ClassKeyword = 68,
-        ConstKeyword = 69,
-        ContinueKeyword = 70,
-        DebuggerKeyword = 71,
-        DefaultKeyword = 72,
-        DeleteKeyword = 73,
-        DoKeyword = 74,
-        ElseKeyword = 75,
-        EnumKeyword = 76,
-        ExportKeyword = 77,
-        ExtendsKeyword = 78,
-        FalseKeyword = 79,
-        FinallyKeyword = 80,
-        ForKeyword = 81,
-        FunctionKeyword = 82,
-        IfKeyword = 83,
-        ImportKeyword = 84,
-        InKeyword = 85,
-        InstanceOfKeyword = 86,
-        NewKeyword = 87,
-        NullKeyword = 88,
-        ReturnKeyword = 89,
-        SuperKeyword = 90,
-        SwitchKeyword = 91,
-        ThisKeyword = 92,
-        ThrowKeyword = 93,
-        TrueKeyword = 94,
-        TryKeyword = 95,
-        TypeOfKeyword = 96,
-        VarKeyword = 97,
-        VoidKeyword = 98,
-        WhileKeyword = 99,
-        WithKeyword = 100,
-        AsKeyword = 101,
-        ImplementsKeyword = 102,
-        InterfaceKeyword = 103,
-        LetKeyword = 104,
-        PackageKeyword = 105,
-        PrivateKeyword = 106,
-        ProtectedKeyword = 107,
-        PublicKeyword = 108,
-        StaticKeyword = 109,
-        YieldKeyword = 110,
-        AnyKeyword = 111,
-        BooleanKeyword = 112,
-        ConstructorKeyword = 113,
-        DeclareKeyword = 114,
-        GetKeyword = 115,
-        ModuleKeyword = 116,
-        RequireKeyword = 117,
-        NumberKeyword = 118,
-        SetKeyword = 119,
-        StringKeyword = 120,
-        SymbolKeyword = 121,
-        TypeKeyword = 122,
-        FromKeyword = 123,
-        OfKeyword = 124,
-        QualifiedName = 125,
-        ComputedPropertyName = 126,
-        TypeParameter = 127,
-        Parameter = 128,
-        PropertySignature = 129,
-        PropertyDeclaration = 130,
-        MethodSignature = 131,
-        MethodDeclaration = 132,
-        Constructor = 133,
-        GetAccessor = 134,
-        SetAccessor = 135,
-        CallSignature = 136,
-        ConstructSignature = 137,
-        IndexSignature = 138,
-        TypeReference = 139,
-        FunctionType = 140,
-        ConstructorType = 141,
-        TypeQuery = 142,
-        TypeLiteral = 143,
-        ArrayType = 144,
-        TupleType = 145,
-        UnionType = 146,
-        ParenthesizedType = 147,
-        ObjectBindingPattern = 148,
-        ArrayBindingPattern = 149,
-        BindingElement = 150,
-        ArrayLiteralExpression = 151,
-        ObjectLiteralExpression = 152,
-        PropertyAccessExpression = 153,
-        ElementAccessExpression = 154,
-        CallExpression = 155,
-        NewExpression = 156,
-        TaggedTemplateExpression = 157,
-        TypeAssertionExpression = 158,
-        ParenthesizedExpression = 159,
-        FunctionExpression = 160,
-        ArrowFunction = 161,
-        DeleteExpression = 162,
-        TypeOfExpression = 163,
-        VoidExpression = 164,
-        PrefixUnaryExpression = 165,
-        PostfixUnaryExpression = 166,
-        BinaryExpression = 167,
-        ConditionalExpression = 168,
-        TemplateExpression = 169,
-        YieldExpression = 170,
-        SpreadElementExpression = 171,
-        OmittedExpression = 172,
-        TemplateSpan = 173,
-        Block = 174,
-        VariableStatement = 175,
-        EmptyStatement = 176,
-        ExpressionStatement = 177,
-        IfStatement = 178,
-        DoStatement = 179,
-        WhileStatement = 180,
-        ForStatement = 181,
-        ForInStatement = 182,
-        ForOfStatement = 183,
-        ContinueStatement = 184,
-        BreakStatement = 185,
-        ReturnStatement = 186,
-        WithStatement = 187,
-        SwitchStatement = 188,
-        LabeledStatement = 189,
-        ThrowStatement = 190,
-        TryStatement = 191,
-        DebuggerStatement = 192,
-        VariableDeclaration = 193,
-        VariableDeclarationList = 194,
-        FunctionDeclaration = 195,
-        ClassDeclaration = 196,
-        InterfaceDeclaration = 197,
-        TypeAliasDeclaration = 198,
-        EnumDeclaration = 199,
-        ModuleDeclaration = 200,
-        ModuleBlock = 201,
-        CaseBlock = 202,
-        ImportEqualsDeclaration = 203,
-        ImportDeclaration = 204,
-        ImportClause = 205,
-        NamespaceImport = 206,
-        NamedImports = 207,
-        ImportSpecifier = 208,
-        ExportAssignment = 209,
-        ExportDeclaration = 210,
-        NamedExports = 211,
-        ExportSpecifier = 212,
-        ExternalModuleReference = 213,
-        CaseClause = 214,
-        DefaultClause = 215,
-        HeritageClause = 216,
-        CatchClause = 217,
-        PropertyAssignment = 218,
-        ShorthandPropertyAssignment = 219,
-        EnumMember = 220,
-        SourceFile = 221,
-        SyntaxList = 222,
-        Count = 223,
-        FirstAssignment = 52,
-        LastAssignment = 63,
-        FirstReservedWord = 65,
-        LastReservedWord = 100,
-        FirstKeyword = 65,
-        LastKeyword = 124,
-        FirstFutureReservedWord = 102,
-        LastFutureReservedWord = 110,
-        FirstTypeNode = 139,
-        LastTypeNode = 147,
+        AtToken = 52,
+        EqualsToken = 53,
+        PlusEqualsToken = 54,
+        MinusEqualsToken = 55,
+        AsteriskEqualsToken = 56,
+        SlashEqualsToken = 57,
+        PercentEqualsToken = 58,
+        LessThanLessThanEqualsToken = 59,
+        GreaterThanGreaterThanEqualsToken = 60,
+        GreaterThanGreaterThanGreaterThanEqualsToken = 61,
+        AmpersandEqualsToken = 62,
+        BarEqualsToken = 63,
+        CaretEqualsToken = 64,
+        Identifier = 65,
+        BreakKeyword = 66,
+        CaseKeyword = 67,
+        CatchKeyword = 68,
+        ClassKeyword = 69,
+        ConstKeyword = 70,
+        ContinueKeyword = 71,
+        DebuggerKeyword = 72,
+        DefaultKeyword = 73,
+        DeleteKeyword = 74,
+        DoKeyword = 75,
+        ElseKeyword = 76,
+        EnumKeyword = 77,
+        ExportKeyword = 78,
+        ExtendsKeyword = 79,
+        FalseKeyword = 80,
+        FinallyKeyword = 81,
+        ForKeyword = 82,
+        FunctionKeyword = 83,
+        IfKeyword = 84,
+        ImportKeyword = 85,
+        InKeyword = 86,
+        InstanceOfKeyword = 87,
+        NewKeyword = 88,
+        NullKeyword = 89,
+        ReturnKeyword = 90,
+        SuperKeyword = 91,
+        SwitchKeyword = 92,
+        ThisKeyword = 93,
+        ThrowKeyword = 94,
+        TrueKeyword = 95,
+        TryKeyword = 96,
+        TypeOfKeyword = 97,
+        VarKeyword = 98,
+        VoidKeyword = 99,
+        WhileKeyword = 100,
+        WithKeyword = 101,
+        AsKeyword = 102,
+        ImplementsKeyword = 103,
+        InterfaceKeyword = 104,
+        LetKeyword = 105,
+        PackageKeyword = 106,
+        PrivateKeyword = 107,
+        ProtectedKeyword = 108,
+        PublicKeyword = 109,
+        StaticKeyword = 110,
+        YieldKeyword = 111,
+        AnyKeyword = 112,
+        BooleanKeyword = 113,
+        ConstructorKeyword = 114,
+        DeclareKeyword = 115,
+        GetKeyword = 116,
+        ModuleKeyword = 117,
+        RequireKeyword = 118,
+        NumberKeyword = 119,
+        SetKeyword = 120,
+        StringKeyword = 121,
+        SymbolKeyword = 122,
+        TypeKeyword = 123,
+        FromKeyword = 124,
+        OfKeyword = 125,
+        QualifiedName = 126,
+        ComputedPropertyName = 127,
+        TypeParameter = 128,
+        Parameter = 129,
+        Decorator = 130,
+        PropertySignature = 131,
+        PropertyDeclaration = 132,
+        MethodSignature = 133,
+        MethodDeclaration = 134,
+        Constructor = 135,
+        GetAccessor = 136,
+        SetAccessor = 137,
+        CallSignature = 138,
+        ConstructSignature = 139,
+        IndexSignature = 140,
+        TypeReference = 141,
+        FunctionType = 142,
+        ConstructorType = 143,
+        TypeQuery = 144,
+        TypeLiteral = 145,
+        ArrayType = 146,
+        TupleType = 147,
+        UnionType = 148,
+        ParenthesizedType = 149,
+        ObjectBindingPattern = 150,
+        ArrayBindingPattern = 151,
+        BindingElement = 152,
+        ArrayLiteralExpression = 153,
+        ObjectLiteralExpression = 154,
+        PropertyAccessExpression = 155,
+        ElementAccessExpression = 156,
+        CallExpression = 157,
+        NewExpression = 158,
+        TaggedTemplateExpression = 159,
+        TypeAssertionExpression = 160,
+        ParenthesizedExpression = 161,
+        FunctionExpression = 162,
+        ArrowFunction = 163,
+        DeleteExpression = 164,
+        TypeOfExpression = 165,
+        VoidExpression = 166,
+        PrefixUnaryExpression = 167,
+        PostfixUnaryExpression = 168,
+        BinaryExpression = 169,
+        ConditionalExpression = 170,
+        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,
+        FirstAssignment = 53,
+        LastAssignment = 64,
+        FirstReservedWord = 66,
+        LastReservedWord = 101,
+        FirstKeyword = 66,
+        LastKeyword = 125,
+        FirstFutureReservedWord = 103,
+        LastFutureReservedWord = 111,
+        FirstTypeNode = 141,
+        LastTypeNode = 149,
         FirstPunctuation = 14,
-        LastPunctuation = 63,
+        LastPunctuation = 64,
         FirstToken = 0,
-        LastToken = 124,
+        LastToken = 125,
         FirstTriviaToken = 2,
         LastTriviaToken = 6,
         FirstLiteralToken = 7,
@@ -373,8 +376,8 @@ declare module "typescript" {
         FirstTemplateToken = 10,
         LastTemplateToken = 13,
         FirstBinaryOperator = 24,
-        LastBinaryOperator = 63,
-        FirstNode = 125,
+        LastBinaryOperator = 64,
+        FirstNode = 126,
     }
     const enum NodeFlags {
         Export = 1,
@@ -400,10 +403,11 @@ declare module "typescript" {
         DisallowIn = 2,
         Yield = 4,
         GeneratorParameter = 8,
-        ThisNodeHasError = 16,
-        ParserGeneratedFlags = 31,
-        ThisNodeOrAnySubNodesHasError = 32,
-        HasAggregatedChildData = 64,
+        Decorator = 16,
+        ThisNodeHasError = 32,
+        ParserGeneratedFlags = 63,
+        ThisNodeOrAnySubNodesHasError = 64,
+        HasAggregatedChildData = 128,
     }
     const enum RelationComparisonResult {
         Succeeded = 1,
@@ -414,6 +418,7 @@ declare module "typescript" {
         kind: SyntaxKind;
         flags: NodeFlags;
         parserContextFlags?: ParserContextFlags;
+        decorators?: NodeArray<Decorator>;
         modifiers?: ModifiersArray;
         id?: number;
         parent?: Node;
@@ -444,6 +449,9 @@ declare module "typescript" {
     interface ComputedPropertyName extends Node {
         expression: Expression;
     }
+    interface Decorator extends Node {
+        expression: LeftHandSideExpression;
+    }
     interface TypeParameterDeclaration extends Declaration {
         name: Identifier;
         constraint?: TypeNode;
@@ -1008,8 +1016,8 @@ declare module "typescript" {
         errorModuleName?: string;
     }
     interface EmitResolver {
-        getGeneratedNameForNode(node: Node): string;
-        getExpressionNameSubstitution(node: Identifier): string;
+        hasGlobalName(name: string): boolean;
+        getExpressionNameSubstitution(node: Identifier, getGeneratedNameForNode: (node: Node) => string): string;
         isValueAliasDeclaration(node: Node): boolean;
         isReferencedAliasDeclaration(node: Node, checkChildren?: boolean): boolean;
         isTopLevelValueImportEqualsWithEntityName(node: ImportEqualsDeclaration): boolean;
@@ -1023,7 +1031,7 @@ declare module "typescript" {
         isSymbolAccessible(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags): SymbolAccessiblityResult;
         isEntityNameVisible(entityName: EntityName, enclosingDeclaration: Node): SymbolVisibilityResult;
         getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;
-        isUnknownIdentifier(location: Node, name: string): boolean;
+        resolvesToSomeValue(location: Node, name: string): boolean;
         getBlockScopedVariableId(node: Identifier): number;
     }
     const enum SymbolFlags {
@@ -1130,6 +1138,7 @@ declare module "typescript" {
         ContextChecked = 64,
         EnumValuesComputed = 128,
         BlockScopedBindingInLoop = 256,
+        EmitDecorate = 512,
     }
     interface NodeLinks {
         resolvedType?: Type;
diff --git a/tests/baselines/reference/APISample_watcher.types b/tests/baselines/reference/APISample_watcher.types
index 716fe5394879a..3903e169b4e3b 100644
--- a/tests/baselines/reference/APISample_watcher.types
+++ b/tests/baselines/reference/APISample_watcher.types
@@ -620,562 +620,571 @@ declare module "typescript" {
         ColonToken = 51,

 >ColonToken : SyntaxKind
 
-        EqualsToken = 52,

+        AtToken = 52,

+>AtToken : SyntaxKind
+
+        EqualsToken = 53,

 >EqualsToken : SyntaxKind
 
-        PlusEqualsToken = 53,

+        PlusEqualsToken = 54,

 >PlusEqualsToken : SyntaxKind
 
-        MinusEqualsToken = 54,

+        MinusEqualsToken = 55,

 >MinusEqualsToken : SyntaxKind
 
-        AsteriskEqualsToken = 55,

+        AsteriskEqualsToken = 56,

 >AsteriskEqualsToken : SyntaxKind
 
-        SlashEqualsToken = 56,

+        SlashEqualsToken = 57,

 >SlashEqualsToken : SyntaxKind
 
-        PercentEqualsToken = 57,

+        PercentEqualsToken = 58,

 >PercentEqualsToken : SyntaxKind
 
-        LessThanLessThanEqualsToken = 58,

+        LessThanLessThanEqualsToken = 59,

 >LessThanLessThanEqualsToken : SyntaxKind
 
-        GreaterThanGreaterThanEqualsToken = 59,

+        GreaterThanGreaterThanEqualsToken = 60,

 >GreaterThanGreaterThanEqualsToken : SyntaxKind
 
-        GreaterThanGreaterThanGreaterThanEqualsToken = 60,

+        GreaterThanGreaterThanGreaterThanEqualsToken = 61,

 >GreaterThanGreaterThanGreaterThanEqualsToken : SyntaxKind
 
-        AmpersandEqualsToken = 61,

+        AmpersandEqualsToken = 62,

 >AmpersandEqualsToken : SyntaxKind
 
-        BarEqualsToken = 62,

+        BarEqualsToken = 63,

 >BarEqualsToken : SyntaxKind
 
-        CaretEqualsToken = 63,

+        CaretEqualsToken = 64,

 >CaretEqualsToken : SyntaxKind
 
-        Identifier = 64,

+        Identifier = 65,

 >Identifier : SyntaxKind
 
-        BreakKeyword = 65,

+        BreakKeyword = 66,

 >BreakKeyword : SyntaxKind
 
-        CaseKeyword = 66,

+        CaseKeyword = 67,

 >CaseKeyword : SyntaxKind
 
-        CatchKeyword = 67,

+        CatchKeyword = 68,

 >CatchKeyword : SyntaxKind
 
-        ClassKeyword = 68,

+        ClassKeyword = 69,

 >ClassKeyword : SyntaxKind
 
-        ConstKeyword = 69,

+        ConstKeyword = 70,

 >ConstKeyword : SyntaxKind
 
-        ContinueKeyword = 70,

+        ContinueKeyword = 71,

 >ContinueKeyword : SyntaxKind
 
-        DebuggerKeyword = 71,

+        DebuggerKeyword = 72,

 >DebuggerKeyword : SyntaxKind
 
-        DefaultKeyword = 72,

+        DefaultKeyword = 73,

 >DefaultKeyword : SyntaxKind
 
-        DeleteKeyword = 73,

+        DeleteKeyword = 74,

 >DeleteKeyword : SyntaxKind
 
-        DoKeyword = 74,

+        DoKeyword = 75,

 >DoKeyword : SyntaxKind
 
-        ElseKeyword = 75,

+        ElseKeyword = 76,

 >ElseKeyword : SyntaxKind
 
-        EnumKeyword = 76,

+        EnumKeyword = 77,

 >EnumKeyword : SyntaxKind
 
-        ExportKeyword = 77,

+        ExportKeyword = 78,

 >ExportKeyword : SyntaxKind
 
-        ExtendsKeyword = 78,

+        ExtendsKeyword = 79,

 >ExtendsKeyword : SyntaxKind
 
-        FalseKeyword = 79,

+        FalseKeyword = 80,

 >FalseKeyword : SyntaxKind
 
-        FinallyKeyword = 80,

+        FinallyKeyword = 81,

 >FinallyKeyword : SyntaxKind
 
-        ForKeyword = 81,

+        ForKeyword = 82,

 >ForKeyword : SyntaxKind
 
-        FunctionKeyword = 82,

+        FunctionKeyword = 83,

 >FunctionKeyword : SyntaxKind
 
-        IfKeyword = 83,

+        IfKeyword = 84,

 >IfKeyword : SyntaxKind
 
-        ImportKeyword = 84,

+        ImportKeyword = 85,

 >ImportKeyword : SyntaxKind
 
-        InKeyword = 85,

+        InKeyword = 86,

 >InKeyword : SyntaxKind
 
-        InstanceOfKeyword = 86,

+        InstanceOfKeyword = 87,

 >InstanceOfKeyword : SyntaxKind
 
-        NewKeyword = 87,

+        NewKeyword = 88,

 >NewKeyword : SyntaxKind
 
-        NullKeyword = 88,

+        NullKeyword = 89,

 >NullKeyword : SyntaxKind
 
-        ReturnKeyword = 89,

+        ReturnKeyword = 90,

 >ReturnKeyword : SyntaxKind
 
-        SuperKeyword = 90,

+        SuperKeyword = 91,

 >SuperKeyword : SyntaxKind
 
-        SwitchKeyword = 91,

+        SwitchKeyword = 92,

 >SwitchKeyword : SyntaxKind
 
-        ThisKeyword = 92,

+        ThisKeyword = 93,

 >ThisKeyword : SyntaxKind
 
-        ThrowKeyword = 93,

+        ThrowKeyword = 94,

 >ThrowKeyword : SyntaxKind
 
-        TrueKeyword = 94,

+        TrueKeyword = 95,

 >TrueKeyword : SyntaxKind
 
-        TryKeyword = 95,

+        TryKeyword = 96,

 >TryKeyword : SyntaxKind
 
-        TypeOfKeyword = 96,

+        TypeOfKeyword = 97,

 >TypeOfKeyword : SyntaxKind
 
-        VarKeyword = 97,

+        VarKeyword = 98,

 >VarKeyword : SyntaxKind
 
-        VoidKeyword = 98,

+        VoidKeyword = 99,

 >VoidKeyword : SyntaxKind
 
-        WhileKeyword = 99,

+        WhileKeyword = 100,

 >WhileKeyword : SyntaxKind
 
-        WithKeyword = 100,

+        WithKeyword = 101,

 >WithKeyword : SyntaxKind
 
-        AsKeyword = 101,

+        AsKeyword = 102,

 >AsKeyword : SyntaxKind
 
-        ImplementsKeyword = 102,

+        ImplementsKeyword = 103,

 >ImplementsKeyword : SyntaxKind
 
-        InterfaceKeyword = 103,

+        InterfaceKeyword = 104,

 >InterfaceKeyword : SyntaxKind
 
-        LetKeyword = 104,

+        LetKeyword = 105,

 >LetKeyword : SyntaxKind
 
-        PackageKeyword = 105,

+        PackageKeyword = 106,

 >PackageKeyword : SyntaxKind
 
-        PrivateKeyword = 106,

+        PrivateKeyword = 107,

 >PrivateKeyword : SyntaxKind
 
-        ProtectedKeyword = 107,

+        ProtectedKeyword = 108,

 >ProtectedKeyword : SyntaxKind
 
-        PublicKeyword = 108,

+        PublicKeyword = 109,

 >PublicKeyword : SyntaxKind
 
-        StaticKeyword = 109,

+        StaticKeyword = 110,

 >StaticKeyword : SyntaxKind
 
-        YieldKeyword = 110,

+        YieldKeyword = 111,

 >YieldKeyword : SyntaxKind
 
-        AnyKeyword = 111,

+        AnyKeyword = 112,

 >AnyKeyword : SyntaxKind
 
-        BooleanKeyword = 112,

+        BooleanKeyword = 113,

 >BooleanKeyword : SyntaxKind
 
-        ConstructorKeyword = 113,

+        ConstructorKeyword = 114,

 >ConstructorKeyword : SyntaxKind
 
-        DeclareKeyword = 114,

+        DeclareKeyword = 115,

 >DeclareKeyword : SyntaxKind
 
-        GetKeyword = 115,

+        GetKeyword = 116,

 >GetKeyword : SyntaxKind
 
-        ModuleKeyword = 116,

+        ModuleKeyword = 117,

 >ModuleKeyword : SyntaxKind
 
-        RequireKeyword = 117,

+        RequireKeyword = 118,

 >RequireKeyword : SyntaxKind
 
-        NumberKeyword = 118,

+        NumberKeyword = 119,

 >NumberKeyword : SyntaxKind
 
-        SetKeyword = 119,

+        SetKeyword = 120,

 >SetKeyword : SyntaxKind
 
-        StringKeyword = 120,

+        StringKeyword = 121,

 >StringKeyword : SyntaxKind
 
-        SymbolKeyword = 121,

+        SymbolKeyword = 122,

 >SymbolKeyword : SyntaxKind
 
-        TypeKeyword = 122,

+        TypeKeyword = 123,

 >TypeKeyword : SyntaxKind
 
-        FromKeyword = 123,

+        FromKeyword = 124,

 >FromKeyword : SyntaxKind
 
-        OfKeyword = 124,

+        OfKeyword = 125,

 >OfKeyword : SyntaxKind
 
-        QualifiedName = 125,

+        QualifiedName = 126,

 >QualifiedName : SyntaxKind
 
-        ComputedPropertyName = 126,

+        ComputedPropertyName = 127,

 >ComputedPropertyName : SyntaxKind
 
-        TypeParameter = 127,

+        TypeParameter = 128,

 >TypeParameter : SyntaxKind
 
-        Parameter = 128,

+        Parameter = 129,

 >Parameter : SyntaxKind
 
-        PropertySignature = 129,

+        Decorator = 130,

+>Decorator : SyntaxKind
+
+        PropertySignature = 131,

 >PropertySignature : SyntaxKind
 
-        PropertyDeclaration = 130,

+        PropertyDeclaration = 132,

 >PropertyDeclaration : SyntaxKind
 
-        MethodSignature = 131,

+        MethodSignature = 133,

 >MethodSignature : SyntaxKind
 
-        MethodDeclaration = 132,

+        MethodDeclaration = 134,

 >MethodDeclaration : SyntaxKind
 
-        Constructor = 133,

+        Constructor = 135,

 >Constructor : SyntaxKind
 
-        GetAccessor = 134,

+        GetAccessor = 136,

 >GetAccessor : SyntaxKind
 
-        SetAccessor = 135,

+        SetAccessor = 137,

 >SetAccessor : SyntaxKind
 
-        CallSignature = 136,

+        CallSignature = 138,

 >CallSignature : SyntaxKind
 
-        ConstructSignature = 137,

+        ConstructSignature = 139,

 >ConstructSignature : SyntaxKind
 
-        IndexSignature = 138,

+        IndexSignature = 140,

 >IndexSignature : SyntaxKind
 
-        TypeReference = 139,

+        TypeReference = 141,

 >TypeReference : SyntaxKind
 
-        FunctionType = 140,

+        FunctionType = 142,

 >FunctionType : SyntaxKind
 
-        ConstructorType = 141,

+        ConstructorType = 143,

 >ConstructorType : SyntaxKind
 
-        TypeQuery = 142,

+        TypeQuery = 144,

 >TypeQuery : SyntaxKind
 
-        TypeLiteral = 143,

+        TypeLiteral = 145,

 >TypeLiteral : SyntaxKind
 
-        ArrayType = 144,

+        ArrayType = 146,

 >ArrayType : SyntaxKind
 
-        TupleType = 145,

+        TupleType = 147,

 >TupleType : SyntaxKind
 
-        UnionType = 146,

+        UnionType = 148,

 >UnionType : SyntaxKind
 
-        ParenthesizedType = 147,

+        ParenthesizedType = 149,

 >ParenthesizedType : SyntaxKind
 
-        ObjectBindingPattern = 148,

+        ObjectBindingPattern = 150,

 >ObjectBindingPattern : SyntaxKind
 
-        ArrayBindingPattern = 149,

+        ArrayBindingPattern = 151,

 >ArrayBindingPattern : SyntaxKind
 
-        BindingElement = 150,

+        BindingElement = 152,

 >BindingElement : SyntaxKind
 
-        ArrayLiteralExpression = 151,

+        ArrayLiteralExpression = 153,

 >ArrayLiteralExpression : SyntaxKind
 
-        ObjectLiteralExpression = 152,

+        ObjectLiteralExpression = 154,

 >ObjectLiteralExpression : SyntaxKind
 
-        PropertyAccessExpression = 153,

+        PropertyAccessExpression = 155,

 >PropertyAccessExpression : SyntaxKind
 
-        ElementAccessExpression = 154,

+        ElementAccessExpression = 156,

 >ElementAccessExpression : SyntaxKind
 
-        CallExpression = 155,

+        CallExpression = 157,

 >CallExpression : SyntaxKind
 
-        NewExpression = 156,

+        NewExpression = 158,

 >NewExpression : SyntaxKind
 
-        TaggedTemplateExpression = 157,

+        TaggedTemplateExpression = 159,

 >TaggedTemplateExpression : SyntaxKind
 
-        TypeAssertionExpression = 158,

+        TypeAssertionExpression = 160,

 >TypeAssertionExpression : SyntaxKind
 
-        ParenthesizedExpression = 159,

+        ParenthesizedExpression = 161,

 >ParenthesizedExpression : SyntaxKind
 
-        FunctionExpression = 160,

+        FunctionExpression = 162,

 >FunctionExpression : SyntaxKind
 
-        ArrowFunction = 161,

+        ArrowFunction = 163,

 >ArrowFunction : SyntaxKind
 
-        DeleteExpression = 162,

+        DeleteExpression = 164,

 >DeleteExpression : SyntaxKind
 
-        TypeOfExpression = 163,

+        TypeOfExpression = 165,

 >TypeOfExpression : SyntaxKind
 
-        VoidExpression = 164,

+        VoidExpression = 166,

 >VoidExpression : SyntaxKind
 
-        PrefixUnaryExpression = 165,

+        PrefixUnaryExpression = 167,

 >PrefixUnaryExpression : SyntaxKind
 
-        PostfixUnaryExpression = 166,

+        PostfixUnaryExpression = 168,

 >PostfixUnaryExpression : SyntaxKind
 
-        BinaryExpression = 167,

+        BinaryExpression = 169,

 >BinaryExpression : SyntaxKind
 
-        ConditionalExpression = 168,

+        ConditionalExpression = 170,

 >ConditionalExpression : SyntaxKind
 
-        TemplateExpression = 169,

+        TemplateExpression = 171,

 >TemplateExpression : SyntaxKind
 
-        YieldExpression = 170,

+        YieldExpression = 172,

 >YieldExpression : SyntaxKind
 
-        SpreadElementExpression = 171,

+        SpreadElementExpression = 173,

 >SpreadElementExpression : SyntaxKind
 
-        OmittedExpression = 172,

+        OmittedExpression = 174,

 >OmittedExpression : SyntaxKind
 
-        TemplateSpan = 173,

+        TemplateSpan = 175,

 >TemplateSpan : SyntaxKind
 
-        Block = 174,

+        Block = 176,

 >Block : SyntaxKind
 
-        VariableStatement = 175,

+        VariableStatement = 177,

 >VariableStatement : SyntaxKind
 
-        EmptyStatement = 176,

+        EmptyStatement = 178,

 >EmptyStatement : SyntaxKind
 
-        ExpressionStatement = 177,

+        ExpressionStatement = 179,

 >ExpressionStatement : SyntaxKind
 
-        IfStatement = 178,

+        IfStatement = 180,

 >IfStatement : SyntaxKind
 
-        DoStatement = 179,

+        DoStatement = 181,

 >DoStatement : SyntaxKind
 
-        WhileStatement = 180,

+        WhileStatement = 182,

 >WhileStatement : SyntaxKind
 
-        ForStatement = 181,

+        ForStatement = 183,

 >ForStatement : SyntaxKind
 
-        ForInStatement = 182,

+        ForInStatement = 184,

 >ForInStatement : SyntaxKind
 
-        ForOfStatement = 183,

+        ForOfStatement = 185,

 >ForOfStatement : SyntaxKind
 
-        ContinueStatement = 184,

+        ContinueStatement = 186,

 >ContinueStatement : SyntaxKind
 
-        BreakStatement = 185,

+        BreakStatement = 187,

 >BreakStatement : SyntaxKind
 
-        ReturnStatement = 186,

+        ReturnStatement = 188,

 >ReturnStatement : SyntaxKind
 
-        WithStatement = 187,

+        WithStatement = 189,

 >WithStatement : SyntaxKind
 
-        SwitchStatement = 188,

+        SwitchStatement = 190,

 >SwitchStatement : SyntaxKind
 
-        LabeledStatement = 189,

+        LabeledStatement = 191,

 >LabeledStatement : SyntaxKind
 
-        ThrowStatement = 190,

+        ThrowStatement = 192,

 >ThrowStatement : SyntaxKind
 
-        TryStatement = 191,

+        TryStatement = 193,

 >TryStatement : SyntaxKind
 
-        DebuggerStatement = 192,

+        DebuggerStatement = 194,

 >DebuggerStatement : SyntaxKind
 
-        VariableDeclaration = 193,

+        VariableDeclaration = 195,

 >VariableDeclaration : SyntaxKind
 
-        VariableDeclarationList = 194,

+        VariableDeclarationList = 196,

 >VariableDeclarationList : SyntaxKind
 
-        FunctionDeclaration = 195,

+        FunctionDeclaration = 197,

 >FunctionDeclaration : SyntaxKind
 
-        ClassDeclaration = 196,

+        ClassDeclaration = 198,

 >ClassDeclaration : SyntaxKind
 
-        InterfaceDeclaration = 197,

+        InterfaceDeclaration = 199,

 >InterfaceDeclaration : SyntaxKind
 
-        TypeAliasDeclaration = 198,

+        TypeAliasDeclaration = 200,

 >TypeAliasDeclaration : SyntaxKind
 
-        EnumDeclaration = 199,

+        EnumDeclaration = 201,

 >EnumDeclaration : SyntaxKind
 
-        ModuleDeclaration = 200,

+        ModuleDeclaration = 202,

 >ModuleDeclaration : SyntaxKind
 
-        ModuleBlock = 201,

+        ModuleBlock = 203,

 >ModuleBlock : SyntaxKind
 
-        CaseBlock = 202,

+        CaseBlock = 204,

 >CaseBlock : SyntaxKind
 
-        ImportEqualsDeclaration = 203,

+        ImportEqualsDeclaration = 205,

 >ImportEqualsDeclaration : SyntaxKind
 
-        ImportDeclaration = 204,

+        ImportDeclaration = 206,

 >ImportDeclaration : SyntaxKind
 
-        ImportClause = 205,

+        ImportClause = 207,

 >ImportClause : SyntaxKind
 
-        NamespaceImport = 206,

+        NamespaceImport = 208,

 >NamespaceImport : SyntaxKind
 
-        NamedImports = 207,

+        NamedImports = 209,

 >NamedImports : SyntaxKind
 
-        ImportSpecifier = 208,

+        ImportSpecifier = 210,

 >ImportSpecifier : SyntaxKind
 
-        ExportAssignment = 209,

+        ExportAssignment = 211,

 >ExportAssignment : SyntaxKind
 
-        ExportDeclaration = 210,

+        ExportDeclaration = 212,

 >ExportDeclaration : SyntaxKind
 
-        NamedExports = 211,

+        NamedExports = 213,

 >NamedExports : SyntaxKind
 
-        ExportSpecifier = 212,

+        ExportSpecifier = 214,

 >ExportSpecifier : SyntaxKind
 
-        ExternalModuleReference = 213,

+        MissingDeclaration = 215,

+>MissingDeclaration : SyntaxKind
+
+        ExternalModuleReference = 216,

 >ExternalModuleReference : SyntaxKind
 
-        CaseClause = 214,

+        CaseClause = 217,

 >CaseClause : SyntaxKind
 
-        DefaultClause = 215,

+        DefaultClause = 218,

 >DefaultClause : SyntaxKind
 
-        HeritageClause = 216,

+        HeritageClause = 219,

 >HeritageClause : SyntaxKind
 
-        CatchClause = 217,

+        CatchClause = 220,

 >CatchClause : SyntaxKind
 
-        PropertyAssignment = 218,

+        PropertyAssignment = 221,

 >PropertyAssignment : SyntaxKind
 
-        ShorthandPropertyAssignment = 219,

+        ShorthandPropertyAssignment = 222,

 >ShorthandPropertyAssignment : SyntaxKind
 
-        EnumMember = 220,

+        EnumMember = 223,

 >EnumMember : SyntaxKind
 
-        SourceFile = 221,

+        SourceFile = 224,

 >SourceFile : SyntaxKind
 
-        SyntaxList = 222,

+        SyntaxList = 225,

 >SyntaxList : SyntaxKind
 
-        Count = 223,

+        Count = 226,

 >Count : SyntaxKind
 
-        FirstAssignment = 52,

+        FirstAssignment = 53,

 >FirstAssignment : SyntaxKind
 
-        LastAssignment = 63,

+        LastAssignment = 64,

 >LastAssignment : SyntaxKind
 
-        FirstReservedWord = 65,

+        FirstReservedWord = 66,

 >FirstReservedWord : SyntaxKind
 
-        LastReservedWord = 100,

+        LastReservedWord = 101,

 >LastReservedWord : SyntaxKind
 
-        FirstKeyword = 65,

+        FirstKeyword = 66,

 >FirstKeyword : SyntaxKind
 
-        LastKeyword = 124,

+        LastKeyword = 125,

 >LastKeyword : SyntaxKind
 
-        FirstFutureReservedWord = 102,

+        FirstFutureReservedWord = 103,

 >FirstFutureReservedWord : SyntaxKind
 
-        LastFutureReservedWord = 110,

+        LastFutureReservedWord = 111,

 >LastFutureReservedWord : SyntaxKind
 
-        FirstTypeNode = 139,

+        FirstTypeNode = 141,

 >FirstTypeNode : SyntaxKind
 
-        LastTypeNode = 147,

+        LastTypeNode = 149,

 >LastTypeNode : SyntaxKind
 
         FirstPunctuation = 14,

 >FirstPunctuation : SyntaxKind
 
-        LastPunctuation = 63,

+        LastPunctuation = 64,

 >LastPunctuation : SyntaxKind
 
         FirstToken = 0,

 >FirstToken : SyntaxKind
 
-        LastToken = 124,

+        LastToken = 125,

 >LastToken : SyntaxKind
 
         FirstTriviaToken = 2,

@@ -1199,10 +1208,10 @@ declare module "typescript" {
         FirstBinaryOperator = 24,

 >FirstBinaryOperator : SyntaxKind
 
-        LastBinaryOperator = 63,

+        LastBinaryOperator = 64,

 >LastBinaryOperator : SyntaxKind
 
-        FirstNode = 125,

+        FirstNode = 126,

 >FirstNode : SyntaxKind
     }

     const enum NodeFlags {

@@ -1274,16 +1283,19 @@ declare module "typescript" {
         GeneratorParameter = 8,

 >GeneratorParameter : ParserContextFlags
 
-        ThisNodeHasError = 16,

+        Decorator = 16,

+>Decorator : ParserContextFlags
+
+        ThisNodeHasError = 32,

 >ThisNodeHasError : ParserContextFlags
 
-        ParserGeneratedFlags = 31,

+        ParserGeneratedFlags = 63,

 >ParserGeneratedFlags : ParserContextFlags
 
-        ThisNodeOrAnySubNodesHasError = 32,

+        ThisNodeOrAnySubNodesHasError = 64,

 >ThisNodeOrAnySubNodesHasError : ParserContextFlags
 
-        HasAggregatedChildData = 64,

+        HasAggregatedChildData = 128,

 >HasAggregatedChildData : ParserContextFlags
     }

     const enum RelationComparisonResult {

@@ -1314,6 +1326,11 @@ declare module "typescript" {
 >parserContextFlags : ParserContextFlags
 >ParserContextFlags : ParserContextFlags
 
+        decorators?: NodeArray<Decorator>;

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

 >modifiers : ModifiersArray
 >ModifiersArray : ModifiersArray
@@ -1408,6 +1425,14 @@ declare module "typescript" {
         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
@@ -3275,15 +3300,17 @@ declare module "typescript" {
     interface EmitResolver {

 >EmitResolver : EmitResolver
 
-        getGeneratedNameForNode(node: Node): string;

->getGeneratedNameForNode : (node: Node) => string
->node : Node
->Node : Node
+        hasGlobalName(name: string): boolean;

+>hasGlobalName : (name: string) => boolean
+>name : string
 
-        getExpressionNameSubstitution(node: Identifier): string;

->getExpressionNameSubstitution : (node: Identifier) => 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
@@ -3382,8 +3409,8 @@ declare module "typescript" {
 >PropertyAccessExpression : PropertyAccessExpression
 >ElementAccessExpression : ElementAccessExpression
 
-        isUnknownIdentifier(location: Node, name: string): boolean;

->isUnknownIdentifier : (location: Node, name: string) => boolean
+        resolvesToSomeValue(location: Node, name: string): boolean;

+>resolvesToSomeValue : (location: Node, name: string) => boolean
 >location : Node
 >Node : Node
 >name : string
@@ -3705,6 +3732,9 @@ declare module "typescript" {
 
         BlockScopedBindingInLoop = 256,

 >BlockScopedBindingInLoop : NodeCheckFlags
+
+        EmitDecorate = 512,

+>EmitDecorate : NodeCheckFlags
     }

     interface NodeLinks {

 >NodeLinks : NodeLinks
diff --git a/tests/baselines/reference/ES5For-of15.js b/tests/baselines/reference/ES5For-of15.js
index 46d3dbd1d6e3e..5a1b8327107c7 100644
--- a/tests/baselines/reference/ES5For-of15.js
+++ b/tests/baselines/reference/ES5For-of15.js
@@ -11,7 +11,7 @@ for (var _i = 0, _a = []; _i < _a.length; _i++) {
     var v = _a[_i];
     v;
     for (var _b = 0, _c = []; _b < _c.length; _b++) {
-        var _v = _c[_b];
-        var x = _v;
+        var v_1 = _c[_b];
+        var x = v_1;
     }
 }
diff --git a/tests/baselines/reference/ES5For-of16.js b/tests/baselines/reference/ES5For-of16.js
index 1649e4481f27d..88f2c39414aa4 100644
--- a/tests/baselines/reference/ES5For-of16.js
+++ b/tests/baselines/reference/ES5For-of16.js
@@ -12,8 +12,8 @@ for (var _i = 0, _a = []; _i < _a.length; _i++) {
     var v = _a[_i];
     v;
     for (var _b = 0, _c = []; _b < _c.length; _b++) {
-        var _v = _c[_b];
-        var x = _v;
-        _v++;
+        var v_1 = _c[_b];
+        var x = v_1;
+        v_1++;
     }
 }
diff --git a/tests/baselines/reference/ES5For-of17.js b/tests/baselines/reference/ES5For-of17.js
index b728074ae939d..4752f1be90f30 100644
--- a/tests/baselines/reference/ES5For-of17.js
+++ b/tests/baselines/reference/ES5For-of17.js
@@ -14,8 +14,8 @@ for (var _i = 0, _a = []; _i < _a.length; _i++) {
     for (var _b = 0, _c = [
         v
     ]; _b < _c.length; _b++) {
-        var _v = _c[_b];
-        var x = _v;
-        _v++;
+        var v_1 = _c[_b];
+        var x = v_1;
+        v_1++;
     }
 }
diff --git a/tests/baselines/reference/ES5For-of18.js b/tests/baselines/reference/ES5For-of18.js
index a135b8b04639e..0d4809ed72d06 100644
--- a/tests/baselines/reference/ES5For-of18.js
+++ b/tests/baselines/reference/ES5For-of18.js
@@ -13,6 +13,6 @@ for (var _i = 0, _a = []; _i < _a.length; _i++) {
     v;
 }
 for (var _b = 0, _c = []; _b < _c.length; _b++) {
-    var _v = _c[_b];
-    _v;
+    var v = _c[_b];
+    v;
 }
diff --git a/tests/baselines/reference/ES5For-of19.js b/tests/baselines/reference/ES5For-of19.js
index 7af9418f04f69..2714574ab5bc8 100644
--- a/tests/baselines/reference/ES5For-of19.js
+++ b/tests/baselines/reference/ES5For-of19.js
@@ -14,9 +14,9 @@ for (var _i = 0, _a = []; _i < _a.length; _i++) {
     var v = _a[_i];
     v;
     function foo() {
-        for (var _b = 0, _c = []; _b < _c.length; _b++) {
-            var _v = _c[_b];
-            _v;
+        for (var _i = 0, _a = []; _i < _a.length; _i++) {
+            var v_1 = _a[_i];
+            v_1;
         }
     }
 }
diff --git a/tests/baselines/reference/ES5For-of20.js b/tests/baselines/reference/ES5For-of20.js
index 3dd707805d8bc..d3f44e4922a1e 100644
--- a/tests/baselines/reference/ES5For-of20.js
+++ b/tests/baselines/reference/ES5For-of20.js
@@ -9,11 +9,11 @@ for (let v of []) {
 //// [ES5For-of20.js]
 for (var _i = 0, _a = []; _i < _a.length; _i++) {
     var v = _a[_i];
-    var _v;
+    var v_1;
     for (var _b = 0, _c = [
         v
     ]; _b < _c.length; _b++) {
-        var _v_1 = _c[_b];
-        var _v_2;
+        var v_2 = _c[_b];
+        var v_3;
     }
 }
diff --git a/tests/baselines/reference/ES5For-of24.js b/tests/baselines/reference/ES5For-of24.js
index 418ccc2005c47..00cd24ea28062 100644
--- a/tests/baselines/reference/ES5For-of24.js
+++ b/tests/baselines/reference/ES5For-of24.js
@@ -12,5 +12,5 @@ var a = [
 ];
 for (var _i = 0; _i < a.length; _i++) {
     var v = a[_i];
-    var _a = 0;
+    var a_1 = 0;
 }
diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.js b/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.js
index 7555ae217e575..06e5427a87958 100644
--- a/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.js
+++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.js
@@ -35,19 +35,19 @@ var ag2 = new A.A2<string, number>();
 
 //// [ModuleWithExportedAndNonExportedClasses.js]
 var A;
-(function (_A) {
+(function (A_1) {
     var A = (function () {
         function A() {
         }
         return A;
     })();
-    _A.A = A;
+    A_1.A = A;
     var AG = (function () {
         function AG() {
         }
         return AG;
     })();
-    _A.AG = AG;
+    A_1.AG = AG;
     var A2 = (function () {
         function A2() {
         }
diff --git a/tests/baselines/reference/cloduleWithRecursiveReference.js b/tests/baselines/reference/cloduleWithRecursiveReference.js
index 1b8a91b3c6817..1a688712270e1 100644
--- a/tests/baselines/reference/cloduleWithRecursiveReference.js
+++ b/tests/baselines/reference/cloduleWithRecursiveReference.js
@@ -17,7 +17,7 @@ var M;
     })();
     M.C = C;
     var C;
-    (function (_C) {
-        _C.C = M.C;
+    (function (C_1) {
+        C_1.C = M.C;
     })(C = M.C || (M.C = {}));
 })(M || (M = {}));
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.js b/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.js
index 141ef285f037a..8152a9c27215e 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.js
+++ b/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.js
@@ -47,14 +47,14 @@ module M { // Shouldnt be _M
 
 //// [collisionCodeGenModuleWithAccessorChildren.js]
 var M;
-(function (_M) {
-    _M.x = 3;
+(function (M_1) {
+    M_1.x = 3;
     var c = (function () {
         function c() {
         }
         Object.defineProperty(c.prototype, "Z", {
             set: function (M) {
-                this.y = _M.x;
+                this.y = M_1.x;
             },
             enumerable: true,
             configurable: true
@@ -63,14 +63,14 @@ var M;
     })();
 })(M || (M = {}));
 var M;
-(function (_M_1) {
+(function (M_2) {
     var d = (function () {
         function d() {
         }
         Object.defineProperty(d.prototype, "Z", {
             set: function (p) {
                 var M = 10;
-                this.y = _M_1.x;
+                this.y = M_2.x;
             },
             enumerable: true,
             configurable: true
@@ -94,14 +94,14 @@ var M;
     })();
 })(M || (M = {}));
 var M;
-(function (_M_2) {
+(function (M_3) {
     var f = (function () {
         function f() {
         }
         Object.defineProperty(f.prototype, "Z", {
             get: function () {
                 var M = 10;
-                return _M_2.x;
+                return M_3.x;
             },
             enumerable: true,
             configurable: true
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.js b/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.js
index 2158a0562ea2d..2aa705c914123 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.js
+++ b/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.js
@@ -25,31 +25,31 @@ module M {
 
 //// [collisionCodeGenModuleWithConstructorChildren.js]
 var M;
-(function (_M) {
-    _M.x = 3;
+(function (M_1) {
+    M_1.x = 3;
     var c = (function () {
         function c(M, p) {
-            if (p === void 0) { p = _M.x; }
+            if (p === void 0) { p = M_1.x; }
         }
         return c;
     })();
 })(M || (M = {}));
 var M;
-(function (_M_1) {
+(function (M_2) {
     var d = (function () {
         function d(M, p) {
-            if (p === void 0) { p = _M_1.x; }
+            if (p === void 0) { p = M_2.x; }
             this.M = M;
         }
         return d;
     })();
 })(M || (M = {}));
 var M;
-(function (_M_2) {
+(function (M_3) {
     var d2 = (function () {
         function d2() {
             var M = 10;
-            var p = _M_2.x;
+            var p = M_3.x;
         }
         return d2;
     })();
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.js b/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.js
index caaa6a59da525..252ad2c63dc65 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.js
+++ b/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.js
@@ -21,24 +21,24 @@ module M {
 
 //// [collisionCodeGenModuleWithFunctionChildren.js]
 var M;
-(function (_M) {
-    _M.x = 3;
+(function (M_1) {
+    M_1.x = 3;
     function fn(M, p) {
-        if (p === void 0) { p = _M.x; }
+        if (p === void 0) { p = M_1.x; }
     }
 })(M || (M = {}));
 var M;
-(function (_M_1) {
+(function (M_2) {
     function fn2() {
         var M;
-        var p = _M_1.x;
+        var p = M_2.x;
     }
 })(M || (M = {}));
 var M;
-(function (_M_2) {
+(function (M_3) {
     function fn3() {
         function M() {
-            var p = _M_2.x;
+            var p = M_3.x;
         }
     }
 })(M || (M = {}));
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.js b/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.js
index 59c2ebf295d52..05ae475e7d234 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.js
+++ b/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.js
@@ -17,29 +17,29 @@ var foo = new m2._m2();
 
 //// [collisionCodeGenModuleWithMemberClassConflict.js]
 var m1;
-(function (_m1) {
+(function (m1_1) {
     var m1 = (function () {
         function m1() {
         }
         return m1;
     })();
-    _m1.m1 = m1;
+    m1_1.m1 = m1;
 })(m1 || (m1 = {}));
 var foo = new m1.m1();
 var m2;
-(function (_m2_1) {
+(function (m2_1) {
     var m2 = (function () {
         function m2() {
         }
         return m2;
     })();
-    _m2_1.m2 = m2;
+    m2_1.m2 = m2;
     var _m2 = (function () {
         function _m2() {
         }
         return _m2;
     })();
-    _m2_1._m2 = _m2;
+    m2_1._m2 = _m2;
 })(m2 || (m2 = {}));
 var foo = new m2.m2();
 var foo = new m2._m2();
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMemberVariable.js b/tests/baselines/reference/collisionCodeGenModuleWithMemberVariable.js
index d57de06dfa73d..1a23b81c139e2 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithMemberVariable.js
+++ b/tests/baselines/reference/collisionCodeGenModuleWithMemberVariable.js
@@ -7,8 +7,8 @@ var foo = m1.m1;
 
 //// [collisionCodeGenModuleWithMemberVariable.js]
 var m1;
-(function (_m1) {
-    _m1.m1 = 10;
-    var b = _m1.m1;
+(function (m1_1) {
+    m1_1.m1 = 10;
+    var b = m1_1.m1;
 })(m1 || (m1 = {}));
 var foo = m1.m1;
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.js b/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.js
index 212364ed30b00..53807f1cabd52 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.js
+++ b/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.js
@@ -34,37 +34,37 @@ module M { // Shouldnt bn _M
 
 //// [collisionCodeGenModuleWithMethodChildren.js]
 var M;
-(function (_M) {
-    _M.x = 3;
+(function (M_1) {
+    M_1.x = 3;
     var c = (function () {
         function c() {
         }
         c.prototype.fn = function (M, p) {
-            if (p === void 0) { p = _M.x; }
+            if (p === void 0) { p = M_1.x; }
         };
         return c;
     })();
 })(M || (M = {}));
 var M;
-(function (_M_1) {
+(function (M_2) {
     var d = (function () {
         function d() {
         }
         d.prototype.fn2 = function () {
             var M;
-            var p = _M_1.x;
+            var p = M_2.x;
         };
         return d;
     })();
 })(M || (M = {}));
 var M;
-(function (_M_2) {
+(function (M_3) {
     var e = (function () {
         function e() {
         }
         e.prototype.fn3 = function () {
             function M() {
-                var p = _M_2.x;
+                var p = M_3.x;
             }
         };
         return e;
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.js b/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.js
index 3c8b17deadd68..2862a84406786 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.js
+++ b/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.js
@@ -44,16 +44,16 @@ module M {
 
 //// [collisionCodeGenModuleWithModuleChildren.js]
 var M;
-(function (_M) {
-    _M.x = 3;
+(function (M_1) {
+    M_1.x = 3;
     var m1;
     (function (m1) {
         var M = 10;
-        var p = _M.x;
+        var p = M_1.x;
     })(m1 || (m1 = {}));
 })(M || (M = {}));
 var M;
-(function (_M_1) {
+(function (M_2) {
     var m2;
     (function (m2) {
         var M = (function () {
@@ -61,17 +61,17 @@ var M;
             }
             return M;
         })();
-        var p = _M_1.x;
+        var p = M_2.x;
         var p2 = new M();
     })(m2 || (m2 = {}));
 })(M || (M = {}));
 var M;
-(function (_M_2) {
+(function (M_3) {
     var m3;
     (function (m3) {
         function M() {
         }
-        var p = _M_2.x;
+        var p = M_3.x;
         var p2 = M();
     })(m3 || (m3 = {}));
 })(M || (M = {}));
@@ -84,12 +84,12 @@ var M;
     })(m3 || (m3 = {}));
 })(M || (M = {}));
 var M;
-(function (_M_3) {
+(function (M_4) {
     var m4;
     (function (m4) {
         var M;
         (function (M) {
-            var p = _M_3.x;
+            var p = M_4.x;
         })(M || (M = {}));
     })(m4 || (m4 = {}));
 })(M || (M = {}));
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.js b/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.js
index 4c3d60230635d..710c09e4558ae 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.js
+++ b/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.js
@@ -31,13 +31,13 @@ var foo2 = new m2.m2();
 
 //// [collisionCodeGenModuleWithModuleReopening.js]
 var m1;
-(function (_m1) {
+(function (m1_1) {
     var m1 = (function () {
         function m1() {
         }
         return m1;
     })();
-    _m1.m1 = m1;
+    m1_1.m1 = m1;
 })(m1 || (m1 = {}));
 var foo = new m1.m1();
 var m1;
@@ -65,16 +65,16 @@ var m2;
 })(m2 || (m2 = {}));
 var foo3 = new m2.c1();
 var m2;
-(function (_m2) {
+(function (m2_1) {
     var m2 = (function () {
         function m2() {
         }
         return m2;
     })();
-    _m2.m2 = m2;
+    m2_1.m2 = m2;
     var b = new m2();
-    var d = _m2.b10;
-    var c = new _m2.c1();
+    var d = m2_1.b10;
+    var c = new m2_1.c1();
 })(m2 || (m2 = {}));
 var foo3 = new m2.c1();
 var foo2 = new m2.m2();
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.js b/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.js
index 28901bd11e829..4b4d6aa7afb1b 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.js
+++ b/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.js
@@ -10,7 +10,7 @@ var foo = new m1.c1();
 
 //// [collisionCodeGenModuleWithPrivateMember.js]
 var m1;
-(function (_m1) {
+(function (m1_1) {
     var m1 = (function () {
         function m1() {
         }
@@ -22,6 +22,6 @@ var m1;
         }
         return c1;
     })();
-    _m1.c1 = c1;
+    m1_1.c1 = c1;
 })(m1 || (m1 = {}));
 var foo = new m1.c1();
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithUnicodeNames.js b/tests/baselines/reference/collisionCodeGenModuleWithUnicodeNames.js
index d4e919e0a17ae..3204a05bc7575 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithUnicodeNames.js
+++ b/tests/baselines/reference/collisionCodeGenModuleWithUnicodeNames.js
@@ -11,12 +11,12 @@ var x = new 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكو
 
 //// [collisionCodeGenModuleWithUnicodeNames.js]
 var 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123;
-(function (_才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123) {
+(function (才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123_1) {
     var 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 = (function () {
         function 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123() {
         }
         return 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123;
     })();
-    _才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123.才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 = 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123;
+    才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123_1.才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 = 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123;
 })(才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 || (才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 = {}));
 var x = new 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123.才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123();
diff --git a/tests/baselines/reference/computedPropertyNames23_ES5.js b/tests/baselines/reference/computedPropertyNames23_ES5.js
index c3024a7fbbfde..34eb0896376df 100644
--- a/tests/baselines/reference/computedPropertyNames23_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames23_ES5.js
@@ -20,5 +20,5 @@ var C = (function () {
         _a)[0]] = function () {
     };
     return C;
+    var _a;
 })();
-var _a;
diff --git a/tests/baselines/reference/computedPropertyNames26_ES5.js b/tests/baselines/reference/computedPropertyNames26_ES5.js
index 5651ee266c94e..cac71f734a693 100644
--- a/tests/baselines/reference/computedPropertyNames26_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames26_ES5.js
@@ -35,5 +35,5 @@ var C = (function (_super) {
         _a)[0]] = function () {
     };
     return C;
+    var _a;
 })(Base);
-var _a;
diff --git a/tests/baselines/reference/declFileImportChainInExportAssignment.js b/tests/baselines/reference/declFileImportChainInExportAssignment.js
index c8773889a7d0b..4ec3893d02fa8 100644
--- a/tests/baselines/reference/declFileImportChainInExportAssignment.js
+++ b/tests/baselines/reference/declFileImportChainInExportAssignment.js
@@ -13,13 +13,13 @@ export = b;
 var m;
 (function (m) {
     var c;
-    (function (_c) {
+    (function (c_1) {
         var c = (function () {
             function c() {
             }
             return c;
         })();
-        _c.c = c;
+        c_1.c = c;
     })(c = m.c || (m.c = {}));
 })(m || (m = {}));
 var a = m.c;
diff --git a/tests/baselines/reference/declarationEmitDefaultExport2.js b/tests/baselines/reference/declarationEmitDefaultExport2.js
index 388bd41e4f885..687c6d67cdbaf 100644
--- a/tests/baselines/reference/declarationEmitDefaultExport2.js
+++ b/tests/baselines/reference/declarationEmitDefaultExport2.js
@@ -3,7 +3,7 @@ export default class {
 }
 
 //// [declarationEmitDefaultExport2.js]
-export default class  {
+export default class {
 }
 
 
diff --git a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.js b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.js
index de3045be1ccc5..9b48f418f5ad5 100644
--- a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.js
+++ b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.js
@@ -73,8 +73,8 @@ function f15() {
 var _f = f15(), a4 = _f.a4, b4 = _f.b4, c4 = _f.c4;
 var m;
 (function (m) {
-    _g = f15(), m.a4 = _g.a4, m.b4 = _g.b4, m.c4 = _g.c4;
-    var _g;
+    _a = f15(), m.a4 = _a.a4, m.b4 = _a.b4, m.c4 = _a.c4;
+    var _a;
 })(m || (m = {}));
 
 
diff --git a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.js b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.js
index 509edfa6c87f1..140fc03780a05 100644
--- a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.js
+++ b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.js
@@ -37,8 +37,8 @@ function f15() {
 var _c = f15(), a4 = _c.a4, b4 = _c.b4, c4 = _c.c4;
 var m;
 (function (m) {
-    _d = f15(), m.a4 = _d.a4, m.b4 = _d.b4, m.c4 = _d.c4;
-    var _d;
+    _a = f15(), m.a4 = _a.a4, m.b4 = _a.b4, m.c4 = _a.c4;
+    var _a;
 })(m || (m = {}));
 
 
diff --git a/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.js b/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.js
index b41ca177b0558..9b580bcd7a4e3 100644
--- a/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.js
+++ b/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.js
@@ -14,13 +14,13 @@ export = m;
 var m;
 (function (m) {
     var c;
-    (function (_c) {
+    (function (c_1) {
         var c = (function () {
             function c() {
             }
             return c;
         })();
-        _c.c = c;
+        c_1.c = c;
     })(c = m.c || (m.c = {}));
     m.a;
 })(m || (m = {}));
diff --git a/tests/baselines/reference/decoratorOnArrowFunction.errors.txt b/tests/baselines/reference/decoratorOnArrowFunction.errors.txt
new file mode 100644
index 0000000000000..14bde1e49bf27
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnArrowFunction.errors.txt
@@ -0,0 +1,16 @@
+tests/cases/conformance/decorators/invalid/decoratorOnArrowFunction.ts(3,9): error TS1109: Expression expected.
+tests/cases/conformance/decorators/invalid/decoratorOnArrowFunction.ts(3,16): error TS1146: Declaration expected.
+tests/cases/conformance/decorators/invalid/decoratorOnArrowFunction.ts(3,17): error TS1128: Declaration or statement expected.
+
+
+==== tests/cases/conformance/decorators/invalid/decoratorOnArrowFunction.ts (3 errors) ====
+    declare function dec<T>(target: T): T;
+    
+    var F = @dec () => {
+            ~
+!!! error TS1109: Expression expected.
+                   
+!!! error TS1146: Declaration expected.
+                    ~~
+!!! error TS1128: Declaration or statement expected.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnArrowFunction.js b/tests/baselines/reference/decoratorOnArrowFunction.js
new file mode 100644
index 0000000000000..1a327e7fc9a9b
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnArrowFunction.js
@@ -0,0 +1,10 @@
+//// [decoratorOnArrowFunction.ts]
+declare function dec<T>(target: T): T;
+
+var F = @dec () => {
+}
+
+//// [decoratorOnArrowFunction.js]
+var F = ;
+{
+}
diff --git a/tests/baselines/reference/decoratorOnClass1.js b/tests/baselines/reference/decoratorOnClass1.js
new file mode 100644
index 0000000000000..24be2517469fc
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClass1.js
@@ -0,0 +1,27 @@
+//// [decoratorOnClass1.ts]
+declare function dec<T>(target: T): T;
+
+@dec
+class C {
+}
+
+//// [decoratorOnClass1.js]
+var __decorate = this.__decorate || function (decorators, target, key, value) {
+    var kind = typeof (arguments.length == 2 ? value = target : value);
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        switch (kind) {
+            case "function": value = decorator(value) || value; break;
+            case "number": decorator(target, key, value); break;
+            case "undefined": decorator(target, key); break;
+            case "object": value = decorator(target, key, value) || value; break;
+        }
+    }
+    return value;
+};
+var C = (function () {
+    function C() {
+    }
+    C = __decorate([dec], C);
+    return C;
+})();
diff --git a/tests/baselines/reference/decoratorOnClass1.types b/tests/baselines/reference/decoratorOnClass1.types
new file mode 100644
index 0000000000000..19e066586da2c
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClass1.types
@@ -0,0 +1,14 @@
+=== tests/cases/conformance/decorators/class/decoratorOnClass1.ts ===
+declare function dec<T>(target: T): T;
+>dec : <T>(target: T) => T
+>T : T
+>target : T
+>T : T
+>T : T
+
+@dec
+>dec : unknown
+
+class C {
+>C : C
+}
diff --git a/tests/baselines/reference/decoratorOnClass2.js b/tests/baselines/reference/decoratorOnClass2.js
new file mode 100644
index 0000000000000..92741819e9449
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClass2.js
@@ -0,0 +1,28 @@
+//// [decoratorOnClass2.ts]
+declare function dec<T>(target: T): T;
+
+@dec
+export class C {
+}
+
+//// [decoratorOnClass2.js]
+var __decorate = this.__decorate || function (decorators, target, key, value) {
+    var kind = typeof (arguments.length == 2 ? value = target : value);
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        switch (kind) {
+            case "function": value = decorator(value) || value; break;
+            case "number": decorator(target, key, value); break;
+            case "undefined": decorator(target, key); break;
+            case "object": value = decorator(target, key, value) || value; break;
+        }
+    }
+    return value;
+};
+var C = (function () {
+    function C() {
+    }
+    C = __decorate([dec], C);
+    return C;
+})();
+exports.C = C;
diff --git a/tests/baselines/reference/decoratorOnClass2.types b/tests/baselines/reference/decoratorOnClass2.types
new file mode 100644
index 0000000000000..43102ee912299
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClass2.types
@@ -0,0 +1,14 @@
+=== tests/cases/conformance/decorators/class/decoratorOnClass2.ts ===
+declare function dec<T>(target: T): T;
+>dec : <T>(target: T) => T
+>T : T
+>target : T
+>T : T
+>T : T
+
+@dec
+>dec : unknown
+
+export class C {
+>C : C
+}
diff --git a/tests/baselines/reference/decoratorOnClass3.errors.txt b/tests/baselines/reference/decoratorOnClass3.errors.txt
new file mode 100644
index 0000000000000..dfa430dec0cd7
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClass3.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/conformance/decorators/class/decoratorOnClass3.ts(3,1): error TS1128: Declaration or statement expected.
+
+
+==== tests/cases/conformance/decorators/class/decoratorOnClass3.ts (1 errors) ====
+    declare function dec<T>(target: T): T;
+    
+    export
+    ~~~~~~
+!!! error TS1128: Declaration or statement expected.
+    @dec
+    class C {
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClass3.js b/tests/baselines/reference/decoratorOnClass3.js
new file mode 100644
index 0000000000000..766acc42072ed
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClass3.js
@@ -0,0 +1,28 @@
+//// [decoratorOnClass3.ts]
+declare function dec<T>(target: T): T;
+
+export
+@dec
+class C {
+}
+
+//// [decoratorOnClass3.js]
+var __decorate = this.__decorate || function (decorators, target, key, value) {
+    var kind = typeof (arguments.length == 2 ? value = target : value);
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        switch (kind) {
+            case "function": value = decorator(value) || value; break;
+            case "number": decorator(target, key, value); break;
+            case "undefined": decorator(target, key); break;
+            case "object": value = decorator(target, key, value) || value; break;
+        }
+    }
+    return value;
+};
+var C = (function () {
+    function C() {
+    }
+    C = __decorate([dec], C);
+    return C;
+})();
diff --git a/tests/baselines/reference/decoratorOnClass4.js b/tests/baselines/reference/decoratorOnClass4.js
new file mode 100644
index 0000000000000..95bde549379e8
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClass4.js
@@ -0,0 +1,27 @@
+//// [decoratorOnClass4.ts]
+declare function dec(): <T>(target: T) => T;
+
+@dec()
+class C {
+}
+
+//// [decoratorOnClass4.js]
+var __decorate = this.__decorate || function (decorators, target, key, value) {
+    var kind = typeof (arguments.length == 2 ? value = target : value);
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        switch (kind) {
+            case "function": value = decorator(value) || value; break;
+            case "number": decorator(target, key, value); break;
+            case "undefined": decorator(target, key); break;
+            case "object": value = decorator(target, key, value) || value; break;
+        }
+    }
+    return value;
+};
+var C = (function () {
+    function C() {
+    }
+    C = __decorate([dec()], C);
+    return C;
+})();
diff --git a/tests/baselines/reference/decoratorOnClass4.types b/tests/baselines/reference/decoratorOnClass4.types
new file mode 100644
index 0000000000000..425aa63ac213d
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClass4.types
@@ -0,0 +1,15 @@
+=== tests/cases/conformance/decorators/class/decoratorOnClass4.ts ===
+declare function dec(): <T>(target: T) => T;
+>dec : () => <T>(target: T) => T
+>T : T
+>target : T
+>T : T
+>T : T
+
+@dec()
+>dec() : <T>(target: T) => T
+>dec : () => <T>(target: T) => T
+
+class C {
+>C : C
+}
diff --git a/tests/baselines/reference/decoratorOnClass5.js b/tests/baselines/reference/decoratorOnClass5.js
new file mode 100644
index 0000000000000..a93d625f49136
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClass5.js
@@ -0,0 +1,27 @@
+//// [decoratorOnClass5.ts]
+declare function dec(): <T>(target: T) => T;
+
+@dec()
+class C {
+}
+
+//// [decoratorOnClass5.js]
+var __decorate = this.__decorate || function (decorators, target, key, value) {
+    var kind = typeof (arguments.length == 2 ? value = target : value);
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        switch (kind) {
+            case "function": value = decorator(value) || value; break;
+            case "number": decorator(target, key, value); break;
+            case "undefined": decorator(target, key); break;
+            case "object": value = decorator(target, key, value) || value; break;
+        }
+    }
+    return value;
+};
+var C = (function () {
+    function C() {
+    }
+    C = __decorate([dec()], C);
+    return C;
+})();
diff --git a/tests/baselines/reference/decoratorOnClass5.types b/tests/baselines/reference/decoratorOnClass5.types
new file mode 100644
index 0000000000000..1c967ffcc0011
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClass5.types
@@ -0,0 +1,15 @@
+=== tests/cases/conformance/decorators/class/decoratorOnClass5.ts ===
+declare function dec(): <T>(target: T) => T;
+>dec : () => <T>(target: T) => T
+>T : T
+>target : T
+>T : T
+>T : T
+
+@dec()
+>dec() : <T>(target: T) => T
+>dec : () => <T>(target: T) => T
+
+class C {
+>C : C
+}
diff --git a/tests/baselines/reference/decoratorOnClass8.errors.txt b/tests/baselines/reference/decoratorOnClass8.errors.txt
new file mode 100644
index 0000000000000..0a9fbf2956c11
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClass8.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/decorators/class/decoratorOnClass8.ts(3,1): error TS2322: Type '(target: Function, paramIndex: number) => void' is not assignable to type '(target: typeof C) => void | typeof C'.
+
+
+==== tests/cases/conformance/decorators/class/decoratorOnClass8.ts (1 errors) ====
+    declare function dec(): (target: Function, paramIndex: number) => void;
+    
+    @dec()
+    ~~~~~~
+!!! error TS2322: Type '(target: Function, paramIndex: number) => void' is not assignable to type '(target: typeof C) => void | typeof C'.
+    class C {
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClass8.js b/tests/baselines/reference/decoratorOnClass8.js
new file mode 100644
index 0000000000000..0e782d45e1158
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClass8.js
@@ -0,0 +1,27 @@
+//// [decoratorOnClass8.ts]
+declare function dec(): (target: Function, paramIndex: number) => void;
+
+@dec()
+class C {
+}
+
+//// [decoratorOnClass8.js]
+var __decorate = this.__decorate || function (decorators, target, key, value) {
+    var kind = typeof (arguments.length == 2 ? value = target : value);
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        switch (kind) {
+            case "function": value = decorator(value) || value; break;
+            case "number": decorator(target, key, value); break;
+            case "undefined": decorator(target, key); break;
+            case "object": value = decorator(target, key, value) || value; break;
+        }
+    }
+    return value;
+};
+var C = (function () {
+    function C() {
+    }
+    C = __decorate([dec()], C);
+    return C;
+})();
diff --git a/tests/baselines/reference/decoratorOnClassAccessor1.js b/tests/baselines/reference/decoratorOnClassAccessor1.js
new file mode 100644
index 0000000000000..d78e776cb96bc
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassAccessor1.js
@@ -0,0 +1,34 @@
+//// [decoratorOnClassAccessor1.ts]
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+
+class C {
+    @dec get accessor() { return 1; }
+}
+
+//// [decoratorOnClassAccessor1.js]
+var __decorate = this.__decorate || function (decorators, target, key, value) {
+    var kind = typeof (arguments.length == 2 ? value = target : value);
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        switch (kind) {
+            case "function": value = decorator(value) || value; break;
+            case "number": decorator(target, key, value); break;
+            case "undefined": decorator(target, key); break;
+            case "object": value = decorator(target, key, value) || value; break;
+        }
+    }
+    return value;
+};
+var C = (function () {
+    function C() {
+    }
+    Object.defineProperty(C.prototype, "accessor", {
+        get: function () {
+            return 1;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C.prototype, "accessor", __decorate([dec], C.prototype, "accessor", Object.getOwnPropertyDescriptor(C.prototype, "accessor")));
+    return C;
+})();
diff --git a/tests/baselines/reference/decoratorOnClassAccessor1.types b/tests/baselines/reference/decoratorOnClassAccessor1.types
new file mode 100644
index 0000000000000..fd592d7d29449
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassAccessor1.types
@@ -0,0 +1,19 @@
+=== tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor1.ts ===
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>T : T
+>target : any
+>propertyKey : string
+>descriptor : TypedPropertyDescriptor<T>
+>TypedPropertyDescriptor : TypedPropertyDescriptor<T>
+>T : T
+>TypedPropertyDescriptor : TypedPropertyDescriptor<T>
+>T : T
+
+class C {
+>C : C
+
+    @dec get accessor() { return 1; }
+>dec : unknown
+>accessor : number
+}
diff --git a/tests/baselines/reference/decoratorOnClassAccessor2.js b/tests/baselines/reference/decoratorOnClassAccessor2.js
new file mode 100644
index 0000000000000..f1bfce9ea6dce
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassAccessor2.js
@@ -0,0 +1,34 @@
+//// [decoratorOnClassAccessor2.ts]
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+
+class C {
+    @dec public get accessor() { return 1; }
+}
+
+//// [decoratorOnClassAccessor2.js]
+var __decorate = this.__decorate || function (decorators, target, key, value) {
+    var kind = typeof (arguments.length == 2 ? value = target : value);
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        switch (kind) {
+            case "function": value = decorator(value) || value; break;
+            case "number": decorator(target, key, value); break;
+            case "undefined": decorator(target, key); break;
+            case "object": value = decorator(target, key, value) || value; break;
+        }
+    }
+    return value;
+};
+var C = (function () {
+    function C() {
+    }
+    Object.defineProperty(C.prototype, "accessor", {
+        get: function () {
+            return 1;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C.prototype, "accessor", __decorate([dec], C.prototype, "accessor", Object.getOwnPropertyDescriptor(C.prototype, "accessor")));
+    return C;
+})();
diff --git a/tests/baselines/reference/decoratorOnClassAccessor2.types b/tests/baselines/reference/decoratorOnClassAccessor2.types
new file mode 100644
index 0000000000000..32bb503d889ee
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassAccessor2.types
@@ -0,0 +1,19 @@
+=== tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor2.ts ===
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>T : T
+>target : any
+>propertyKey : string
+>descriptor : TypedPropertyDescriptor<T>
+>TypedPropertyDescriptor : TypedPropertyDescriptor<T>
+>T : T
+>TypedPropertyDescriptor : TypedPropertyDescriptor<T>
+>T : T
+
+class C {
+>C : C
+
+    @dec public get accessor() { return 1; }
+>dec : unknown
+>accessor : number
+}
diff --git a/tests/baselines/reference/decoratorOnClassAccessor3.errors.txt b/tests/baselines/reference/decoratorOnClassAccessor3.errors.txt
new file mode 100644
index 0000000000000..b75b7e0d8b63a
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassAccessor3.errors.txt
@@ -0,0 +1,35 @@
+tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts(4,5): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
+tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts(4,5): error TS2304: Cannot find name 'public'.
+tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts(4,12): error TS1005: ';' expected.
+tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts(4,16): error TS1146: Declaration expected.
+tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts(4,17): error TS2304: Cannot find name 'get'.
+tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts(4,21): error TS1005: ';' expected.
+tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts(4,21): error TS2304: Cannot find name 'accessor'.
+tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts(4,32): error TS1005: ';' expected.
+tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts(5,1): error TS1128: Declaration or statement expected.
+
+
+==== tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts (9 errors) ====
+    declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+    
+    class C {
+        public @dec get accessor() { return 1; }
+        ~~~~~~
+!!! error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
+        ~~~~~~
+!!! error TS2304: Cannot find name 'public'.
+               ~
+!!! error TS1005: ';' expected.
+                   
+!!! error TS1146: Declaration expected.
+                    ~~~
+!!! error TS2304: Cannot find name 'get'.
+                        ~~~~~~~~
+!!! error TS1005: ';' expected.
+                        ~~~~~~~~
+!!! error TS2304: Cannot find name 'accessor'.
+                                   ~
+!!! error TS1005: ';' expected.
+    }
+    ~
+!!! error TS1128: Declaration or statement expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassAccessor3.js b/tests/baselines/reference/decoratorOnClassAccessor3.js
new file mode 100644
index 0000000000000..f48a755953f3d
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassAccessor3.js
@@ -0,0 +1,19 @@
+//// [decoratorOnClassAccessor3.ts]
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+
+class C {
+    public @dec get accessor() { return 1; }
+}
+
+//// [decoratorOnClassAccessor3.js]
+var C = (function () {
+    function C() {
+    }
+    return C;
+})();
+public;
+get;
+accessor();
+{
+    return 1;
+}
diff --git a/tests/baselines/reference/decoratorOnClassAccessor4.js b/tests/baselines/reference/decoratorOnClassAccessor4.js
new file mode 100644
index 0000000000000..77dbc569e5aaa
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassAccessor4.js
@@ -0,0 +1,33 @@
+//// [decoratorOnClassAccessor4.ts]
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+
+class C {
+    @dec set accessor(value: number) { }
+}
+
+//// [decoratorOnClassAccessor4.js]
+var __decorate = this.__decorate || function (decorators, target, key, value) {
+    var kind = typeof (arguments.length == 2 ? value = target : value);
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        switch (kind) {
+            case "function": value = decorator(value) || value; break;
+            case "number": decorator(target, key, value); break;
+            case "undefined": decorator(target, key); break;
+            case "object": value = decorator(target, key, value) || value; break;
+        }
+    }
+    return value;
+};
+var C = (function () {
+    function C() {
+    }
+    Object.defineProperty(C.prototype, "accessor", {
+        set: function (value) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C.prototype, "accessor", __decorate([dec], C.prototype, "accessor", Object.getOwnPropertyDescriptor(C.prototype, "accessor")));
+    return C;
+})();
diff --git a/tests/baselines/reference/decoratorOnClassAccessor4.types b/tests/baselines/reference/decoratorOnClassAccessor4.types
new file mode 100644
index 0000000000000..40dd43d7e6227
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassAccessor4.types
@@ -0,0 +1,20 @@
+=== tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor4.ts ===
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>T : T
+>target : any
+>propertyKey : string
+>descriptor : TypedPropertyDescriptor<T>
+>TypedPropertyDescriptor : TypedPropertyDescriptor<T>
+>T : T
+>TypedPropertyDescriptor : TypedPropertyDescriptor<T>
+>T : T
+
+class C {
+>C : C
+
+    @dec set accessor(value: number) { }
+>dec : unknown
+>accessor : number
+>value : number
+}
diff --git a/tests/baselines/reference/decoratorOnClassAccessor5.js b/tests/baselines/reference/decoratorOnClassAccessor5.js
new file mode 100644
index 0000000000000..bfd6518c59bd6
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassAccessor5.js
@@ -0,0 +1,33 @@
+//// [decoratorOnClassAccessor5.ts]
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+
+class C {
+    @dec public set accessor(value: number) { }
+}
+
+//// [decoratorOnClassAccessor5.js]
+var __decorate = this.__decorate || function (decorators, target, key, value) {
+    var kind = typeof (arguments.length == 2 ? value = target : value);
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        switch (kind) {
+            case "function": value = decorator(value) || value; break;
+            case "number": decorator(target, key, value); break;
+            case "undefined": decorator(target, key); break;
+            case "object": value = decorator(target, key, value) || value; break;
+        }
+    }
+    return value;
+};
+var C = (function () {
+    function C() {
+    }
+    Object.defineProperty(C.prototype, "accessor", {
+        set: function (value) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C.prototype, "accessor", __decorate([dec], C.prototype, "accessor", Object.getOwnPropertyDescriptor(C.prototype, "accessor")));
+    return C;
+})();
diff --git a/tests/baselines/reference/decoratorOnClassAccessor5.types b/tests/baselines/reference/decoratorOnClassAccessor5.types
new file mode 100644
index 0000000000000..4b167fe8df17c
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassAccessor5.types
@@ -0,0 +1,20 @@
+=== tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor5.ts ===
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>T : T
+>target : any
+>propertyKey : string
+>descriptor : TypedPropertyDescriptor<T>
+>TypedPropertyDescriptor : TypedPropertyDescriptor<T>
+>T : T
+>TypedPropertyDescriptor : TypedPropertyDescriptor<T>
+>T : T
+
+class C {
+>C : C
+
+    @dec public set accessor(value: number) { }
+>dec : unknown
+>accessor : number
+>value : number
+}
diff --git a/tests/baselines/reference/decoratorOnClassAccessor6.errors.txt b/tests/baselines/reference/decoratorOnClassAccessor6.errors.txt
new file mode 100644
index 0000000000000..ec22ae0b3e139
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassAccessor6.errors.txt
@@ -0,0 +1,44 @@
+tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts(4,5): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
+tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts(4,5): error TS2304: Cannot find name 'public'.
+tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts(4,12): error TS1005: ';' expected.
+tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts(4,16): error TS1146: Declaration expected.
+tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts(4,17): error TS2304: Cannot find name 'set'.
+tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts(4,21): error TS1005: ';' expected.
+tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts(4,21): error TS2304: Cannot find name 'accessor'.
+tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts(4,30): error TS2304: Cannot find name 'value'.
+tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts(4,35): error TS1005: ',' expected.
+tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts(4,37): error TS2304: Cannot find name 'number'.
+tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts(4,45): error TS1005: ';' expected.
+tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts(5,1): error TS1128: Declaration or statement expected.
+
+
+==== tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts (12 errors) ====
+    declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+    
+    class C {
+        public @dec set accessor(value: number) { }
+        ~~~~~~
+!!! error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
+        ~~~~~~
+!!! error TS2304: Cannot find name 'public'.
+               ~
+!!! error TS1005: ';' expected.
+                   
+!!! error TS1146: Declaration expected.
+                    ~~~
+!!! error TS2304: Cannot find name 'set'.
+                        ~~~~~~~~
+!!! error TS1005: ';' expected.
+                        ~~~~~~~~
+!!! error TS2304: Cannot find name 'accessor'.
+                                 ~~~~~
+!!! error TS2304: Cannot find name 'value'.
+                                      ~
+!!! error TS1005: ',' expected.
+                                        ~~~~~~
+!!! error TS2304: Cannot find name 'number'.
+                                                ~
+!!! error TS1005: ';' expected.
+    }
+    ~
+!!! error TS1128: Declaration or statement expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassAccessor6.js b/tests/baselines/reference/decoratorOnClassAccessor6.js
new file mode 100644
index 0000000000000..905e3d3b2db96
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassAccessor6.js
@@ -0,0 +1,18 @@
+//// [decoratorOnClassAccessor6.ts]
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+
+class C {
+    public @dec set accessor(value: number) { }
+}
+
+//// [decoratorOnClassAccessor6.js]
+var C = (function () {
+    function C() {
+    }
+    return C;
+})();
+public;
+set;
+accessor(value, number);
+{
+}
diff --git a/tests/baselines/reference/decoratorOnClassConstructor1.errors.txt b/tests/baselines/reference/decoratorOnClassConstructor1.errors.txt
new file mode 100644
index 0000000000000..14a164eccb429
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassConstructor1.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor1.ts(4,5): error TS1206: Decorators are not valid here.
+
+
+==== tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor1.ts (1 errors) ====
+    declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+    
+    class C {
+        @dec constructor() {}
+        ~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1206: Decorators are not valid here.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassConstructor1.js b/tests/baselines/reference/decoratorOnClassConstructor1.js
new file mode 100644
index 0000000000000..c61d1d218a5de
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassConstructor1.js
@@ -0,0 +1,13 @@
+//// [decoratorOnClassConstructor1.ts]
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+
+class C {
+    @dec constructor() {}
+}
+
+//// [decoratorOnClassConstructor1.js]
+var C = (function () {
+    function C() {
+    }
+    return C;
+})();
diff --git a/tests/baselines/reference/decoratorOnClassConstructorParameter1.js b/tests/baselines/reference/decoratorOnClassConstructorParameter1.js
new file mode 100644
index 0000000000000..0c86a1ccf7aa7
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassConstructorParameter1.js
@@ -0,0 +1,27 @@
+//// [decoratorOnClassConstructorParameter1.ts]
+declare function dec(target: Function, propertyKey: string | symbol, parameterIndex: number): void;
+
+class C {
+    constructor(@dec p: number) {}
+}
+
+//// [decoratorOnClassConstructorParameter1.js]
+var __decorate = this.__decorate || function (decorators, target, key, value) {
+    var kind = typeof (arguments.length == 2 ? value = target : value);
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        switch (kind) {
+            case "function": value = decorator(value) || value; break;
+            case "number": decorator(target, key, value); break;
+            case "undefined": decorator(target, key); break;
+            case "object": value = decorator(target, key, value) || value; break;
+        }
+    }
+    return value;
+};
+var C = (function () {
+    function C(p) {
+    }
+    __decorate([dec], C, void 0, 0);
+    return C;
+})();
diff --git a/tests/baselines/reference/decoratorOnClassConstructorParameter1.types b/tests/baselines/reference/decoratorOnClassConstructorParameter1.types
new file mode 100644
index 0000000000000..d5ce51269bc3d
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassConstructorParameter1.types
@@ -0,0 +1,15 @@
+=== tests/cases/conformance/decorators/class/constructor/parameter/decoratorOnClassConstructorParameter1.ts ===
+declare function dec(target: Function, propertyKey: string | symbol, parameterIndex: number): void;
+>dec : (target: Function, propertyKey: string | symbol, parameterIndex: number) => void
+>target : Function
+>Function : Function
+>propertyKey : string | symbol
+>parameterIndex : number
+
+class C {
+>C : C
+
+    constructor(@dec p: number) {}
+>dec : unknown
+>p : number
+}
diff --git a/tests/baselines/reference/decoratorOnClassConstructorParameter4.errors.txt b/tests/baselines/reference/decoratorOnClassConstructorParameter4.errors.txt
new file mode 100644
index 0000000000000..5969cfca06973
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassConstructorParameter4.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/decorators/class/constructor/parameter/decoratorOnClassConstructorParameter4.ts(4,24): error TS1005: ',' expected.
+
+
+==== tests/cases/conformance/decorators/class/constructor/parameter/decoratorOnClassConstructorParameter4.ts (1 errors) ====
+    declare function dec(target: Function, propertyKey: string | symbol, parameterIndex: number): void;
+    
+    class C {
+        constructor(public @dec p: number) {}
+                           ~
+!!! error TS1005: ',' expected.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassConstructorParameter4.js b/tests/baselines/reference/decoratorOnClassConstructorParameter4.js
new file mode 100644
index 0000000000000..07dc7cae0750a
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassConstructorParameter4.js
@@ -0,0 +1,27 @@
+//// [decoratorOnClassConstructorParameter4.ts]
+declare function dec(target: Function, propertyKey: string | symbol, parameterIndex: number): void;
+
+class C {
+    constructor(public @dec p: number) {}
+}
+
+//// [decoratorOnClassConstructorParameter4.js]
+var __decorate = this.__decorate || function (decorators, target, key, value) {
+    var kind = typeof (arguments.length == 2 ? value = target : value);
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        switch (kind) {
+            case "function": value = decorator(value) || value; break;
+            case "number": decorator(target, key, value); break;
+            case "undefined": decorator(target, key); break;
+            case "object": value = decorator(target, key, value) || value; break;
+        }
+    }
+    return value;
+};
+var C = (function () {
+    function C(public, p) {
+    }
+    __decorate([dec], C, void 0, 1);
+    return C;
+})();
diff --git a/tests/baselines/reference/decoratorOnClassMethod1.js b/tests/baselines/reference/decoratorOnClassMethod1.js
new file mode 100644
index 0000000000000..be9c00290fbb9
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassMethod1.js
@@ -0,0 +1,29 @@
+//// [decoratorOnClassMethod1.ts]
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+
+class C {
+    @dec method() {}
+}
+
+//// [decoratorOnClassMethod1.js]
+var __decorate = this.__decorate || function (decorators, target, key, value) {
+    var kind = typeof (arguments.length == 2 ? value = target : value);
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        switch (kind) {
+            case "function": value = decorator(value) || value; break;
+            case "number": decorator(target, key, value); break;
+            case "undefined": decorator(target, key); break;
+            case "object": value = decorator(target, key, value) || value; break;
+        }
+    }
+    return value;
+};
+var C = (function () {
+    function C() {
+    }
+    C.prototype.method = function () {
+    };
+    Object.defineProperty(C.prototype, "method", __decorate([dec], C.prototype, "method", Object.getOwnPropertyDescriptor(C.prototype, "method")));
+    return C;
+})();
diff --git a/tests/baselines/reference/decoratorOnClassMethod1.types b/tests/baselines/reference/decoratorOnClassMethod1.types
new file mode 100644
index 0000000000000..760f758bbff17
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassMethod1.types
@@ -0,0 +1,19 @@
+=== tests/cases/conformance/decorators/class/method/decoratorOnClassMethod1.ts ===
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>T : T
+>target : any
+>propertyKey : string
+>descriptor : TypedPropertyDescriptor<T>
+>TypedPropertyDescriptor : TypedPropertyDescriptor<T>
+>T : T
+>TypedPropertyDescriptor : TypedPropertyDescriptor<T>
+>T : T
+
+class C {
+>C : C
+
+    @dec method() {}
+>dec : unknown
+>method : () => void
+}
diff --git a/tests/baselines/reference/decoratorOnClassMethod10.errors.txt b/tests/baselines/reference/decoratorOnClassMethod10.errors.txt
new file mode 100644
index 0000000000000..cd331473b7cda
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassMethod10.errors.txt
@@ -0,0 +1,17 @@
+tests/cases/conformance/decorators/class/method/decoratorOnClassMethod10.ts(4,5): error TS2322: Type '(target: Function, paramIndex: number) => void' is not assignable to type '(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<() => void>) => void | TypedPropertyDescriptor<() => void>'.
+  Types of parameters 'paramIndex' and 'propertyKey' are incompatible.
+    Type 'number' is not assignable to type 'string | symbol'.
+      Type 'number' is not assignable to type 'symbol'.
+
+
+==== tests/cases/conformance/decorators/class/method/decoratorOnClassMethod10.ts (1 errors) ====
+    declare function dec(target: Function, paramIndex: number): void;
+    
+    class C {
+        @dec method() {}
+        ~~~~
+!!! error TS2322: Type '(target: Function, paramIndex: number) => void' is not assignable to type '(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<() => void>) => void | TypedPropertyDescriptor<() => void>'.
+!!! error TS2322:   Types of parameters 'paramIndex' and 'propertyKey' are incompatible.
+!!! error TS2322:     Type 'number' is not assignable to type 'string | symbol'.
+!!! error TS2322:       Type 'number' is not assignable to type 'symbol'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassMethod10.js b/tests/baselines/reference/decoratorOnClassMethod10.js
new file mode 100644
index 0000000000000..3dd38f806bdc6
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassMethod10.js
@@ -0,0 +1,29 @@
+//// [decoratorOnClassMethod10.ts]
+declare function dec(target: Function, paramIndex: number): void;
+
+class C {
+    @dec method() {}
+}
+
+//// [decoratorOnClassMethod10.js]
+var __decorate = this.__decorate || function (decorators, target, key, value) {
+    var kind = typeof (arguments.length == 2 ? value = target : value);
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        switch (kind) {
+            case "function": value = decorator(value) || value; break;
+            case "number": decorator(target, key, value); break;
+            case "undefined": decorator(target, key); break;
+            case "object": value = decorator(target, key, value) || value; break;
+        }
+    }
+    return value;
+};
+var C = (function () {
+    function C() {
+    }
+    C.prototype.method = function () {
+    };
+    Object.defineProperty(C.prototype, "method", __decorate([dec], C.prototype, "method", Object.getOwnPropertyDescriptor(C.prototype, "method")));
+    return C;
+})();
diff --git a/tests/baselines/reference/decoratorOnClassMethod2.js b/tests/baselines/reference/decoratorOnClassMethod2.js
new file mode 100644
index 0000000000000..b7df7b9ba9c4e
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassMethod2.js
@@ -0,0 +1,29 @@
+//// [decoratorOnClassMethod2.ts]
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+
+class C {
+    @dec public method() {}
+}
+
+//// [decoratorOnClassMethod2.js]
+var __decorate = this.__decorate || function (decorators, target, key, value) {
+    var kind = typeof (arguments.length == 2 ? value = target : value);
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        switch (kind) {
+            case "function": value = decorator(value) || value; break;
+            case "number": decorator(target, key, value); break;
+            case "undefined": decorator(target, key); break;
+            case "object": value = decorator(target, key, value) || value; break;
+        }
+    }
+    return value;
+};
+var C = (function () {
+    function C() {
+    }
+    C.prototype.method = function () {
+    };
+    Object.defineProperty(C.prototype, "method", __decorate([dec], C.prototype, "method", Object.getOwnPropertyDescriptor(C.prototype, "method")));
+    return C;
+})();
diff --git a/tests/baselines/reference/decoratorOnClassMethod2.types b/tests/baselines/reference/decoratorOnClassMethod2.types
new file mode 100644
index 0000000000000..98539648cd03c
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassMethod2.types
@@ -0,0 +1,19 @@
+=== tests/cases/conformance/decorators/class/method/decoratorOnClassMethod2.ts ===
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>T : T
+>target : any
+>propertyKey : string
+>descriptor : TypedPropertyDescriptor<T>
+>TypedPropertyDescriptor : TypedPropertyDescriptor<T>
+>T : T
+>TypedPropertyDescriptor : TypedPropertyDescriptor<T>
+>T : T
+
+class C {
+>C : C
+
+    @dec public method() {}
+>dec : unknown
+>method : () => void
+}
diff --git a/tests/baselines/reference/decoratorOnClassMethod3.errors.txt b/tests/baselines/reference/decoratorOnClassMethod3.errors.txt
new file mode 100644
index 0000000000000..b2173dedf9ef9
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassMethod3.errors.txt
@@ -0,0 +1,29 @@
+tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts(4,5): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
+tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts(4,5): error TS2304: Cannot find name 'public'.
+tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts(4,12): error TS1005: ';' expected.
+tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts(4,16): error TS1146: Declaration expected.
+tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts(4,17): error TS2304: Cannot find name 'method'.
+tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts(4,26): error TS1005: ';' expected.
+tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts(5,1): error TS1128: Declaration or statement expected.
+
+
+==== tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts (7 errors) ====
+    declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+    
+    class C {
+        public @dec method() {}
+        ~~~~~~
+!!! error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
+        ~~~~~~
+!!! error TS2304: Cannot find name 'public'.
+               ~
+!!! error TS1005: ';' expected.
+                   
+!!! error TS1146: Declaration expected.
+                    ~~~~~~
+!!! error TS2304: Cannot find name 'method'.
+                             ~
+!!! error TS1005: ';' expected.
+    }
+    ~
+!!! error TS1128: Declaration or statement expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassMethod3.js b/tests/baselines/reference/decoratorOnClassMethod3.js
new file mode 100644
index 0000000000000..3a01184527531
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassMethod3.js
@@ -0,0 +1,17 @@
+//// [decoratorOnClassMethod3.ts]
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+
+class C {
+    public @dec method() {}
+}
+
+//// [decoratorOnClassMethod3.js]
+var C = (function () {
+    function C() {
+    }
+    return C;
+})();
+public;
+method();
+{
+}
diff --git a/tests/baselines/reference/decoratorOnClassMethod4.js b/tests/baselines/reference/decoratorOnClassMethod4.js
new file mode 100644
index 0000000000000..7021e5af32836
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassMethod4.js
@@ -0,0 +1,27 @@
+//// [decoratorOnClassMethod4.ts]
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+
+class C {
+    @dec ["method"]() {}
+}
+
+//// [decoratorOnClassMethod4.js]
+var __decorate = this.__decorate || function (decorators, target, key, value) {
+    var kind = typeof (arguments.length == 2 ? value = target : value);
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        switch (kind) {
+            case "function": value = decorator(value) || value; break;
+            case "number": decorator(target, key, value); break;
+            case "undefined": decorator(target, key); break;
+            case "object": value = decorator(target, key, value) || value; break;
+        }
+    }
+    return value;
+};
+class C {
+    [_a = "method"]() {
+    }
+}
+Object.defineProperty(C.prototype, _a, __decorate([dec], C.prototype, _a, Object.getOwnPropertyDescriptor(C.prototype, _a)));
+var _a;
diff --git a/tests/baselines/reference/decoratorOnClassMethod4.types b/tests/baselines/reference/decoratorOnClassMethod4.types
new file mode 100644
index 0000000000000..6d55e01e97a86
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassMethod4.types
@@ -0,0 +1,18 @@
+=== tests/cases/conformance/decorators/class/method/decoratorOnClassMethod4.ts ===
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>T : T
+>target : any
+>propertyKey : string
+>descriptor : TypedPropertyDescriptor<T>
+>TypedPropertyDescriptor : TypedPropertyDescriptor<T>
+>T : T
+>TypedPropertyDescriptor : TypedPropertyDescriptor<T>
+>T : T
+
+class C {
+>C : C
+
+    @dec ["method"]() {}
+>dec : unknown
+}
diff --git a/tests/baselines/reference/decoratorOnClassMethod5.js b/tests/baselines/reference/decoratorOnClassMethod5.js
new file mode 100644
index 0000000000000..3bde0968eab7b
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassMethod5.js
@@ -0,0 +1,27 @@
+//// [decoratorOnClassMethod5.ts]
+declare function dec(): <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>;
+
+class C {
+    @dec() ["method"]() {}
+}
+
+//// [decoratorOnClassMethod5.js]
+var __decorate = this.__decorate || function (decorators, target, key, value) {
+    var kind = typeof (arguments.length == 2 ? value = target : value);
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        switch (kind) {
+            case "function": value = decorator(value) || value; break;
+            case "number": decorator(target, key, value); break;
+            case "undefined": decorator(target, key); break;
+            case "object": value = decorator(target, key, value) || value; break;
+        }
+    }
+    return value;
+};
+class C {
+    [_a = "method"]() {
+    }
+}
+Object.defineProperty(C.prototype, _a, __decorate([dec()], C.prototype, _a, Object.getOwnPropertyDescriptor(C.prototype, _a)));
+var _a;
diff --git a/tests/baselines/reference/decoratorOnClassMethod5.types b/tests/baselines/reference/decoratorOnClassMethod5.types
new file mode 100644
index 0000000000000..d87de2b351add
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassMethod5.types
@@ -0,0 +1,19 @@
+=== tests/cases/conformance/decorators/class/method/decoratorOnClassMethod5.ts ===
+declare function dec(): <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>;
+>dec : () => <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>T : T
+>target : any
+>propertyKey : string
+>descriptor : TypedPropertyDescriptor<T>
+>TypedPropertyDescriptor : TypedPropertyDescriptor<T>
+>T : T
+>TypedPropertyDescriptor : TypedPropertyDescriptor<T>
+>T : T
+
+class C {
+>C : C
+
+    @dec() ["method"]() {}
+>dec() : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>dec : () => <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+}
diff --git a/tests/baselines/reference/decoratorOnClassMethod6.js b/tests/baselines/reference/decoratorOnClassMethod6.js
new file mode 100644
index 0000000000000..126dc47ad2f7b
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassMethod6.js
@@ -0,0 +1,27 @@
+//// [decoratorOnClassMethod6.ts]
+declare function dec(): <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>;
+
+class C {
+    @dec ["method"]() {}
+}
+
+//// [decoratorOnClassMethod6.js]
+var __decorate = this.__decorate || function (decorators, target, key, value) {
+    var kind = typeof (arguments.length == 2 ? value = target : value);
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        switch (kind) {
+            case "function": value = decorator(value) || value; break;
+            case "number": decorator(target, key, value); break;
+            case "undefined": decorator(target, key); break;
+            case "object": value = decorator(target, key, value) || value; break;
+        }
+    }
+    return value;
+};
+class C {
+    [_a = "method"]() {
+    }
+}
+Object.defineProperty(C.prototype, _a, __decorate([dec], C.prototype, _a, Object.getOwnPropertyDescriptor(C.prototype, _a)));
+var _a;
diff --git a/tests/baselines/reference/decoratorOnClassMethod6.types b/tests/baselines/reference/decoratorOnClassMethod6.types
new file mode 100644
index 0000000000000..4e6629cd60aeb
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassMethod6.types
@@ -0,0 +1,18 @@
+=== tests/cases/conformance/decorators/class/method/decoratorOnClassMethod6.ts ===
+declare function dec(): <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>;
+>dec : () => <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>T : T
+>target : any
+>propertyKey : string
+>descriptor : TypedPropertyDescriptor<T>
+>TypedPropertyDescriptor : TypedPropertyDescriptor<T>
+>T : T
+>TypedPropertyDescriptor : TypedPropertyDescriptor<T>
+>T : T
+
+class C {
+>C : C
+
+    @dec ["method"]() {}
+>dec : unknown
+}
diff --git a/tests/baselines/reference/decoratorOnClassMethod7.js b/tests/baselines/reference/decoratorOnClassMethod7.js
new file mode 100644
index 0000000000000..34fbdb53ca5dd
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassMethod7.js
@@ -0,0 +1,27 @@
+//// [decoratorOnClassMethod7.ts]
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+
+class C {
+    @dec public ["method"]() {}
+}
+
+//// [decoratorOnClassMethod7.js]
+var __decorate = this.__decorate || function (decorators, target, key, value) {
+    var kind = typeof (arguments.length == 2 ? value = target : value);
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        switch (kind) {
+            case "function": value = decorator(value) || value; break;
+            case "number": decorator(target, key, value); break;
+            case "undefined": decorator(target, key); break;
+            case "object": value = decorator(target, key, value) || value; break;
+        }
+    }
+    return value;
+};
+class C {
+    [_a = "method"]() {
+    }
+}
+Object.defineProperty(C.prototype, _a, __decorate([dec], C.prototype, _a, Object.getOwnPropertyDescriptor(C.prototype, _a)));
+var _a;
diff --git a/tests/baselines/reference/decoratorOnClassMethod7.types b/tests/baselines/reference/decoratorOnClassMethod7.types
new file mode 100644
index 0000000000000..7e426cb773c15
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassMethod7.types
@@ -0,0 +1,18 @@
+=== tests/cases/conformance/decorators/class/method/decoratorOnClassMethod7.ts ===
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>T : T
+>target : any
+>propertyKey : string
+>descriptor : TypedPropertyDescriptor<T>
+>TypedPropertyDescriptor : TypedPropertyDescriptor<T>
+>T : T
+>TypedPropertyDescriptor : TypedPropertyDescriptor<T>
+>T : T
+
+class C {
+>C : C
+
+    @dec public ["method"]() {}
+>dec : unknown
+}
diff --git a/tests/baselines/reference/decoratorOnClassMethod8.js b/tests/baselines/reference/decoratorOnClassMethod8.js
new file mode 100644
index 0000000000000..629ff4e253bba
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassMethod8.js
@@ -0,0 +1,29 @@
+//// [decoratorOnClassMethod8.ts]
+declare function dec<T>(target: T): T;
+
+class C {
+    @dec method() {}
+}
+
+//// [decoratorOnClassMethod8.js]
+var __decorate = this.__decorate || function (decorators, target, key, value) {
+    var kind = typeof (arguments.length == 2 ? value = target : value);
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        switch (kind) {
+            case "function": value = decorator(value) || value; break;
+            case "number": decorator(target, key, value); break;
+            case "undefined": decorator(target, key); break;
+            case "object": value = decorator(target, key, value) || value; break;
+        }
+    }
+    return value;
+};
+var C = (function () {
+    function C() {
+    }
+    C.prototype.method = function () {
+    };
+    Object.defineProperty(C.prototype, "method", __decorate([dec], C.prototype, "method", Object.getOwnPropertyDescriptor(C.prototype, "method")));
+    return C;
+})();
diff --git a/tests/baselines/reference/decoratorOnClassMethod8.types b/tests/baselines/reference/decoratorOnClassMethod8.types
new file mode 100644
index 0000000000000..f932ab8696fba
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassMethod8.types
@@ -0,0 +1,15 @@
+=== tests/cases/conformance/decorators/class/method/decoratorOnClassMethod8.ts ===
+declare function dec<T>(target: T): T;
+>dec : <T>(target: T) => T
+>T : T
+>target : T
+>T : T
+>T : T
+
+class C {
+>C : C
+
+    @dec method() {}
+>dec : unknown
+>method : () => void
+}
diff --git a/tests/baselines/reference/decoratorOnClassMethodParameter1.js b/tests/baselines/reference/decoratorOnClassMethodParameter1.js
new file mode 100644
index 0000000000000..1dcb057e53038
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassMethodParameter1.js
@@ -0,0 +1,29 @@
+//// [decoratorOnClassMethodParameter1.ts]
+declare function dec(target: Function, propertyKey: string | symbol, parameterIndex: number): void;
+
+class C {
+    method(@dec p: number) {}
+}
+
+//// [decoratorOnClassMethodParameter1.js]
+var __decorate = this.__decorate || function (decorators, target, key, value) {
+    var kind = typeof (arguments.length == 2 ? value = target : value);
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        switch (kind) {
+            case "function": value = decorator(value) || value; break;
+            case "number": decorator(target, key, value); break;
+            case "undefined": decorator(target, key); break;
+            case "object": value = decorator(target, key, value) || value; break;
+        }
+    }
+    return value;
+};
+var C = (function () {
+    function C() {
+    }
+    C.prototype.method = function (p) {
+    };
+    __decorate([dec], C.prototype, "method", 0);
+    return C;
+})();
diff --git a/tests/baselines/reference/decoratorOnClassMethodParameter1.types b/tests/baselines/reference/decoratorOnClassMethodParameter1.types
new file mode 100644
index 0000000000000..cf7bfd352bfee
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassMethodParameter1.types
@@ -0,0 +1,16 @@
+=== tests/cases/conformance/decorators/class/method/parameter/decoratorOnClassMethodParameter1.ts ===
+declare function dec(target: Function, propertyKey: string | symbol, parameterIndex: number): void;
+>dec : (target: Function, propertyKey: string | symbol, parameterIndex: number) => void
+>target : Function
+>Function : Function
+>propertyKey : string | symbol
+>parameterIndex : number
+
+class C {
+>C : C
+
+    method(@dec p: number) {}
+>method : (p: number) => void
+>dec : unknown
+>p : number
+}
diff --git a/tests/baselines/reference/decoratorOnClassProperty1.js b/tests/baselines/reference/decoratorOnClassProperty1.js
new file mode 100644
index 0000000000000..efc6a2c04dbf5
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassProperty1.js
@@ -0,0 +1,27 @@
+//// [decoratorOnClassProperty1.ts]
+declare function dec(target: any, propertyKey: string): void;
+
+class C {
+    @dec prop;
+}
+
+//// [decoratorOnClassProperty1.js]
+var __decorate = this.__decorate || function (decorators, target, key, value) {
+    var kind = typeof (arguments.length == 2 ? value = target : value);
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        switch (kind) {
+            case "function": value = decorator(value) || value; break;
+            case "number": decorator(target, key, value); break;
+            case "undefined": decorator(target, key); break;
+            case "object": value = decorator(target, key, value) || value; break;
+        }
+    }
+    return value;
+};
+var C = (function () {
+    function C() {
+    }
+    __decorate([dec], C.prototype, "prop");
+    return C;
+})();
diff --git a/tests/baselines/reference/decoratorOnClassProperty1.types b/tests/baselines/reference/decoratorOnClassProperty1.types
new file mode 100644
index 0000000000000..651085c7ac49b
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassProperty1.types
@@ -0,0 +1,13 @@
+=== tests/cases/conformance/decorators/class/property/decoratorOnClassProperty1.ts ===
+declare function dec(target: any, propertyKey: string): void;
+>dec : (target: any, propertyKey: string) => void
+>target : any
+>propertyKey : string
+
+class C {
+>C : C
+
+    @dec prop;
+>dec : unknown
+>prop : any
+}
diff --git a/tests/baselines/reference/decoratorOnClassProperty10.js b/tests/baselines/reference/decoratorOnClassProperty10.js
new file mode 100644
index 0000000000000..d55eb71e3c637
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassProperty10.js
@@ -0,0 +1,27 @@
+//// [decoratorOnClassProperty10.ts]
+declare function dec(): <T>(target: any, propertyKey: string) => void;
+
+class C {
+    @dec() prop;
+}
+
+//// [decoratorOnClassProperty10.js]
+var __decorate = this.__decorate || function (decorators, target, key, value) {
+    var kind = typeof (arguments.length == 2 ? value = target : value);
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        switch (kind) {
+            case "function": value = decorator(value) || value; break;
+            case "number": decorator(target, key, value); break;
+            case "undefined": decorator(target, key); break;
+            case "object": value = decorator(target, key, value) || value; break;
+        }
+    }
+    return value;
+};
+var C = (function () {
+    function C() {
+    }
+    __decorate([dec()], C.prototype, "prop");
+    return C;
+})();
diff --git a/tests/baselines/reference/decoratorOnClassProperty10.types b/tests/baselines/reference/decoratorOnClassProperty10.types
new file mode 100644
index 0000000000000..d0aa05589ff13
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassProperty10.types
@@ -0,0 +1,15 @@
+=== tests/cases/conformance/decorators/class/property/decoratorOnClassProperty10.ts ===
+declare function dec(): <T>(target: any, propertyKey: string) => void;
+>dec : () => <T>(target: any, propertyKey: string) => void
+>T : T
+>target : any
+>propertyKey : string
+
+class C {
+>C : C
+
+    @dec() prop;
+>dec() : <T>(target: any, propertyKey: string) => void
+>dec : () => <T>(target: any, propertyKey: string) => void
+>prop : any
+}
diff --git a/tests/baselines/reference/decoratorOnClassProperty11.js b/tests/baselines/reference/decoratorOnClassProperty11.js
new file mode 100644
index 0000000000000..63e5f8d02e94c
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassProperty11.js
@@ -0,0 +1,27 @@
+//// [decoratorOnClassProperty11.ts]
+declare function dec(): <T>(target: any, propertyKey: string) => void;
+
+class C {
+    @dec prop;
+}
+
+//// [decoratorOnClassProperty11.js]
+var __decorate = this.__decorate || function (decorators, target, key, value) {
+    var kind = typeof (arguments.length == 2 ? value = target : value);
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        switch (kind) {
+            case "function": value = decorator(value) || value; break;
+            case "number": decorator(target, key, value); break;
+            case "undefined": decorator(target, key); break;
+            case "object": value = decorator(target, key, value) || value; break;
+        }
+    }
+    return value;
+};
+var C = (function () {
+    function C() {
+    }
+    __decorate([dec], C.prototype, "prop");
+    return C;
+})();
diff --git a/tests/baselines/reference/decoratorOnClassProperty11.types b/tests/baselines/reference/decoratorOnClassProperty11.types
new file mode 100644
index 0000000000000..5377e53c31c4a
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassProperty11.types
@@ -0,0 +1,14 @@
+=== tests/cases/conformance/decorators/class/property/decoratorOnClassProperty11.ts ===
+declare function dec(): <T>(target: any, propertyKey: string) => void;
+>dec : () => <T>(target: any, propertyKey: string) => void
+>T : T
+>target : any
+>propertyKey : string
+
+class C {
+>C : C
+
+    @dec prop;
+>dec : unknown
+>prop : any
+}
diff --git a/tests/baselines/reference/decoratorOnClassProperty2.js b/tests/baselines/reference/decoratorOnClassProperty2.js
new file mode 100644
index 0000000000000..d52baa7920273
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassProperty2.js
@@ -0,0 +1,27 @@
+//// [decoratorOnClassProperty2.ts]
+declare function dec(target: any, propertyKey: string): void;
+
+class C {
+    @dec public prop;
+}
+
+//// [decoratorOnClassProperty2.js]
+var __decorate = this.__decorate || function (decorators, target, key, value) {
+    var kind = typeof (arguments.length == 2 ? value = target : value);
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        switch (kind) {
+            case "function": value = decorator(value) || value; break;
+            case "number": decorator(target, key, value); break;
+            case "undefined": decorator(target, key); break;
+            case "object": value = decorator(target, key, value) || value; break;
+        }
+    }
+    return value;
+};
+var C = (function () {
+    function C() {
+    }
+    __decorate([dec], C.prototype, "prop");
+    return C;
+})();
diff --git a/tests/baselines/reference/decoratorOnClassProperty2.types b/tests/baselines/reference/decoratorOnClassProperty2.types
new file mode 100644
index 0000000000000..2d5c9fe07d770
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassProperty2.types
@@ -0,0 +1,13 @@
+=== tests/cases/conformance/decorators/class/property/decoratorOnClassProperty2.ts ===
+declare function dec(target: any, propertyKey: string): void;
+>dec : (target: any, propertyKey: string) => void
+>target : any
+>propertyKey : string
+
+class C {
+>C : C
+
+    @dec public prop;
+>dec : unknown
+>prop : any
+}
diff --git a/tests/baselines/reference/decoratorOnClassProperty3.errors.txt b/tests/baselines/reference/decoratorOnClassProperty3.errors.txt
new file mode 100644
index 0000000000000..29438bd67a9e5
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassProperty3.errors.txt
@@ -0,0 +1,26 @@
+tests/cases/conformance/decorators/class/property/decoratorOnClassProperty3.ts(4,5): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
+tests/cases/conformance/decorators/class/property/decoratorOnClassProperty3.ts(4,5): error TS2304: Cannot find name 'public'.
+tests/cases/conformance/decorators/class/property/decoratorOnClassProperty3.ts(4,12): error TS1005: ';' expected.
+tests/cases/conformance/decorators/class/property/decoratorOnClassProperty3.ts(4,16): error TS1146: Declaration expected.
+tests/cases/conformance/decorators/class/property/decoratorOnClassProperty3.ts(4,17): error TS2304: Cannot find name 'prop'.
+tests/cases/conformance/decorators/class/property/decoratorOnClassProperty3.ts(5,1): error TS1128: Declaration or statement expected.
+
+
+==== tests/cases/conformance/decorators/class/property/decoratorOnClassProperty3.ts (6 errors) ====
+    declare function dec(target: any, propertyKey: string): void;
+    
+    class C {
+        public @dec prop;
+        ~~~~~~
+!!! error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
+        ~~~~~~
+!!! error TS2304: Cannot find name 'public'.
+               ~
+!!! error TS1005: ';' expected.
+                   
+!!! error TS1146: Declaration expected.
+                    ~~~~
+!!! error TS2304: Cannot find name 'prop'.
+    }
+    ~
+!!! error TS1128: Declaration or statement expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassProperty3.js b/tests/baselines/reference/decoratorOnClassProperty3.js
new file mode 100644
index 0000000000000..6c9945677ca51
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassProperty3.js
@@ -0,0 +1,15 @@
+//// [decoratorOnClassProperty3.ts]
+declare function dec(target: any, propertyKey: string): void;
+
+class C {
+    public @dec prop;
+}
+
+//// [decoratorOnClassProperty3.js]
+var C = (function () {
+    function C() {
+    }
+    return C;
+})();
+public;
+prop;
diff --git a/tests/baselines/reference/decoratorOnClassProperty6.js b/tests/baselines/reference/decoratorOnClassProperty6.js
new file mode 100644
index 0000000000000..7f087156bc7a1
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassProperty6.js
@@ -0,0 +1,27 @@
+//// [decoratorOnClassProperty6.ts]
+declare function dec(target: Function): void;
+
+class C {
+    @dec prop;
+}
+
+//// [decoratorOnClassProperty6.js]
+var __decorate = this.__decorate || function (decorators, target, key, value) {
+    var kind = typeof (arguments.length == 2 ? value = target : value);
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        switch (kind) {
+            case "function": value = decorator(value) || value; break;
+            case "number": decorator(target, key, value); break;
+            case "undefined": decorator(target, key); break;
+            case "object": value = decorator(target, key, value) || value; break;
+        }
+    }
+    return value;
+};
+var C = (function () {
+    function C() {
+    }
+    __decorate([dec], C.prototype, "prop");
+    return C;
+})();
diff --git a/tests/baselines/reference/decoratorOnClassProperty6.types b/tests/baselines/reference/decoratorOnClassProperty6.types
new file mode 100644
index 0000000000000..2c8c41abf78e9
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassProperty6.types
@@ -0,0 +1,13 @@
+=== tests/cases/conformance/decorators/class/property/decoratorOnClassProperty6.ts ===
+declare function dec(target: Function): void;
+>dec : (target: Function) => void
+>target : Function
+>Function : Function
+
+class C {
+>C : C
+
+    @dec prop;
+>dec : unknown
+>prop : any
+}
diff --git a/tests/baselines/reference/decoratorOnClassProperty7.errors.txt b/tests/baselines/reference/decoratorOnClassProperty7.errors.txt
new file mode 100644
index 0000000000000..8b93d0ab38ebc
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassProperty7.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/decorators/class/property/decoratorOnClassProperty7.ts(4,5): error TS2322: Type '(target: Function, propertyKey: string | symbol, paramIndex: number) => void' is not assignable to type '(target: Object, propertyKey: string | symbol) => void'.
+
+
+==== tests/cases/conformance/decorators/class/property/decoratorOnClassProperty7.ts (1 errors) ====
+    declare function dec(target: Function, propertyKey: string | symbol, paramIndex: number): void;
+    
+    class C {
+        @dec prop;
+        ~~~~
+!!! error TS2322: Type '(target: Function, propertyKey: string | symbol, paramIndex: number) => void' is not assignable to type '(target: Object, propertyKey: string | symbol) => void'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassProperty7.js b/tests/baselines/reference/decoratorOnClassProperty7.js
new file mode 100644
index 0000000000000..ba2c8383a2cce
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnClassProperty7.js
@@ -0,0 +1,27 @@
+//// [decoratorOnClassProperty7.ts]
+declare function dec(target: Function, propertyKey: string | symbol, paramIndex: number): void;
+
+class C {
+    @dec prop;
+}
+
+//// [decoratorOnClassProperty7.js]
+var __decorate = this.__decorate || function (decorators, target, key, value) {
+    var kind = typeof (arguments.length == 2 ? value = target : value);
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        switch (kind) {
+            case "function": value = decorator(value) || value; break;
+            case "number": decorator(target, key, value); break;
+            case "undefined": decorator(target, key); break;
+            case "object": value = decorator(target, key, value) || value; break;
+        }
+    }
+    return value;
+};
+var C = (function () {
+    function C() {
+    }
+    __decorate([dec], C.prototype, "prop");
+    return C;
+})();
diff --git a/tests/baselines/reference/decoratorOnEnum.errors.txt b/tests/baselines/reference/decoratorOnEnum.errors.txt
new file mode 100644
index 0000000000000..21a6d39aab501
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnEnum.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/decorators/invalid/decoratorOnEnum.ts(4,6): error TS1206: Decorators are not valid here.
+
+
+==== tests/cases/conformance/decorators/invalid/decoratorOnEnum.ts (1 errors) ====
+    declare function dec<T>(target: T): T;
+    
+    @dec
+    enum E {
+         ~
+!!! error TS1206: Decorators are not valid here.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnEnum.js b/tests/baselines/reference/decoratorOnEnum.js
new file mode 100644
index 0000000000000..14651b6592834
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnEnum.js
@@ -0,0 +1,11 @@
+//// [decoratorOnEnum.ts]
+declare function dec<T>(target: T): T;
+
+@dec
+enum E {
+}
+
+//// [decoratorOnEnum.js]
+var E;
+(function (E) {
+})(E || (E = {}));
diff --git a/tests/baselines/reference/decoratorOnEnum2.errors.txt b/tests/baselines/reference/decoratorOnEnum2.errors.txt
new file mode 100644
index 0000000000000..3a643bc861ada
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnEnum2.errors.txt
@@ -0,0 +1,20 @@
+tests/cases/conformance/decorators/invalid/decoratorOnEnum2.ts(4,5): error TS1132: Enum member expected.
+tests/cases/conformance/decorators/invalid/decoratorOnEnum2.ts(4,9): error TS1146: Declaration expected.
+tests/cases/conformance/decorators/invalid/decoratorOnEnum2.ts(4,10): error TS2304: Cannot find name 'A'.
+tests/cases/conformance/decorators/invalid/decoratorOnEnum2.ts(5,1): error TS1128: Declaration or statement expected.
+
+
+==== tests/cases/conformance/decorators/invalid/decoratorOnEnum2.ts (4 errors) ====
+    declare function dec<T>(target: T): T;
+    
+    enum E {
+        @dec A
+        ~
+!!! error TS1132: Enum member expected.
+            
+!!! error TS1146: Declaration expected.
+             ~
+!!! error TS2304: Cannot find name 'A'.
+    }
+    ~
+!!! error TS1128: Declaration or statement expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnEnum2.js b/tests/baselines/reference/decoratorOnEnum2.js
new file mode 100644
index 0000000000000..fecff1f3413be
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnEnum2.js
@@ -0,0 +1,12 @@
+//// [decoratorOnEnum2.ts]
+declare function dec<T>(target: T): T;
+
+enum E {
+    @dec A
+}
+
+//// [decoratorOnEnum2.js]
+var E;
+(function (E) {
+})(E || (E = {}));
+A;
diff --git a/tests/baselines/reference/decoratorOnFunctionDeclaration.errors.txt b/tests/baselines/reference/decoratorOnFunctionDeclaration.errors.txt
new file mode 100644
index 0000000000000..bda00f1a85f82
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnFunctionDeclaration.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/decorators/invalid/decoratorOnFunctionDeclaration.ts(4,10): error TS1206: Decorators are not valid here.
+
+
+==== tests/cases/conformance/decorators/invalid/decoratorOnFunctionDeclaration.ts (1 errors) ====
+    declare function dec<T>(target: T): T;
+    
+    @dec
+    function F() {
+             ~
+!!! error TS1206: Decorators are not valid here.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnFunctionDeclaration.js b/tests/baselines/reference/decoratorOnFunctionDeclaration.js
new file mode 100644
index 0000000000000..7c1a1ff5bfe69
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnFunctionDeclaration.js
@@ -0,0 +1,10 @@
+//// [decoratorOnFunctionDeclaration.ts]
+declare function dec<T>(target: T): T;
+
+@dec
+function F() {
+}
+
+//// [decoratorOnFunctionDeclaration.js]
+function F() {
+}
diff --git a/tests/baselines/reference/decoratorOnFunctionExpression.errors.txt b/tests/baselines/reference/decoratorOnFunctionExpression.errors.txt
new file mode 100644
index 0000000000000..71aae3e13eb23
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnFunctionExpression.errors.txt
@@ -0,0 +1,13 @@
+tests/cases/conformance/decorators/invalid/decoratorOnFunctionExpression.ts(3,9): error TS1109: Expression expected.
+tests/cases/conformance/decorators/invalid/decoratorOnFunctionExpression.ts(3,23): error TS1003: Identifier expected.
+
+
+==== tests/cases/conformance/decorators/invalid/decoratorOnFunctionExpression.ts (2 errors) ====
+    declare function dec<T>(target: T): T;
+    
+    var F = @dec function () {
+            ~
+!!! error TS1109: Expression expected.
+                          ~
+!!! error TS1003: Identifier expected.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnFunctionExpression.js b/tests/baselines/reference/decoratorOnFunctionExpression.js
new file mode 100644
index 0000000000000..f6808674ed4e7
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnFunctionExpression.js
@@ -0,0 +1,10 @@
+//// [decoratorOnFunctionExpression.ts]
+declare function dec<T>(target: T): T;
+
+var F = @dec function () {
+}
+
+//// [decoratorOnFunctionExpression.js]
+var F = ;
+function () {
+}
diff --git a/tests/baselines/reference/decoratorOnImportEquals1.errors.txt b/tests/baselines/reference/decoratorOnImportEquals1.errors.txt
new file mode 100644
index 0000000000000..a09a0b014278d
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnImportEquals1.errors.txt
@@ -0,0 +1,17 @@
+tests/cases/conformance/decorators/invalid/decoratorOnImportEquals1.ts(8,5): error TS1206: Decorators are not valid here.
+
+
+==== tests/cases/conformance/decorators/invalid/decoratorOnImportEquals1.ts (1 errors) ====
+    declare function dec<T>(target: T): T;
+    
+    module M1 {
+        export var X: number;
+    }
+    
+    module M2 {
+        @dec
+        ~~~~
+        import X = M1.X;
+    ~~~~~~~~~~~~~~~~~~~~
+!!! error TS1206: Decorators are not valid here.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnImportEquals1.js b/tests/baselines/reference/decoratorOnImportEquals1.js
new file mode 100644
index 0000000000000..440fdb99bce3b
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnImportEquals1.js
@@ -0,0 +1,17 @@
+//// [decoratorOnImportEquals1.ts]
+declare function dec<T>(target: T): T;
+
+module M1 {
+    export var X: number;
+}
+
+module M2 {
+    @dec
+    import X = M1.X;
+}
+
+//// [decoratorOnImportEquals1.js]
+var M1;
+(function (M1) {
+    M1.X;
+})(M1 || (M1 = {}));
diff --git a/tests/baselines/reference/decoratorOnImportEquals2.errors.txt b/tests/baselines/reference/decoratorOnImportEquals2.errors.txt
new file mode 100644
index 0000000000000..5701afe569be2
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnImportEquals2.errors.txt
@@ -0,0 +1,14 @@
+tests/cases/conformance/decorators/invalid/decoratorOnImportEquals2_1.ts(1,1): error TS1206: Decorators are not valid here.
+
+
+==== tests/cases/conformance/decorators/invalid/decoratorOnImportEquals2_1.ts (1 errors) ====
+    @dec
+    ~~~~
+    import lib = require('./decoratorOnImportEquals2_0');
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1206: Decorators are not valid here.
+    
+    declare function dec<T>(target: T): T;
+==== tests/cases/conformance/decorators/invalid/decoratorOnImportEquals2_0.ts (0 errors) ====
+    export var X;
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnImportEquals2.js b/tests/baselines/reference/decoratorOnImportEquals2.js
new file mode 100644
index 0000000000000..7db2da6b2c2b9
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnImportEquals2.js
@@ -0,0 +1,14 @@
+//// [tests/cases/conformance/decorators/invalid/decoratorOnImportEquals2.ts] ////
+
+//// [decoratorOnImportEquals2_0.ts]
+export var X;
+
+//// [decoratorOnImportEquals2_1.ts]
+@dec
+import lib = require('./decoratorOnImportEquals2_0');
+
+declare function dec<T>(target: T): T;
+
+//// [decoratorOnImportEquals2_0.js]
+exports.X;
+//// [decoratorOnImportEquals2_1.js]
diff --git a/tests/baselines/reference/decoratorOnInterface.errors.txt b/tests/baselines/reference/decoratorOnInterface.errors.txt
new file mode 100644
index 0000000000000..055b43fa877a4
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnInterface.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/decorators/invalid/decoratorOnInterface.ts(4,11): error TS1206: Decorators are not valid here.
+
+
+==== tests/cases/conformance/decorators/invalid/decoratorOnInterface.ts (1 errors) ====
+    declare function dec<T>(target: T): T;
+    
+    @dec
+    interface I {
+              ~
+!!! error TS1206: Decorators are not valid here.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnInterface.js b/tests/baselines/reference/decoratorOnInterface.js
new file mode 100644
index 0000000000000..10b01f299bfab
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnInterface.js
@@ -0,0 +1,8 @@
+//// [decoratorOnInterface.ts]
+declare function dec<T>(target: T): T;
+
+@dec
+interface I {
+}
+
+//// [decoratorOnInterface.js]
diff --git a/tests/baselines/reference/decoratorOnInternalModule.errors.txt b/tests/baselines/reference/decoratorOnInternalModule.errors.txt
new file mode 100644
index 0000000000000..2fd92dfb2500a
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnInternalModule.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/conformance/decorators/invalid/decoratorOnInternalModule.ts(4,8): error TS1206: Decorators are not valid here.
+
+
+==== tests/cases/conformance/decorators/invalid/decoratorOnInternalModule.ts (1 errors) ====
+    declare function dec<T>(target: T): T;
+    
+    @dec
+    module M {
+           ~
+!!! error TS1206: Decorators are not valid here.
+        
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnInternalModule.js b/tests/baselines/reference/decoratorOnInternalModule.js
new file mode 100644
index 0000000000000..d69ab6f1a5622
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnInternalModule.js
@@ -0,0 +1,9 @@
+//// [decoratorOnInternalModule.ts]
+declare function dec<T>(target: T): T;
+
+@dec
+module M {
+    
+}
+
+//// [decoratorOnInternalModule.js]
diff --git a/tests/baselines/reference/decoratorOnTypeAlias.errors.txt b/tests/baselines/reference/decoratorOnTypeAlias.errors.txt
new file mode 100644
index 0000000000000..0d3109fe463f2
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnTypeAlias.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/decorators/invalid/decoratorOnTypeAlias.ts(3,1): error TS1206: Decorators are not valid here.
+
+
+==== tests/cases/conformance/decorators/invalid/decoratorOnTypeAlias.ts (1 errors) ====
+    declare function dec<T>(target: T): T;
+    
+    @dec
+    ~~~~
+    type T = number;
+    ~~~~~~~~~~~~~~~~
+!!! error TS1206: Decorators are not valid here.
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnTypeAlias.js b/tests/baselines/reference/decoratorOnTypeAlias.js
new file mode 100644
index 0000000000000..ef4fc51034f91
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnTypeAlias.js
@@ -0,0 +1,7 @@
+//// [decoratorOnTypeAlias.ts]
+declare function dec<T>(target: T): T;
+
+@dec
+type T = number;
+
+//// [decoratorOnTypeAlias.js]
diff --git a/tests/baselines/reference/decoratorOnVar.errors.txt b/tests/baselines/reference/decoratorOnVar.errors.txt
new file mode 100644
index 0000000000000..bd87357edad6a
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnVar.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/decorators/invalid/decoratorOnVar.ts(3,1): error TS1206: Decorators are not valid here.
+
+
+==== tests/cases/conformance/decorators/invalid/decoratorOnVar.ts (1 errors) ====
+    declare function dec<T>(target: T): T;
+    
+    @dec
+    ~~~~
+    var x: number;
+    ~~~~~~~~~~~~~~
+!!! error TS1206: Decorators are not valid here.
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnVar.js b/tests/baselines/reference/decoratorOnVar.js
new file mode 100644
index 0000000000000..5240d59fda041
--- /dev/null
+++ b/tests/baselines/reference/decoratorOnVar.js
@@ -0,0 +1,8 @@
+//// [decoratorOnVar.ts]
+declare function dec<T>(target: T): T;
+
+@dec
+var x: number;
+
+//// [decoratorOnVar.js]
+var x;
diff --git a/tests/baselines/reference/downlevelLetConst14.js b/tests/baselines/reference/downlevelLetConst14.js
index ffe667eda3f4c..ac9444f9facca 100644
--- a/tests/baselines/reference/downlevelLetConst14.js
+++ b/tests/baselines/reference/downlevelLetConst14.js
@@ -59,24 +59,24 @@ use(y);
 var x = 10;
 var z0, z1, z2, z3;
 {
-    var _x = 20;
-    use(_x);
-    var _z0 = ([
+    var x_1 = 20;
+    use(x_1);
+    var z0_1 = ([
         1
     ])[0];
-    use(_z0);
-    var _z1 = ([
+    use(z0_1);
+    var z1_1 = ([
         1
     ])[0];
-    use(_z1);
-    var _z2 = ({
+    use(z1_1);
+    var z2_1 = ({
         a: 1
     }).a;
-    use(_z2);
-    var _z3 = ({
+    use(z2_1);
+    var z3_1 = ({
         a: 1
     }).a;
-    use(_z3);
+    use(z3_1);
 }
 use(x);
 use(z0);
@@ -86,38 +86,38 @@ use(z3);
 var z6;
 var y = true;
 {
-    var _y = "";
-    var _z6 = ([
+    var y_1 = "";
+    var z6_1 = ([
         true
     ])[0];
     {
-        var _y_1 = 1;
-        var _z6_1 = ({
+        var y_2 = 1;
+        var z6_2 = ({
             a: 1
         }).a;
-        use(_y_1);
-        use(_z6_1);
+        use(y_2);
+        use(z6_2);
     }
-    use(_y);
-    use(_z6);
+    use(y_1);
+    use(z6_1);
 }
 use(y);
 use(z6);
 var z = false;
 var z5 = 1;
 {
-    var _z = "";
-    var _z5 = ([
+    var z_1 = "";
+    var z5_1 = ([
         5
     ])[0];
     {
-        var _z_1 = 1;
-        var _z5_1 = ({
+        var _z = 1;
+        var _z5 = ({
             a: 1
         }).a;
         // try to step on generated name
-        use(_z_1);
+        use(_z);
     }
-    use(_z);
+    use(z_1);
 }
 use(y);
diff --git a/tests/baselines/reference/downlevelLetConst15.js b/tests/baselines/reference/downlevelLetConst15.js
index 94fcb1b03a008..f1b476c017612 100644
--- a/tests/baselines/reference/downlevelLetConst15.js
+++ b/tests/baselines/reference/downlevelLetConst15.js
@@ -59,28 +59,28 @@ use(y);
 var x = 10;
 var z0, z1, z2, z3;
 {
-    var _x = 20;
-    use(_x);
-    var _z0 = ([
+    var x_1 = 20;
+    use(x_1);
+    var z0_1 = ([
         1
     ])[0];
-    use(_z0);
-    var _z1 = ([
+    use(z0_1);
+    var z1_1 = ([
         {
             a: 1
         }
     ])[0].a;
-    use(_z1);
-    var _z2 = ({
+    use(z1_1);
+    var z2_1 = ({
         a: 1
     }).a;
-    use(_z2);
-    var _z3 = ({
+    use(z2_1);
+    var z3_1 = ({
         a: {
             b: 1
         }
     }).a.b;
-    use(_z3);
+    use(z3_1);
 }
 use(x);
 use(z0);
@@ -90,38 +90,38 @@ use(z3);
 var z6;
 var y = true;
 {
-    var _y = "";
-    var _z6 = ([
+    var y_1 = "";
+    var z6_1 = ([
         true
     ])[0];
     {
-        var _y_1 = 1;
-        var _z6_1 = ({
+        var y_2 = 1;
+        var z6_2 = ({
             a: 1
         }).a;
-        use(_y_1);
-        use(_z6_1);
+        use(y_2);
+        use(z6_2);
     }
-    use(_y);
-    use(_z6);
+    use(y_1);
+    use(z6_1);
 }
 use(y);
 use(z6);
 var z = false;
 var z5 = 1;
 {
-    var _z = "";
-    var _z5 = ([
+    var z_1 = "";
+    var z5_1 = ([
         5
     ])[0];
     {
-        var _z_1 = 1;
-        var _z5_1 = ({
+        var _z = 1;
+        var _z5 = ({
             a: 1
         }).a;
         // try to step on generated name
-        use(_z_1);
+        use(_z);
     }
-    use(_z);
+    use(z_1);
 }
 use(y);
diff --git a/tests/baselines/reference/downlevelLetConst16.js b/tests/baselines/reference/downlevelLetConst16.js
index f83e745c55403..aefe2830adc2f 100644
--- a/tests/baselines/reference/downlevelLetConst16.js
+++ b/tests/baselines/reference/downlevelLetConst16.js
@@ -236,29 +236,29 @@ use(x);
 use(y);
 use(z);
 function foo1() {
-    var _x = 1;
-    use(_x);
-    var _y = ([
+    var x = 1;
+    use(x);
+    var y = ([
         1
     ])[0];
-    use(_y);
-    var _z = ({
+    use(y);
+    var z = ({
         a: 1
     }).a;
-    use(_z);
+    use(z);
 }
 function foo2() {
     {
-        var _x = 1;
-        use(_x);
-        var _y = ([
+        var x_1 = 1;
+        use(x_1);
+        var y_1 = ([
             1
         ])[0];
-        use(_y);
-        var _z = ({
+        use(y_1);
+        var z_1 = ({
             a: 1
         }).a;
-        use(_z);
+        use(z_1);
     }
     use(x);
 }
@@ -266,29 +266,29 @@ var A = (function () {
     function A() {
     }
     A.prototype.m1 = function () {
-        var _x = 1;
-        use(_x);
-        var _y = ([
+        var x = 1;
+        use(x);
+        var y = ([
             1
         ])[0];
-        use(_y);
-        var _z = ({
+        use(y);
+        var z = ({
             a: 1
         }).a;
-        use(_z);
+        use(z);
     };
     A.prototype.m2 = function () {
         {
-            var _x = 1;
-            use(_x);
-            var _y = ([
+            var x_2 = 1;
+            use(x_2);
+            var y_2 = ([
                 1
             ])[0];
-            use(_y);
-            var _z = ({
+            use(y_2);
+            var z_2 = ({
                 a: 1
             }).a;
-            use(_z);
+            use(z_2);
         }
         use(x);
     };
@@ -298,200 +298,200 @@ var B = (function () {
     function B() {
     }
     B.prototype.m1 = function () {
-        var _x = 1;
-        use(_x);
-        var _y = ([
+        var x = 1;
+        use(x);
+        var y = ([
             1
         ])[0];
-        use(_y);
-        var _z = ({
+        use(y);
+        var z = ({
             a: 1
         }).a;
-        use(_z);
+        use(z);
     };
     B.prototype.m2 = function () {
         {
-            var _x = 1;
-            use(_x);
-            var _y = ([
+            var x_3 = 1;
+            use(x_3);
+            var y_3 = ([
                 1
             ])[0];
-            use(_y);
-            var _z = ({
+            use(y_3);
+            var z_3 = ({
                 a: 1
             }).a;
-            use(_z);
+            use(z_3);
         }
         use(x);
     };
     return B;
 })();
 function bar1() {
-    var _x = 1;
-    use(_x);
-    var _y = ([
+    var x = 1;
+    use(x);
+    var y = ([
         1
     ])[0];
-    use(_y);
-    var _z = ({
+    use(y);
+    var z = ({
         a: 1
     }).a;
-    use(_z);
+    use(z);
 }
 function bar2() {
     {
-        var _x = 1;
-        use(_x);
-        var _y = ([
+        var x_4 = 1;
+        use(x_4);
+        var y_4 = ([
             1
         ])[0];
-        use(_y);
-        var _z = ({
+        use(y_4);
+        var z_4 = ({
             a: 1
         }).a;
-        use(_z);
+        use(z_4);
     }
     use(x);
 }
 var M1;
 (function (M1) {
-    var _x = 1;
-    use(_x);
-    var _y = ([
+    var x = 1;
+    use(x);
+    var y = ([
         1
     ])[0];
-    use(_y);
-    var _z = ({
+    use(y);
+    var z = ({
         a: 1
     }).a;
-    use(_z);
+    use(z);
 })(M1 || (M1 = {}));
 var M2;
 (function (M2) {
     {
-        var _x = 1;
-        use(_x);
-        var _y = ([
+        var x_5 = 1;
+        use(x_5);
+        var y_5 = ([
             1
         ])[0];
-        use(_y);
-        var _z = ({
+        use(y_5);
+        var z_5 = ({
             a: 1
         }).a;
-        use(_z);
+        use(z_5);
     }
     use(x);
 })(M2 || (M2 = {}));
 var M3;
 (function (M3) {
-    var _x = 1;
-    use(_x);
-    var _y = ([
+    var x = 1;
+    use(x);
+    var y = ([
         1
     ])[0];
-    use(_y);
-    var _z = ({
+    use(y);
+    var z = ({
         a: 1
     }).a;
-    use(_z);
+    use(z);
 })(M3 || (M3 = {}));
 var M4;
 (function (M4) {
     {
-        var _x = 1;
-        use(_x);
-        var _y = ([
+        var x_6 = 1;
+        use(x_6);
+        var y_6 = ([
             1
         ])[0];
-        use(_y);
-        var _z = ({
+        use(y_6);
+        var z_6 = ({
             a: 1
         }).a;
-        use(_z);
+        use(z_6);
     }
     use(x);
     use(y);
     use(z);
 })(M4 || (M4 = {}));
 function foo3() {
-    for (var _x = void 0;;) {
-        use(_x);
+    for (var x_7 = void 0;;) {
+        use(x_7);
     }
-    for (var _y = ([])[0];;) {
-        use(_y);
+    for (var y_7 = ([])[0];;) {
+        use(y_7);
     }
-    for (var _z = ({
+    for (var z_7 = ({
         a: 1
     }).a;;) {
-        use(_z);
+        use(z_7);
     }
     use(x);
 }
 function foo4() {
-    for (var _x = 1;;) {
-        use(_x);
+    for (var x_8 = 1;;) {
+        use(x_8);
     }
-    for (var _y = ([])[0];;) {
-        use(_y);
+    for (var y_8 = ([])[0];;) {
+        use(y_8);
     }
-    for (var _z = ({
+    for (var z_8 = ({
         a: 1
     }).a;;) {
-        use(_z);
+        use(z_8);
     }
     use(x);
 }
 function foo5() {
-    for (var _x in []) {
-        use(_x);
+    for (var x_9 in []) {
+        use(x_9);
     }
     use(x);
 }
 function foo6() {
-    for (var _x in []) {
-        use(_x);
+    for (var x_10 in []) {
+        use(x_10);
     }
     use(x);
 }
 function foo7() {
     for (var _i = 0, _a = []; _i < _a.length; _i++) {
-        var _x = _a[_i];
-        use(_x);
+        var x_11 = _a[_i];
+        use(x_11);
     }
     use(x);
 }
 function foo8() {
     for (var _i = 0, _a = []; _i < _a.length; _i++) {
-        var _x = _a[_i][0];
-        use(_x);
+        var x_12 = _a[_i][0];
+        use(x_12);
     }
     use(x);
 }
 function foo9() {
     for (var _i = 0, _a = []; _i < _a.length; _i++) {
-        var _x = _a[_i].a;
-        use(_x);
+        var x_13 = _a[_i].a;
+        use(x_13);
     }
     use(x);
 }
 function foo10() {
     for (var _i = 0, _a = []; _i < _a.length; _i++) {
-        var _x = _a[_i];
-        use(_x);
+        var x_14 = _a[_i];
+        use(x_14);
     }
     use(x);
 }
 function foo11() {
     for (var _i = 0, _a = []; _i < _a.length; _i++) {
-        var _x = _a[_i][0];
-        use(_x);
+        var x_15 = _a[_i][0];
+        use(x_15);
     }
     use(x);
 }
 function foo12() {
     for (var _i = 0, _a = []; _i < _a.length; _i++) {
-        var _x = _a[_i].a;
-        use(_x);
+        var x_16 = _a[_i].a;
+        use(x_16);
     }
     use(x);
 }
diff --git a/tests/baselines/reference/downlevelLetConst17.js b/tests/baselines/reference/downlevelLetConst17.js
index d38ec3fde08c8..56ab1e6df54c6 100644
--- a/tests/baselines/reference/downlevelLetConst17.js
+++ b/tests/baselines/reference/downlevelLetConst17.js
@@ -70,54 +70,54 @@ for (const x of []) {
 //// [downlevelLetConst17.js]
 'use strict';
 var x;
-for (var _x = 10;;) {
-    use(_x);
+for (var x_1 = 10;;) {
+    use(x_1);
 }
 use(x);
-for (var _x_1 = 10;;) {
-    use(_x_1);
+for (var x_2 = 10;;) {
+    use(x_2);
 }
 for (;;) {
-    var _x_2 = 10;
-    use(_x_2);
-    _x_2 = 1;
+    var x_3 = 10;
+    use(x_3);
+    x_3 = 1;
 }
 for (;;) {
-    var _x_3 = 10;
-    use(_x_3);
+    var x_4 = 10;
+    use(x_4);
 }
-for (var _x_4 = void 0;;) {
-    use(_x_4);
-    _x_4 = 1;
+for (var x_5 = void 0;;) {
+    use(x_5);
+    x_5 = 1;
 }
 for (;;) {
-    var _x_5 = void 0;
-    use(_x_5);
-    _x_5 = 1;
+    var x_6 = void 0;
+    use(x_6);
+    x_6 = 1;
 }
 while (true) {
-    var _x_6 = void 0;
-    use(_x_6);
+    var x_7 = void 0;
+    use(x_7);
 }
 while (true) {
-    var _x_7 = true;
-    use(_x_7);
+    var x_8 = true;
+    use(x_8);
 }
 do {
-    var _x_8 = void 0;
-    use(_x_8);
+    var x_9 = void 0;
+    use(x_9);
 } while (true);
 do {
-    var _x_9 = void 0;
-    use(_x_9);
+    var x_10 = void 0;
+    use(x_10);
 } while (true);
-for (var _x_10 in []) {
-    use(_x_10);
+for (var x_11 in []) {
+    use(x_11);
 }
-for (var _x_11 in []) {
-    use(_x_11);
+for (var x_12 in []) {
+    use(x_12);
 }
 for (var _i = 0, _a = []; _i < _a.length; _i++) {
-    var _x_12 = _a[_i];
-    use(_x_12);
+    var x_13 = _a[_i];
+    use(x_13);
 }
diff --git a/tests/baselines/reference/downlevelLetConst18.js b/tests/baselines/reference/downlevelLetConst18.js
index 0c025573e209b..f3b2306d62b33 100644
--- a/tests/baselines/reference/downlevelLetConst18.js
+++ b/tests/baselines/reference/downlevelLetConst18.js
@@ -38,40 +38,40 @@ for (var x = void 0;;) {
     }
     ;
 }
-for (var _x = void 0;;) {
+for (var x = void 0;;) {
     function foo() {
-        _x;
+        x;
     }
     ;
 }
-for (var _x_1 = void 0;;) {
+for (var x = void 0;;) {
     (function () {
-        _x_1;
+        x;
     })();
 }
-for (var _x_2 = 1;;) {
+for (var x = 1;;) {
     (function () {
-        _x_2;
+        x;
     })();
 }
-for (var _x_3 = void 0;;) {
+for (var x = void 0;;) {
     ({
         foo: function () {
-            _x_3;
+            x;
         }
     });
 }
-for (var _x_4 = void 0;;) {
+for (var x = void 0;;) {
     ({
         get foo() {
-            return _x_4;
+            return x;
         }
     });
 }
-for (var _x_5 = void 0;;) {
+for (var x = void 0;;) {
     ({
         set foo(v) {
-            _x_5;
+            x;
         }
     });
 }
diff --git a/tests/baselines/reference/downlevelLetConst19.js b/tests/baselines/reference/downlevelLetConst19.js
index adcc2e256a81d..2b3ec8036cbdb 100644
--- a/tests/baselines/reference/downlevelLetConst19.js
+++ b/tests/baselines/reference/downlevelLetConst19.js
@@ -24,14 +24,14 @@ use(x)
 var x;
 function a() {
     {
-        var _x;
-        use(_x);
+        var x_1;
+        use(x_1);
         function b() {
             {
-                var _x_1;
-                use(_x_1);
+                var x_2;
+                use(x_2);
             }
-            use(_x);
+            use(x_1);
         }
     }
     use(x);
diff --git a/tests/baselines/reference/duplicateExportAssignments.js b/tests/baselines/reference/duplicateExportAssignments.js
index 7d2776962f7ad..3742a5f1fe54f 100644
--- a/tests/baselines/reference/duplicateExportAssignments.js
+++ b/tests/baselines/reference/duplicateExportAssignments.js
@@ -56,8 +56,8 @@ var y = (function () {
 module.exports = x;
 //// [foo3.js]
 var x;
-(function (_x) {
-    _x.x = 10;
+(function (x_1) {
+    x_1.x = 10;
 })(x || (x = {}));
 var y = (function () {
     function y() {
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js
index 3ac993c612b10..4d29fce3c10d9 100644
--- a/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js
@@ -6,14 +6,14 @@ export default class {
 
 
 //// [es5ExportDefaultClassDeclaration2.js]
-var _default = (function () {
-    function _default() {
+var default_1 = (function () {
+    function default_1() {
     }
-    _default.prototype.method = function () {
+    default_1.prototype.method = function () {
     };
-    return _default;
+    return default_1;
 })();
-exports.default = _default;
+exports.default = default_1;
 
 
 //// [es5ExportDefaultClassDeclaration2.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js
index 4cfb4dcd6179d..61f167619eb9c 100644
--- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js
+++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js
@@ -6,7 +6,7 @@ export default function () { }
 //// [es5ExportDefaultFunctionDeclaration2.js]
 function () {
 }
-exports.default = _default;
+exports.default = default_1;
 
 
 //// [es5ExportDefaultFunctionDeclaration2.d.ts]
diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
index 95fcd77e42deb..6250e0ce3264b 100644
--- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
+++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
@@ -33,14 +33,14 @@ var m;
 })(m = exports.m || (exports.m = {}));
 exports.x = 10;
 //// [client.js]
-var _server = require("server");
-exports.c = _server.c;
-var _server_1 = require("server");
-exports.c2 = _server_1.c;
-var _server_2 = require("server");
-exports.instantiatedModule = _server_2.m;
-var _server_4 = require("server");
-exports.x = _server_4.x;
+var server_1 = require("server");
+exports.c = server_1.c;
+var server_2 = require("server");
+exports.c2 = server_2.c;
+var server_3 = require("server");
+exports.instantiatedModule = server_3.m;
+var server_4 = require("server");
+exports.x = server_4.x;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ExportDefaultClassDeclaration2.js b/tests/baselines/reference/es6ExportDefaultClassDeclaration2.js
index 045de615c8666..ac5d92b6c129d 100644
--- a/tests/baselines/reference/es6ExportDefaultClassDeclaration2.js
+++ b/tests/baselines/reference/es6ExportDefaultClassDeclaration2.js
@@ -6,7 +6,7 @@ export default class {
 
 
 //// [es6ExportDefaultClassDeclaration2.js]
-export default class  {
+export default class {
     method() {
     }
 }
diff --git a/tests/baselines/reference/es6ExportEqualsInterop.js b/tests/baselines/reference/es6ExportEqualsInterop.js
index 6775bb8c6bbe6..747b0b2beb808 100644
--- a/tests/baselines/reference/es6ExportEqualsInterop.js
+++ b/tests/baselines/reference/es6ExportEqualsInterop.js
@@ -253,41 +253,41 @@ y8.a;
 y9.a;
 y0.a;
 // named import
-var _interface_2 = require("interface");
-var _variable_2 = require("variable");
-var _interface_variable_2 = require("interface-variable");
-var _module_2 = require("module");
-var _interface_module_2 = require("interface-module");
-var _variable_module_2 = require("variable-module");
-var _function_2 = require("function");
-var _function_module_2 = require("function-module");
-var _class_2 = require("class");
-var _class_module_2 = require("class-module");
-_interface_2.a;
-_variable_2.a;
-_interface_variable_2.a;
-_module_2.a;
-_interface_module_2.a;
-_variable_module_2.a;
-_function_2.a;
-_function_module_2.a;
-_class_2.a;
-_class_module_2.a;
+var interface_1 = require("interface");
+var variable_1 = require("variable");
+var interface_variable_1 = require("interface-variable");
+var module_1 = require("module");
+var interface_module_1 = require("interface-module");
+var variable_module_1 = require("variable-module");
+var function_1 = require("function");
+var function_module_1 = require("function-module");
+var class_1 = require("class");
+var class_module_1 = require("class-module");
+interface_1.a;
+variable_1.a;
+interface_variable_1.a;
+module_1.a;
+interface_module_1.a;
+variable_module_1.a;
+function_1.a;
+function_module_1.a;
+class_1.a;
+class_module_1.a;
 // named export
-var _variable_3 = require("variable");
-exports.a2 = _variable_3.a;
-var _interface_variable_3 = require("interface-variable");
-exports.a3 = _interface_variable_3.a;
-var _module_3 = require("module");
-exports.a4 = _module_3.a;
-var _interface_module_3 = require("interface-module");
-exports.a5 = _interface_module_3.a;
-var _variable_module_3 = require("variable-module");
-exports.a6 = _variable_module_3.a;
-var _function_module_3 = require("function-module");
-exports.a8 = _function_module_3.a;
-var _class_module_3 = require("class-module");
-exports.a0 = _class_module_3.a;
+var variable_2 = require("variable");
+exports.a2 = variable_2.a;
+var interface_variable_2 = require("interface-variable");
+exports.a3 = interface_variable_2.a;
+var module_2 = require("module");
+exports.a4 = module_2.a;
+var interface_module_2 = require("interface-module");
+exports.a5 = interface_module_2.a;
+var variable_module_2 = require("variable-module");
+exports.a6 = variable_module_2.a;
+var function_module_2 = require("function-module");
+exports.a8 = function_module_2.a;
+var class_module_2 = require("class-module");
+exports.a0 = class_module_2.a;
 // export-star
 __export(require("interface"));
 __export(require("variable"));
diff --git a/tests/baselines/reference/es6ImportDefaultBindingAmd.js b/tests/baselines/reference/es6ImportDefaultBindingAmd.js
index 094e971ecb411..70e4f7e2f57a1 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingAmd.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingAmd.js
@@ -17,8 +17,8 @@ define(["require", "exports"], function (require, exports) {
     exports.default = a;
 });
 //// [es6ImportDefaultBindingAmd_1.js]
-define(["require", "exports", "es6ImportDefaultBindingAmd_0"], function (require, exports, _es6ImportDefaultBindingAmd_0) {
-    var x = _es6ImportDefaultBindingAmd_0.default;
+define(["require", "exports", "es6ImportDefaultBindingAmd_0"], function (require, exports, es6ImportDefaultBindingAmd_0_1) {
+    var x = es6ImportDefaultBindingAmd_0_1.default;
 });
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingDts.js
index 8aa195533eb1d..caa46ed30efe2 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingDts.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingDts.js
@@ -19,8 +19,8 @@ var c = (function () {
 })();
 exports.default = c;
 //// [client.js]
-var _server = require("server");
-exports.x = new _server.default();
+var server_1 = require("server");
+exports.x = new server_1.default();
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
index b0523e9f1d579..15ca1284a1e0b 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
@@ -24,18 +24,18 @@ var x: number = defaultBinding6;
 var a = 10;
 exports.default = a;
 //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.js]
-var _es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0 = require("es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
-var x = _es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0.default;
-var _es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1 = require("es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
-var x = _es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1.default;
-var _es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_2 = require("es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
-var x = _es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_2.default;
-var _es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_3 = require("es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
-var x = _es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_3.default;
-var _es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_4 = require("es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
-var x = _es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_4.default;
-var _es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5 = require("es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
-var x = _es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5.default;
+var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1 = require("es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
+var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1.default;
+var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_2 = require("es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
+var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_2.default;
+var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_3 = require("es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
+var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_3.default;
+var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_4 = require("es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
+var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_4.default;
+var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5 = require("es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
+var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5.default;
+var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6 = require("es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
+var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6.default;
 
 
 //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js
index ed6b672ee7b1e..b6b03176df115 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js
@@ -24,18 +24,18 @@ export var x1: number = defaultBinding6;
 var a = 10;
 exports.default = a;
 //// [client.js]
-var _server = require("server");
-exports.x1 = _server.default;
-var _server_1 = require("server");
-exports.x1 = _server_1.default;
-var _server_2 = require("server");
-exports.x1 = _server_2.default;
-var _server_3 = require("server");
-exports.x1 = _server_3.default;
-var _server_4 = require("server");
-exports.x1 = _server_4.default;
-var _server_5 = require("server");
-exports.x1 = _server_5.default;
+var server_1 = require("server");
+exports.x1 = server_1.default;
+var server_2 = require("server");
+exports.x1 = server_2.default;
+var server_3 = require("server");
+exports.x1 = server_3.default;
+var server_4 = require("server");
+exports.x1 = server_4.default;
+var server_5 = require("server");
+exports.x1 = server_5.default;
+var server_6 = require("server");
+exports.x1 = server_6.default;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js
index 6c85e281150de..8cf9ab1ffb129 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js
@@ -62,17 +62,17 @@ var x11 = (function () {
 })();
 exports.x11 = x11;
 //// [client.js]
-var _server_1 = require("server");
-exports.x1 = new _server_1.a();
-var _server_2 = require("server");
-exports.x2 = new _server_2.a11();
-var _server_3 = require("server");
-exports.x4 = new _server_3.x();
-exports.x5 = new _server_3.a12();
-var _server_4 = require("server");
-exports.x3 = new _server_4.x11();
-var _server_5 = require("server");
-exports.x6 = new _server_5.m();
+var server_1 = require("server");
+exports.x1 = new server_1.a();
+var server_2 = require("server");
+exports.x2 = new server_2.a11();
+var server_3 = require("server");
+exports.x4 = new server_3.x();
+exports.x5 = new server_3.a12();
+var server_4 = require("server");
+exports.x3 = new server_4.x11();
+var server_5 = require("server");
+exports.x6 = new server_5.m();
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
index 3fe7532009895..e6211ac1ebec0 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
@@ -27,18 +27,18 @@ var a = (function () {
 })();
 exports.default = a;
 //// [client.js]
-var _server = require("server");
-exports.x1 = new _server.default();
-var _server_1 = require("server");
-exports.x2 = new _server_1.default();
-var _server_2 = require("server");
-exports.x3 = new _server_2.default();
-var _server_3 = require("server");
-exports.x4 = new _server_3.default();
-var _server_4 = require("server");
-exports.x5 = new _server_4.default();
-var _server_5 = require("server");
-exports.x6 = new _server_5.default();
+var server_1 = require("server");
+exports.x1 = new server_1.default();
+var server_2 = require("server");
+exports.x2 = new server_2.default();
+var server_3 = require("server");
+exports.x3 = new server_3.default();
+var server_4 = require("server");
+exports.x4 = new server_4.default();
+var server_5 = require("server");
+exports.x5 = new server_5.default();
+var server_6 = require("server");
+exports.x6 = new server_6.default();
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js
index 1c63005bb0680..1c65fadbe1d43 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js
@@ -26,17 +26,17 @@ exports.a = 10;
 exports.x = exports.a;
 exports.m = exports.a;
 //// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.js]
-var _es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_1 = require("es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
-var x1 = _es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_1.a;
-var _es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_2 = require("es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
-var x1 = _es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_2.a;
-var _es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_3 = require("es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
-var x1 = _es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_3.x;
-var x1 = _es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_3.a;
-var _es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_4 = require("es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
-var x1 = _es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_4.x;
-var _es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_5 = require("es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
-var x1 = _es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_5.m;
+var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_1 = require("es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
+var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_1.a;
+var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_2 = require("es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
+var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_2.a;
+var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_3 = require("es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
+var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_3.x;
+var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_3.a;
+var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_4 = require("es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
+var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_4.x;
+var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_5 = require("es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
+var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_5.m;
 
 
 //// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js
index c6d487ace472a..0d5f38c0be43c 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js
@@ -30,13 +30,13 @@ define(["require", "exports"], function (require, exports) {
     exports.default = {};
 });
 //// [client.js]
-define(["require", "exports", "server", "server", "server", "server", "server"], function (require, exports, _server_1, _server_2, _server_3, _server_4, _server_5) {
-    exports.x1 = _server_1.a;
-    exports.x1 = _server_2.a;
-    exports.x1 = _server_3.x;
-    exports.x1 = _server_3.a;
-    exports.x1 = _server_4.x;
-    exports.x1 = _server_5.m;
+define(["require", "exports", "server", "server", "server", "server", "server"], function (require, exports, server_1, server_2, server_3, server_4, server_5) {
+    exports.x1 = server_1.a;
+    exports.x1 = server_2.a;
+    exports.x1 = server_3.x;
+    exports.x1 = server_3.a;
+    exports.x1 = server_4.x;
+    exports.x1 = server_5.m;
 });
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
index 8481420ac9415..c2bd5476a7c4e 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
@@ -13,8 +13,8 @@ var x: number = defaultBinding;
 var a = 10;
 exports.default = a;
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js]
-var _es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0 = require("es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"), nameSpaceBinding = _es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0;
-var x = _es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.default;
+var es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1 = require("es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"), nameSpaceBinding = es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1;
+var x = es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1.default;
 
 
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js
index e676554e8c621..ed40582e9231d 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js
@@ -15,9 +15,9 @@ define(["require", "exports"], function (require, exports) {
     exports.default = a;
 });
 //// [client.js]
-define(["require", "exports", "server"], function (require, exports, _server) {
-    var nameSpaceBinding = _server;
-    exports.x = _server.default;
+define(["require", "exports", "server"], function (require, exports, server_1) {
+    var nameSpaceBinding = server_1;
+    exports.x = server_1.default;
 });
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
index dc068451677c2..31ef01c464c80 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
@@ -16,7 +16,7 @@ var a = (function () {
 })();
 exports.a = a;
 //// [client.js]
-var _server = require("server"), nameSpaceBinding = _server;
+var server_1 = require("server"), nameSpaceBinding = server_1;
 exports.x = new nameSpaceBinding.a();
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
index 2d4eec9e4127f..e03ded5fd5aaf 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
@@ -19,9 +19,9 @@ define(["require", "exports"], function (require, exports) {
     exports.default = a;
 });
 //// [client.js]
-define(["require", "exports", "server"], function (require, exports, _server) {
-    var nameSpaceBinding = _server;
-    exports.x = new _server.default();
+define(["require", "exports", "server"], function (require, exports, server_1) {
+    var nameSpaceBinding = server_1;
+    exports.x = new server_1.default();
 });
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
index a37e732ca40db..4a49d3c2d6fd5 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
@@ -11,7 +11,7 @@ var x: number = nameSpaceBinding.a;
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.js]
 exports.a = 10;
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js]
-var _es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0 = require("es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"), nameSpaceBinding = _es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0;
+var es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1 = require("es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"), nameSpaceBinding = es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1;
 var x = nameSpaceBinding.a;
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js
index 27bde8dde01a5..df233fe18a5b3 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js
@@ -11,7 +11,7 @@ export var x: number = nameSpaceBinding.a;
 //// [server.js]
 exports.a = 10;
 //// [client.js]
-var _server = require("server"), nameSpaceBinding = _server;
+var server_1 = require("server"), nameSpaceBinding = server_1;
 exports.x = nameSpaceBinding.a;
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
index 9cacd1837923f..1208ace5ddef4 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
@@ -20,6 +20,6 @@ import defaultBinding3 from "es6ImportDefaultBindingMergeErrors_0"; // SHould be
 var a = 10;
 exports.default = a;
 //// [es6ImportDefaultBindingMergeErrors_1.js]
-var _es6ImportDefaultBindingMergeErrors_0 = require("es6ImportDefaultBindingMergeErrors_0");
-var x = _es6ImportDefaultBindingMergeErrors_0.default;
+var es6ImportDefaultBindingMergeErrors_0_1 = require("es6ImportDefaultBindingMergeErrors_0");
+var x = es6ImportDefaultBindingMergeErrors_0_1.default;
 var defaultBinding2 = "hello world";
diff --git a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
index e68daef500953..e2c5fab4c94b6 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
@@ -16,8 +16,8 @@ define(["require", "exports"], function (require, exports) {
     exports.default = a;
 });
 //// [client.js]
-define(["require", "exports", "server"], function (require, exports, _server) {
-    exports.x = _server.default;
+define(["require", "exports", "server"], function (require, exports, server_1) {
+    exports.x = server_1.default;
 });
 
 
diff --git a/tests/baselines/reference/es6ImportNamedImportAmd.js b/tests/baselines/reference/es6ImportNamedImportAmd.js
index 5e3ddc433083a..c335337325e51 100644
--- a/tests/baselines/reference/es6ImportNamedImportAmd.js
+++ b/tests/baselines/reference/es6ImportNamedImportAmd.js
@@ -53,19 +53,19 @@ define(["require", "exports"], function (require, exports) {
     exports.aaaa = 10;
 });
 //// [es6ImportNamedImportAmd_1.js]
-define(["require", "exports", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0"], function (require, exports, _es6ImportNamedImportAmd_0_1, _es6ImportNamedImportAmd_0_2, _es6ImportNamedImportAmd_0_3, _es6ImportNamedImportAmd_0_4, _es6ImportNamedImportAmd_0_5, _es6ImportNamedImportAmd_0_6, _es6ImportNamedImportAmd_0_7, _es6ImportNamedImportAmd_0_8, _es6ImportNamedImportAmd_0_9) {
-    var xxxx = _es6ImportNamedImportAmd_0_1.a;
-    var xxxx = _es6ImportNamedImportAmd_0_2.a;
-    var xxxx = _es6ImportNamedImportAmd_0_3.x;
-    var xxxx = _es6ImportNamedImportAmd_0_3.a;
-    var xxxx = _es6ImportNamedImportAmd_0_4.x;
-    var xxxx = _es6ImportNamedImportAmd_0_5.m;
-    var xxxx = _es6ImportNamedImportAmd_0_6.a1;
-    var xxxx = _es6ImportNamedImportAmd_0_6.x1;
-    var xxxx = _es6ImportNamedImportAmd_0_7.a1;
-    var xxxx = _es6ImportNamedImportAmd_0_7.x1;
-    var z111 = _es6ImportNamedImportAmd_0_8.z1;
-    var z2 = _es6ImportNamedImportAmd_0_9.z2; // z2 shouldn't give redeclare error
+define(["require", "exports", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0"], function (require, exports, es6ImportNamedImportAmd_0_1, es6ImportNamedImportAmd_0_2, es6ImportNamedImportAmd_0_3, es6ImportNamedImportAmd_0_4, es6ImportNamedImportAmd_0_5, es6ImportNamedImportAmd_0_6, es6ImportNamedImportAmd_0_7, es6ImportNamedImportAmd_0_8, es6ImportNamedImportAmd_0_9) {
+    var xxxx = es6ImportNamedImportAmd_0_1.a;
+    var xxxx = es6ImportNamedImportAmd_0_2.a;
+    var xxxx = es6ImportNamedImportAmd_0_3.x;
+    var xxxx = es6ImportNamedImportAmd_0_3.a;
+    var xxxx = es6ImportNamedImportAmd_0_4.x;
+    var xxxx = es6ImportNamedImportAmd_0_5.m;
+    var xxxx = es6ImportNamedImportAmd_0_6.a1;
+    var xxxx = es6ImportNamedImportAmd_0_6.x1;
+    var xxxx = es6ImportNamedImportAmd_0_7.a1;
+    var xxxx = es6ImportNamedImportAmd_0_7.x1;
+    var z111 = es6ImportNamedImportAmd_0_8.z1;
+    var z2 = es6ImportNamedImportAmd_0_9.z2; // z2 shouldn't give redeclare error
 });
 
 
diff --git a/tests/baselines/reference/es6ImportNamedImportDts.js b/tests/baselines/reference/es6ImportNamedImportDts.js
index 877ae6fab74f3..a72632a737e7a 100644
--- a/tests/baselines/reference/es6ImportNamedImportDts.js
+++ b/tests/baselines/reference/es6ImportNamedImportDts.js
@@ -132,27 +132,27 @@ var aaaa1 = (function () {
 })();
 exports.aaaa1 = aaaa1;
 //// [client.js]
-var _server_1 = require("server");
-exports.xxxx = new _server_1.a();
-var _server_2 = require("server");
-exports.xxxx1 = new _server_2.a11();
-var _server_3 = require("server");
-exports.xxxx2 = new _server_3.x();
-exports.xxxx3 = new _server_3.a12();
-var _server_4 = require("server");
-exports.xxxx4 = new _server_4.x11();
-var _server_5 = require("server");
-exports.xxxx5 = new _server_5.m();
-var _server_6 = require("server");
-exports.xxxx6 = new _server_6.a1();
-exports.xxxx7 = new _server_6.x1();
-var _server_7 = require("server");
-exports.xxxx8 = new _server_7.a111();
-exports.xxxx9 = new _server_7.x111();
-var _server_8 = require("server");
-exports.z111 = new _server_8.z1();
-var _server_9 = require("server");
-exports.z2 = new _server_9.z2(); // z2 shouldn't give redeclare error
+var server_1 = require("server");
+exports.xxxx = new server_1.a();
+var server_2 = require("server");
+exports.xxxx1 = new server_2.a11();
+var server_3 = require("server");
+exports.xxxx2 = new server_3.x();
+exports.xxxx3 = new server_3.a12();
+var server_4 = require("server");
+exports.xxxx4 = new server_4.x11();
+var server_5 = require("server");
+exports.xxxx5 = new server_5.m();
+var server_6 = require("server");
+exports.xxxx6 = new server_6.a1();
+exports.xxxx7 = new server_6.x1();
+var server_7 = require("server");
+exports.xxxx8 = new server_7.a111();
+exports.xxxx9 = new server_7.x111();
+var server_8 = require("server");
+exports.z111 = new server_8.z1();
+var server_9 = require("server");
+exports.z2 = new server_9.z2(); // z2 shouldn't give redeclare error
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportNamedImportInEs5.js b/tests/baselines/reference/es6ImportNamedImportInEs5.js
index fcb88d55b333a..9992508c00be5 100644
--- a/tests/baselines/reference/es6ImportNamedImportInEs5.js
+++ b/tests/baselines/reference/es6ImportNamedImportInEs5.js
@@ -51,27 +51,27 @@ exports.z1 = 10;
 exports.z2 = 10;
 exports.aaaa = 10;
 //// [es6ImportNamedImportInEs5_1.js]
-var _es6ImportNamedImportInEs5_0_1 = require("es6ImportNamedImportInEs5_0");
-var xxxx = _es6ImportNamedImportInEs5_0_1.a;
-var _es6ImportNamedImportInEs5_0_2 = require("es6ImportNamedImportInEs5_0");
-var xxxx = _es6ImportNamedImportInEs5_0_2.a;
-var _es6ImportNamedImportInEs5_0_3 = require("es6ImportNamedImportInEs5_0");
-var xxxx = _es6ImportNamedImportInEs5_0_3.x;
-var xxxx = _es6ImportNamedImportInEs5_0_3.a;
-var _es6ImportNamedImportInEs5_0_4 = require("es6ImportNamedImportInEs5_0");
-var xxxx = _es6ImportNamedImportInEs5_0_4.x;
-var _es6ImportNamedImportInEs5_0_5 = require("es6ImportNamedImportInEs5_0");
-var xxxx = _es6ImportNamedImportInEs5_0_5.m;
-var _es6ImportNamedImportInEs5_0_6 = require("es6ImportNamedImportInEs5_0");
-var xxxx = _es6ImportNamedImportInEs5_0_6.a1;
-var xxxx = _es6ImportNamedImportInEs5_0_6.x1;
-var _es6ImportNamedImportInEs5_0_7 = require("es6ImportNamedImportInEs5_0");
-var xxxx = _es6ImportNamedImportInEs5_0_7.a1;
-var xxxx = _es6ImportNamedImportInEs5_0_7.x1;
-var _es6ImportNamedImportInEs5_0_8 = require("es6ImportNamedImportInEs5_0");
-var z111 = _es6ImportNamedImportInEs5_0_8.z1;
-var _es6ImportNamedImportInEs5_0_9 = require("es6ImportNamedImportInEs5_0");
-var z2 = _es6ImportNamedImportInEs5_0_9.z2; // z2 shouldn't give redeclare error
+var es6ImportNamedImportInEs5_0_1 = require("es6ImportNamedImportInEs5_0");
+var xxxx = es6ImportNamedImportInEs5_0_1.a;
+var es6ImportNamedImportInEs5_0_2 = require("es6ImportNamedImportInEs5_0");
+var xxxx = es6ImportNamedImportInEs5_0_2.a;
+var es6ImportNamedImportInEs5_0_3 = require("es6ImportNamedImportInEs5_0");
+var xxxx = es6ImportNamedImportInEs5_0_3.x;
+var xxxx = es6ImportNamedImportInEs5_0_3.a;
+var es6ImportNamedImportInEs5_0_4 = require("es6ImportNamedImportInEs5_0");
+var xxxx = es6ImportNamedImportInEs5_0_4.x;
+var es6ImportNamedImportInEs5_0_5 = require("es6ImportNamedImportInEs5_0");
+var xxxx = es6ImportNamedImportInEs5_0_5.m;
+var es6ImportNamedImportInEs5_0_6 = require("es6ImportNamedImportInEs5_0");
+var xxxx = es6ImportNamedImportInEs5_0_6.a1;
+var xxxx = es6ImportNamedImportInEs5_0_6.x1;
+var es6ImportNamedImportInEs5_0_7 = require("es6ImportNamedImportInEs5_0");
+var xxxx = es6ImportNamedImportInEs5_0_7.a1;
+var xxxx = es6ImportNamedImportInEs5_0_7.x1;
+var es6ImportNamedImportInEs5_0_8 = require("es6ImportNamedImportInEs5_0");
+var z111 = es6ImportNamedImportInEs5_0_8.z1;
+var es6ImportNamedImportInEs5_0_9 = require("es6ImportNamedImportInEs5_0");
+var z2 = es6ImportNamedImportInEs5_0_9.z2; // z2 shouldn't give redeclare error
 
 
 //// [es6ImportNamedImportInEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js
index 9c383ab3e3b36..f457e31f53c82 100644
--- a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js
+++ b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js
@@ -23,8 +23,8 @@ var a;
     a.c = c;
 })(a = exports.a || (exports.a = {}));
 //// [es6ImportNamedImportInIndirectExportAssignment_1.js]
-var _es6ImportNamedImportInIndirectExportAssignment_0 = require("es6ImportNamedImportInIndirectExportAssignment_0");
-var x = _es6ImportNamedImportInIndirectExportAssignment_0.a;
+var es6ImportNamedImportInIndirectExportAssignment_0_1 = require("es6ImportNamedImportInIndirectExportAssignment_0");
+var x = es6ImportNamedImportInIndirectExportAssignment_0_1.a;
 module.exports = x;
 
 
diff --git a/tests/baselines/reference/es6ImportNamedImportWithExport.js b/tests/baselines/reference/es6ImportNamedImportWithExport.js
index 71f4af721788c..60ba6bf706be4 100644
--- a/tests/baselines/reference/es6ImportNamedImportWithExport.js
+++ b/tests/baselines/reference/es6ImportNamedImportWithExport.js
@@ -50,27 +50,27 @@ exports.z1 = 10;
 exports.z2 = 10;
 exports.aaaa = 10;
 //// [client.js]
-var _server_1 = require("server");
-exports.xxxx = _server_1.a;
-var _server_2 = require("server");
-exports.xxxx = _server_2.a;
-var _server_3 = require("server");
-exports.xxxx = _server_3.x;
-exports.xxxx = _server_3.a;
-var _server_4 = require("server");
-exports.xxxx = _server_4.x;
-var _server_5 = require("server");
-exports.xxxx = _server_5.m;
-var _server_6 = require("server");
-exports.xxxx = _server_6.a1;
-exports.xxxx = _server_6.x1;
-var _server_7 = require("server");
-exports.xxxx = _server_7.a1;
-exports.xxxx = _server_7.x1;
-var _server_8 = require("server");
-exports.z111 = _server_8.z1;
-var _server_9 = require("server");
-exports.z2 = _server_9.z2; // z2 shouldn't give redeclare error
+var server_1 = require("server");
+exports.xxxx = server_1.a;
+var server_2 = require("server");
+exports.xxxx = server_2.a;
+var server_3 = require("server");
+exports.xxxx = server_3.x;
+exports.xxxx = server_3.a;
+var server_4 = require("server");
+exports.xxxx = server_4.x;
+var server_5 = require("server");
+exports.xxxx = server_5.m;
+var server_6 = require("server");
+exports.xxxx = server_6.a1;
+exports.xxxx = server_6.x1;
+var server_7 = require("server");
+exports.xxxx = server_7.a1;
+exports.xxxx = server_7.x1;
+var server_8 = require("server");
+exports.z111 = server_8.z1;
+var server_9 = require("server");
+exports.z2 = server_9.z2; // z2 shouldn't give redeclare error
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js
index 7852d2991bc8a..dcf99c5359a81 100644
--- a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js
+++ b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js
@@ -36,8 +36,8 @@ var C2 = (function () {
 })();
 exports.C2 = C2;
 //// [client.js]
-var _server = require("server"); // Shouldnt emit I and C2 into the js file and emit C and I in .d.ts file
-exports.cVal = new _server.C();
+var server_1 = require("server"); // Shouldnt emit I and C2 into the js file and emit C and I in .d.ts file
+exports.cVal = new server_1.C();
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/exportDefaultTypeAnnoation3.js b/tests/baselines/reference/exportDefaultTypeAnnoation3.js
index 77cb7937712c2..1f95e669de5d9 100644
--- a/tests/baselines/reference/exportDefaultTypeAnnoation3.js
+++ b/tests/baselines/reference/exportDefaultTypeAnnoation3.js
@@ -15,8 +15,8 @@ import { default as d } from "mod";
 var s: string = d; // Error
 
 //// [reference1.js]
-var _mod = require("mod");
-var s = _mod.default; // Error
+var mod_1 = require("mod");
+var s = mod_1.default; // Error
 //// [reference2.js]
-var _mod = require("mod");
-var s = _mod.default; // Error
+var mod_1 = require("mod");
+var s = mod_1.default; // Error
diff --git a/tests/baselines/reference/exportStar-amd.js b/tests/baselines/reference/exportStar-amd.js
index 36d0904a1860d..fb04aa208b22b 100644
--- a/tests/baselines/reference/exportStar-amd.js
+++ b/tests/baselines/reference/exportStar-amd.js
@@ -51,19 +51,19 @@ define(["require", "exports"], function (require, exports) {
     exports.z = z;
 });
 //// [t4.js]
-define(["require", "exports", "./t1", "./t2", "./t3"], function (require, exports, _t1, _t2, _t3) {
+define(["require", "exports", "./t1", "./t2", "./t3"], function (require, exports, t1_1, t2_1, t3_1) {
     function __export(m) {
         for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
     }
-    __export(_t1);
-    __export(_t2);
-    __export(_t3);
+    __export(t1_1);
+    __export(t2_1);
+    __export(t3_1);
 });
 //// [main.js]
-define(["require", "exports", "./t4"], function (require, exports, _t4) {
-    _t4.default;
-    _t4.x;
-    _t4.y;
-    _t4.z;
-    _t4.foo;
+define(["require", "exports", "./t4"], function (require, exports, t4_1) {
+    t4_1.default;
+    t4_1.x;
+    t4_1.y;
+    t4_1.z;
+    t4_1.foo;
 });
diff --git a/tests/baselines/reference/exportStar.js b/tests/baselines/reference/exportStar.js
index 070dd90b1dbd2..9fca12af8b153 100644
--- a/tests/baselines/reference/exportStar.js
+++ b/tests/baselines/reference/exportStar.js
@@ -52,9 +52,9 @@ __export(require("./t1"));
 __export(require("./t2"));
 __export(require("./t3"));
 //// [main.js]
-var _t4 = require("./t4");
-_t4.default;
-_t4.x;
-_t4.y;
-_t4.z;
-_t4.foo;
+var t4_1 = require("./t4");
+t4_1.default;
+t4_1.x;
+t4_1.y;
+t4_1.z;
+t4_1.foo;
diff --git a/tests/baselines/reference/exportsAndImports1-amd.js b/tests/baselines/reference/exportsAndImports1-amd.js
index ac0d56769bb42..99c6fe8d43fe4 100644
--- a/tests/baselines/reference/exportsAndImports1-amd.js
+++ b/tests/baselines/reference/exportsAndImports1-amd.js
@@ -63,20 +63,20 @@ define(["require", "exports"], function (require, exports) {
     exports.a = a;
 });
 //// [t2.js]
-define(["require", "exports", "./t1"], function (require, exports, _t1) {
-    exports.v = _t1.v;
-    exports.f = _t1.f;
-    exports.C = _t1.C;
-    exports.E = _t1.E;
-    exports.M = _t1.M;
-    exports.a = _t1.a;
+define(["require", "exports", "./t1"], function (require, exports, t1_1) {
+    exports.v = t1_1.v;
+    exports.f = t1_1.f;
+    exports.C = t1_1.C;
+    exports.E = t1_1.E;
+    exports.M = t1_1.M;
+    exports.a = t1_1.a;
 });
 //// [t3.js]
-define(["require", "exports", "./t1"], function (require, exports, _t1) {
-    exports.v = _t1.v;
-    exports.f = _t1.f;
-    exports.C = _t1.C;
-    exports.E = _t1.E;
-    exports.M = _t1.M;
-    exports.a = _t1.a;
+define(["require", "exports", "./t1"], function (require, exports, t1_1) {
+    exports.v = t1_1.v;
+    exports.f = t1_1.f;
+    exports.C = t1_1.C;
+    exports.E = t1_1.E;
+    exports.M = t1_1.M;
+    exports.a = t1_1.a;
 });
diff --git a/tests/baselines/reference/exportsAndImports1.js b/tests/baselines/reference/exportsAndImports1.js
index 2e396c1c72b1a..f381e6b724212 100644
--- a/tests/baselines/reference/exportsAndImports1.js
+++ b/tests/baselines/reference/exportsAndImports1.js
@@ -61,18 +61,18 @@ exports.M = M;
 var a = M.x;
 exports.a = a;
 //// [t2.js]
-var _t1 = require("./t1");
-exports.v = _t1.v;
-exports.f = _t1.f;
-exports.C = _t1.C;
-exports.E = _t1.E;
-exports.M = _t1.M;
-exports.a = _t1.a;
+var t1_1 = require("./t1");
+exports.v = t1_1.v;
+exports.f = t1_1.f;
+exports.C = t1_1.C;
+exports.E = t1_1.E;
+exports.M = t1_1.M;
+exports.a = t1_1.a;
 //// [t3.js]
-var _t1 = require("./t1");
-exports.v = _t1.v;
-exports.f = _t1.f;
-exports.C = _t1.C;
-exports.E = _t1.E;
-exports.M = _t1.M;
-exports.a = _t1.a;
+var t1_1 = require("./t1");
+exports.v = t1_1.v;
+exports.f = t1_1.f;
+exports.C = t1_1.C;
+exports.E = t1_1.E;
+exports.M = t1_1.M;
+exports.a = t1_1.a;
diff --git a/tests/baselines/reference/exportsAndImports2-amd.js b/tests/baselines/reference/exportsAndImports2-amd.js
index a958c5dd77192..10f524de68441 100644
--- a/tests/baselines/reference/exportsAndImports2-amd.js
+++ b/tests/baselines/reference/exportsAndImports2-amd.js
@@ -19,12 +19,12 @@ define(["require", "exports"], function (require, exports) {
     exports.y = "y";
 });
 //// [t2.js]
-define(["require", "exports", "./t1"], function (require, exports, _t1) {
-    exports.y = _t1.x;
-    exports.x = _t1.y;
+define(["require", "exports", "./t1"], function (require, exports, t1_1) {
+    exports.y = t1_1.x;
+    exports.x = t1_1.y;
 });
 //// [t3.js]
-define(["require", "exports", "./t1"], function (require, exports, _t1) {
-    exports.y = _t1.x;
-    exports.x = _t1.y;
+define(["require", "exports", "./t1"], function (require, exports, t1_1) {
+    exports.y = t1_1.x;
+    exports.x = t1_1.y;
 });
diff --git a/tests/baselines/reference/exportsAndImports2.js b/tests/baselines/reference/exportsAndImports2.js
index 3773dc624c87b..96a3b838ed1ec 100644
--- a/tests/baselines/reference/exportsAndImports2.js
+++ b/tests/baselines/reference/exportsAndImports2.js
@@ -17,10 +17,10 @@ export { x as y, y as x };
 exports.x = "x";
 exports.y = "y";
 //// [t2.js]
-var _t1 = require("./t1");
-exports.y = _t1.x;
-exports.x = _t1.y;
+var t1_1 = require("./t1");
+exports.y = t1_1.x;
+exports.x = t1_1.y;
 //// [t3.js]
-var _t1 = require("./t1");
-exports.y = _t1.x;
-exports.x = _t1.y;
+var t1_1 = require("./t1");
+exports.y = t1_1.x;
+exports.x = t1_1.y;
diff --git a/tests/baselines/reference/exportsAndImports3-amd.js b/tests/baselines/reference/exportsAndImports3-amd.js
index 443358eafd021..613598cc0ee77 100644
--- a/tests/baselines/reference/exportsAndImports3-amd.js
+++ b/tests/baselines/reference/exportsAndImports3-amd.js
@@ -65,20 +65,20 @@ define(["require", "exports"], function (require, exports) {
     exports.a1 = exports.a;
 });
 //// [t2.js]
-define(["require", "exports", "./t1"], function (require, exports, _t1) {
-    exports.v = _t1.v1;
-    exports.f = _t1.f1;
-    exports.C = _t1.C1;
-    exports.E = _t1.E1;
-    exports.M = _t1.M1;
-    exports.a = _t1.a1;
+define(["require", "exports", "./t1"], function (require, exports, t1_1) {
+    exports.v = t1_1.v1;
+    exports.f = t1_1.f1;
+    exports.C = t1_1.C1;
+    exports.E = t1_1.E1;
+    exports.M = t1_1.M1;
+    exports.a = t1_1.a1;
 });
 //// [t3.js]
-define(["require", "exports", "./t1"], function (require, exports, _t1) {
-    exports.v = _t1.v1;
-    exports.f = _t1.f1;
-    exports.C = _t1.C1;
-    exports.E = _t1.E1;
-    exports.M = _t1.M1;
-    exports.a = _t1.a1;
+define(["require", "exports", "./t1"], function (require, exports, t1_1) {
+    exports.v = t1_1.v1;
+    exports.f = t1_1.f1;
+    exports.C = t1_1.C1;
+    exports.E = t1_1.E1;
+    exports.M = t1_1.M1;
+    exports.a = t1_1.a1;
 });
diff --git a/tests/baselines/reference/exportsAndImports3.js b/tests/baselines/reference/exportsAndImports3.js
index d4ebe982f895d..f06a6f684d0e4 100644
--- a/tests/baselines/reference/exportsAndImports3.js
+++ b/tests/baselines/reference/exportsAndImports3.js
@@ -63,18 +63,18 @@ exports.M1 = exports.M;
 exports.a = M.x;
 exports.a1 = exports.a;
 //// [t2.js]
-var _t1 = require("./t1");
-exports.v = _t1.v1;
-exports.f = _t1.f1;
-exports.C = _t1.C1;
-exports.E = _t1.E1;
-exports.M = _t1.M1;
-exports.a = _t1.a1;
+var t1_1 = require("./t1");
+exports.v = t1_1.v1;
+exports.f = t1_1.f1;
+exports.C = t1_1.C1;
+exports.E = t1_1.E1;
+exports.M = t1_1.M1;
+exports.a = t1_1.a1;
 //// [t3.js]
-var _t1 = require("./t1");
-exports.v = _t1.v1;
-exports.f = _t1.f1;
-exports.C = _t1.C1;
-exports.E = _t1.E1;
-exports.M = _t1.M1;
-exports.a = _t1.a1;
+var t1_1 = require("./t1");
+exports.v = t1_1.v1;
+exports.f = t1_1.f1;
+exports.C = t1_1.C1;
+exports.E = t1_1.E1;
+exports.M = t1_1.M1;
+exports.a = t1_1.a1;
diff --git a/tests/baselines/reference/exportsAndImports4-amd.js b/tests/baselines/reference/exportsAndImports4-amd.js
index 08342c566007b..db28ed5b35009 100644
--- a/tests/baselines/reference/exportsAndImports4-amd.js
+++ b/tests/baselines/reference/exportsAndImports4-amd.js
@@ -44,22 +44,22 @@ define(["require", "exports"], function (require, exports) {
     exports.default = "hello";
 });
 //// [t3.js]
-define(["require", "exports", "./t1", "./t1", "./t1", "./t1", "./t1", "./t1"], function (require, exports, a, _t1, c, _t1_2, _t1_3, _t1_4) {
+define(["require", "exports", "./t1", "./t1", "./t1", "./t1", "./t1", "./t1"], function (require, exports, a, t1_1, c, t1_2, t1_3, t1_4) {
     exports.a = a;
     a.default;
-    exports.b = _t1.default;
-    _t1.default;
+    exports.b = t1_1.default;
+    t1_1.default;
     exports.c = c;
     c.default;
-    exports.d = _t1_2.default;
-    _t1_2.default;
-    var e2 = _t1_3;
-    exports.e1 = _t1_3.default;
+    exports.d = t1_2.default;
+    t1_2.default;
+    var e2 = t1_3;
+    exports.e1 = t1_3.default;
     exports.e2 = e2;
-    _t1_3.default;
+    t1_3.default;
     e2.default;
-    exports.f1 = _t1_4.default;
-    exports.f2 = _t1_4.default;
-    _t1_4.default;
-    _t1_4.default;
+    exports.f1 = t1_4.default;
+    exports.f2 = t1_4.default;
+    t1_4.default;
+    t1_4.default;
 });
diff --git a/tests/baselines/reference/exportsAndImports4.js b/tests/baselines/reference/exportsAndImports4.js
index 05f0285472964..ea5f34b882be8 100644
--- a/tests/baselines/reference/exportsAndImports4.js
+++ b/tests/baselines/reference/exportsAndImports4.js
@@ -45,22 +45,22 @@ exports.default = "hello";
 var a = require("./t1");
 exports.a = a;
 a.default;
-var _t1 = require("./t1");
-exports.b = _t1.default;
-_t1.default;
+var t1_1 = require("./t1");
+exports.b = t1_1.default;
+t1_1.default;
 var c = require("./t1");
 exports.c = c;
 c.default;
-var _t1_2 = require("./t1");
-exports.d = _t1_2.default;
-_t1_2.default;
-var _t1_3 = require("./t1"), e2 = _t1_3;
-exports.e1 = _t1_3.default;
+var t1_2 = require("./t1");
+exports.d = t1_2.default;
+t1_2.default;
+var t1_3 = require("./t1"), e2 = t1_3;
+exports.e1 = t1_3.default;
 exports.e2 = e2;
-_t1_3.default;
+t1_3.default;
 e2.default;
-var _t1_4 = require("./t1");
-exports.f1 = _t1_4.default;
-exports.f2 = _t1_4.default;
-_t1_4.default;
-_t1_4.default;
+var t1_4 = require("./t1");
+exports.f1 = t1_4.default;
+exports.f2 = t1_4.default;
+t1_4.default;
+t1_4.default;
diff --git a/tests/baselines/reference/externalModuleImmutableBindings.errors.txt b/tests/baselines/reference/externalModuleImmutableBindings.errors.txt
new file mode 100644
index 0000000000000..09cc7b3329578
--- /dev/null
+++ b/tests/baselines/reference/externalModuleImmutableBindings.errors.txt
@@ -0,0 +1,164 @@
+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(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(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/f1.ts (0 errors) ====
+    export var x = 1;
+    
+==== tests/cases/compiler/f2.ts (38 errors) ====
+    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
new file mode 100644
index 0000000000000..546b593fa77b7
--- /dev/null
+++ b/tests/baselines/reference/externalModuleImmutableBindings.js
@@ -0,0 +1,112 @@
+//// [tests/cases/compiler/externalModuleImmutableBindings.ts] ////
+
+//// [f1.ts]
+export var x = 1;
+
+//// [f2.ts]
+import * as stuff from 'f1';
+
+var n = 'baz';
+
+stuff.x = 0;
+stuff['x'] = 1;
+stuff.blah = 2;
+stuff[n] = 3;
+
+stuff.x++;
+stuff['x']++;
+stuff['blah']++;
+stuff[n]++;
+
+(stuff.x) = 0;
+(stuff['x']) = 1;
+(stuff.blah) = 2;
+(stuff[n]) = 3;
+
+(stuff.x)++;
+(stuff['x'])++;
+(stuff['blah'])++;
+(stuff[n])++;
+
+for (stuff.x in []) {}
+for (stuff.x of []) {}
+for (stuff['x'] in []) {}
+for (stuff['x'] of []) {}
+for (stuff.blah in []) {}
+for (stuff.blah of []) {}
+for (stuff[n] in []) {}
+for (stuff[n] of []) {}
+
+for ((stuff.x) in []) {}
+for ((stuff.x) of []) {}
+for ((stuff['x']) in []) {}
+for ((stuff['x']) of []) {}
+for ((stuff.blah) in []) {}
+for ((stuff.blah) of []) {}
+for ((stuff[n]) in []) {}
+for ((stuff[n]) of []) {}
+
+
+
+
+//// [f1.js]
+exports.x = 1;
+//// [f2.js]
+var stuff = require('f1');
+var n = 'baz';
+stuff.x = 0;
+stuff['x'] = 1;
+stuff.blah = 2;
+stuff[n] = 3;
+stuff.x++;
+stuff['x']++;
+stuff['blah']++;
+stuff[n]++;
+(stuff.x) = 0;
+(stuff['x']) = 1;
+(stuff.blah) = 2;
+(stuff[n]) = 3;
+(stuff.x)++;
+(stuff['x'])++;
+(stuff['blah'])++;
+(stuff[n])++;
+for (stuff.x in []) {
+}
+for (var _i = 0, _a = []; _i < _a.length; _i++) {
+    stuff.x = _a[_i];
+}
+for (stuff['x'] in []) {
+}
+for (var _b = 0, _c = []; _b < _c.length; _b++) {
+    stuff['x'] = _c[_b];
+}
+for (stuff.blah in []) {
+}
+for (var _d = 0, _e = []; _d < _e.length; _d++) {
+    stuff.blah = _e[_d];
+}
+for (stuff[n] in []) {
+}
+for (var _f = 0, _g = []; _f < _g.length; _f++) {
+    stuff[n] = _g[_f];
+}
+for ((stuff.x) in []) {
+}
+for (var _h = 0, _j = []; _h < _j.length; _h++) {
+    (stuff.x) = _j[_h];
+}
+for ((stuff['x']) in []) {
+}
+for (var _k = 0, _l = []; _k < _l.length; _k++) {
+    (stuff['x']) = _l[_k];
+}
+for ((stuff.blah) in []) {
+}
+for (var _m = 0, _o = []; _m < _o.length; _m++) {
+    (stuff.blah) = _o[_m];
+}
+for ((stuff[n]) in []) {
+}
+for (var _p = 0, _q = []; _p < _q.length; _p++) {
+    (stuff[n]) = _q[_p];
+}
diff --git a/tests/baselines/reference/giant.js b/tests/baselines/reference/giant.js
index 9de46f76b1bb8..cc532ff43d955 100644
--- a/tests/baselines/reference/giant.js
+++ b/tests/baselines/reference/giant.js
@@ -754,7 +754,7 @@ define(["require", "exports"], function (require, exports) {
         return C;
     })();
     var M;
-    (function (_M) {
+    (function (M_1) {
         var V;
         function F() {
         }
@@ -844,10 +844,10 @@ define(["require", "exports"], function (require, exports) {
             ;
             ;
         })(M || (M = {}));
-        _M.eV;
+        M_1.eV;
         function eF() {
         }
-        _M.eF = eF;
+        M_1.eF = eF;
         ;
         var eC = (function () {
             function eC() {
@@ -902,7 +902,7 @@ define(["require", "exports"], function (require, exports) {
             });
             return eC;
         })();
-        _M.eC = eC;
+        M_1.eC = eC;
         var eM;
         (function (eM) {
             var V;
@@ -934,7 +934,7 @@ define(["require", "exports"], function (require, exports) {
             ;
             ;
             ;
-        })(eM = _M.eM || (_M.eM = {}));
+        })(eM = M_1.eM || (M_1.eM = {}));
         ;
     })(M || (M = {}));
     exports.eV;
@@ -997,7 +997,7 @@ define(["require", "exports"], function (require, exports) {
     })();
     exports.eC = eC;
     var eM;
-    (function (_eM) {
+    (function (eM_1) {
         var V;
         function F() {
         }
@@ -1087,10 +1087,10 @@ define(["require", "exports"], function (require, exports) {
             ;
             ;
         })(M || (M = {}));
-        _eM.eV;
+        eM_1.eV;
         function eF() {
         }
-        _eM.eF = eF;
+        eM_1.eF = eF;
         ;
         var eC = (function () {
             function eC() {
@@ -1145,7 +1145,7 @@ define(["require", "exports"], function (require, exports) {
             });
             return eC;
         })();
-        _eM.eC = eC;
+        eM_1.eC = eC;
         var eM;
         (function (eM) {
             var V;
@@ -1177,7 +1177,7 @@ define(["require", "exports"], function (require, exports) {
             ;
             ;
             ;
-        })(eM = _eM.eM || (_eM.eM = {}));
+        })(eM = eM_1.eM || (eM_1.eM = {}));
         ;
     })(eM = exports.eM || (exports.eM = {}));
     ;
diff --git a/tests/baselines/reference/importAndVariableDeclarationConflict1.js b/tests/baselines/reference/importAndVariableDeclarationConflict1.js
index 78484b2c295a1..b812deec0ef45 100644
--- a/tests/baselines/reference/importAndVariableDeclarationConflict1.js
+++ b/tests/baselines/reference/importAndVariableDeclarationConflict1.js
@@ -9,8 +9,8 @@ var x = '';
 
 //// [importAndVariableDeclarationConflict1.js]
 var m;
-(function (_m) {
-    _m.m = '';
+(function (m_1) {
+    m_1.m = '';
 })(m || (m = {}));
 var x = m.m;
 var x = '';
diff --git a/tests/baselines/reference/importAndVariableDeclarationConflict2.js b/tests/baselines/reference/importAndVariableDeclarationConflict2.js
index bea146fe9bf0e..6d188b373b74a 100644
--- a/tests/baselines/reference/importAndVariableDeclarationConflict2.js
+++ b/tests/baselines/reference/importAndVariableDeclarationConflict2.js
@@ -13,8 +13,8 @@ class C {
 
 //// [importAndVariableDeclarationConflict2.js]
 var m;
-(function (_m) {
-    _m.m = '';
+(function (m_1) {
+    m_1.m = '';
 })(m || (m = {}));
 var x = m.m;
 var C = (function () {
diff --git a/tests/baselines/reference/importAndVariableDeclarationConflict3.js b/tests/baselines/reference/importAndVariableDeclarationConflict3.js
index 426d44bab2173..887aec16c59b0 100644
--- a/tests/baselines/reference/importAndVariableDeclarationConflict3.js
+++ b/tests/baselines/reference/importAndVariableDeclarationConflict3.js
@@ -9,8 +9,8 @@ import x = m.m;
 
 //// [importAndVariableDeclarationConflict3.js]
 var m;
-(function (_m) {
-    _m.m = '';
+(function (m_1) {
+    m_1.m = '';
 })(m || (m = {}));
 var x = m.m;
 var x = m.m;
diff --git a/tests/baselines/reference/importAndVariableDeclarationConflict4.js b/tests/baselines/reference/importAndVariableDeclarationConflict4.js
index 2adb78594a23a..4949df6366a42 100644
--- a/tests/baselines/reference/importAndVariableDeclarationConflict4.js
+++ b/tests/baselines/reference/importAndVariableDeclarationConflict4.js
@@ -9,8 +9,8 @@ import x = m.m;
 
 //// [importAndVariableDeclarationConflict4.js]
 var m;
-(function (_m) {
-    _m.m = '';
+(function (m_1) {
+    m_1.m = '';
 })(m || (m = {}));
 var x = '';
 var x = m.m;
diff --git a/tests/baselines/reference/importedModuleAddToGlobal.js b/tests/baselines/reference/importedModuleAddToGlobal.js
index 6685bec69e374..a848ccb504bde 100644
--- a/tests/baselines/reference/importedModuleAddToGlobal.js
+++ b/tests/baselines/reference/importedModuleAddToGlobal.js
@@ -18,13 +18,13 @@ module C {
 
 //// [importedModuleAddToGlobal.js]
 var B;
-(function (_B) {
+(function (B_1) {
     var B = (function () {
         function B() {
         }
         return B;
     })();
-    _B.B = B;
+    B_1.B = B;
 })(B || (B = {}));
 var C;
 (function (C) {
diff --git a/tests/baselines/reference/initializePropertiesWithRenamedLet.js b/tests/baselines/reference/initializePropertiesWithRenamedLet.js
index 902a23f5886e0..1d34d7c13fc86 100644
--- a/tests/baselines/reference/initializePropertiesWithRenamedLet.js
+++ b/tests/baselines/reference/initializePropertiesWithRenamedLet.js
@@ -19,28 +19,28 @@ if (true) {
 //// [initializePropertiesWithRenamedLet.js]
 var x0;
 if (true) {
-    var _x0;
+    var x0_1;
     var obj1 = {
-        x0: _x0
+        x0: x0_1
     };
     var obj2 = {
-        x0: _x0
+        x0: x0_1
     };
 }
 var x, y, z;
 if (true) {
-    var _x = ({
+    var x_1 = ({
         x: 0
     }).x;
-    var _y = ({
+    var y_1 = ({
         y: 0
     }).y;
-    var _z;
+    var z_1;
     (_a = {
         z: 0
-    }, _z = _a.z, _a);
+    }, z_1 = _a.z, _a);
     (_b = {
         z: 0
-    }, _z = _b.z, _b);
+    }, z_1 = _b.z, _b);
 }
 var _a, _b;
diff --git a/tests/baselines/reference/isDeclarationVisibleNodeKinds.js b/tests/baselines/reference/isDeclarationVisibleNodeKinds.js
index d357922f5bce6..8604ec493a2ab 100644
--- a/tests/baselines/reference/isDeclarationVisibleNodeKinds.js
+++ b/tests/baselines/reference/isDeclarationVisibleNodeKinds.js
@@ -72,67 +72,67 @@ module schema {
 //// [isDeclarationVisibleNodeKinds.js]
 // Function types
 var schema;
-(function (_schema) {
+(function (schema_1) {
     function createValidator1(schema) {
         return undefined;
     }
-    _schema.createValidator1 = createValidator1;
+    schema_1.createValidator1 = createValidator1;
 })(schema || (schema = {}));
 // Constructor types
 var schema;
-(function (_schema_1) {
+(function (schema_2) {
     function createValidator2(schema) {
         return undefined;
     }
-    _schema_1.createValidator2 = createValidator2;
+    schema_2.createValidator2 = createValidator2;
 })(schema || (schema = {}));
 // union types
 var schema;
-(function (_schema_2) {
+(function (schema_3) {
     function createValidator3(schema) {
         return undefined;
     }
-    _schema_2.createValidator3 = createValidator3;
+    schema_3.createValidator3 = createValidator3;
 })(schema || (schema = {}));
 // Array types
 var schema;
-(function (_schema_3) {
+(function (schema_4) {
     function createValidator4(schema) {
         return undefined;
     }
-    _schema_3.createValidator4 = createValidator4;
+    schema_4.createValidator4 = createValidator4;
 })(schema || (schema = {}));
 // TypeLiterals
 var schema;
-(function (_schema_4) {
+(function (schema_5) {
     function createValidator5(schema) {
         return undefined;
     }
-    _schema_4.createValidator5 = createValidator5;
+    schema_5.createValidator5 = createValidator5;
 })(schema || (schema = {}));
 // Tuple types
 var schema;
-(function (_schema_5) {
+(function (schema_6) {
     function createValidator6(schema) {
         return undefined;
     }
-    _schema_5.createValidator6 = createValidator6;
+    schema_6.createValidator6 = createValidator6;
 })(schema || (schema = {}));
 // Paren Types
 var schema;
-(function (_schema_6) {
+(function (schema_7) {
     function createValidator7(schema) {
         return undefined;
     }
-    _schema_6.createValidator7 = createValidator7;
+    schema_7.createValidator7 = createValidator7;
 })(schema || (schema = {}));
 // Type reference
 var schema;
-(function (_schema_7) {
+(function (schema_8) {
     function createValidator8(schema) {
         return undefined;
     }
-    _schema_7.createValidator8 = createValidator8;
+    schema_8.createValidator8 = createValidator8;
 })(schema || (schema = {}));
 var schema;
 (function (schema) {
diff --git a/tests/baselines/reference/letConstInCaseClauses.js b/tests/baselines/reference/letConstInCaseClauses.js
index 94840a11a2c74..33650dcaf4caf 100644
--- a/tests/baselines/reference/letConstInCaseClauses.js
+++ b/tests/baselines/reference/letConstInCaseClauses.js
@@ -34,28 +34,28 @@ var y = 20;
 var x = 10;
 var y = 20;
 {
-    var _x = 1;
-    var _y = 2;
-    console.log(_x);
-    switch (_x) {
+    var x_1 = 1;
+    var y_1 = 2;
+    console.log(x_1);
+    switch (x_1) {
         case 10:
-            var _x_1 = 20;
+            var x_2 = 20;
     }
-    switch (_y) {
+    switch (y_1) {
         case 10:
-            var _y_1 = 20;
+            var y_2 = 20;
     }
 }
 {
-    var _x_2 = 1;
-    var _y_2 = 2;
-    console.log(_x_2);
-    switch (_x_2) {
+    var x_3 = 1;
+    var y_3 = 2;
+    console.log(x_3);
+    switch (x_3) {
         case 10:
-            var _x_3 = 20;
+            var x_4 = 20;
     }
-    switch (_y_2) {
+    switch (y_3) {
         case 10:
-            var _y_3 = 20;
+            var y_4 = 20;
     }
 }
diff --git a/tests/baselines/reference/letConstMatchingParameterNames.js b/tests/baselines/reference/letConstMatchingParameterNames.js
index a11405b9f83c7..392f0e7ae943e 100644
--- a/tests/baselines/reference/letConstMatchingParameterNames.js
+++ b/tests/baselines/reference/letConstMatchingParameterNames.js
@@ -19,8 +19,8 @@ function a() {
 var parent = true;
 var parent2 = true;
 function a() {
-    var _parent = 1;
-    var _parent2 = 2;
+    var parent = 1;
+    var parent2 = 2;
     function b(parent, parent2) {
         use(parent);
         use(parent2);
diff --git a/tests/baselines/reference/letDeclarations-es5.js b/tests/baselines/reference/letDeclarations-es5.js
index 5246e91edfb76..1d4eb4afcbfef 100644
--- a/tests/baselines/reference/letDeclarations-es5.js
+++ b/tests/baselines/reference/letDeclarations-es5.js
@@ -20,7 +20,7 @@ var l3, l4, l5, l6;
 var l7 = false;
 var l8 = 23;
 var l9 = 0, l10 = "", l11 = null;
-for (var _l11 in {}) {
+for (var l11_1 in {}) {
 }
 for (var l12 = 0; l12 < 9; l12++) {
 }
diff --git a/tests/baselines/reference/letKeepNamesOfTopLevelItems.js b/tests/baselines/reference/letKeepNamesOfTopLevelItems.js
new file mode 100644
index 0000000000000..96fd31ae536dd
--- /dev/null
+++ b/tests/baselines/reference/letKeepNamesOfTopLevelItems.js
@@ -0,0 +1,19 @@
+//// [letKeepNamesOfTopLevelItems.ts]
+let x;
+function foo() {
+    let x;
+}
+
+module A {
+    let x;
+}
+
+//// [letKeepNamesOfTopLevelItems.js]
+var x;
+function foo() {
+    var x;
+}
+var A;
+(function (A) {
+    var x;
+})(A || (A = {}));
diff --git a/tests/baselines/reference/letKeepNamesOfTopLevelItems.types b/tests/baselines/reference/letKeepNamesOfTopLevelItems.types
new file mode 100644
index 0000000000000..952be1512a984
--- /dev/null
+++ b/tests/baselines/reference/letKeepNamesOfTopLevelItems.types
@@ -0,0 +1,17 @@
+=== tests/cases/compiler/letKeepNamesOfTopLevelItems.ts ===
+let x;
+>x : any
+
+function foo() {
+>foo : () => void
+
+    let x;
+>x : any
+}
+
+module A {
+>A : typeof A
+
+    let x;
+>x : any
+}
diff --git a/tests/baselines/reference/letShadowedByNameInNestedScope.errors.txt b/tests/baselines/reference/letShadowedByNameInNestedScope.errors.txt
new file mode 100644
index 0000000000000..b47e194f93eb1
--- /dev/null
+++ b/tests/baselines/reference/letShadowedByNameInNestedScope.errors.txt
@@ -0,0 +1,14 @@
+tests/cases/compiler/letShadowedByNameInNestedScope.ts(6,9): error TS2304: Cannot find name 'console'.
+
+
+==== tests/cases/compiler/letShadowedByNameInNestedScope.ts (1 errors) ====
+    var x;
+    function foo() {
+        let x = 0;
+        (function () {
+            var _x = 1;
+            console.log(x);
+            ~~~~~~~
+!!! error TS2304: Cannot find name 'console'.
+        })();
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/letShadowedByNameInNestedScope.js b/tests/baselines/reference/letShadowedByNameInNestedScope.js
new file mode 100644
index 0000000000000..648fe0b8e94df
--- /dev/null
+++ b/tests/baselines/reference/letShadowedByNameInNestedScope.js
@@ -0,0 +1,19 @@
+//// [letShadowedByNameInNestedScope.ts]
+var x;
+function foo() {
+    let x = 0;
+    (function () {
+        var _x = 1;
+        console.log(x);
+    })();
+}
+
+//// [letShadowedByNameInNestedScope.js]
+var x;
+function foo() {
+    var x = 0;
+    (function () {
+        var _x = 1;
+        console.log(x);
+    })();
+}
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen.js
index 88b949dd92023..d5cda7c91099d 100644
--- a/tests/baselines/reference/mergedModuleDeclarationCodeGen.js
+++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen.js
@@ -19,10 +19,10 @@ export module X {
 var X;
 (function (X) {
     var Y;
-    (function (_Y) {
+    (function (Y_1) {
         var A = (function () {
             function A(Y) {
-                new _Y.B();
+                new Y_1.B();
             }
             return A;
         })();
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen2.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen2.js
index 457bd12b8f082..06a590194f5f5 100644
--- a/tests/baselines/reference/mergedModuleDeclarationCodeGen2.js
+++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen2.js
@@ -22,11 +22,11 @@ var my;
     })(data = my.data || (my.data = {}));
 })(my || (my = {}));
 var my;
-(function (_my) {
+(function (my_1) {
     var data;
-    (function (_data) {
+    (function (data_1) {
         function data(my) {
-            _data.foo.buz();
+            data_1.foo.buz();
         }
-    })(data = _my.data || (_my.data = {}));
+    })(data = my_1.data || (my_1.data = {}));
 })(my || (my = {}));
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen3.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen3.js
index 0618346dd75ea..43c55ed8291af 100644
--- a/tests/baselines/reference/mergedModuleDeclarationCodeGen3.js
+++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen3.js
@@ -19,14 +19,14 @@ var my;
     })(data = my.data || (my.data = {}));
 })(my || (my = {}));
 var my;
-(function (_my) {
+(function (my_1) {
     var data;
-    (function (_data) {
+    (function (data_1) {
         var foo;
-        (function (_foo) {
+        (function (foo_1) {
             function data(my, foo) {
-                _data.buz();
+                data_1.buz();
             }
-        })(foo = _data.foo || (_data.foo = {}));
-    })(data = _my.data || (_my.data = {}));
+        })(foo = data_1.foo || (data_1.foo = {}));
+    })(data = my_1.data || (my_1.data = {}));
 })(my || (my = {}));
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen4.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen4.js
index 2463c9cae906a..af7f5bacef73b 100644
--- a/tests/baselines/reference/mergedModuleDeclarationCodeGen4.js
+++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen4.js
@@ -20,7 +20,7 @@ module superContain {
 var superContain;
 (function (superContain) {
     var contain;
-    (function (_contain) {
+    (function (contain_1) {
         var my;
         (function (my) {
             var buz;
@@ -32,19 +32,19 @@ var superContain;
                     data.foo = foo;
                 })(data = buz.data || (buz.data = {}));
             })(buz = my.buz || (my.buz = {}));
-        })(my = _contain.my || (_contain.my = {}));
+        })(my = contain_1.my || (contain_1.my = {}));
         var my;
-        (function (_my) {
+        (function (my_1) {
             var buz;
-            (function (_buz) {
+            (function (buz_1) {
                 var data;
-                (function (_data) {
+                (function (data_1) {
                     function bar(contain, my, buz, data) {
-                        _data.foo();
+                        data_1.foo();
                     }
-                    _data.bar = bar;
-                })(data = _buz.data || (_buz.data = {}));
-            })(buz = _my.buz || (_my.buz = {}));
-        })(my = _contain.my || (_contain.my = {}));
+                    data_1.bar = bar;
+                })(data = buz_1.data || (buz_1.data = {}));
+            })(buz = my_1.buz || (my_1.buz = {}));
+        })(my = contain_1.my || (contain_1.my = {}));
     })(contain = superContain.contain || (superContain.contain = {}));
 })(superContain || (superContain = {}));
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen5.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen5.js
index 2c8e0bb79e4fb..4bbad2e567868 100644
--- a/tests/baselines/reference/mergedModuleDeclarationCodeGen5.js
+++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen5.js
@@ -20,7 +20,7 @@ module M.buz.plop {
 
 //// [mergedModuleDeclarationCodeGen5.js]
 var M;
-(function (_M) {
+(function (M_1) {
     var buz;
     (function (buz) {
         var plop;
@@ -32,14 +32,14 @@ var M;
             }
             plop.M = M;
         })(plop = buz.plop || (buz.plop = {}));
-    })(buz = _M.buz || (_M.buz = {}));
+    })(buz = M_1.buz || (M_1.buz = {}));
 })(M || (M = {}));
 var M;
 (function (M) {
     var buz;
-    (function (_buz) {
+    (function (buz_1) {
         var plop;
-        (function (_plop) {
+        (function (plop_1) {
             function gunk() {
             }
             function buz() {
@@ -49,17 +49,17 @@ var M;
                 }
                 return fudge;
             })();
-            _plop.fudge = fudge;
+            plop_1.fudge = fudge;
             (function (plop) {
-            })(_plop.plop || (_plop.plop = {}));
-            var plop = _plop.plop;
+            })(plop_1.plop || (plop_1.plop = {}));
+            var plop = plop_1.plop;
             // Emit these references as follows
             var v1 = gunk; // gunk
             var v2 = buz; // buz
-            _plop.v3 = _plop.doom; // _plop.doom
-            _plop.v4 = _plop.M; // _plop.M
-            _plop.v5 = fudge; // fudge
-            _plop.v6 = plop; // plop
-        })(plop = _buz.plop || (_buz.plop = {}));
+            plop_1.v3 = plop_1.doom; // _plop.doom
+            plop_1.v4 = plop_1.M; // _plop.M
+            plop_1.v5 = fudge; // fudge
+            plop_1.v6 = plop; // plop
+        })(plop = buz_1.plop || (buz_1.plop = {}));
     })(buz = M.buz || (M.buz = {}));
 })(M || (M = {}));
diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt.js b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt.js
index 983dc004acf31..f9a90fd515155 100644
--- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt.js
+++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt.js
@@ -25,11 +25,11 @@ var Z;
 var A;
 (function (A) {
     var M;
-    (function (_M) {
+    (function (M_1) {
         var M = Z.M;
         function bar() {
         }
-        _M.bar = bar;
+        M_1.bar = bar;
         M.bar(); // Should call Z.M.bar
     })(M = A.M || (A.M = {}));
 })(A || (A = {}));
diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt3.js b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt3.js
index c11b36f643a30..efdcebe84e96d 100644
--- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt3.js
+++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt3.js
@@ -30,11 +30,11 @@ var Z;
 var A;
 (function (A) {
     var M;
-    (function (_M) {
+    (function (M_1) {
         var M = Z.M;
         function bar() {
         }
-        _M.bar = bar;
+        M_1.bar = bar;
         M.bar(); // Should call Z.M.bar
     })(M = A.M || (A.M = {}));
 })(A || (A = {}));
diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt4.js b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt4.js
index c61f3d4dd9d73..e9cd456f3f3f8 100644
--- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt4.js
+++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt4.js
@@ -26,11 +26,11 @@ var Z;
 var A;
 (function (A) {
     var M;
-    (function (_M) {
+    (function (M_1) {
         var M = Z.M;
         function bar() {
         }
-        _M.bar = bar;
+        M_1.bar = bar;
         M.bar(); // Should call Z.M.bar
     })(M = A.M || (A.M = {}));
 })(A || (A = {}));
diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt5.js b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt5.js
index 0bc314ccc0706..72aa36022634d 100644
--- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt5.js
+++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt5.js
@@ -30,10 +30,10 @@ var Z;
 var A;
 (function (A) {
     var M;
-    (function (_M) {
+    (function (M_1) {
         function bar() {
         }
-        _M.bar = bar;
+        M_1.bar = bar;
         M.bar(); // Should call Z.M.bar
     })(M = A.M || (A.M = {}));
 })(A || (A = {}));
diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt6.js b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt6.js
index 4ba0a33c29a0c..fbad13359b8eb 100644
--- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt6.js
+++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt6.js
@@ -24,9 +24,9 @@ var Z;
 var A;
 (function (A) {
     var M;
-    (function (_M) {
+    (function (M_1) {
         function bar() {
         }
-        _M.bar = bar;
+        M_1.bar = bar;
     })(M = A.M || (A.M = {}));
 })(A || (A = {}));
diff --git a/tests/baselines/reference/moduleWithStatementsOfEveryKind.js b/tests/baselines/reference/moduleWithStatementsOfEveryKind.js
index 5161f72d5f023..cab0d35aa5a20 100644
--- a/tests/baselines/reference/moduleWithStatementsOfEveryKind.js
+++ b/tests/baselines/reference/moduleWithStatementsOfEveryKind.js
@@ -66,7 +66,7 @@ var __extends = this.__extends || function (d, b) {
     d.prototype = new __();
 };
 var A;
-(function (_A) {
+(function (A_1) {
     var A = (function () {
         function A() {
         }
diff --git a/tests/baselines/reference/nameCollision.js b/tests/baselines/reference/nameCollision.js
index fe7bb3a891975..0e559b7091cc8 100644
--- a/tests/baselines/reference/nameCollision.js
+++ b/tests/baselines/reference/nameCollision.js
@@ -48,7 +48,7 @@ module D {
 
 //// [nameCollision.js]
 var A;
-(function (_A_1) {
+(function (A_1) {
     // these 2 statements force an underscore before the 'A' 
     // in the generated function call.
     var A = 12;
@@ -59,7 +59,7 @@ var B;
     var A = 12;
 })(B || (B = {}));
 var B;
-(function (_B) {
+(function (B_1) {
     // re-opened module with colliding name
     // this should add an underscore.
     var B = (function () {
@@ -69,29 +69,29 @@ var B;
     })();
 })(B || (B = {}));
 var X;
-(function (_X) {
+(function (X_1) {
     var X = 13;
     var Y;
-    (function (_Y) {
+    (function (Y_1) {
         var Y = 13;
         var Z;
-        (function (_Z) {
+        (function (Z_1) {
             var X = 12;
             var Y = 12;
             var Z = 12;
-        })(Z = _Y.Z || (_Y.Z = {}));
-    })(Y = _X.Y || (_X.Y = {}));
+        })(Z = Y_1.Z || (Y_1.Z = {}));
+    })(Y = X_1.Y || (X_1.Y = {}));
 })(X || (X = {}));
 var Y;
-(function (_Y_1) {
+(function (Y_2) {
     var Y;
-    (function (_Y_2) {
+    (function (Y_3) {
         (function (Y) {
             Y[Y["Red"] = 0] = "Red";
             Y[Y["Blue"] = 1] = "Blue";
-        })(_Y_2.Y || (_Y_2.Y = {}));
-        var Y = _Y_2.Y;
-    })(Y = _Y_1.Y || (_Y_1.Y = {}));
+        })(Y_3.Y || (Y_3.Y = {}));
+        var Y = Y_3.Y;
+    })(Y = Y_2.Y || (Y_2.Y = {}));
 })(Y || (Y = {}));
 // no collision, since interface doesn't
 // generate code.
diff --git a/tests/baselines/reference/noDefaultLib.errors.txt b/tests/baselines/reference/noDefaultLib.errors.txt
index b8f42ba7c331b..c73f3e0b9487e 100644
--- a/tests/baselines/reference/noDefaultLib.errors.txt
+++ b/tests/baselines/reference/noDefaultLib.errors.txt
@@ -1,9 +1,19 @@
+error TS2318: Cannot find global type 'TypedPropertyDescriptor'.
+error TS2318: Cannot find global type 'PropertyDecorator'.
+error TS2318: Cannot find global type 'ParameterDecorator'.
+error TS2318: Cannot find global type 'MethodDecorator'.
 error TS2318: Cannot find global type 'IArguments'.
+error TS2318: Cannot find global type 'ClassDecorator'.
 error TS2318: Cannot find global type 'Boolean'.
 tests/cases/compiler/noDefaultLib.ts(4,11): error TS2317: Global type 'Array' must have 1 type parameter(s).
 
 
+!!! error TS2318: Cannot find global type 'TypedPropertyDescriptor'.
+!!! error TS2318: Cannot find global type 'PropertyDecorator'.
+!!! error TS2318: Cannot find global type 'ParameterDecorator'.
+!!! error TS2318: Cannot find global type 'MethodDecorator'.
 !!! error TS2318: Cannot find global type 'IArguments'.
+!!! error TS2318: Cannot find global type 'ClassDecorator'.
 !!! error TS2318: Cannot find global type 'Boolean'.
 ==== tests/cases/compiler/noDefaultLib.ts (1 errors) ====
     /// <reference no-default-lib="true"/>
diff --git a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js
index d0ced9921469c..86e84ced58f0f 100644
--- a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js
+++ b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js
@@ -39,8 +39,8 @@ var Bugs;
         }
         var result = message.replace(/\{(\d+)\}/g, function (match) {
             var rest = [];
-            for (var _a = 1; _a < arguments.length; _a++) {
-                rest[_a - 1] = arguments[_a];
+            for (var _i = 1; _i < arguments.length; _i++) {
+                rest[_i - 1] = arguments[_i];
             }
             var index = rest[0];
             return typeof args[index] !== 'undefined' ? args[index] : match;
diff --git a/tests/baselines/reference/parser509698.errors.txt b/tests/baselines/reference/parser509698.errors.txt
index 85485dd65012a..3dd70275e5c7a 100644
--- a/tests/baselines/reference/parser509698.errors.txt
+++ b/tests/baselines/reference/parser509698.errors.txt
@@ -1,21 +1,31 @@
+error TS2318: Cannot find global type 'Number'.
+error TS2318: Cannot find global type 'TypedPropertyDescriptor'.
+error TS2318: Cannot find global type 'Object'.
+error TS2318: Cannot find global type 'Array'.
+error TS2318: Cannot find global type 'ClassDecorator'.
 error TS2318: Cannot find global type 'String'.
 error TS2318: Cannot find global type 'RegExp'.
-error TS2318: Cannot find global type 'Object'.
-error TS2318: Cannot find global type 'Number'.
-error TS2318: Cannot find global type 'IArguments'.
+error TS2318: Cannot find global type 'PropertyDecorator'.
+error TS2318: Cannot find global type 'ParameterDecorator'.
 error TS2318: Cannot find global type 'Function'.
 error TS2318: Cannot find global type 'Boolean'.
-error TS2318: Cannot find global type 'Array'.
+error TS2318: Cannot find global type 'MethodDecorator'.
+error TS2318: Cannot find global type 'IArguments'.
 
 
+!!! error TS2318: Cannot find global type 'Number'.
+!!! error TS2318: Cannot find global type 'TypedPropertyDescriptor'.
+!!! error TS2318: Cannot find global type 'Object'.
+!!! error TS2318: Cannot find global type 'Array'.
+!!! error TS2318: Cannot find global type 'ClassDecorator'.
 !!! error TS2318: Cannot find global type 'String'.
 !!! error TS2318: Cannot find global type 'RegExp'.
-!!! error TS2318: Cannot find global type 'Object'.
-!!! error TS2318: Cannot find global type 'Number'.
-!!! error TS2318: Cannot find global type 'IArguments'.
+!!! error TS2318: Cannot find global type 'PropertyDecorator'.
+!!! error TS2318: Cannot find global type 'ParameterDecorator'.
 !!! error TS2318: Cannot find global type 'Function'.
 !!! error TS2318: Cannot find global type 'Boolean'.
-!!! error TS2318: Cannot find global type 'Array'.
+!!! error TS2318: Cannot find global type 'MethodDecorator'.
+!!! error TS2318: Cannot find global type 'IArguments'.
 ==== tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509698.ts (0 errors) ====
     /// <style requireSemi="on" />
     /// <reference no-default-lib="true"/>
diff --git a/tests/baselines/reference/parserErrorRecovery_ClassElement3.errors.txt b/tests/baselines/reference/parserErrorRecovery_ClassElement3.errors.txt
index 63c62bcd13df0..7f81c6114f6d2 100644
--- a/tests/baselines/reference/parserErrorRecovery_ClassElement3.errors.txt
+++ b/tests/baselines/reference/parserErrorRecovery_ClassElement3.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ClassElements/parserErrorRecovery_ClassElement3.ts(2,4): error TS1127: Invalid character.
-tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ClassElements/parserErrorRecovery_ClassElement3.ts(5,4): error TS1127: Invalid character.
+tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ClassElements/parserErrorRecovery_ClassElement3.ts(6,4): error TS1109: Expression expected.
 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ClassElements/parserErrorRecovery_ClassElement3.ts(7,4): error TS1127: Invalid character.
 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ClassElements/parserErrorRecovery_ClassElement3.ts(7,5): error TS1005: '}' expected.
 
@@ -12,9 +12,9 @@ tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ClassElements/parserErr
        class C {
        }
        @
-       
-!!! error TS1127: Invalid character.
        enum E {
+       ~~~~
+!!! error TS1109: Expression expected.
        #
        
 !!! error TS1127: Invalid character.
diff --git a/tests/baselines/reference/privacyGloImportParseErrors.js b/tests/baselines/reference/privacyGloImportParseErrors.js
index 3b82d65a07bca..d5a089a7678f2 100644
--- a/tests/baselines/reference/privacyGloImportParseErrors.js
+++ b/tests/baselines/reference/privacyGloImportParseErrors.js
@@ -238,7 +238,7 @@ var glo_M1_public;
     glo_M1_public.v2;
 })(glo_M1_public || (glo_M1_public = {}));
 var m2;
-(function (_m2) {
+(function (m2_1) {
     var m4;
     (function (m4) {
         var a = 10;
diff --git a/tests/baselines/reference/privacyImportParseErrors.js b/tests/baselines/reference/privacyImportParseErrors.js
index 7a875fa12d11d..90e4a7cb097f4 100644
--- a/tests/baselines/reference/privacyImportParseErrors.js
+++ b/tests/baselines/reference/privacyImportParseErrors.js
@@ -566,14 +566,14 @@ var glo_im4_private_v4_private = glo_im4_private.f1();
 exports.glo_im1_public = glo_M1_public;
 exports.glo_im2_public = glo_M3_private;
 var m2;
-(function (_m2) {
+(function (m2_1) {
     var m4;
     (function (m4) {
         var a = 10;
     })(m4 || (m4 = {}));
 })(m2 || (m2 = {}));
 var m3;
-(function (_m3) {
+(function (m3_1) {
     var m4;
     (function (m4) {
         var a = 10;
diff --git a/tests/baselines/reference/project/noDefaultLib/amd/noDefaultLib.errors.txt b/tests/baselines/reference/project/noDefaultLib/amd/noDefaultLib.errors.txt
index e7db8a4da6ae3..09264b901fcd0 100644
--- a/tests/baselines/reference/project/noDefaultLib/amd/noDefaultLib.errors.txt
+++ b/tests/baselines/reference/project/noDefaultLib/amd/noDefaultLib.errors.txt
@@ -1,22 +1,32 @@
+error TS2318: Cannot find global type 'Object'.
+error TS2318: Cannot find global type 'Array'.
+error TS2318: Cannot find global type 'ParameterDecorator'.
+error TS2318: Cannot find global type 'ClassDecorator'.
+error TS2318: Cannot find global type 'TypedPropertyDescriptor'.
 error TS2318: Cannot find global type 'String'.
 error TS2318: Cannot find global type 'RegExp'.
-error TS2318: Cannot find global type 'Object'.
-error TS2318: Cannot find global type 'Number'.
-error TS2318: Cannot find global type 'IArguments'.
+error TS2318: Cannot find global type 'PropertyDecorator'.
 error TS2318: Cannot find global type 'Function'.
 error TS2318: Cannot find global type 'Boolean'.
-error TS2318: Cannot find global type 'Array'.
+error TS2318: Cannot find global type 'Number'.
+error TS2318: Cannot find global type 'MethodDecorator'.
+error TS2318: Cannot find global type 'IArguments'.
 test.ts(3,8): error TS2304: Cannot find name 'Array'.
 
 
+!!! error TS2318: Cannot find global type 'Object'.
+!!! error TS2318: Cannot find global type 'Array'.
+!!! error TS2318: Cannot find global type 'ParameterDecorator'.
+!!! error TS2318: Cannot find global type 'ClassDecorator'.
+!!! error TS2318: Cannot find global type 'TypedPropertyDescriptor'.
 !!! error TS2318: Cannot find global type 'String'.
 !!! error TS2318: Cannot find global type 'RegExp'.
-!!! error TS2318: Cannot find global type 'Object'.
-!!! error TS2318: Cannot find global type 'Number'.
-!!! error TS2318: Cannot find global type 'IArguments'.
+!!! error TS2318: Cannot find global type 'PropertyDecorator'.
 !!! error TS2318: Cannot find global type 'Function'.
 !!! error TS2318: Cannot find global type 'Boolean'.
-!!! error TS2318: Cannot find global type 'Array'.
+!!! error TS2318: Cannot find global type 'Number'.
+!!! error TS2318: Cannot find global type 'MethodDecorator'.
+!!! error TS2318: Cannot find global type 'IArguments'.
 ==== test.ts (1 errors) ====
     /// <reference no-default-lib="true"/>
     
diff --git a/tests/baselines/reference/project/noDefaultLib/node/noDefaultLib.errors.txt b/tests/baselines/reference/project/noDefaultLib/node/noDefaultLib.errors.txt
index e7db8a4da6ae3..09264b901fcd0 100644
--- a/tests/baselines/reference/project/noDefaultLib/node/noDefaultLib.errors.txt
+++ b/tests/baselines/reference/project/noDefaultLib/node/noDefaultLib.errors.txt
@@ -1,22 +1,32 @@
+error TS2318: Cannot find global type 'Object'.
+error TS2318: Cannot find global type 'Array'.
+error TS2318: Cannot find global type 'ParameterDecorator'.
+error TS2318: Cannot find global type 'ClassDecorator'.
+error TS2318: Cannot find global type 'TypedPropertyDescriptor'.
 error TS2318: Cannot find global type 'String'.
 error TS2318: Cannot find global type 'RegExp'.
-error TS2318: Cannot find global type 'Object'.
-error TS2318: Cannot find global type 'Number'.
-error TS2318: Cannot find global type 'IArguments'.
+error TS2318: Cannot find global type 'PropertyDecorator'.
 error TS2318: Cannot find global type 'Function'.
 error TS2318: Cannot find global type 'Boolean'.
-error TS2318: Cannot find global type 'Array'.
+error TS2318: Cannot find global type 'Number'.
+error TS2318: Cannot find global type 'MethodDecorator'.
+error TS2318: Cannot find global type 'IArguments'.
 test.ts(3,8): error TS2304: Cannot find name 'Array'.
 
 
+!!! error TS2318: Cannot find global type 'Object'.
+!!! error TS2318: Cannot find global type 'Array'.
+!!! error TS2318: Cannot find global type 'ParameterDecorator'.
+!!! error TS2318: Cannot find global type 'ClassDecorator'.
+!!! error TS2318: Cannot find global type 'TypedPropertyDescriptor'.
 !!! error TS2318: Cannot find global type 'String'.
 !!! error TS2318: Cannot find global type 'RegExp'.
-!!! error TS2318: Cannot find global type 'Object'.
-!!! error TS2318: Cannot find global type 'Number'.
-!!! error TS2318: Cannot find global type 'IArguments'.
+!!! error TS2318: Cannot find global type 'PropertyDecorator'.
 !!! error TS2318: Cannot find global type 'Function'.
 !!! error TS2318: Cannot find global type 'Boolean'.
-!!! error TS2318: Cannot find global type 'Array'.
+!!! error TS2318: Cannot find global type 'Number'.
+!!! error TS2318: Cannot find global type 'MethodDecorator'.
+!!! error TS2318: Cannot find global type 'IArguments'.
 ==== test.ts (1 errors) ====
     /// <reference no-default-lib="true"/>
     
diff --git a/tests/baselines/reference/recursiveClassReferenceTest.js b/tests/baselines/reference/recursiveClassReferenceTest.js
index f565f8f23d08a..5f8be8bfdf1dd 100644
--- a/tests/baselines/reference/recursiveClassReferenceTest.js
+++ b/tests/baselines/reference/recursiveClassReferenceTest.js
@@ -116,7 +116,7 @@ var Sample;
     var Actions;
     (function (Actions) {
         var Thing;
-        (function (_Thing_1) {
+        (function (Thing_1) {
             var Find;
             (function (Find) {
                 var StartFindAction = (function () {
@@ -131,7 +131,7 @@ var Sample;
                     return StartFindAction;
                 })();
                 Find.StartFindAction = StartFindAction;
-            })(Find = _Thing_1.Find || (_Thing_1.Find = {}));
+            })(Find = Thing_1.Find || (Thing_1.Find = {}));
         })(Thing = Actions.Thing || (Actions.Thing = {}));
     })(Actions = Sample.Actions || (Sample.Actions = {}));
 })(Sample || (Sample = {}));
diff --git a/tests/baselines/reference/recursiveClassReferenceTest.js.map b/tests/baselines/reference/recursiveClassReferenceTest.js.map
index d77875f10e4a4..acc518edacac8 100644
--- a/tests/baselines/reference/recursiveClassReferenceTest.js.map
+++ b/tests/baselines/reference/recursiveClassReferenceTest.js.map
@@ -1,2 +1,2 @@
 //// [recursiveClassReferenceTest.js.map]
-{"version":3,"file":"recursiveClassReferenceTest.js","sourceRoot":"","sources":["recursiveClassReferenceTest.ts"],"names":["Sample","Sample.Actions","Sample.Actions.Thing","Sample.Actions.Thing.Find","Sample.Actions.Thing.Find.StartFindAction","Sample.Actions.Thing.Find.StartFindAction.constructor","Sample.Actions.Thing.Find.StartFindAction.getId","Sample.Actions.Thing.Find.StartFindAction.run","Sample.Thing","Sample.Thing.Widgets","Sample.Thing.Widgets.FindWidget","Sample.Thing.Widgets.FindWidget.constructor","Sample.Thing.Widgets.FindWidget.gar","Sample.Thing.Widgets.FindWidget.getDomNode","Sample.Thing.Widgets.FindWidget.destroy","AbstractMode","AbstractMode.constructor","AbstractMode.getInitialState","Sample.Thing.Languages","Sample.Thing.Languages.PlainText","Sample.Thing.Languages.PlainText.State","Sample.Thing.Languages.PlainText.State.constructor","Sample.Thing.Languages.PlainText.State.clone","Sample.Thing.Languages.PlainText.State.equals","Sample.Thing.Languages.PlainText.State.getMode","Sample.Thing.Languages.PlainText.Mode","Sample.Thing.Languages.PlainText.Mode.constructor","Sample.Thing.Languages.PlainText.Mode.getInitialState"],"mappings":"AAAA,iEAAiE;AACjE,0EAA0E;;;;;;;AA8B1E,IAAO,MAAM,CAUZ;AAVD,WAAO,MAAM;IAACA,IAAAA,OAAOA,CAUpBA;IAVaA,WAAAA,OAAOA;QAACC,IAAAA,KAAKA,CAU1BA;QAVqBA,WAAAA,QAAKA;YAACC,IAAAA,IAAIA,CAU/BA;YAV2BA,WAAAA,IAAIA,EAACA,CAACA;gBACjCC;oBAAAC;oBAQAC,CAACA;oBANOD,+BAAKA,GAAZA;wBAAiBE,MAAMA,CAACA,IAAIA,CAACA;oBAACA,CAACA;oBAExBF,6BAAGA,GAAVA,UAAWA,KAA6BA;wBAEvCG,MAAMA,CAACA,IAAIA,CAACA;oBACbA,CAACA;oBACFH,sBAACA;gBAADA,CAACA,AARDD,IAQCA;gBARYA,oBAAeA,kBAQ3BA,CAAAA;YACFA,CAACA,EAV2BD,IAAIA,GAAJA,aAAIA,KAAJA,aAAIA,QAU/BA;QAADA,CAACA,EAVqBD,KAAKA,GAALA,aAAKA,KAALA,aAAKA,QAU1BA;IAADA,CAACA,EAVaD,OAAOA,GAAPA,cAAOA,KAAPA,cAAOA,QAUpBA;AAADA,CAACA,EAVM,MAAM,KAAN,MAAM,QAUZ;AAED,IAAO,MAAM,CAoBZ;AApBD,WAAO,MAAM;IAACA,IAAAA,KAAKA,CAoBlBA;IApBaA,WAAAA,KAAKA;QAACQ,IAAAA,OAAOA,CAoB1BA;QApBmBA,WAAAA,OAAOA,EAACA,CAACA;YAC5BC;gBAKCC,oBAAoBA,SAAkCA;oBAAlCC,cAASA,GAATA,SAASA,CAAyBA;oBAD9CA,YAAOA,GAAOA,IAAIA,CAACA;oBAGvBA,AADAA,aAAaA;oBACbA,SAASA,CAACA,SAASA,CAACA,WAAWA,EAAEA,IAAIA,CAACA,CAACA;gBAC3CA,CAACA;gBANMD,wBAAGA,GAAVA,UAAWA,MAAyCA;oBAAIE,EAAEA,CAACA,CAACA,IAAIA,CAACA,CAACA,CAACA;wBAAAA,MAAMA,CAACA,MAAMA,CAACA,IAAIA,CAACA,CAACA;oBAAAA,CAACA;gBAAAA,CAACA;gBAQlFF,+BAAUA,GAAjBA;oBACCG,MAAMA,CAACA,OAAOA,CAACA;gBAChBA,CAACA;gBAEMH,4BAAOA,GAAdA;gBAEAI,CAACA;gBAEFJ,iBAACA;YAADA,CAACA,AAlBDD,IAkBCA;YAlBYA,kBAAUA,aAkBtBA,CAAAA;QACFA,CAACA,EApBmBD,OAAOA,GAAPA,aAAOA,KAAPA,aAAOA,QAoB1BA;IAADA,CAACA,EApBaR,KAAKA,GAALA,YAAKA,KAALA,YAAKA,QAoBlBA;AAADA,CAACA,EApBM,MAAM,KAAN,MAAM,QAoBZ;AAGD;IAAAe;IAAuFC,CAACA;IAA3CD,sCAAeA,GAAtBA;QAAmCE,MAAMA,CAACA,IAAIA,CAACA;IAAAA,CAACA;IAACF,mBAACA;AAADA,CAACA,AAAxF,IAAwF;AASxF,IAAO,MAAM,CAwBZ;AAxBD,WAAO,MAAM;IAACf,IAAAA,KAAKA,CAwBlBA;IAxBaA,WAAAA,KAAKA;QAACQ,IAAAA,SAASA,CAwB5BA;QAxBmBA,WAAAA,SAASA;YAACU,IAAAA,SAASA,CAwBtCA;YAxB6BA,WAAAA,SAASA,EAACA,CAACA;gBAExCC;oBACOC,eAAoBA,IAAWA;wBAAXC,SAAIA,GAAJA,IAAIA,CAAOA;oBAAIA,CAACA;oBACnCD,qBAAKA,GAAZA;wBACCE,MAAMA,CAACA,IAAIA,CAACA;oBACbA,CAACA;oBAEMF,sBAAMA,GAAbA,UAAcA,KAAYA;wBACzBG,MAAMA,CAACA,IAAIA,KAAKA,KAAKA,CAACA;oBACvBA,CAACA;oBAEMH,uBAAOA,GAAdA;wBAA0BI,MAAMA,CAACA,IAAIA,CAACA;oBAACA,CAACA;oBACzCJ,YAACA;gBAADA,CAACA,AAXDD,IAWCA;gBAXYA,eAAKA,QAWjBA,CAAAA;gBAEDA;oBAA0BM,wBAAYA;oBAAtCA;wBAA0BC,8BAAYA;oBAQtCA,CAACA;oBANAD,aAAaA;oBACNA,8BAAeA,GAAtBA;wBACCE,MAAMA,CAACA,IAAIA,KAAKA,CAACA,IAAIA,CAACA,CAACA;oBACxBA,CAACA;oBAGFF,WAACA;gBAADA,CAACA,AARDN,EAA0BA,YAAYA,EAQrCA;gBARYA,cAAIA,OAQhBA,CAAAA;YACFA,CAACA,EAxB6BD,SAASA,GAATA,mBAASA,KAATA,mBAASA,QAwBtCA;QAADA,CAACA,EAxBmBV,SAASA,GAATA,eAASA,KAATA,eAASA,QAwB5BA;IAADA,CAACA,EAxBaR,KAAKA,GAALA,YAAKA,KAALA,YAAKA,QAwBlBA;AAADA,CAACA,EAxBM,MAAM,KAAN,MAAM,QAwBZ"}
\ No newline at end of file
+{"version":3,"file":"recursiveClassReferenceTest.js","sourceRoot":"","sources":["recursiveClassReferenceTest.ts"],"names":["Sample","Sample.Actions","Sample.Actions.Thing","Sample.Actions.Thing.Find","Sample.Actions.Thing.Find.StartFindAction","Sample.Actions.Thing.Find.StartFindAction.constructor","Sample.Actions.Thing.Find.StartFindAction.getId","Sample.Actions.Thing.Find.StartFindAction.run","Sample.Thing","Sample.Thing.Widgets","Sample.Thing.Widgets.FindWidget","Sample.Thing.Widgets.FindWidget.constructor","Sample.Thing.Widgets.FindWidget.gar","Sample.Thing.Widgets.FindWidget.getDomNode","Sample.Thing.Widgets.FindWidget.destroy","AbstractMode","AbstractMode.constructor","AbstractMode.getInitialState","Sample.Thing.Languages","Sample.Thing.Languages.PlainText","Sample.Thing.Languages.PlainText.State","Sample.Thing.Languages.PlainText.State.constructor","Sample.Thing.Languages.PlainText.State.clone","Sample.Thing.Languages.PlainText.State.equals","Sample.Thing.Languages.PlainText.State.getMode","Sample.Thing.Languages.PlainText.Mode","Sample.Thing.Languages.PlainText.Mode.constructor","Sample.Thing.Languages.PlainText.Mode.getInitialState"],"mappings":"AAAA,iEAAiE;AACjE,0EAA0E;;;;;;;AA8B1E,IAAO,MAAM,CAUZ;AAVD,WAAO,MAAM;IAACA,IAAAA,OAAOA,CAUpBA;IAVaA,WAAAA,OAAOA;QAACC,IAAAA,KAAKA,CAU1BA;QAVqBA,WAAAA,OAAKA;YAACC,IAAAA,IAAIA,CAU/BA;YAV2BA,WAAAA,IAAIA,EAACA,CAACA;gBACjCC;oBAAAC;oBAQAC,CAACA;oBANOD,+BAAKA,GAAZA;wBAAiBE,MAAMA,CAACA,IAAIA,CAACA;oBAACA,CAACA;oBAExBF,6BAAGA,GAAVA,UAAWA,KAA6BA;wBAEvCG,MAAMA,CAACA,IAAIA,CAACA;oBACbA,CAACA;oBACFH,sBAACA;gBAADA,CAACA,AARDD,IAQCA;gBARYA,oBAAeA,kBAQ3BA,CAAAA;YACFA,CAACA,EAV2BD,IAAIA,GAAJA,YAAIA,KAAJA,YAAIA,QAU/BA;QAADA,CAACA,EAVqBD,KAAKA,GAALA,aAAKA,KAALA,aAAKA,QAU1BA;IAADA,CAACA,EAVaD,OAAOA,GAAPA,cAAOA,KAAPA,cAAOA,QAUpBA;AAADA,CAACA,EAVM,MAAM,KAAN,MAAM,QAUZ;AAED,IAAO,MAAM,CAoBZ;AApBD,WAAO,MAAM;IAACA,IAAAA,KAAKA,CAoBlBA;IApBaA,WAAAA,KAAKA;QAACQ,IAAAA,OAAOA,CAoB1BA;QApBmBA,WAAAA,OAAOA,EAACA,CAACA;YAC5BC;gBAKCC,oBAAoBA,SAAkCA;oBAAlCC,cAASA,GAATA,SAASA,CAAyBA;oBAD9CA,YAAOA,GAAOA,IAAIA,CAACA;oBAGvBA,AADAA,aAAaA;oBACbA,SAASA,CAACA,SAASA,CAACA,WAAWA,EAAEA,IAAIA,CAACA,CAACA;gBAC3CA,CAACA;gBANMD,wBAAGA,GAAVA,UAAWA,MAAyCA;oBAAIE,EAAEA,CAACA,CAACA,IAAIA,CAACA,CAACA,CAACA;wBAAAA,MAAMA,CAACA,MAAMA,CAACA,IAAIA,CAACA,CAACA;oBAAAA,CAACA;gBAAAA,CAACA;gBAQlFF,+BAAUA,GAAjBA;oBACCG,MAAMA,CAACA,OAAOA,CAACA;gBAChBA,CAACA;gBAEMH,4BAAOA,GAAdA;gBAEAI,CAACA;gBAEFJ,iBAACA;YAADA,CAACA,AAlBDD,IAkBCA;YAlBYA,kBAAUA,aAkBtBA,CAAAA;QACFA,CAACA,EApBmBD,OAAOA,GAAPA,aAAOA,KAAPA,aAAOA,QAoB1BA;IAADA,CAACA,EApBaR,KAAKA,GAALA,YAAKA,KAALA,YAAKA,QAoBlBA;AAADA,CAACA,EApBM,MAAM,KAAN,MAAM,QAoBZ;AAGD;IAAAe;IAAuFC,CAACA;IAA3CD,sCAAeA,GAAtBA;QAAmCE,MAAMA,CAACA,IAAIA,CAACA;IAAAA,CAACA;IAACF,mBAACA;AAADA,CAACA,AAAxF,IAAwF;AASxF,IAAO,MAAM,CAwBZ;AAxBD,WAAO,MAAM;IAACf,IAAAA,KAAKA,CAwBlBA;IAxBaA,WAAAA,KAAKA;QAACQ,IAAAA,SAASA,CAwB5BA;QAxBmBA,WAAAA,SAASA;YAACU,IAAAA,SAASA,CAwBtCA;YAxB6BA,WAAAA,SAASA,EAACA,CAACA;gBAExCC;oBACOC,eAAoBA,IAAWA;wBAAXC,SAAIA,GAAJA,IAAIA,CAAOA;oBAAIA,CAACA;oBACnCD,qBAAKA,GAAZA;wBACCE,MAAMA,CAACA,IAAIA,CAACA;oBACbA,CAACA;oBAEMF,sBAAMA,GAAbA,UAAcA,KAAYA;wBACzBG,MAAMA,CAACA,IAAIA,KAAKA,KAAKA,CAACA;oBACvBA,CAACA;oBAEMH,uBAAOA,GAAdA;wBAA0BI,MAAMA,CAACA,IAAIA,CAACA;oBAACA,CAACA;oBACzCJ,YAACA;gBAADA,CAACA,AAXDD,IAWCA;gBAXYA,eAAKA,QAWjBA,CAAAA;gBAEDA;oBAA0BM,wBAAYA;oBAAtCA;wBAA0BC,8BAAYA;oBAQtCA,CAACA;oBANAD,aAAaA;oBACNA,8BAAeA,GAAtBA;wBACCE,MAAMA,CAACA,IAAIA,KAAKA,CAACA,IAAIA,CAACA,CAACA;oBACxBA,CAACA;oBAGFF,WAACA;gBAADA,CAACA,AARDN,EAA0BA,YAAYA,EAQrCA;gBARYA,cAAIA,OAQhBA,CAAAA;YACFA,CAACA,EAxB6BD,SAASA,GAATA,mBAASA,KAATA,mBAASA,QAwBtCA;QAADA,CAACA,EAxBmBV,SAASA,GAATA,eAASA,KAATA,eAASA,QAwB5BA;IAADA,CAACA,EAxBaR,KAAKA,GAALA,YAAKA,KAALA,YAAKA,QAwBlBA;AAADA,CAACA,EAxBM,MAAM,KAAN,MAAM,QAwBZ"}
\ No newline at end of file
diff --git a/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt b/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt
index 47bb3f2d18ab8..7e1295d630613 100644
--- a/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt
+++ b/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt
@@ -139,7 +139,7 @@ sourceFile:recursiveClassReferenceTest.ts
 2 >        ^^^^
 3 >            ^^^^^
 4 >                 ^
-5 >                  ^^^^^^^^^^^^^->
+5 >                  ^^^^^^^^^^^^->
 1 >.
 2 >        
 3 >            Thing
@@ -159,16 +159,16 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >Emitted(13, 18) Source(32, 28) + SourceIndex(0) name (Sample.Actions)
 4 >Emitted(13, 19) Source(42, 2) + SourceIndex(0) name (Sample.Actions)
 ---
->>>        (function (_Thing_1) {
+>>>        (function (Thing_1) {
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^
-3 >                   ^^^^^^^^
+3 >                   ^^^^^^^
 1->
 2 >        
 3 >                   Thing
 1->Emitted(14, 9) Source(32, 23) + SourceIndex(0) name (Sample.Actions)
 2 >Emitted(14, 20) Source(32, 23) + SourceIndex(0) name (Sample.Actions)
-3 >Emitted(14, 28) Source(32, 28) + SourceIndex(0) name (Sample.Actions)
+3 >Emitted(14, 27) Source(32, 28) + SourceIndex(0) name (Sample.Actions)
 ---
 >>>            var Find;
 1 >^^^^^^^^^^^^
@@ -365,7 +365,7 @@ sourceFile:recursiveClassReferenceTest.ts
 2 >                ^^^^^^^^^^^^^^^^^^^^
 3 >                                    ^^^^^^^^^^^^^^^^^^
 4 >                                                      ^
-5 >                                                       ^^^^^^^->
+5 >                                                       ^^^^^->
 1->
 2 >                StartFindAction
 3 >                                     implements Sample.Thing.IAction {
@@ -383,16 +383,16 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >Emitted(28, 55) Source(41, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find)
 4 >Emitted(28, 56) Source(41, 3) + SourceIndex(0) name (Sample.Actions.Thing.Find)
 ---
->>>            })(Find = _Thing_1.Find || (_Thing_1.Find = {}));
+>>>            })(Find = Thing_1.Find || (Thing_1.Find = {}));
 1->^^^^^^^^^^^^
 2 >            ^
 3 >             ^^
 4 >               ^^^^
 5 >                   ^^^
-6 >                      ^^^^^^^^^^^^^
-7 >                                   ^^^^^
-8 >                                        ^^^^^^^^^^^^^
-9 >                                                     ^^^^^^^^
+6 >                      ^^^^^^^^^^^^
+7 >                                  ^^^^^
+8 >                                       ^^^^^^^^^^^^
+9 >                                                   ^^^^^^^^
 1->
   >
 2 >            }
@@ -400,28 +400,28 @@ sourceFile:recursiveClassReferenceTest.ts
 4 >               Find
 5 >                   
 6 >                      Find
-7 >                                   
-8 >                                        Find
-9 >                                                      {
-  >                                                     	export class StartFindAction implements Sample.Thing.IAction {
-  >                                                     		
-  >                                                     		public getId() { return "yo"; }
-  >                                                     		
-  >                                                     		public run(Thing:Sample.Thing.ICodeThing):boolean {
-  >                                                     
-  >                                                     			return true;
-  >                                                     		}
-  >                                                     	}
-  >                                                     }
+7 >                                  
+8 >                                       Find
+9 >                                                    {
+  >                                                   	export class StartFindAction implements Sample.Thing.IAction {
+  >                                                   		
+  >                                                   		public getId() { return "yo"; }
+  >                                                   		
+  >                                                   		public run(Thing:Sample.Thing.ICodeThing):boolean {
+  >                                                   
+  >                                                   			return true;
+  >                                                   		}
+  >                                                   	}
+  >                                                   }
 1->Emitted(29, 13) Source(42, 1) + SourceIndex(0) name (Sample.Actions.Thing.Find)
 2 >Emitted(29, 14) Source(42, 2) + SourceIndex(0) name (Sample.Actions.Thing.Find)
 3 >Emitted(29, 16) Source(32, 29) + SourceIndex(0) name (Sample.Actions.Thing)
 4 >Emitted(29, 20) Source(32, 33) + SourceIndex(0) name (Sample.Actions.Thing)
 5 >Emitted(29, 23) Source(32, 29) + SourceIndex(0) name (Sample.Actions.Thing)
-6 >Emitted(29, 36) Source(32, 33) + SourceIndex(0) name (Sample.Actions.Thing)
-7 >Emitted(29, 41) Source(32, 29) + SourceIndex(0) name (Sample.Actions.Thing)
-8 >Emitted(29, 54) Source(32, 33) + SourceIndex(0) name (Sample.Actions.Thing)
-9 >Emitted(29, 62) Source(42, 2) + SourceIndex(0) name (Sample.Actions.Thing)
+6 >Emitted(29, 35) Source(32, 33) + SourceIndex(0) name (Sample.Actions.Thing)
+7 >Emitted(29, 40) Source(32, 29) + SourceIndex(0) name (Sample.Actions.Thing)
+8 >Emitted(29, 52) Source(32, 33) + SourceIndex(0) name (Sample.Actions.Thing)
+9 >Emitted(29, 60) Source(42, 2) + SourceIndex(0) name (Sample.Actions.Thing)
 ---
 >>>        })(Thing = Actions.Thing || (Actions.Thing = {}));
 1 >^^^^^^^^
diff --git a/tests/baselines/reference/recursiveCloduleReference.js b/tests/baselines/reference/recursiveCloduleReference.js
index 5cb6e6b2c1e1b..74072e653ef9f 100644
--- a/tests/baselines/reference/recursiveCloduleReference.js
+++ b/tests/baselines/reference/recursiveCloduleReference.js
@@ -20,8 +20,8 @@ var M;
     })();
     M.C = C;
     var C;
-    (function (_C) {
-        _C.C = M.C;
+    (function (C_1) {
+        C_1.C = M.C;
     })(C = M.C || (M.C = {}));
     ;
 })(M || (M = {}));
diff --git a/tests/baselines/reference/shadowingViaLocalValue.js b/tests/baselines/reference/shadowingViaLocalValue.js
index e788caf5720c1..0a589f8d427fd 100644
--- a/tests/baselines/reference/shadowingViaLocalValue.js
+++ b/tests/baselines/reference/shadowingViaLocalValue.js
@@ -17,13 +17,13 @@
 
 //// [shadowingViaLocalValue.js]
 {
-    var _x;
+    var x_1;
     {
         var x = 1;
     }
 }
 {
-    var _x1;
+    var x1_1;
     {
         for (var x1 = 0;;)
             ;
diff --git a/tests/baselines/reference/shadowingViaLocalValueOrBindingElement.js b/tests/baselines/reference/shadowingViaLocalValueOrBindingElement.js
index 594ec1ca18e81..a930f7405fff9 100644
--- a/tests/baselines/reference/shadowingViaLocalValueOrBindingElement.js
+++ b/tests/baselines/reference/shadowingViaLocalValueOrBindingElement.js
@@ -12,7 +12,7 @@ if (true) {
 
 //// [shadowingViaLocalValueOrBindingElement.js]
 if (true) {
-    var _x;
+    var x_1;
     if (true) {
         var x = 0; // Error
         var _a = ({
diff --git a/tests/baselines/reference/sourceMapValidationDecorators.js b/tests/baselines/reference/sourceMapValidationDecorators.js
new file mode 100644
index 0000000000000..81ce9bc60ffb9
--- /dev/null
+++ b/tests/baselines/reference/sourceMapValidationDecorators.js
@@ -0,0 +1,107 @@
+//// [sourceMapValidationDecorators.ts]
+declare function ClassDecorator1(target: Function): void;
+declare function ClassDecorator2(x: number): (target: Function) => void;
+declare function PropertyDecorator1(target: Object, key: string | symbol, descriptor?: PropertyDescriptor): void;
+declare function PropertyDecorator2(x: number): (target: Object, key: string | symbol, descriptor?: PropertyDescriptor) => void;
+declare function ParameterDecorator1(target: Function, key: string | symbol, paramIndex: number): void;
+declare function ParameterDecorator2(x: number): (target: Function, key: string | symbol, paramIndex: number) => void;
+
+@ClassDecorator1
+@ClassDecorator2(10)
+class Greeter {
+    constructor(
+      @ParameterDecorator1 
+      @ParameterDecorator2(20) 
+      public greeting: string, 
+      
+      @ParameterDecorator1 
+      @ParameterDecorator2(30) 
+      ...b: string[]) {
+    }
+    
+    @PropertyDecorator1
+    @PropertyDecorator2(40)
+    greet() {
+        return "<h1>" + this.greeting + "</h1>";
+    }
+
+    @PropertyDecorator1
+    @PropertyDecorator2(50)
+    private x: string;
+
+    @PropertyDecorator1
+    @PropertyDecorator2(60)
+    private static x1: number = 10;
+    
+    private fn(
+      @ParameterDecorator1 
+      @ParameterDecorator2(70) 
+      x: number) {
+        return this.greeting;
+    }
+
+    @PropertyDecorator1
+    @PropertyDecorator2(80)
+    get greetings() {
+        return this.greeting;
+    }
+
+    set greetings(
+      @ParameterDecorator1 
+      @ParameterDecorator2(90) 
+      greetings: string) {
+        this.greeting = greetings;
+    }    
+}
+
+//// [sourceMapValidationDecorators.js]
+var __decorate = this.__decorate || function (decorators, target, key, value) {
+    var kind = typeof (arguments.length == 2 ? value = target : value);
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        switch (kind) {
+            case "function": value = decorator(value) || value; break;
+            case "number": decorator(target, key, value); break;
+            case "undefined": decorator(target, key); break;
+            case "object": value = decorator(target, key, value) || value; break;
+        }
+    }
+    return value;
+};
+var Greeter = (function () {
+    function Greeter(greeting) {
+        var b = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            b[_i - 1] = arguments[_i];
+        }
+        this.greeting = greeting;
+    }
+    Greeter.prototype.greet = function () {
+        return "<h1>" + this.greeting + "</h1>";
+    };
+    Greeter.prototype.fn = function (x) {
+        return this.greeting;
+    };
+    Object.defineProperty(Greeter.prototype, "greetings", {
+        get: function () {
+            return this.greeting;
+        },
+        set: function (greetings) {
+            this.greeting = greetings;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Greeter.x1 = 10;
+    Object.defineProperty(Greeter.prototype, "greet", __decorate([PropertyDecorator1, PropertyDecorator2(40)], Greeter.prototype, "greet", Object.getOwnPropertyDescriptor(Greeter.prototype, "greet")));
+    __decorate([PropertyDecorator1, PropertyDecorator2(50)], Greeter.prototype, "x");
+    __decorate([ParameterDecorator1, ParameterDecorator2(70)], Greeter.prototype, "fn", 0);
+    __decorate([ParameterDecorator1, ParameterDecorator2(90)], Greeter.prototype, "greetings", 0);
+    Object.defineProperty(Greeter.prototype, "greetings", __decorate([PropertyDecorator1, PropertyDecorator2(80)], Greeter.prototype, "greetings", Object.getOwnPropertyDescriptor(Greeter.prototype, "greetings")));
+    __decorate([PropertyDecorator1, PropertyDecorator2(60)], Greeter, "x1");
+    __decorate([ParameterDecorator1, ParameterDecorator2(20)], Greeter, void 0, 0);
+    __decorate([ParameterDecorator1, ParameterDecorator2(30)], Greeter, void 0, 1);
+    Greeter = __decorate([ClassDecorator1, ClassDecorator2(10)], Greeter);
+    return Greeter;
+})();
+//# sourceMappingURL=sourceMapValidationDecorators.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDecorators.js.map b/tests/baselines/reference/sourceMapValidationDecorators.js.map
new file mode 100644
index 0000000000000..4cca04a1e3c43
--- /dev/null
+++ b/tests/baselines/reference/sourceMapValidationDecorators.js.map
@@ -0,0 +1,2 @@
+//// [sourceMapValidationDecorators.js.map]
+{"version":3,"file":"sourceMapValidationDecorators.js","sourceRoot":"","sources":["sourceMapValidationDecorators.ts"],"names":["Greeter","Greeter.constructor","Greeter.greet","Greeter.fn","Greeter.greetings"],"mappings":";;;;;;;;;;;;;AAOA;IAGIA,iBAGSA,QAAgBA;QAEvBC,WAEcA;aAFdA,WAEcA,CAFdA,sBAEcA,CAFdA,IAEcA;YAFdA,0BAEcA;;QAJPA,aAAQA,GAARA,QAAQA,CAAQA;IAKzBA,CAACA;IAIDD,uBAAKA,GAFLA;QAGIE,MAAMA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,QAAQA,GAAGA,OAAOA,CAACA;IAC5CA,CAACA;IAUOF,oBAAEA,GAAVA,UAGEA,CAASA;QACPG,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;IACzBA,CAACA;IAEDH,sBAEIA,8BAASA;aAFbA;YAGII,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;QACzBA,CAACA;aAEDJ,UAGEA,SAAiBA;YACfI,IAAIA,CAACA,QAAQA,GAAGA,SAASA,CAACA;QAC9BA,CAACA;;;OAPAJ;IAbcA,UAAEA,GAAWA,EAAEA,CAACA;IAZ/BA,sBAEAA,0BAAKA,cAFJA,kBAAkBA,EAClBA,kBAAkBA,CAACA,EAAEA,CAACA,GACvBA,0BAAKA,kCAALA,0BAAKA,IAEJA;IAEDA,YAACA,kBAAkBA,EAClBA,kBAAkBA,CAACA,EAAEA,CAACA,GACfA,sBAACA,EAASA;IAOhBA,YAACA,mBAAmBA,EACnBA,mBAAmBA,CAACA,EAAEA,CAACA,GACxBA,0BAACA,EAAQA;IAWTA,YAACA,mBAAmBA,EACnBA,mBAAmBA,CAACA,EAAEA,CAACA,GACxBA,iCAASA,EAAQA;IATnBA,sBAEIA,8BAASA,cAFZA,kBAAkBA,EAClBA,kBAAkBA,CAACA,EAAEA,CAACA,GACnBA,8BAASA,kCAATA,8BAASA,IAEZA;IAfDA,YAACA,kBAAkBA,EAClBA,kBAAkBA,CAACA,EAAEA,CAACA,GACRA,aAAEA,EAAcA;IArB7BA,YAACA,mBAAmBA,EACnBA,mBAAmBA,CAACA,EAAEA,CAACA,GACjBA,kBAAQA,EAAQA;IAEvBA,YAACA,mBAAmBA,EACnBA,mBAAmBA,CAACA,EAAEA,CAACA,GACrBA,kBAACA,EAAUA;IAVpBA,sBAACA,eAAeA,EACfA,eAAeA,CAACA,EAAEA,CAACA,YA6CnBA;IAADA,cAACA;AAADA,CAACA,AA9CD,IA8CC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt
new file mode 100644
index 0000000000000..c0b9d97e6f080
--- /dev/null
+++ b/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt
@@ -0,0 +1,896 @@
+===================================================================
+JsFile: sourceMapValidationDecorators.js
+mapUrl: sourceMapValidationDecorators.js.map
+sourceRoot: 
+sources: sourceMapValidationDecorators.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/sourceMapValidationDecorators.js
+sourceFile:sourceMapValidationDecorators.ts
+-------------------------------------------------------------------
+>>>var __decorate = this.__decorate || function (decorators, target, key, value) {
+>>>    var kind = typeof (arguments.length == 2 ? value = target : value);
+>>>    for (var i = decorators.length - 1; i >= 0; --i) {
+>>>        var decorator = decorators[i];
+>>>        switch (kind) {
+>>>            case "function": value = decorator(value) || value; break;
+>>>            case "number": decorator(target, key, value); break;
+>>>            case "undefined": decorator(target, key); break;
+>>>            case "object": value = decorator(target, key, value) || value; break;
+>>>        }
+>>>    }
+>>>    return value;
+>>>};
+>>>var Greeter = (function () {
+1 >
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >declare function ClassDecorator1(target: Function): void;
+  >declare function ClassDecorator2(x: number): (target: Function) => void;
+  >declare function PropertyDecorator1(target: Object, key: string | symbol, descriptor?: PropertyDescriptor): void;
+  >declare function PropertyDecorator2(x: number): (target: Object, key: string | symbol, descriptor?: PropertyDescriptor) => void;
+  >declare function ParameterDecorator1(target: Function, key: string | symbol, paramIndex: number): void;
+  >declare function ParameterDecorator2(x: number): (target: Function, key: string | symbol, paramIndex: number) => void;
+  >
+  >
+1 >Emitted(14, 1) Source(8, 1) + SourceIndex(0)
+---
+>>>    function Greeter(greeting) {
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^
+3 >                     ^^^^^^^^
+1->@ClassDecorator1
+  >@ClassDecorator2(10)
+  >class Greeter {
+  >    
+2 >    constructor(
+  >          @ParameterDecorator1 
+  >          @ParameterDecorator2(20) 
+  >          public 
+3 >                     greeting: string
+1->Emitted(15, 5) Source(11, 5) + SourceIndex(0) name (Greeter)
+2 >Emitted(15, 22) Source(14, 14) + SourceIndex(0) name (Greeter)
+3 >Emitted(15, 30) Source(14, 30) + SourceIndex(0) name (Greeter)
+---
+>>>        var b = [];
+1 >^^^^^^^^
+2 >        ^^^^^^^^^^^
+3 >                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >, 
+  >      
+  >      
+2 >        @ParameterDecorator1 
+  >              @ParameterDecorator2(30) 
+  >              ...b: string[]
+1 >Emitted(16, 9) Source(16, 7) + SourceIndex(0) name (Greeter.constructor)
+2 >Emitted(16, 20) Source(18, 21) + SourceIndex(0) name (Greeter.constructor)
+---
+>>>        for (var _i = 1; _i < arguments.length; _i++) {
+1->^^^^^^^^^^^^^
+2 >             ^^^^^^^^^^^
+3 >                        ^
+4 >                         ^^^^^^^^^^^^^^^^^^^^^^
+5 >                                               ^
+6 >                                                ^^^^
+1->
+2 >             @ParameterDecorator1 
+  >                   @ParameterDecorator2(30) 
+  >                   ...b: string[]
+3 >                        
+4 >                         @ParameterDecorator1 
+  >                               @ParameterDecorator2(30) 
+  >                               ...b: string[]
+5 >                                               
+6 >                                                @ParameterDecorator1 
+  >                                                      @ParameterDecorator2(30) 
+  >                                                      ...b: string[]
+1->Emitted(17, 14) Source(16, 7) + SourceIndex(0) name (Greeter.constructor)
+2 >Emitted(17, 25) Source(18, 21) + SourceIndex(0) name (Greeter.constructor)
+3 >Emitted(17, 26) Source(16, 7) + SourceIndex(0) name (Greeter.constructor)
+4 >Emitted(17, 48) Source(18, 21) + SourceIndex(0) name (Greeter.constructor)
+5 >Emitted(17, 49) Source(16, 7) + SourceIndex(0) name (Greeter.constructor)
+6 >Emitted(17, 53) Source(18, 21) + SourceIndex(0) name (Greeter.constructor)
+---
+>>>            b[_i - 1] = arguments[_i];
+1 >^^^^^^^^^^^^
+2 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >            @ParameterDecorator1 
+  >                  @ParameterDecorator2(30) 
+  >                  ...b: string[]
+1 >Emitted(18, 13) Source(16, 7) + SourceIndex(0) name (Greeter.constructor)
+2 >Emitted(18, 39) Source(18, 21) + SourceIndex(0) name (Greeter.constructor)
+---
+>>>        }
+>>>        this.greeting = greeting;
+1 >^^^^^^^^
+2 >        ^^^^^^^^^^^^^
+3 >                     ^^^
+4 >                        ^^^^^^^^
+5 >                                ^
+1 >
+2 >        greeting
+3 >                     
+4 >                        greeting
+5 >                                : string
+1 >Emitted(20, 9) Source(14, 14) + SourceIndex(0) name (Greeter.constructor)
+2 >Emitted(20, 22) Source(14, 22) + SourceIndex(0) name (Greeter.constructor)
+3 >Emitted(20, 25) Source(14, 14) + SourceIndex(0) name (Greeter.constructor)
+4 >Emitted(20, 33) Source(14, 22) + SourceIndex(0) name (Greeter.constructor)
+5 >Emitted(20, 34) Source(14, 30) + SourceIndex(0) name (Greeter.constructor)
+---
+>>>    }
+1 >^^^^
+2 >    ^
+3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >, 
+  >      
+  >      @ParameterDecorator1 
+  >      @ParameterDecorator2(30) 
+  >      ...b: string[]) {
+  >    
+2 >    }
+1 >Emitted(21, 5) Source(19, 5) + SourceIndex(0) name (Greeter.constructor)
+2 >Emitted(21, 6) Source(19, 6) + SourceIndex(0) name (Greeter.constructor)
+---
+>>>    Greeter.prototype.greet = function () {
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^
+3 >                           ^^^
+4 >                              ^^^^^^^^^^^^^^^^^^^->
+1->
+  >    
+  >    @PropertyDecorator1
+  >    @PropertyDecorator2(40)
+  >    
+2 >    greet
+3 >                           
+1->Emitted(22, 5) Source(23, 5) + SourceIndex(0) name (Greeter)
+2 >Emitted(22, 28) Source(23, 10) + SourceIndex(0) name (Greeter)
+3 >Emitted(22, 31) Source(21, 5) + SourceIndex(0) name (Greeter)
+---
+>>>        return "<h1>" + this.greeting + "</h1>";
+1->^^^^^^^^
+2 >        ^^^^^^
+3 >              ^
+4 >               ^^^^^^
+5 >                     ^^^
+6 >                        ^^^^
+7 >                            ^
+8 >                             ^^^^^^^^
+9 >                                     ^^^
+10>                                        ^^^^^^^
+11>                                               ^
+1->@PropertyDecorator1
+  >    @PropertyDecorator2(40)
+  >    greet() {
+  >        
+2 >        return
+3 >               
+4 >               "<h1>"
+5 >                      + 
+6 >                        this
+7 >                            .
+8 >                             greeting
+9 >                                      + 
+10>                                        "</h1>"
+11>                                               ;
+1->Emitted(23, 9) Source(24, 9) + SourceIndex(0) name (Greeter.greet)
+2 >Emitted(23, 15) Source(24, 15) + SourceIndex(0) name (Greeter.greet)
+3 >Emitted(23, 16) Source(24, 16) + SourceIndex(0) name (Greeter.greet)
+4 >Emitted(23, 22) Source(24, 22) + SourceIndex(0) name (Greeter.greet)
+5 >Emitted(23, 25) Source(24, 25) + SourceIndex(0) name (Greeter.greet)
+6 >Emitted(23, 29) Source(24, 29) + SourceIndex(0) name (Greeter.greet)
+7 >Emitted(23, 30) Source(24, 30) + SourceIndex(0) name (Greeter.greet)
+8 >Emitted(23, 38) Source(24, 38) + SourceIndex(0) name (Greeter.greet)
+9 >Emitted(23, 41) Source(24, 41) + SourceIndex(0) name (Greeter.greet)
+10>Emitted(23, 48) Source(24, 48) + SourceIndex(0) name (Greeter.greet)
+11>Emitted(23, 49) Source(24, 49) + SourceIndex(0) name (Greeter.greet)
+---
+>>>    };
+1 >^^^^
+2 >    ^
+3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >    
+2 >    }
+1 >Emitted(24, 5) Source(25, 5) + SourceIndex(0) name (Greeter.greet)
+2 >Emitted(24, 6) Source(25, 6) + SourceIndex(0) name (Greeter.greet)
+---
+>>>    Greeter.prototype.fn = function (x) {
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^
+3 >                        ^^^
+4 >                           ^^^^^^^^^^
+5 >                                     ^
+1->
+  >
+  >    @PropertyDecorator1
+  >    @PropertyDecorator2(50)
+  >    private x: string;
+  >
+  >    @PropertyDecorator1
+  >    @PropertyDecorator2(60)
+  >    private static x1: number = 10;
+  >    
+  >    private 
+2 >    fn
+3 >                        
+4 >                           private fn(
+  >                                 @ParameterDecorator1 
+  >                                 @ParameterDecorator2(70) 
+  >                                 
+5 >                                     x: number
+1->Emitted(25, 5) Source(35, 13) + SourceIndex(0) name (Greeter)
+2 >Emitted(25, 25) Source(35, 15) + SourceIndex(0) name (Greeter)
+3 >Emitted(25, 28) Source(35, 5) + SourceIndex(0) name (Greeter)
+4 >Emitted(25, 38) Source(38, 7) + SourceIndex(0) name (Greeter)
+5 >Emitted(25, 39) Source(38, 16) + SourceIndex(0) name (Greeter)
+---
+>>>        return this.greeting;
+1 >^^^^^^^^
+2 >        ^^^^^^
+3 >              ^
+4 >               ^^^^
+5 >                   ^
+6 >                    ^^^^^^^^
+7 >                            ^
+1 >) {
+  >        
+2 >        return
+3 >               
+4 >               this
+5 >                   .
+6 >                    greeting
+7 >                            ;
+1 >Emitted(26, 9) Source(39, 9) + SourceIndex(0) name (Greeter.fn)
+2 >Emitted(26, 15) Source(39, 15) + SourceIndex(0) name (Greeter.fn)
+3 >Emitted(26, 16) Source(39, 16) + SourceIndex(0) name (Greeter.fn)
+4 >Emitted(26, 20) Source(39, 20) + SourceIndex(0) name (Greeter.fn)
+5 >Emitted(26, 21) Source(39, 21) + SourceIndex(0) name (Greeter.fn)
+6 >Emitted(26, 29) Source(39, 29) + SourceIndex(0) name (Greeter.fn)
+7 >Emitted(26, 30) Source(39, 30) + SourceIndex(0) name (Greeter.fn)
+---
+>>>    };
+1 >^^^^
+2 >    ^
+3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >    
+2 >    }
+1 >Emitted(27, 5) Source(40, 5) + SourceIndex(0) name (Greeter.fn)
+2 >Emitted(27, 6) Source(40, 6) + SourceIndex(0) name (Greeter.fn)
+---
+>>>    Object.defineProperty(Greeter.prototype, "greetings", {
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^
+3 >                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+  >
+  >    
+2 >    @PropertyDecorator1
+  >        @PropertyDecorator2(80)
+  >        get 
+3 >                          greetings
+1->Emitted(28, 5) Source(42, 5) + SourceIndex(0) name (Greeter)
+2 >Emitted(28, 27) Source(44, 9) + SourceIndex(0) name (Greeter)
+3 >Emitted(28, 57) Source(44, 18) + SourceIndex(0) name (Greeter)
+---
+>>>        get: function () {
+1 >^^^^^^^^^^^^^
+2 >             ^^^^^^^^^^^^^^^^^^^^^->
+1 >
+1 >Emitted(29, 14) Source(42, 5) + SourceIndex(0) name (Greeter)
+---
+>>>            return this.greeting;
+1->^^^^^^^^^^^^
+2 >            ^^^^^^
+3 >                  ^
+4 >                   ^^^^
+5 >                       ^
+6 >                        ^^^^^^^^
+7 >                                ^
+1->@PropertyDecorator1
+  >    @PropertyDecorator2(80)
+  >    get greetings() {
+  >        
+2 >            return
+3 >                   
+4 >                   this
+5 >                       .
+6 >                        greeting
+7 >                                ;
+1->Emitted(30, 13) Source(45, 9) + SourceIndex(0) name (Greeter.greetings)
+2 >Emitted(30, 19) Source(45, 15) + SourceIndex(0) name (Greeter.greetings)
+3 >Emitted(30, 20) Source(45, 16) + SourceIndex(0) name (Greeter.greetings)
+4 >Emitted(30, 24) Source(45, 20) + SourceIndex(0) name (Greeter.greetings)
+5 >Emitted(30, 25) Source(45, 21) + SourceIndex(0) name (Greeter.greetings)
+6 >Emitted(30, 33) Source(45, 29) + SourceIndex(0) name (Greeter.greetings)
+7 >Emitted(30, 34) Source(45, 30) + SourceIndex(0) name (Greeter.greetings)
+---
+>>>        },
+1 >^^^^^^^^
+2 >        ^
+3 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >    
+2 >        }
+1 >Emitted(31, 9) Source(46, 5) + SourceIndex(0) name (Greeter.greetings)
+2 >Emitted(31, 10) Source(46, 6) + SourceIndex(0) name (Greeter.greetings)
+---
+>>>        set: function (greetings) {
+1->^^^^^^^^^^^^^
+2 >             ^^^^^^^^^^
+3 >                       ^^^^^^^^^
+4 >                                ^^^^^^^->
+1->
+  >
+  >    
+2 >             set greetings(
+  >                   @ParameterDecorator1 
+  >                   @ParameterDecorator2(90) 
+  >                   
+3 >                       greetings: string
+1->Emitted(32, 14) Source(48, 5) + SourceIndex(0) name (Greeter)
+2 >Emitted(32, 24) Source(51, 7) + SourceIndex(0) name (Greeter)
+3 >Emitted(32, 33) Source(51, 24) + SourceIndex(0) name (Greeter)
+---
+>>>            this.greeting = greetings;
+1->^^^^^^^^^^^^
+2 >            ^^^^
+3 >                ^
+4 >                 ^^^^^^^^
+5 >                         ^^^
+6 >                            ^^^^^^^^^
+7 >                                     ^
+1->) {
+  >        
+2 >            this
+3 >                .
+4 >                 greeting
+5 >                          = 
+6 >                            greetings
+7 >                                     ;
+1->Emitted(33, 13) Source(52, 9) + SourceIndex(0) name (Greeter.greetings)
+2 >Emitted(33, 17) Source(52, 13) + SourceIndex(0) name (Greeter.greetings)
+3 >Emitted(33, 18) Source(52, 14) + SourceIndex(0) name (Greeter.greetings)
+4 >Emitted(33, 26) Source(52, 22) + SourceIndex(0) name (Greeter.greetings)
+5 >Emitted(33, 29) Source(52, 25) + SourceIndex(0) name (Greeter.greetings)
+6 >Emitted(33, 38) Source(52, 34) + SourceIndex(0) name (Greeter.greetings)
+7 >Emitted(33, 39) Source(52, 35) + SourceIndex(0) name (Greeter.greetings)
+---
+>>>        },
+1 >^^^^^^^^
+2 >        ^
+3 >         ^^^^^^^^^^^^^^^^^->
+1 >
+  >    
+2 >        }
+1 >Emitted(34, 9) Source(53, 5) + SourceIndex(0) name (Greeter.greetings)
+2 >Emitted(34, 10) Source(53, 6) + SourceIndex(0) name (Greeter.greetings)
+---
+>>>        enumerable: true,
+>>>        configurable: true
+>>>    });
+1->^^^^^^^
+2 >       ^^^^^^^^^^^^^^->
+1->
+1->Emitted(37, 8) Source(46, 6) + SourceIndex(0) name (Greeter)
+---
+>>>    Greeter.x1 = 10;
+1->^^^^
+2 >    ^^^^^^^^^^
+3 >              ^^^
+4 >                 ^^
+5 >                   ^
+6 >                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+2 >    x1
+3 >              : number = 
+4 >                 10
+5 >                   ;
+1->Emitted(38, 5) Source(33, 20) + SourceIndex(0) name (Greeter)
+2 >Emitted(38, 15) Source(33, 22) + SourceIndex(0) name (Greeter)
+3 >Emitted(38, 18) Source(33, 33) + SourceIndex(0) name (Greeter)
+4 >Emitted(38, 20) Source(33, 35) + SourceIndex(0) name (Greeter)
+5 >Emitted(38, 21) Source(33, 36) + SourceIndex(0) name (Greeter)
+---
+>>>    Object.defineProperty(Greeter.prototype, "greet", __decorate([PropertyDecorator1, PropertyDecorator2(40)], Greeter.prototype, "greet", Object.getOwnPropertyDescriptor(Greeter.prototype, "greet")));
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^
+3 >                          ^^^^^^^^^^^^^^^^^^^^^^^^^^
+4 >                                                    ^^^^^^^^^^^^^^
+5 >                                                                  ^^^^^^^^^^^^^^^^^^
+6 >                                                                                    ^^
+7 >                                                                                      ^^^^^^^^^^^^^^^^^^
+8 >                                                                                                        ^
+9 >                                                                                                         ^^
+10>                                                                                                           ^
+11>                                                                                                            ^^^
+12>                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^
+13>                                                                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^
+15>                                                                                                                                                                                                     ^^^^
+1->
+2 >    @PropertyDecorator1
+  >        @PropertyDecorator2(40)
+  >        
+3 >                          greet
+4 >                                                    
+5 >                                                                  PropertyDecorator1
+6 >                                                                                    
+  >                                                                                        @
+7 >                                                                                      PropertyDecorator2
+8 >                                                                                                        (
+9 >                                                                                                         40
+10>                                                                                                           )
+11>                                                                                                            
+  >                                                                                                                
+12>                                                                                                               greet
+13>                                                                                                                                         
+14>                                                                                                                                                                           greet
+15>                                                                                                                                                                                                     () {
+  >                                                                                                                                                                                                             return "<h1>" + this.greeting + "</h1>";
+  >                                                                                                                                                                                                         }
+1->Emitted(39, 5) Source(21, 5) + SourceIndex(0) name (Greeter)
+2 >Emitted(39, 27) Source(23, 5) + SourceIndex(0) name (Greeter)
+3 >Emitted(39, 53) Source(23, 10) + SourceIndex(0) name (Greeter)
+4 >Emitted(39, 67) Source(21, 6) + SourceIndex(0) name (Greeter)
+5 >Emitted(39, 85) Source(21, 24) + SourceIndex(0) name (Greeter)
+6 >Emitted(39, 87) Source(22, 6) + SourceIndex(0) name (Greeter)
+7 >Emitted(39, 105) Source(22, 24) + SourceIndex(0) name (Greeter)
+8 >Emitted(39, 106) Source(22, 25) + SourceIndex(0) name (Greeter)
+9 >Emitted(39, 108) Source(22, 27) + SourceIndex(0) name (Greeter)
+10>Emitted(39, 109) Source(22, 28) + SourceIndex(0) name (Greeter)
+11>Emitted(39, 112) Source(23, 5) + SourceIndex(0) name (Greeter)
+12>Emitted(39, 138) Source(23, 10) + SourceIndex(0) name (Greeter)
+13>Emitted(39, 172) Source(23, 5) + SourceIndex(0) name (Greeter)
+14>Emitted(39, 198) Source(23, 10) + SourceIndex(0) name (Greeter)
+15>Emitted(39, 202) Source(25, 6) + SourceIndex(0) name (Greeter)
+---
+>>>    __decorate([PropertyDecorator1, PropertyDecorator2(50)], Greeter.prototype, "x");
+1 >^^^^
+2 >    ^^^^^^^^^^^^
+3 >                ^^^^^^^^^^^^^^^^^^
+4 >                                  ^^
+5 >                                    ^^^^^^^^^^^^^^^^^^
+6 >                                                      ^
+7 >                                                       ^^
+8 >                                                         ^
+9 >                                                          ^^^
+10>                                                             ^^^^^^^^^^^^^^^^^^^^^^
+11>                                                                                   ^^
+12>                                                                                     ^^^^^^^->
+1 >
+  >
+  >    
+2 >    @
+3 >                PropertyDecorator1
+4 >                                  
+  >                                      @
+5 >                                    PropertyDecorator2
+6 >                                                      (
+7 >                                                       50
+8 >                                                         )
+9 >                                                          
+  >                                                              private 
+10>                                                             x
+11>                                                                                   : string;
+1 >Emitted(40, 5) Source(27, 5) + SourceIndex(0) name (Greeter)
+2 >Emitted(40, 17) Source(27, 6) + SourceIndex(0) name (Greeter)
+3 >Emitted(40, 35) Source(27, 24) + SourceIndex(0) name (Greeter)
+4 >Emitted(40, 37) Source(28, 6) + SourceIndex(0) name (Greeter)
+5 >Emitted(40, 55) Source(28, 24) + SourceIndex(0) name (Greeter)
+6 >Emitted(40, 56) Source(28, 25) + SourceIndex(0) name (Greeter)
+7 >Emitted(40, 58) Source(28, 27) + SourceIndex(0) name (Greeter)
+8 >Emitted(40, 59) Source(28, 28) + SourceIndex(0) name (Greeter)
+9 >Emitted(40, 62) Source(29, 13) + SourceIndex(0) name (Greeter)
+10>Emitted(40, 84) Source(29, 14) + SourceIndex(0) name (Greeter)
+11>Emitted(40, 86) Source(29, 23) + SourceIndex(0) name (Greeter)
+---
+>>>    __decorate([ParameterDecorator1, ParameterDecorator2(70)], Greeter.prototype, "fn", 0);
+1->^^^^
+2 >    ^^^^^^^^^^^^
+3 >                ^^^^^^^^^^^^^^^^^^^
+4 >                                   ^^
+5 >                                     ^^^^^^^^^^^^^^^^^^^
+6 >                                                        ^
+7 >                                                         ^^
+8 >                                                           ^
+9 >                                                            ^^^
+10>                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^
+11>                                                                                         ^^
+12>                                                                                           ^^^^^^^^->
+1->
+  >
+  >    @PropertyDecorator1
+  >    @PropertyDecorator2(60)
+  >    private static x1: number = 10;
+  >    
+  >    private fn(
+  >      
+2 >    @
+3 >                ParameterDecorator1
+4 >                                    
+  >                                         @
+5 >                                     ParameterDecorator2
+6 >                                                        (
+7 >                                                         70
+8 >                                                           )
+9 >                                                             
+  >                                                                  
+10>                                                               x
+11>                                                                                         : number
+1->Emitted(41, 5) Source(36, 7) + SourceIndex(0) name (Greeter)
+2 >Emitted(41, 17) Source(36, 8) + SourceIndex(0) name (Greeter)
+3 >Emitted(41, 36) Source(36, 27) + SourceIndex(0) name (Greeter)
+4 >Emitted(41, 38) Source(37, 8) + SourceIndex(0) name (Greeter)
+5 >Emitted(41, 57) Source(37, 27) + SourceIndex(0) name (Greeter)
+6 >Emitted(41, 58) Source(37, 28) + SourceIndex(0) name (Greeter)
+7 >Emitted(41, 60) Source(37, 30) + SourceIndex(0) name (Greeter)
+8 >Emitted(41, 61) Source(37, 31) + SourceIndex(0) name (Greeter)
+9 >Emitted(41, 64) Source(38, 7) + SourceIndex(0) name (Greeter)
+10>Emitted(41, 90) Source(38, 8) + SourceIndex(0) name (Greeter)
+11>Emitted(41, 92) Source(38, 16) + SourceIndex(0) name (Greeter)
+---
+>>>    __decorate([ParameterDecorator1, ParameterDecorator2(90)], Greeter.prototype, "greetings", 0);
+1->^^^^
+2 >    ^^^^^^^^^^^^
+3 >                ^^^^^^^^^^^^^^^^^^^
+4 >                                   ^^
+5 >                                     ^^^^^^^^^^^^^^^^^^^
+6 >                                                        ^
+7 >                                                         ^^
+8 >                                                           ^
+9 >                                                            ^^^
+10>                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+11>                                                                                                ^^
+12>                                                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) {
+  >        return this.greeting;
+  >    }
+  >
+  >    @PropertyDecorator1
+  >    @PropertyDecorator2(80)
+  >    get greetings() {
+  >        return this.greeting;
+  >    }
+  >
+  >    set greetings(
+  >      
+2 >    @
+3 >                ParameterDecorator1
+4 >                                    
+  >                                         @
+5 >                                     ParameterDecorator2
+6 >                                                        (
+7 >                                                         90
+8 >                                                           )
+9 >                                                             
+  >                                                                  
+10>                                                               greetings
+11>                                                                                                : string
+1->Emitted(42, 5) Source(49, 7) + SourceIndex(0) name (Greeter)
+2 >Emitted(42, 17) Source(49, 8) + SourceIndex(0) name (Greeter)
+3 >Emitted(42, 36) Source(49, 27) + SourceIndex(0) name (Greeter)
+4 >Emitted(42, 38) Source(50, 8) + SourceIndex(0) name (Greeter)
+5 >Emitted(42, 57) Source(50, 27) + SourceIndex(0) name (Greeter)
+6 >Emitted(42, 58) Source(50, 28) + SourceIndex(0) name (Greeter)
+7 >Emitted(42, 60) Source(50, 30) + SourceIndex(0) name (Greeter)
+8 >Emitted(42, 61) Source(50, 31) + SourceIndex(0) name (Greeter)
+9 >Emitted(42, 64) Source(51, 7) + SourceIndex(0) name (Greeter)
+10>Emitted(42, 97) Source(51, 16) + SourceIndex(0) name (Greeter)
+11>Emitted(42, 99) Source(51, 24) + SourceIndex(0) name (Greeter)
+---
+>>>    Object.defineProperty(Greeter.prototype, "greetings", __decorate([PropertyDecorator1, PropertyDecorator2(80)], Greeter.prototype, "greetings", Object.getOwnPropertyDescriptor(Greeter.prototype, "greetings")));
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^
+3 >                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+4 >                                                        ^^^^^^^^^^^^^^
+5 >                                                                      ^^^^^^^^^^^^^^^^^^
+6 >                                                                                        ^^
+7 >                                                                                          ^^^^^^^^^^^^^^^^^^
+8 >                                                                                                            ^
+9 >                                                                                                             ^^
+10>                                                                                                               ^
+11>                                                                                                                ^^^
+12>                                                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+13>                                                                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+15>                                                                                                                                                                                                                 ^^^^
+1->
+2 >    @PropertyDecorator1
+  >        @PropertyDecorator2(80)
+  >        get 
+3 >                          greetings
+4 >                                                        
+5 >                                                                      PropertyDecorator1
+6 >                                                                                        
+  >                                                                                            @
+7 >                                                                                          PropertyDecorator2
+8 >                                                                                                            (
+9 >                                                                                                             80
+10>                                                                                                               )
+11>                                                                                                                
+  >                                                                                                                    get 
+12>                                                                                                                   greetings
+13>                                                                                                                                                 
+14>                                                                                                                                                                                   greetings
+15>                                                                                                                                                                                                                 () {
+  >                                                                                                                                                                                                                         return this.greeting;
+  >                                                                                                                                                                                                                     }
+1->Emitted(43, 5) Source(42, 5) + SourceIndex(0) name (Greeter)
+2 >Emitted(43, 27) Source(44, 9) + SourceIndex(0) name (Greeter)
+3 >Emitted(43, 57) Source(44, 18) + SourceIndex(0) name (Greeter)
+4 >Emitted(43, 71) Source(42, 6) + SourceIndex(0) name (Greeter)
+5 >Emitted(43, 89) Source(42, 24) + SourceIndex(0) name (Greeter)
+6 >Emitted(43, 91) Source(43, 6) + SourceIndex(0) name (Greeter)
+7 >Emitted(43, 109) Source(43, 24) + SourceIndex(0) name (Greeter)
+8 >Emitted(43, 110) Source(43, 25) + SourceIndex(0) name (Greeter)
+9 >Emitted(43, 112) Source(43, 27) + SourceIndex(0) name (Greeter)
+10>Emitted(43, 113) Source(43, 28) + SourceIndex(0) name (Greeter)
+11>Emitted(43, 116) Source(44, 9) + SourceIndex(0) name (Greeter)
+12>Emitted(43, 146) Source(44, 18) + SourceIndex(0) name (Greeter)
+13>Emitted(43, 180) Source(44, 9) + SourceIndex(0) name (Greeter)
+14>Emitted(43, 210) Source(44, 18) + SourceIndex(0) name (Greeter)
+15>Emitted(43, 214) Source(46, 6) + SourceIndex(0) name (Greeter)
+---
+>>>    __decorate([PropertyDecorator1, PropertyDecorator2(60)], Greeter, "x1");
+1 >^^^^
+2 >    ^^^^^^^^^^^^
+3 >                ^^^^^^^^^^^^^^^^^^
+4 >                                  ^^
+5 >                                    ^^^^^^^^^^^^^^^^^^
+6 >                                                      ^
+7 >                                                       ^^
+8 >                                                         ^
+9 >                                                          ^^^
+10>                                                             ^^^^^^^^^^^^^
+11>                                                                          ^^
+12>                                                                            ^^^^^^^^->
+1 >
+2 >    @
+3 >                PropertyDecorator1
+4 >                                  
+  >                                      @
+5 >                                    PropertyDecorator2
+6 >                                                      (
+7 >                                                       60
+8 >                                                         )
+9 >                                                          
+  >                                                              private static 
+10>                                                             x1
+11>                                                                          : number = 10;
+1 >Emitted(44, 5) Source(31, 5) + SourceIndex(0) name (Greeter)
+2 >Emitted(44, 17) Source(31, 6) + SourceIndex(0) name (Greeter)
+3 >Emitted(44, 35) Source(31, 24) + SourceIndex(0) name (Greeter)
+4 >Emitted(44, 37) Source(32, 6) + SourceIndex(0) name (Greeter)
+5 >Emitted(44, 55) Source(32, 24) + SourceIndex(0) name (Greeter)
+6 >Emitted(44, 56) Source(32, 25) + SourceIndex(0) name (Greeter)
+7 >Emitted(44, 58) Source(32, 27) + SourceIndex(0) name (Greeter)
+8 >Emitted(44, 59) Source(32, 28) + SourceIndex(0) name (Greeter)
+9 >Emitted(44, 62) Source(33, 20) + SourceIndex(0) name (Greeter)
+10>Emitted(44, 75) Source(33, 22) + SourceIndex(0) name (Greeter)
+11>Emitted(44, 77) Source(33, 36) + SourceIndex(0) name (Greeter)
+---
+>>>    __decorate([ParameterDecorator1, ParameterDecorator2(20)], Greeter, void 0, 0);
+1->^^^^
+2 >    ^^^^^^^^^^^^
+3 >                ^^^^^^^^^^^^^^^^^^^
+4 >                                   ^^
+5 >                                     ^^^^^^^^^^^^^^^^^^^
+6 >                                                        ^
+7 >                                                         ^^
+8 >                                                           ^
+9 >                                                            ^^^
+10>                                                               ^^^^^^^^^^^^^^^^^^
+11>                                                                                 ^^
+12>                                                                                   ^->
+1->
+2 >    @
+3 >                ParameterDecorator1
+4 >                                    
+  >                                         @
+5 >                                     ParameterDecorator2
+6 >                                                        (
+7 >                                                         20
+8 >                                                           )
+9 >                                                             
+  >                                                                  public 
+10>                                                               greeting
+11>                                                                                 : string
+1->Emitted(45, 5) Source(12, 7) + SourceIndex(0) name (Greeter)
+2 >Emitted(45, 17) Source(12, 8) + SourceIndex(0) name (Greeter)
+3 >Emitted(45, 36) Source(12, 27) + SourceIndex(0) name (Greeter)
+4 >Emitted(45, 38) Source(13, 8) + SourceIndex(0) name (Greeter)
+5 >Emitted(45, 57) Source(13, 27) + SourceIndex(0) name (Greeter)
+6 >Emitted(45, 58) Source(13, 28) + SourceIndex(0) name (Greeter)
+7 >Emitted(45, 60) Source(13, 30) + SourceIndex(0) name (Greeter)
+8 >Emitted(45, 61) Source(13, 31) + SourceIndex(0) name (Greeter)
+9 >Emitted(45, 64) Source(14, 14) + SourceIndex(0) name (Greeter)
+10>Emitted(45, 82) Source(14, 22) + SourceIndex(0) name (Greeter)
+11>Emitted(45, 84) Source(14, 30) + SourceIndex(0) name (Greeter)
+---
+>>>    __decorate([ParameterDecorator1, ParameterDecorator2(30)], Greeter, void 0, 1);
+1->^^^^
+2 >    ^^^^^^^^^^^^
+3 >                ^^^^^^^^^^^^^^^^^^^
+4 >                                   ^^
+5 >                                     ^^^^^^^^^^^^^^^^^^^
+6 >                                                        ^
+7 >                                                         ^^
+8 >                                                           ^
+9 >                                                            ^^^
+10>                                                               ^^^^^^^^^^^^^^^^^^
+11>                                                                                 ^^
+1->, 
+  >      
+  >      
+2 >    @
+3 >                ParameterDecorator1
+4 >                                    
+  >                                         @
+5 >                                     ParameterDecorator2
+6 >                                                        (
+7 >                                                         30
+8 >                                                           )
+9 >                                                             
+  >                                                                  ...
+10>                                                               b
+11>                                                                                 : string[]
+1->Emitted(46, 5) Source(16, 7) + SourceIndex(0) name (Greeter)
+2 >Emitted(46, 17) Source(16, 8) + SourceIndex(0) name (Greeter)
+3 >Emitted(46, 36) Source(16, 27) + SourceIndex(0) name (Greeter)
+4 >Emitted(46, 38) Source(17, 8) + SourceIndex(0) name (Greeter)
+5 >Emitted(46, 57) Source(17, 27) + SourceIndex(0) name (Greeter)
+6 >Emitted(46, 58) Source(17, 28) + SourceIndex(0) name (Greeter)
+7 >Emitted(46, 60) Source(17, 30) + SourceIndex(0) name (Greeter)
+8 >Emitted(46, 61) Source(17, 31) + SourceIndex(0) name (Greeter)
+9 >Emitted(46, 64) Source(18, 10) + SourceIndex(0) name (Greeter)
+10>Emitted(46, 82) Source(18, 11) + SourceIndex(0) name (Greeter)
+11>Emitted(46, 84) Source(18, 21) + SourceIndex(0) name (Greeter)
+---
+>>>    Greeter = __decorate([ClassDecorator1, ClassDecorator2(10)], Greeter);
+1 >^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^
+3 >                          ^^^^^^^^^^^^^^^
+4 >                                         ^^
+5 >                                           ^^^^^^^^^^^^^^^
+6 >                                                          ^
+7 >                                                           ^^
+8 >                                                             ^
+9 >                                                              ^^^^^^^^^^^^
+1 >
+2 >    @
+3 >                          ClassDecorator1
+4 >                                         
+  >                                         @
+5 >                                           ClassDecorator2
+6 >                                                          (
+7 >                                                           10
+8 >                                                             )
+9 >                                                              
+  >                                                              class Greeter {
+  >                                                                  constructor(
+  >                                                                    @ParameterDecorator1 
+  >                                                                    @ParameterDecorator2(20) 
+  >                                                                    public greeting: string, 
+  >                                                                    
+  >                                                                    @ParameterDecorator1 
+  >                                                                    @ParameterDecorator2(30) 
+  >                                                                    ...b: string[]) {
+  >                                                                  }
+  >                                                                  
+  >                                                                  @PropertyDecorator1
+  >                                                                  @PropertyDecorator2(40)
+  >                                                                  greet() {
+  >                                                                      return "<h1>" + this.greeting + "</h1>";
+  >                                                                  }
+  >                                                              
+  >                                                                  @PropertyDecorator1
+  >                                                                  @PropertyDecorator2(50)
+  >                                                                  private x: string;
+  >                                                              
+  >                                                                  @PropertyDecorator1
+  >                                                                  @PropertyDecorator2(60)
+  >                                                                  private static x1: number = 10;
+  >                                                                  
+  >                                                                  private fn(
+  >                                                                    @ParameterDecorator1 
+  >                                                                    @ParameterDecorator2(70) 
+  >                                                                    x: number) {
+  >                                                                      return this.greeting;
+  >                                                                  }
+  >                                                              
+  >                                                                  @PropertyDecorator1
+  >                                                                  @PropertyDecorator2(80)
+  >                                                                  get greetings() {
+  >                                                                      return this.greeting;
+  >                                                                  }
+  >                                                              
+  >                                                                  set greetings(
+  >                                                                    @ParameterDecorator1 
+  >                                                                    @ParameterDecorator2(90) 
+  >                                                                    greetings: string) {
+  >                                                                      this.greeting = greetings;
+  >                                                                  }    
+  >                                                              }
+1 >Emitted(47, 5) Source(8, 1) + SourceIndex(0) name (Greeter)
+2 >Emitted(47, 27) Source(8, 2) + SourceIndex(0) name (Greeter)
+3 >Emitted(47, 42) Source(8, 17) + SourceIndex(0) name (Greeter)
+4 >Emitted(47, 44) Source(9, 2) + SourceIndex(0) name (Greeter)
+5 >Emitted(47, 59) Source(9, 17) + SourceIndex(0) name (Greeter)
+6 >Emitted(47, 60) Source(9, 18) + SourceIndex(0) name (Greeter)
+7 >Emitted(47, 62) Source(9, 20) + SourceIndex(0) name (Greeter)
+8 >Emitted(47, 63) Source(9, 21) + SourceIndex(0) name (Greeter)
+9 >Emitted(47, 75) Source(54, 2) + SourceIndex(0) name (Greeter)
+---
+>>>    return Greeter;
+1 >^^^^
+2 >    ^^^^^^^^^^^^^^
+1 >
+2 >    }
+1 >Emitted(48, 5) Source(54, 1) + SourceIndex(0) name (Greeter)
+2 >Emitted(48, 19) Source(54, 2) + SourceIndex(0) name (Greeter)
+---
+>>>})();
+1 >
+2 >^
+3 > 
+4 > ^^^^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >}
+3 > 
+4 > @ClassDecorator1
+  > @ClassDecorator2(10)
+  > class Greeter {
+  >     constructor(
+  >       @ParameterDecorator1 
+  >       @ParameterDecorator2(20) 
+  >       public greeting: string, 
+  >       
+  >       @ParameterDecorator1 
+  >       @ParameterDecorator2(30) 
+  >       ...b: string[]) {
+  >     }
+  >     
+  >     @PropertyDecorator1
+  >     @PropertyDecorator2(40)
+  >     greet() {
+  >         return "<h1>" + this.greeting + "</h1>";
+  >     }
+  > 
+  >     @PropertyDecorator1
+  >     @PropertyDecorator2(50)
+  >     private x: string;
+  > 
+  >     @PropertyDecorator1
+  >     @PropertyDecorator2(60)
+  >     private static x1: number = 10;
+  >     
+  >     private fn(
+  >       @ParameterDecorator1 
+  >       @ParameterDecorator2(70) 
+  >       x: number) {
+  >         return this.greeting;
+  >     }
+  > 
+  >     @PropertyDecorator1
+  >     @PropertyDecorator2(80)
+  >     get greetings() {
+  >         return this.greeting;
+  >     }
+  > 
+  >     set greetings(
+  >       @ParameterDecorator1 
+  >       @ParameterDecorator2(90) 
+  >       greetings: string) {
+  >         this.greeting = greetings;
+  >     }    
+  > }
+1 >Emitted(49, 1) Source(54, 1) + SourceIndex(0) name (Greeter)
+2 >Emitted(49, 2) Source(54, 2) + SourceIndex(0) name (Greeter)
+3 >Emitted(49, 2) Source(8, 1) + SourceIndex(0)
+4 >Emitted(49, 6) Source(54, 2) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=sourceMapValidationDecorators.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDecorators.types b/tests/baselines/reference/sourceMapValidationDecorators.types
new file mode 100644
index 0000000000000..8be7f237391ce
--- /dev/null
+++ b/tests/baselines/reference/sourceMapValidationDecorators.types
@@ -0,0 +1,170 @@
+=== tests/cases/compiler/sourceMapValidationDecorators.ts ===
+declare function ClassDecorator1(target: Function): void;
+>ClassDecorator1 : (target: Function) => void
+>target : Function
+>Function : Function
+
+declare function ClassDecorator2(x: number): (target: Function) => void;
+>ClassDecorator2 : (x: number) => (target: Function) => void
+>x : number
+>target : Function
+>Function : Function
+
+declare function PropertyDecorator1(target: Object, key: string | symbol, descriptor?: PropertyDescriptor): void;
+>PropertyDecorator1 : (target: Object, key: string | symbol, descriptor?: PropertyDescriptor) => void
+>target : Object
+>Object : Object
+>key : string | symbol
+>descriptor : PropertyDescriptor
+>PropertyDescriptor : PropertyDescriptor
+
+declare function PropertyDecorator2(x: number): (target: Object, key: string | symbol, descriptor?: PropertyDescriptor) => void;
+>PropertyDecorator2 : (x: number) => (target: Object, key: string | symbol, descriptor?: PropertyDescriptor) => void
+>x : number
+>target : Object
+>Object : Object
+>key : string | symbol
+>descriptor : PropertyDescriptor
+>PropertyDescriptor : PropertyDescriptor
+
+declare function ParameterDecorator1(target: Function, key: string | symbol, paramIndex: number): void;
+>ParameterDecorator1 : (target: Function, key: string | symbol, paramIndex: number) => void
+>target : Function
+>Function : Function
+>key : string | symbol
+>paramIndex : number
+
+declare function ParameterDecorator2(x: number): (target: Function, key: string | symbol, paramIndex: number) => void;
+>ParameterDecorator2 : (x: number) => (target: Function, key: string | symbol, paramIndex: number) => void
+>x : number
+>target : Function
+>Function : Function
+>key : string | symbol
+>paramIndex : number
+
+@ClassDecorator1
+>ClassDecorator1 : unknown
+
+@ClassDecorator2(10)
+>ClassDecorator2(10) : (target: Function) => void
+>ClassDecorator2 : (x: number) => (target: Function) => void
+
+class Greeter {
+>Greeter : Greeter
+
+    constructor(
+      @ParameterDecorator1 
+>ParameterDecorator1 : unknown
+
+      @ParameterDecorator2(20) 
+>ParameterDecorator2(20) : (target: Function, key: string | symbol, paramIndex: number) => void
+>ParameterDecorator2 : (x: number) => (target: Function, key: string | symbol, paramIndex: number) => void
+
+      public greeting: string, 
+>greeting : string
+      
+      @ParameterDecorator1 
+>ParameterDecorator1 : unknown
+
+      @ParameterDecorator2(30) 
+>ParameterDecorator2(30) : (target: Function, key: string | symbol, paramIndex: number) => void
+>ParameterDecorator2 : (x: number) => (target: Function, key: string | symbol, paramIndex: number) => void
+
+      ...b: string[]) {
+>b : string[]
+    }
+    
+    @PropertyDecorator1
+>PropertyDecorator1 : unknown
+
+    @PropertyDecorator2(40)
+>PropertyDecorator2(40) : (target: Object, key: string | symbol, descriptor?: PropertyDescriptor) => void
+>PropertyDecorator2 : (x: number) => (target: Object, key: string | symbol, descriptor?: PropertyDescriptor) => void
+
+    greet() {
+>greet : () => string
+
+        return "<h1>" + this.greeting + "</h1>";
+>"<h1>" + this.greeting + "</h1>" : string
+>"<h1>" + this.greeting : string
+>this.greeting : string
+>this : Greeter
+>greeting : string
+    }
+
+    @PropertyDecorator1
+>PropertyDecorator1 : unknown
+
+    @PropertyDecorator2(50)
+>PropertyDecorator2(50) : (target: Object, key: string | symbol, descriptor?: PropertyDescriptor) => void
+>PropertyDecorator2 : (x: number) => (target: Object, key: string | symbol, descriptor?: PropertyDescriptor) => void
+
+    private x: string;
+>x : string
+
+    @PropertyDecorator1
+>PropertyDecorator1 : unknown
+
+    @PropertyDecorator2(60)
+>PropertyDecorator2(60) : (target: Object, key: string | symbol, descriptor?: PropertyDescriptor) => void
+>PropertyDecorator2 : (x: number) => (target: Object, key: string | symbol, descriptor?: PropertyDescriptor) => void
+
+    private static x1: number = 10;
+>x1 : number
+    
+    private fn(
+>fn : (x: number) => string
+
+      @ParameterDecorator1 
+>ParameterDecorator1 : unknown
+
+      @ParameterDecorator2(70) 
+>ParameterDecorator2(70) : (target: Function, key: string | symbol, paramIndex: number) => void
+>ParameterDecorator2 : (x: number) => (target: Function, key: string | symbol, paramIndex: number) => void
+
+      x: number) {
+>x : number
+
+        return this.greeting;
+>this.greeting : string
+>this : Greeter
+>greeting : string
+    }
+
+    @PropertyDecorator1
+>PropertyDecorator1 : unknown
+
+    @PropertyDecorator2(80)
+>PropertyDecorator2(80) : (target: Object, key: string | symbol, descriptor?: PropertyDescriptor) => void
+>PropertyDecorator2 : (x: number) => (target: Object, key: string | symbol, descriptor?: PropertyDescriptor) => void
+
+    get greetings() {
+>greetings : string
+
+        return this.greeting;
+>this.greeting : string
+>this : Greeter
+>greeting : string
+    }
+
+    set greetings(
+>greetings : string
+
+      @ParameterDecorator1 
+>ParameterDecorator1 : unknown
+
+      @ParameterDecorator2(90) 
+>ParameterDecorator2(90) : (target: Function, key: string | symbol, paramIndex: number) => void
+>ParameterDecorator2 : (x: number) => (target: Function, key: string | symbol, paramIndex: number) => void
+
+      greetings: string) {
+>greetings : string
+
+        this.greeting = greetings;
+>this.greeting = greetings : string
+>this.greeting : string
+>this : Greeter
+>greeting : string
+>greetings : string
+    }    
+}
diff --git a/tests/baselines/reference/thisInModuleFunction1.js b/tests/baselines/reference/thisInModuleFunction1.js
index 1f46855239ab8..614ae58c86f65 100644
--- a/tests/baselines/reference/thisInModuleFunction1.js
+++ b/tests/baselines/reference/thisInModuleFunction1.js
@@ -8,10 +8,10 @@ var z = bar.bar();
 
 //// [thisInModuleFunction1.js]
 var bar;
-(function (_bar) {
+(function (bar_1) {
     function bar() {
         return this;
     }
-    _bar.bar = bar;
+    bar_1.bar = bar;
 })(bar || (bar = {}));
 var z = bar.bar();
diff --git a/tests/baselines/reference/typeCheckTypeArgument.errors.txt b/tests/baselines/reference/typeCheckTypeArgument.errors.txt
index 2b2cb22e9458e..e2d7d0532ffc1 100644
--- a/tests/baselines/reference/typeCheckTypeArgument.errors.txt
+++ b/tests/baselines/reference/typeCheckTypeArgument.errors.txt
@@ -1,11 +1,16 @@
-error TS2318: Cannot find global type 'String'.
+error TS2318: Cannot find global type 'PropertyDecorator'.
 error TS2318: Cannot find global type 'Array'.
+error TS2318: Cannot find global type 'RegExp'.
+error TS2318: Cannot find global type 'ClassDecorator'.
+error TS2318: Cannot find global type 'String'.
 error TS2318: Cannot find global type 'IArguments'.
+error TS2318: Cannot find global type 'TypedPropertyDescriptor'.
+error TS2318: Cannot find global type 'Number'.
 error TS2318: Cannot find global type 'Boolean'.
-error TS2318: Cannot find global type 'RegExp'.
 error TS2318: Cannot find global type 'Object'.
-error TS2318: Cannot find global type 'Number'.
+error TS2318: Cannot find global type 'MethodDecorator'.
 error TS2318: Cannot find global type 'Function'.
+error TS2318: Cannot find global type 'ParameterDecorator'.
 tests/cases/compiler/typeCheckTypeArgument.ts(3,19): error TS2304: Cannot find name 'UNKNOWN'.
 tests/cases/compiler/typeCheckTypeArgument.ts(5,26): error TS2304: Cannot find name 'UNKNOWN'.
 tests/cases/compiler/typeCheckTypeArgument.ts(7,21): error TS2304: Cannot find name 'UNKNOWN'.
@@ -14,14 +19,19 @@ tests/cases/compiler/typeCheckTypeArgument.ts(12,22): error TS2304: Cannot find
 tests/cases/compiler/typeCheckTypeArgument.ts(15,13): error TS2304: Cannot find name 'UNKNOWN'.
 
 
-!!! error TS2318: Cannot find global type 'String'.
+!!! error TS2318: Cannot find global type 'PropertyDecorator'.
 !!! error TS2318: Cannot find global type 'Array'.
+!!! error TS2318: Cannot find global type 'RegExp'.
+!!! error TS2318: Cannot find global type 'ClassDecorator'.
+!!! error TS2318: Cannot find global type 'String'.
 !!! error TS2318: Cannot find global type 'IArguments'.
+!!! error TS2318: Cannot find global type 'TypedPropertyDescriptor'.
+!!! error TS2318: Cannot find global type 'Number'.
 !!! error TS2318: Cannot find global type 'Boolean'.
-!!! error TS2318: Cannot find global type 'RegExp'.
 !!! error TS2318: Cannot find global type 'Object'.
-!!! error TS2318: Cannot find global type 'Number'.
+!!! error TS2318: Cannot find global type 'MethodDecorator'.
 !!! error TS2318: Cannot find global type 'Function'.
+!!! error TS2318: Cannot find global type 'ParameterDecorator'.
 ==== tests/cases/compiler/typeCheckTypeArgument.ts (6 errors) ====
     /// <reference no-default-lib="true"/>
     
diff --git a/tests/cases/compiler/externalModuleImmutableBindings.ts b/tests/cases/compiler/externalModuleImmutableBindings.ts
new file mode 100644
index 0000000000000..9ed3d278a3af3
--- /dev/null
+++ b/tests/cases/compiler/externalModuleImmutableBindings.ts
@@ -0,0 +1,48 @@
+// @module: commonjs
+// @Filename: f1.ts
+export var x = 1;
+
+// @Filename: f2.ts
+import * as stuff from 'f1';
+
+var n = 'baz';
+
+stuff.x = 0;
+stuff['x'] = 1;
+stuff.blah = 2;
+stuff[n] = 3;
+
+stuff.x++;
+stuff['x']++;
+stuff['blah']++;
+stuff[n]++;
+
+(stuff.x) = 0;
+(stuff['x']) = 1;
+(stuff.blah) = 2;
+(stuff[n]) = 3;
+
+(stuff.x)++;
+(stuff['x'])++;
+(stuff['blah'])++;
+(stuff[n])++;
+
+for (stuff.x in []) {}
+for (stuff.x of []) {}
+for (stuff['x'] in []) {}
+for (stuff['x'] of []) {}
+for (stuff.blah in []) {}
+for (stuff.blah of []) {}
+for (stuff[n] in []) {}
+for (stuff[n] of []) {}
+
+for ((stuff.x) in []) {}
+for ((stuff.x) of []) {}
+for ((stuff['x']) in []) {}
+for ((stuff['x']) of []) {}
+for ((stuff.blah) in []) {}
+for ((stuff.blah) of []) {}
+for ((stuff[n]) in []) {}
+for ((stuff[n]) of []) {}
+
+
diff --git a/tests/cases/compiler/letKeepNamesOfTopLevelItems.ts b/tests/cases/compiler/letKeepNamesOfTopLevelItems.ts
new file mode 100644
index 0000000000000..b5fc5fc031c2e
--- /dev/null
+++ b/tests/cases/compiler/letKeepNamesOfTopLevelItems.ts
@@ -0,0 +1,8 @@
+let x;
+function foo() {
+    let x;
+}
+
+module A {
+    let x;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/letShadowedByNameInNestedScope.ts b/tests/cases/compiler/letShadowedByNameInNestedScope.ts
new file mode 100644
index 0000000000000..e8b3e67322465
--- /dev/null
+++ b/tests/cases/compiler/letShadowedByNameInNestedScope.ts
@@ -0,0 +1,8 @@
+var x;
+function foo() {
+    let x = 0;
+    (function () {
+        var _x = 1;
+        console.log(x);
+    })();
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/sourceMapValidationDecorators.ts b/tests/cases/compiler/sourceMapValidationDecorators.ts
new file mode 100644
index 0000000000000..c8bd16be80f7e
--- /dev/null
+++ b/tests/cases/compiler/sourceMapValidationDecorators.ts
@@ -0,0 +1,56 @@
+// @sourcemap: true
+// @target: es5
+declare function ClassDecorator1(target: Function): void;
+declare function ClassDecorator2(x: number): (target: Function) => void;
+declare function PropertyDecorator1(target: Object, key: string | symbol, descriptor?: PropertyDescriptor): void;
+declare function PropertyDecorator2(x: number): (target: Object, key: string | symbol, descriptor?: PropertyDescriptor) => void;
+declare function ParameterDecorator1(target: Function, key: string | symbol, paramIndex: number): void;
+declare function ParameterDecorator2(x: number): (target: Function, key: string | symbol, paramIndex: number) => void;
+
+@ClassDecorator1
+@ClassDecorator2(10)
+class Greeter {
+    constructor(
+      @ParameterDecorator1 
+      @ParameterDecorator2(20) 
+      public greeting: string, 
+      
+      @ParameterDecorator1 
+      @ParameterDecorator2(30) 
+      ...b: string[]) {
+    }
+    
+    @PropertyDecorator1
+    @PropertyDecorator2(40)
+    greet() {
+        return "<h1>" + this.greeting + "</h1>";
+    }
+
+    @PropertyDecorator1
+    @PropertyDecorator2(50)
+    private x: string;
+
+    @PropertyDecorator1
+    @PropertyDecorator2(60)
+    private static x1: number = 10;
+    
+    private fn(
+      @ParameterDecorator1 
+      @ParameterDecorator2(70) 
+      x: number) {
+        return this.greeting;
+    }
+
+    @PropertyDecorator1
+    @PropertyDecorator2(80)
+    get greetings() {
+        return this.greeting;
+    }
+
+    set greetings(
+      @ParameterDecorator1 
+      @ParameterDecorator2(90) 
+      greetings: string) {
+        this.greeting = greetings;
+    }    
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor1.ts b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor1.ts
new file mode 100644
index 0000000000000..7e80e9e637d0f
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor1.ts
@@ -0,0 +1,6 @@
+// @target:es5
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+
+class C {
+    @dec get accessor() { return 1; }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor2.ts b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor2.ts
new file mode 100644
index 0000000000000..bbe58e72eb97c
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor2.ts
@@ -0,0 +1,6 @@
+// @target:es5
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+
+class C {
+    @dec public get accessor() { return 1; }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts
new file mode 100644
index 0000000000000..bd1ce41bb12b7
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts
@@ -0,0 +1,6 @@
+// @target:es5
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+
+class C {
+    public @dec get accessor() { return 1; }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor4.ts b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor4.ts
new file mode 100644
index 0000000000000..72259e5d212ad
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor4.ts
@@ -0,0 +1,6 @@
+// @target:es5
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+
+class C {
+    @dec set accessor(value: number) { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor5.ts b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor5.ts
new file mode 100644
index 0000000000000..ba5f82ab0cedc
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor5.ts
@@ -0,0 +1,6 @@
+// @target:es5
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+
+class C {
+    @dec public set accessor(value: number) { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts
new file mode 100644
index 0000000000000..686127858b0fa
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts
@@ -0,0 +1,6 @@
+// @target:es5
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+
+class C {
+    public @dec set accessor(value: number) { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor1.ts b/tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor1.ts
new file mode 100644
index 0000000000000..4a39536e30b20
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor1.ts
@@ -0,0 +1,6 @@
+// @target:es5
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+
+class C {
+    @dec constructor() {}
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/constructor/parameter/decoratorOnClassConstructorParameter1.ts b/tests/cases/conformance/decorators/class/constructor/parameter/decoratorOnClassConstructorParameter1.ts
new file mode 100644
index 0000000000000..3f4baabac7c9b
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/constructor/parameter/decoratorOnClassConstructorParameter1.ts
@@ -0,0 +1,6 @@
+// @target:es5
+declare function dec(target: Function, propertyKey: string | symbol, parameterIndex: number): void;
+
+class C {
+    constructor(@dec p: number) {}
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/constructor/parameter/decoratorOnClassConstructorParameter4.ts b/tests/cases/conformance/decorators/class/constructor/parameter/decoratorOnClassConstructorParameter4.ts
new file mode 100644
index 0000000000000..e58771fbebb25
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/constructor/parameter/decoratorOnClassConstructorParameter4.ts
@@ -0,0 +1,6 @@
+// @target:es5
+declare function dec(target: Function, propertyKey: string | symbol, parameterIndex: number): void;
+
+class C {
+    constructor(public @dec p: number) {}
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/decoratorOnClass1.ts b/tests/cases/conformance/decorators/class/decoratorOnClass1.ts
new file mode 100644
index 0000000000000..1d3c87e7a6af1
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/decoratorOnClass1.ts
@@ -0,0 +1,6 @@
+// @target:es5
+declare function dec<T>(target: T): T;
+
+@dec
+class C {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/decoratorOnClass2.ts b/tests/cases/conformance/decorators/class/decoratorOnClass2.ts
new file mode 100644
index 0000000000000..c82b9fe04a756
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/decoratorOnClass2.ts
@@ -0,0 +1,7 @@
+// @target:es5
+// @module: commonjs
+declare function dec<T>(target: T): T;
+
+@dec
+export class C {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/decoratorOnClass3.ts b/tests/cases/conformance/decorators/class/decoratorOnClass3.ts
new file mode 100644
index 0000000000000..cf77838035600
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/decoratorOnClass3.ts
@@ -0,0 +1,8 @@
+// @target:es5
+// @module: commonjs
+declare function dec<T>(target: T): T;
+
+export
+@dec
+class C {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/decoratorOnClass4.ts b/tests/cases/conformance/decorators/class/decoratorOnClass4.ts
new file mode 100644
index 0000000000000..e365df091fc64
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/decoratorOnClass4.ts
@@ -0,0 +1,6 @@
+// @target:es5
+declare function dec(): <T>(target: T) => T;
+
+@dec()
+class C {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/decoratorOnClass5.ts b/tests/cases/conformance/decorators/class/decoratorOnClass5.ts
new file mode 100644
index 0000000000000..e365df091fc64
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/decoratorOnClass5.ts
@@ -0,0 +1,6 @@
+// @target:es5
+declare function dec(): <T>(target: T) => T;
+
+@dec()
+class C {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/decoratorOnClass8.ts b/tests/cases/conformance/decorators/class/decoratorOnClass8.ts
new file mode 100644
index 0000000000000..a72279641804f
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/decoratorOnClass8.ts
@@ -0,0 +1,6 @@
+// @target:es5
+declare function dec(): (target: Function, paramIndex: number) => void;
+
+@dec()
+class C {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod1.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod1.ts
new file mode 100644
index 0000000000000..7216be210f156
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod1.ts
@@ -0,0 +1,6 @@
+// @target: ES5
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+
+class C {
+    @dec method() {}
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod10.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod10.ts
new file mode 100644
index 0000000000000..03f75f1655243
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod10.ts
@@ -0,0 +1,6 @@
+// @target: ES5
+declare function dec(target: Function, paramIndex: number): void;
+
+class C {
+    @dec method() {}
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod2.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod2.ts
new file mode 100644
index 0000000000000..7b7f089e4d49c
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod2.ts
@@ -0,0 +1,6 @@
+// @target: ES5
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+
+class C {
+    @dec public method() {}
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts
new file mode 100644
index 0000000000000..aa80151cf83a9
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts
@@ -0,0 +1,6 @@
+// @target: ES5
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+
+class C {
+    public @dec method() {}
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod4.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod4.ts
new file mode 100644
index 0000000000000..92b35ae618914
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod4.ts
@@ -0,0 +1,6 @@
+// @target: ES6
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+
+class C {
+    @dec ["method"]() {}
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod5.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod5.ts
new file mode 100644
index 0000000000000..cd891b4231be0
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod5.ts
@@ -0,0 +1,6 @@
+// @target: ES6
+declare function dec(): <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>;
+
+class C {
+    @dec() ["method"]() {}
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod6.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod6.ts
new file mode 100644
index 0000000000000..a1fa700589201
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod6.ts
@@ -0,0 +1,6 @@
+// @target: ES6
+declare function dec(): <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>;
+
+class C {
+    @dec ["method"]() {}
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod7.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod7.ts
new file mode 100644
index 0000000000000..4bf86aa4995b1
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod7.ts
@@ -0,0 +1,6 @@
+// @target: ES6
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+
+class C {
+    @dec public ["method"]() {}
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod8.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod8.ts
new file mode 100644
index 0000000000000..9bd2c192c2d01
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod8.ts
@@ -0,0 +1,6 @@
+// @target: ES5
+declare function dec<T>(target: T): T;
+
+class C {
+    @dec method() {}
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/method/parameter/decoratorOnClassMethodParameter1.ts b/tests/cases/conformance/decorators/class/method/parameter/decoratorOnClassMethodParameter1.ts
new file mode 100644
index 0000000000000..e525933fb6aa5
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/method/parameter/decoratorOnClassMethodParameter1.ts
@@ -0,0 +1,6 @@
+// @target:es5
+declare function dec(target: Function, propertyKey: string | symbol, parameterIndex: number): void;
+
+class C {
+    method(@dec p: number) {}
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty1.ts b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty1.ts
new file mode 100644
index 0000000000000..0d8fd82225d6e
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty1.ts
@@ -0,0 +1,6 @@
+// @target: ES5
+declare function dec(target: any, propertyKey: string): void;
+
+class C {
+    @dec prop;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty10.ts b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty10.ts
new file mode 100644
index 0000000000000..4be77035692df
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty10.ts
@@ -0,0 +1,6 @@
+// @target: ES5
+declare function dec(): <T>(target: any, propertyKey: string) => void;
+
+class C {
+    @dec() prop;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty11.ts b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty11.ts
new file mode 100644
index 0000000000000..60ea10189e289
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty11.ts
@@ -0,0 +1,6 @@
+// @target: ES5
+declare function dec(): <T>(target: any, propertyKey: string) => void;
+
+class C {
+    @dec prop;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty2.ts b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty2.ts
new file mode 100644
index 0000000000000..dc2886e7dbd98
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty2.ts
@@ -0,0 +1,6 @@
+// @target: ES5
+declare function dec(target: any, propertyKey: string): void;
+
+class C {
+    @dec public prop;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty3.ts b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty3.ts
new file mode 100644
index 0000000000000..cf58b4b71ec03
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty3.ts
@@ -0,0 +1,6 @@
+// @target: ES5
+declare function dec(target: any, propertyKey: string): void;
+
+class C {
+    public @dec prop;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty6.ts b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty6.ts
new file mode 100644
index 0000000000000..1dd184419af48
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty6.ts
@@ -0,0 +1,6 @@
+// @target: ES5
+declare function dec(target: Function): void;
+
+class C {
+    @dec prop;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty7.ts b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty7.ts
new file mode 100644
index 0000000000000..d82ca6eb2ebbe
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty7.ts
@@ -0,0 +1,6 @@
+// @target: ES5
+declare function dec(target: Function, propertyKey: string | symbol, paramIndex: number): void;
+
+class C {
+    @dec prop;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/invalid/decoratorOnArrowFunction.ts b/tests/cases/conformance/decorators/invalid/decoratorOnArrowFunction.ts
new file mode 100644
index 0000000000000..303aa50556316
--- /dev/null
+++ b/tests/cases/conformance/decorators/invalid/decoratorOnArrowFunction.ts
@@ -0,0 +1,4 @@
+declare function dec<T>(target: T): T;
+
+var F = @dec () => {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/invalid/decoratorOnEnum.ts b/tests/cases/conformance/decorators/invalid/decoratorOnEnum.ts
new file mode 100644
index 0000000000000..437d9ca3fbd8a
--- /dev/null
+++ b/tests/cases/conformance/decorators/invalid/decoratorOnEnum.ts
@@ -0,0 +1,5 @@
+declare function dec<T>(target: T): T;
+
+@dec
+enum E {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/invalid/decoratorOnEnum2.ts b/tests/cases/conformance/decorators/invalid/decoratorOnEnum2.ts
new file mode 100644
index 0000000000000..090e7e1f0b5a2
--- /dev/null
+++ b/tests/cases/conformance/decorators/invalid/decoratorOnEnum2.ts
@@ -0,0 +1,5 @@
+declare function dec<T>(target: T): T;
+
+enum E {
+    @dec A
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/invalid/decoratorOnFunctionDeclaration.ts b/tests/cases/conformance/decorators/invalid/decoratorOnFunctionDeclaration.ts
new file mode 100644
index 0000000000000..5b9c68ef24788
--- /dev/null
+++ b/tests/cases/conformance/decorators/invalid/decoratorOnFunctionDeclaration.ts
@@ -0,0 +1,5 @@
+declare function dec<T>(target: T): T;
+
+@dec
+function F() {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/invalid/decoratorOnFunctionExpression.ts b/tests/cases/conformance/decorators/invalid/decoratorOnFunctionExpression.ts
new file mode 100644
index 0000000000000..00a0f258a67b9
--- /dev/null
+++ b/tests/cases/conformance/decorators/invalid/decoratorOnFunctionExpression.ts
@@ -0,0 +1,4 @@
+declare function dec<T>(target: T): T;
+
+var F = @dec function () {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/invalid/decoratorOnImportEquals1.ts b/tests/cases/conformance/decorators/invalid/decoratorOnImportEquals1.ts
new file mode 100644
index 0000000000000..b5990252355f1
--- /dev/null
+++ b/tests/cases/conformance/decorators/invalid/decoratorOnImportEquals1.ts
@@ -0,0 +1,10 @@
+declare function dec<T>(target: T): T;
+
+module M1 {
+    export var X: number;
+}
+
+module M2 {
+    @dec
+    import X = M1.X;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/invalid/decoratorOnImportEquals2.ts b/tests/cases/conformance/decorators/invalid/decoratorOnImportEquals2.ts
new file mode 100644
index 0000000000000..1b99e0e186303
--- /dev/null
+++ b/tests/cases/conformance/decorators/invalid/decoratorOnImportEquals2.ts
@@ -0,0 +1,9 @@
+// @module: commonjs
+// @Filename: decoratorOnImportEquals2_0.ts
+export var X;
+
+// @Filename: decoratorOnImportEquals2_1.ts
+@dec
+import lib = require('./decoratorOnImportEquals2_0');
+
+declare function dec<T>(target: T): T;
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/invalid/decoratorOnInterface.ts b/tests/cases/conformance/decorators/invalid/decoratorOnInterface.ts
new file mode 100644
index 0000000000000..9660f3995f0f8
--- /dev/null
+++ b/tests/cases/conformance/decorators/invalid/decoratorOnInterface.ts
@@ -0,0 +1,5 @@
+declare function dec<T>(target: T): T;
+
+@dec
+interface I {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/invalid/decoratorOnInternalModule.ts b/tests/cases/conformance/decorators/invalid/decoratorOnInternalModule.ts
new file mode 100644
index 0000000000000..3f7c57b6ae9eb
--- /dev/null
+++ b/tests/cases/conformance/decorators/invalid/decoratorOnInternalModule.ts
@@ -0,0 +1,6 @@
+declare function dec<T>(target: T): T;
+
+@dec
+module M {
+    
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/invalid/decoratorOnTypeAlias.ts b/tests/cases/conformance/decorators/invalid/decoratorOnTypeAlias.ts
new file mode 100644
index 0000000000000..8ddcec1e16dc8
--- /dev/null
+++ b/tests/cases/conformance/decorators/invalid/decoratorOnTypeAlias.ts
@@ -0,0 +1,4 @@
+declare function dec<T>(target: T): T;
+
+@dec
+type T = number;
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/invalid/decoratorOnVar.ts b/tests/cases/conformance/decorators/invalid/decoratorOnVar.ts
new file mode 100644
index 0000000000000..b27adc690665b
--- /dev/null
+++ b/tests/cases/conformance/decorators/invalid/decoratorOnVar.ts
@@ -0,0 +1,4 @@
+declare function dec<T>(target: T): T;
+
+@dec
+var x: number;
\ No newline at end of file
diff --git a/tests/cases/fourslash/arrayCallAndConstructTypings.ts b/tests/cases/fourslash/arrayCallAndConstructTypings.ts
index 40f9c066c14dc..c2c9d6cedbbcf 100644
--- a/tests/cases/fourslash/arrayCallAndConstructTypings.ts
+++ b/tests/cases/fourslash/arrayCallAndConstructTypings.ts
@@ -13,31 +13,31 @@
 
 
 goTo.marker('1');
-verify.quickInfoIs('(var) a1: any[]');
+verify.quickInfoIs('var a1: any[]');
 
 goTo.marker('2');
-verify.quickInfoIs('(var) a2: any[]');
+verify.quickInfoIs('var a2: any[]');
 
 goTo.marker('3');
-verify.quickInfoIs('(var) a3: boolean[]');
+verify.quickInfoIs('var a3: boolean[]');
 
 goTo.marker('4');
-verify.quickInfoIs('(var) a4: boolean[]');
+verify.quickInfoIs('var a4: boolean[]');
 
 goTo.marker('5');
-verify.quickInfoIs('(var) a5: string[]');
+verify.quickInfoIs('var a5: string[]');
 
 goTo.marker('6');
-verify.quickInfoIs('(var) a6: any[]');
+verify.quickInfoIs('var a6: any[]');
 
 goTo.marker('7');
-verify.quickInfoIs('(var) a7: any[]');
+verify.quickInfoIs('var a7: any[]');
 
 goTo.marker('8');
-verify.quickInfoIs('(var) a8: boolean[]');
+verify.quickInfoIs('var a8: boolean[]');
 
 goTo.marker('9');
-verify.quickInfoIs('(var) a9: boolean[]');
+verify.quickInfoIs('var a9: boolean[]');
 
 goTo.marker('10');
-verify.quickInfoIs('(var) a10: string[]');
\ No newline at end of file
+verify.quickInfoIs('var a10: string[]');
\ No newline at end of file
diff --git a/tests/cases/fourslash/augmentedTypesClass2.ts b/tests/cases/fourslash/augmentedTypesClass2.ts
index cb9e5f7f57233..90be770272b29 100644
--- a/tests/cases/fourslash/augmentedTypesClass2.ts
+++ b/tests/cases/fourslash/augmentedTypesClass2.ts
@@ -7,7 +7,7 @@
 ////r./*2*/
 
 goTo.marker('1');
-verify.not.completionListContains('y', '(var) y: number');
+verify.not.completionListContains('y', 'var y: number');
 edit.backspace(4);
 goTo.marker('2');
 verify.completionListContains('foo', '(method) c5b.foo(): void');
\ No newline at end of file
diff --git a/tests/cases/fourslash/augmentedTypesModule1.ts b/tests/cases/fourslash/augmentedTypesModule1.ts
index 0a56504b97252..6358d93e342be 100644
--- a/tests/cases/fourslash/augmentedTypesModule1.ts
+++ b/tests/cases/fourslash/augmentedTypesModule1.ts
@@ -12,4 +12,4 @@ verify.completionListContains('I');
 verify.not.completionListContains('foo');
 
 goTo.marker('2');
-verify.quickInfoIs('(var) r: number');
\ No newline at end of file
+verify.quickInfoIs('var r: number');
diff --git a/tests/cases/fourslash/augmentedTypesModule2.ts b/tests/cases/fourslash/augmentedTypesModule2.ts
index 6c2c63fff068e..844bee7642ac7 100644
--- a/tests/cases/fourslash/augmentedTypesModule2.ts
+++ b/tests/cases/fourslash/augmentedTypesModule2.ts
@@ -6,7 +6,7 @@
 ////var /*2*/r = m2f/*3*/;
 
 goTo.marker('11');
-verify.quickInfoIs('(function) m2f(x: number): void\nmodule m2f');
+verify.quickInfoIs('function m2f(x: number): void\nmodule m2f');
 
 goTo.marker('1');
 verify.completionListContains('I');
@@ -16,7 +16,7 @@ verify.not.completionListContains('foo');
 edit.backspace(1);
 
 goTo.marker('2');
-verify.quickInfoIs('(var) r: (x: number) => void');
+verify.quickInfoIs('var r: (x: number) => void');
 
 goTo.marker('3');
 edit.insert('(');
diff --git a/tests/cases/fourslash/augmentedTypesModule3.ts b/tests/cases/fourslash/augmentedTypesModule3.ts
index b1640a4164111..8e7e5be8ce596 100644
--- a/tests/cases/fourslash/augmentedTypesModule3.ts
+++ b/tests/cases/fourslash/augmentedTypesModule3.ts
@@ -13,7 +13,7 @@ verify.not.completionListContains('foo');
 edit.backspace(1);
 
 goTo.marker('2');
-verify.quickInfoIs("(var) r: typeof m2g");
+verify.quickInfoIs("var r: typeof m2g");
 
 goTo.marker('3');
 edit.insert('(');
diff --git a/tests/cases/fourslash/augmentedTypesModule4.ts b/tests/cases/fourslash/augmentedTypesModule4.ts
index ffef24aa65856..0cb1e350837ee 100644
--- a/tests/cases/fourslash/augmentedTypesModule4.ts
+++ b/tests/cases/fourslash/augmentedTypesModule4.ts
@@ -7,7 +7,7 @@
 ////var /*4*/r2 = m3d./*3*/
 
 goTo.marker('1');
-verify.quickInfoIs('(var) r: m3d');
+verify.quickInfoIs('var r: m3d');
 
 goTo.marker('2');
 verify.completionListContains('foo');
@@ -18,4 +18,4 @@ verify.completionListContains('y');
 edit.insert('y;');
 
 goTo.marker('4');
-verify.quickInfoIs('(var) r2: number');
\ No newline at end of file
+verify.quickInfoIs('var r2: number');
diff --git a/tests/cases/fourslash/augmentedTypesModule5.ts b/tests/cases/fourslash/augmentedTypesModule5.ts
index 043372f21d50a..71024f7ed9cd0 100644
--- a/tests/cases/fourslash/augmentedTypesModule5.ts
+++ b/tests/cases/fourslash/augmentedTypesModule5.ts
@@ -7,7 +7,7 @@
 ////var /*4*/r2 = m3e./*3*/
 
 goTo.marker('1');
-verify.quickInfoIs('(var) r: m3e');
+verify.quickInfoIs('var r: m3e');
 
 goTo.marker('2');
 verify.completionListContains('foo');
@@ -19,4 +19,4 @@ verify.completionListContains('y');
 edit.insert('y;');
 
 goTo.marker('4');
-verify.quickInfoIs('(var) r2: number');
\ No newline at end of file
+verify.quickInfoIs('var r2: number');
diff --git a/tests/cases/fourslash/augmentedTypesModule6.ts b/tests/cases/fourslash/augmentedTypesModule6.ts
index a24337462657c..9f5a23a8a3c40 100644
--- a/tests/cases/fourslash/augmentedTypesModule6.ts
+++ b/tests/cases/fourslash/augmentedTypesModule6.ts
@@ -20,7 +20,7 @@ goTo.marker('3');
 verify.currentSignatureHelpIs('m3f(): m3f');
 
 goTo.marker('4');
-verify.quickInfoIs('(var) r: m3f');
+verify.quickInfoIs('var r: m3f');
 
 goTo.marker('5');
 verify.completionListContains('foo');
diff --git a/tests/cases/fourslash/automaticConstructorToggling.ts b/tests/cases/fourslash/automaticConstructorToggling.ts
index 9f43082785474..091f005f4c3a2 100644
--- a/tests/cases/fourslash/automaticConstructorToggling.ts
+++ b/tests/cases/fourslash/automaticConstructorToggling.ts
@@ -17,41 +17,41 @@ var D = 'D'
 goTo.marker(B);
 edit.insert('constructor(val: T) { }');
 goTo.marker('Asig');
-verify.quickInfoIs("(constructor) A<string>(): A<string>");
+verify.quickInfoIs("constructor A<string>(): A<string>");
 
 goTo.marker('Bsig');
-verify.quickInfoIs("(constructor) B<string>(val: string): B<string>");
+verify.quickInfoIs("constructor B<string>(val: string): B<string>");
 
 goTo.marker('Csig'); 
-verify.quickInfoIs("(constructor) C<string>(val: string): C<string>");
+verify.quickInfoIs("constructor C<string>(val: string): C<string>");
 
 goTo.marker('Dsig');
-verify.quickInfoIs("(constructor) D<T>(val: T): D<T>"); // Cannot resolve signature
+verify.quickInfoIs("constructor D<T>(val: T): D<T>"); // Cannot resolve signature
 
 goTo.marker(C);
 edit.deleteAtCaret('constructor(val: T) { }'.length);
 goTo.marker('Asig');
-verify.quickInfoIs("(constructor) A<string>(): A<string>");
+verify.quickInfoIs("constructor A<string>(): A<string>");
 
 goTo.marker('Bsig');
-verify.quickInfoIs("(constructor) B<string>(val: string): B<string>");
+verify.quickInfoIs("constructor B<string>(val: string): B<string>");
 
 goTo.marker('Csig');
-verify.quickInfoIs("(constructor) C<T>(): C<T>"); // Cannot resolve signature
+verify.quickInfoIs("constructor C<T>(): C<T>"); // Cannot resolve signature
 
 goTo.marker('Dsig');
-verify.quickInfoIs("(constructor) D<T>(val: T): D<T>"); // Cannot resolve signature
+verify.quickInfoIs("constructor D<T>(val: T): D<T>"); // Cannot resolve signature
 
 goTo.marker(D);
 edit.deleteAtCaret("val: T".length);
 goTo.marker('Asig');
-verify.quickInfoIs("(constructor) A<string>(): A<string>");
+verify.quickInfoIs("constructor A<string>(): A<string>");
 
 goTo.marker('Bsig');
-verify.quickInfoIs("(constructor) B<string>(val: string): B<string>");
+verify.quickInfoIs("constructor B<string>(val: string): B<string>");
 
 goTo.marker('Csig');
-verify.quickInfoIs("(constructor) C<T>(): C<T>"); // Cannot resolve signature
+verify.quickInfoIs("constructor C<T>(): C<T>"); // Cannot resolve signature
 
 goTo.marker('Dsig');
-verify.quickInfoIs("(constructor) D<string>(): D<string>");
\ No newline at end of file
+verify.quickInfoIs("constructor D<string>(): D<string>");
diff --git a/tests/cases/fourslash/bestCommonTypeObjectLiterals1.ts b/tests/cases/fourslash/bestCommonTypeObjectLiterals1.ts
index 79d3174b542f1..d95825ff383b6 100644
--- a/tests/cases/fourslash/bestCommonTypeObjectLiterals1.ts
+++ b/tests/cases/fourslash/bestCommonTypeObjectLiterals1.ts
@@ -22,13 +22,13 @@
 ////var /*5*/c3 = [a2, b2, i];
 
 goTo.marker('1');
-verify.quickInfoIs('(var) c: {\n    name: string;\n    age: number;\n}[]');
+verify.quickInfoIs('var c: {\n    name: string;\n    age: number;\n}[]');
 
 goTo.marker('2');
-verify.quickInfoIs('(var) c1: {\n    name: string;\n    age: number;\n}[]');
+verify.quickInfoIs('var c1: {\n    name: string;\n    age: number;\n}[]');
 
 goTo.marker('3');
-verify.quickInfoIs('(var) c2: ({\n\
+verify.quickInfoIs('var c2: ({\n\
     name: string;\n\
     age: number;\n\
     address: string;\n\
@@ -39,8 +39,8 @@ verify.quickInfoIs('(var) c2: ({\n\
 })[]');
 
 goTo.marker('4');
-verify.quickInfoIs('(var) c2a: {\n    name: string;\n    age: number;\n}[]');
+verify.quickInfoIs('var c2a: {\n    name: string;\n    age: number;\n}[]');
 
 goTo.marker('5');
-verify.quickInfoIs('(var) c3: I[]');
+verify.quickInfoIs('var c3: I[]');
 
diff --git a/tests/cases/fourslash/cloduleWithRecursiveReference.ts b/tests/cases/fourslash/cloduleWithRecursiveReference.ts
index 96e5e51d4d4d8..069049907ff0e 100644
--- a/tests/cases/fourslash/cloduleWithRecursiveReference.ts
+++ b/tests/cases/fourslash/cloduleWithRecursiveReference.ts
@@ -13,5 +13,5 @@
 edit.insert('');
 
 goTo.marker();
-verify.quickInfoIs('(var) M.C.C: typeof M.C');
+verify.quickInfoIs('var M.C.C: typeof M.C');
 verify.numberOfErrorsInCurrentFile(0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/commentsClass.ts b/tests/cases/fourslash/commentsClass.ts
index a2c9ccc6fab05..b9a446efe6e42 100644
--- a/tests/cases/fourslash/commentsClass.ts
+++ b/tests/cases/fourslash/commentsClass.ts
@@ -65,13 +65,13 @@ goTo.marker('1');
 verify.quickInfoIs("class c2", "This is class c2 without constuctor");
 
 goTo.marker('2');
-verify.quickInfoIs("(var) i2: c2", "");
+verify.quickInfoIs("var i2: c2", "");
 
 goTo.marker('3');
 verify.currentSignatureHelpDocCommentIs("");
 
 goTo.marker('4');
-verify.quickInfoIs("(var) i2_c: typeof c2", "");
+verify.quickInfoIs("var i2_c: typeof c2", "");
 
 goTo.marker('5');
 verify.quickInfoIs("class c2", "This is class c2 without constuctor");
@@ -80,13 +80,13 @@ goTo.marker('6');
 verify.quickInfoIs("class c3", "");
 
 goTo.marker('7');
-verify.quickInfoIs("(var) i3: c3", "");
+verify.quickInfoIs("var i3: c3", "");
 
 goTo.marker('8');
 verify.currentSignatureHelpDocCommentIs("Constructor comment");
 
 goTo.marker('9');
-verify.quickInfoIs("(var) i3_c: typeof c3", "");
+verify.quickInfoIs("var i3_c: typeof c3", "");
 
 goTo.marker('10');
 verify.quickInfoIs("class c3", "");
@@ -95,13 +95,13 @@ goTo.marker('11');
 verify.quickInfoIs("class c4", "Class comment");
 
 goTo.marker('12');
-verify.quickInfoIs("(var) i4: c4", "");
+verify.quickInfoIs("var i4: c4", "");
 
 goTo.marker('13');
 verify.currentSignatureHelpDocCommentIs("Constructor comment");
 
 goTo.marker('14');
-verify.quickInfoIs("(var) i4_c: typeof c4", "");
+verify.quickInfoIs("var i4_c: typeof c4", "");
 
 goTo.marker('15');
 verify.quickInfoIs("class c4", "Class comment");
@@ -110,13 +110,13 @@ goTo.marker('16');
 verify.quickInfoIs("class c5", "Class with statics");
 
 goTo.marker('17');
-verify.quickInfoIs("(var) i5: c5", "");
+verify.quickInfoIs("var i5: c5", "");
 
 goTo.marker('18');
 verify.currentSignatureHelpDocCommentIs("");
 
 goTo.marker('19');
-verify.quickInfoIs("(var) i5_c: typeof c5", "");
+verify.quickInfoIs("var i5_c: typeof c5", "");
 
 goTo.marker('20');
 verify.quickInfoIs("class c5", "Class with statics");
@@ -125,52 +125,52 @@ goTo.marker('21');
 verify.quickInfoIs("class c6", "class with statics and constructor");
 
 goTo.marker('22');
-verify.quickInfoIs("(var) i6: c6", "");
+verify.quickInfoIs("var i6: c6", "");
 
 goTo.marker('23');
 verify.currentSignatureHelpDocCommentIs("constructor comment");
 
 goTo.marker('24');
-verify.quickInfoIs("(var) i6_c: typeof c6", "");
+verify.quickInfoIs("var i6_c: typeof c6", "");
 
 goTo.marker('25');
 verify.quickInfoIs("class c6", "class with statics and constructor");
 
 goTo.marker('26');
 verify.completionListContains("c2", "class c2", "This is class c2 without constuctor");
-verify.completionListContains("i2", "(var) i2: c2", "");
-verify.completionListContains("i2_c", "(var) i2_c: typeof c2", "");
+verify.completionListContains("i2", "var i2: c2", "");
+verify.completionListContains("i2_c", "var i2_c: typeof c2", "");
 verify.completionListContains("c3", "class c3", "");
-verify.completionListContains("i3", "(var) i3: c3", "");
-verify.completionListContains("i3_c", "(var) i3_c: typeof c3", "");
+verify.completionListContains("i3", "var i3: c3", "");
+verify.completionListContains("i3_c", "var i3_c: typeof c3", "");
 verify.completionListContains("c4", "class c4", "Class comment");
-verify.completionListContains("i4", "(var) i4: c4", "");
-verify.completionListContains("i4_c", "(var) i4_c: typeof c4", "");
+verify.completionListContains("i4", "var i4: c4", "");
+verify.completionListContains("i4_c", "var i4_c: typeof c4", "");
 verify.completionListContains("c5", "class c5", "Class with statics");
-verify.completionListContains("i5", "(var) i5: c5", "");
-verify.completionListContains("i5_c", "(var) i5_c: typeof c5");
+verify.completionListContains("i5", "var i5: c5", "");
+verify.completionListContains("i5_c", "var i5_c: typeof c5");
 verify.completionListContains("c6", "class c6", "class with statics and constructor");
-verify.completionListContains("i6", "(var) i6: c6", "");
-verify.completionListContains("i6_c", "(var) i6_c: typeof c6", "");
+verify.completionListContains("i6", "var i6: c6", "");
+verify.completionListContains("i6_c", "var i6_c: typeof c6", "");
 
 goTo.marker('27');
 verify.currentSignatureHelpDocCommentIs("constructor for a");
 verify.currentParameterHelpArgumentDocCommentIs("this is my a");
 
 goTo.marker('28');
-verify.quickInfoIs("(constructor) c2(): c2", "");
+verify.quickInfoIs("constructor c2(): c2", "");
 
 goTo.marker('29');
-verify.quickInfoIs("(constructor) c3(): c3", "Constructor comment");
+verify.quickInfoIs("constructor c3(): c3", "Constructor comment");
 
 goTo.marker('30');
-verify.quickInfoIs("(constructor) c4(): c4", "Constructor comment");
+verify.quickInfoIs("constructor c4(): c4", "Constructor comment");
 
 goTo.marker('31');
-verify.quickInfoIs("(constructor) c5(): c5", "");
+verify.quickInfoIs("constructor c5(): c5", "");
 
 goTo.marker('32');
-verify.quickInfoIs("(constructor) c6(): c6", "constructor comment");
+verify.quickInfoIs("constructor c6(): c6", "constructor comment");
 
 goTo.marker('33');
-verify.quickInfoIs("(constructor) m.m2.c1(): m.m2.c1", "constructor comment");
\ No newline at end of file
+verify.quickInfoIs("constructor m.m2.c1(): m.m2.c1", "constructor comment");
diff --git a/tests/cases/fourslash/commentsClassMembers.ts b/tests/cases/fourslash/commentsClassMembers.ts
index c524b4184c74f..54b4f0253d4f0 100644
--- a/tests/cases/fourslash/commentsClassMembers.ts
+++ b/tests/cases/fourslash/commentsClassMembers.ts
@@ -332,7 +332,7 @@ goTo.marker('25q');
 verify.quickInfoIs("(method) c1.pp2(b: number): number", "sum with property");
 
 goTo.marker('26');
-verify.quickInfoIs("(constructor) c1(): c1", "Constructor method");
+verify.quickInfoIs("constructor c1(): c1", "Constructor method");
 
 goTo.marker('27');
 verify.quickInfoIs("(property) c1.s1: number", "s1 is static property of c1");
@@ -500,15 +500,15 @@ goTo.marker('63q');
 verify.quickInfoIs("(method) c1.nc_s2(b: number): number", "");
 
 goTo.marker('64');
-verify.quickInfoIs("(var) i1: c1", "");
+verify.quickInfoIs("var i1: c1", "");
 
 goTo.marker('65');
 verify.currentSignatureHelpDocCommentIs("Constructor method");
 goTo.marker('65q');
-verify.quickInfoIs("(constructor) c1(): c1", "Constructor method");
+verify.quickInfoIs("constructor c1(): c1", "Constructor method");
 
 goTo.marker('66');
-verify.quickInfoIs("(var) i1_p: number", "");
+verify.quickInfoIs("var i1_p: number", "");
 
 goTo.marker('67');
 verify.quickInfoIs("(property) c1.p1: number", "p1 is property of c1");
@@ -520,13 +520,13 @@ verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
 verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
 
 goTo.marker('68');
-verify.quickInfoIs("(var) i1_f: (b: number) => number", "");
+verify.quickInfoIs("var i1_f: (b: number) => number", "");
 
 goTo.marker('69');
 verify.quickInfoIs("(method) c1.p2(b: number): number", "sum with property");
 
 goTo.marker('70');
-verify.quickInfoIs("(var) i1_r: number", "");
+verify.quickInfoIs("var i1_r: number", "");
 
 goTo.marker('71');
 verify.currentSignatureHelpDocCommentIs("sum with property");
@@ -535,28 +535,28 @@ goTo.marker('71q');
 verify.quickInfoIs("(method) c1.p2(b: number): number", "sum with property");
 
 goTo.marker('72');
-verify.quickInfoIs("(var) i1_prop: number", "");
+verify.quickInfoIs("var i1_prop: number", "");
 goTo.marker('73');
 verify.quickInfoIs("(property) c1.p3: number", "getter property\nsetter property");
 goTo.marker('74');
 verify.quickInfoIs("(property) c1.p3: number", "getter property\nsetter property");
 goTo.marker('75');
-verify.quickInfoIs("(var) i1_prop: number", "");
+verify.quickInfoIs("var i1_prop: number", "");
 
 goTo.marker('76');
-verify.quickInfoIs("(var) i1_nc_p: number", "");
+verify.quickInfoIs("var i1_nc_p: number", "");
 
 goTo.marker('77');
 verify.quickInfoIs("(property) c1.nc_p1: number", "");
 
 goTo.marker('78');
-verify.quickInfoIs("(var) i1_ncf: (b: number) => number", "");
+verify.quickInfoIs("var i1_ncf: (b: number) => number", "");
 
 goTo.marker('79');
 verify.quickInfoIs("(method) c1.nc_p2(b: number): number", "");
 
 goTo.marker('80');
-verify.quickInfoIs("(var) i1_ncr: number", "");
+verify.quickInfoIs("var i1_ncr: number", "");
 
 goTo.marker('81');
 verify.currentSignatureHelpDocCommentIs("");
@@ -565,16 +565,16 @@ goTo.marker('81q');
 verify.quickInfoIs("(method) c1.nc_p2(b: number): number", "");
 
 goTo.marker('82');
-verify.quickInfoIs("(var) i1_ncprop: number", "");
+verify.quickInfoIs("var i1_ncprop: number", "");
 goTo.marker('83');
 verify.quickInfoIs("(property) c1.nc_p3: number", "");
 goTo.marker('84');
 verify.quickInfoIs("(property) c1.nc_p3: number", "");
 goTo.marker('85');
-verify.quickInfoIs("(var) i1_ncprop: number", "");
+verify.quickInfoIs("var i1_ncprop: number", "");
 
 goTo.marker('86');
-verify.quickInfoIs("(var) i1_s_p: number", "");
+verify.quickInfoIs("var i1_s_p: number", "");
 
 goTo.marker('87');
 verify.quickInfoIs("class c1", "This is comment for c1");
@@ -590,13 +590,13 @@ verify.memberListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
 verify.memberListContains("nc_s3", "(property) c1.nc_s3: number", "");
 
 goTo.marker('89');
-verify.quickInfoIs("(var) i1_s_f: (b: number) => number", "");
+verify.quickInfoIs("var i1_s_f: (b: number) => number", "");
 
 goTo.marker('90');
 verify.quickInfoIs("(method) c1.s2(b: number): number", "static sum with property");
 
 goTo.marker('91');
-verify.quickInfoIs("(var) i1_s_r: number", "");
+verify.quickInfoIs("var i1_s_r: number", "");
 
 goTo.marker('92');
 verify.currentSignatureHelpDocCommentIs("static sum with property");
@@ -605,28 +605,28 @@ goTo.marker('92q');
 verify.quickInfoIs("(method) c1.s2(b: number): number", "static sum with property");
 
 goTo.marker('93');
-verify.quickInfoIs("(var) i1_s_prop: number", "");
+verify.quickInfoIs("var i1_s_prop: number", "");
 goTo.marker('94');
 verify.quickInfoIs("(property) c1.s3: number", "static getter property\nsetter property");
 goTo.marker('95');
 verify.quickInfoIs("(property) c1.s3: number", "static getter property\nsetter property");
 goTo.marker('96');
-verify.quickInfoIs("(var) i1_s_prop: number", "");
+verify.quickInfoIs("var i1_s_prop: number", "");
 
 goTo.marker('97');
-verify.quickInfoIs("(var) i1_s_nc_p: number", "");
+verify.quickInfoIs("var i1_s_nc_p: number", "");
 
 goTo.marker('98');
 verify.quickInfoIs("(property) c1.nc_s1: number", "");
 
 goTo.marker('99');
-verify.quickInfoIs("(var) i1_s_ncf: (b: number) => number", "");
+verify.quickInfoIs("var i1_s_ncf: (b: number) => number", "");
 
 goTo.marker('100');
 verify.quickInfoIs("(method) c1.nc_s2(b: number): number", "");
 
 goTo.marker('101');
-verify.quickInfoIs("(var) i1_s_ncr: number", "");
+verify.quickInfoIs("var i1_s_ncr: number", "");
 
 goTo.marker('102');
 verify.currentSignatureHelpDocCommentIs("");
@@ -635,41 +635,41 @@ goTo.marker('102q');
 verify.quickInfoIs("(method) c1.nc_s2(b: number): number", "");
 
 goTo.marker('103');
-verify.quickInfoIs("(var) i1_s_ncprop: number", "");
+verify.quickInfoIs("var i1_s_ncprop: number", "");
 goTo.marker('104');
 verify.quickInfoIs("(property) c1.nc_s3: number", "");
 goTo.marker('105');
 verify.quickInfoIs("(property) c1.nc_s3: number", "");
 goTo.marker('106');
-verify.quickInfoIs("(var) i1_s_ncprop: number", "");
+verify.quickInfoIs("var i1_s_ncprop: number", "");
 
 goTo.marker('107');
-verify.quickInfoIs("(var) i1_c: typeof c1", "");
+verify.quickInfoIs("var i1_c: typeof c1", "");
 
 goTo.marker('108');
 verify.quickInfoIs("class c1", "This is comment for c1");
 
 goTo.marker('109');
 verify.completionListContains("c1", "class c1", "This is comment for c1");
-verify.completionListContains("i1", "(var) i1: c1", "");
-verify.completionListContains("i1_p", "(var) i1_p: number", "");
-verify.completionListContains("i1_f", "(var) i1_f: (b: number) => number", "");
-verify.completionListContains("i1_r", "(var) i1_r: number", "");
-verify.completionListContains("i1_prop", "(var) i1_prop: number", "");
-verify.completionListContains("i1_nc_p", "(var) i1_nc_p: number", "");
-verify.completionListContains("i1_ncf", "(var) i1_ncf: (b: number) => number", "");
-verify.completionListContains("i1_ncr", "(var) i1_ncr: number", "");
-verify.completionListContains("i1_ncprop", "(var) i1_ncprop: number", "");
-verify.completionListContains("i1_s_p", "(var) i1_s_p: number", "");
-verify.completionListContains("i1_s_f", "(var) i1_s_f: (b: number) => number", "");
-verify.completionListContains("i1_s_r", "(var) i1_s_r: number", "");
-verify.completionListContains("i1_s_prop", "(var) i1_s_prop: number", "");
-verify.completionListContains("i1_s_nc_p", "(var) i1_s_nc_p: number", "");
-verify.completionListContains("i1_s_ncf", "(var) i1_s_ncf: (b: number) => number", "");
-verify.completionListContains("i1_s_ncr", "(var) i1_s_ncr: number", "");
-verify.completionListContains("i1_s_ncprop", "(var) i1_s_ncprop: number", "");
-
-verify.completionListContains("i1_c", "(var) i1_c: typeof c1", "");
+verify.completionListContains("i1", "var i1: c1", "");
+verify.completionListContains("i1_p", "var i1_p: number", "");
+verify.completionListContains("i1_f", "var i1_f: (b: number) => number", "");
+verify.completionListContains("i1_r", "var i1_r: number", "");
+verify.completionListContains("i1_prop", "var i1_prop: number", "");
+verify.completionListContains("i1_nc_p", "var i1_nc_p: number", "");
+verify.completionListContains("i1_ncf", "var i1_ncf: (b: number) => number", "");
+verify.completionListContains("i1_ncr", "var i1_ncr: number", "");
+verify.completionListContains("i1_ncprop", "var i1_ncprop: number", "");
+verify.completionListContains("i1_s_p", "var i1_s_p: number", "");
+verify.completionListContains("i1_s_f", "var i1_s_f: (b: number) => number", "");
+verify.completionListContains("i1_s_r", "var i1_s_r: number", "");
+verify.completionListContains("i1_s_prop", "var i1_s_prop: number", "");
+verify.completionListContains("i1_s_nc_p", "var i1_s_nc_p: number", "");
+verify.completionListContains("i1_s_ncf", "var i1_s_ncf: (b: number) => number", "");
+verify.completionListContains("i1_s_ncr", "var i1_s_ncr: number", "");
+verify.completionListContains("i1_s_ncprop", "var i1_s_ncprop: number", "");
+
+verify.completionListContains("i1_c", "var i1_c: typeof c1", "");
 
 goTo.marker('110');
 verify.quickInfoIs("(property) cProperties.p2: number", "setter only property");
@@ -703,4 +703,4 @@ goTo.marker('118');
 verify.quickInfoIs("(local var) bbbb: number", "");
 
 goTo.marker('119');
-verify.quickInfoIs("(constructor) cWithConstructorProperty(a: number): cWithConstructorProperty", "this is class cWithConstructorProperty's constructor");
\ No newline at end of file
+verify.quickInfoIs("constructor cWithConstructorProperty(a: number): cWithConstructorProperty", "this is class cWithConstructorProperty's constructor");
diff --git a/tests/cases/fourslash/commentsCommentParsing.ts b/tests/cases/fourslash/commentsCommentParsing.ts
index 4e4c33c0d94e8..f209f573e2fd9 100644
--- a/tests/cases/fourslash/commentsCommentParsing.ts
+++ b/tests/cases/fourslash/commentsCommentParsing.ts
@@ -205,81 +205,81 @@
 goTo.marker('1');
 verify.currentSignatureHelpDocCommentIs("");
 goTo.marker('1q');
-verify.quickInfoIs("(function) simple(): void", "");
+verify.quickInfoIs("function simple(): void", "");
 
 goTo.marker('2');
 verify.currentSignatureHelpDocCommentIs("");
 goTo.marker('2q');
-verify.quickInfoIs("(function) multiLine(): void", "");
+verify.quickInfoIs("function multiLine(): void", "");
 
 goTo.marker('3');
 verify.currentSignatureHelpDocCommentIs("this is eg of single line jsdoc style comment ");
 goTo.marker('3q');
-verify.quickInfoIs("(function) jsDocSingleLine(): void", "this is eg of single line jsdoc style comment ");
+verify.quickInfoIs("function jsDocSingleLine(): void", "this is eg of single line jsdoc style comment ");
 
 goTo.marker('4');
 verify.currentSignatureHelpDocCommentIs("this is multiple line jsdoc stule comment\nNew line1\nNew Line2");
 goTo.marker('4q');
-verify.quickInfoIs("(function) jsDocMultiLine(): void", "this is multiple line jsdoc stule comment\nNew line1\nNew Line2");
+verify.quickInfoIs("function jsDocMultiLine(): void", "this is multiple line jsdoc stule comment\nNew line1\nNew Line2");
 
 goTo.marker('5');
 verify.currentSignatureHelpDocCommentIs("this is multiple line jsdoc stule comment\nNew line1\nNew Line2\nShoul mege this line as well\nand this too\nAnother this one too");
 goTo.marker('5q');
-verify.quickInfoIs("(function) jsDocMultiLineMerge(): void", "this is multiple line jsdoc stule comment\nNew line1\nNew Line2\nShoul mege this line as well\nand this too\nAnother this one too");
+verify.quickInfoIs("function jsDocMultiLineMerge(): void", "this is multiple line jsdoc stule comment\nNew line1\nNew Line2\nShoul mege this line as well\nand this too\nAnother this one too");
 
 goTo.marker('6');
 verify.currentSignatureHelpDocCommentIs("jsdoc comment ");
 goTo.marker('6q');
-verify.quickInfoIs("(function) jsDocMixedComments1(): void", "jsdoc comment ");
+verify.quickInfoIs("function jsDocMixedComments1(): void", "jsdoc comment ");
 
 goTo.marker('7');
 verify.currentSignatureHelpDocCommentIs("jsdoc comment \nanother jsDocComment");
 goTo.marker('7q');
-verify.quickInfoIs("(function) jsDocMixedComments2(): void", "jsdoc comment \nanother jsDocComment");
+verify.quickInfoIs("function jsDocMixedComments2(): void", "jsdoc comment \nanother jsDocComment");
 
 goTo.marker('8');
 verify.currentSignatureHelpDocCommentIs("jsdoc comment \n* another jsDocComment");
 goTo.marker('8q');
-verify.quickInfoIs("(function) jsDocMixedComments3(): void", "jsdoc comment \n* another jsDocComment");
+verify.quickInfoIs("function jsDocMixedComments3(): void", "jsdoc comment \n* another jsDocComment");
 
 goTo.marker('9');
 verify.currentSignatureHelpDocCommentIs("jsdoc comment \nanother jsDocComment");
 goTo.marker('9q');
-verify.quickInfoIs("(function) jsDocMixedComments4(): void", "jsdoc comment \nanother jsDocComment");
+verify.quickInfoIs("function jsDocMixedComments4(): void", "jsdoc comment \nanother jsDocComment");
 
 goTo.marker('10');
 verify.currentSignatureHelpDocCommentIs("jsdoc comment \nanother jsDocComment");
 goTo.marker('10q');
-verify.quickInfoIs("(function) jsDocMixedComments5(): void", "jsdoc comment \nanother jsDocComment");
+verify.quickInfoIs("function jsDocMixedComments5(): void", "jsdoc comment \nanother jsDocComment");
 
 goTo.marker('11');
 verify.currentSignatureHelpDocCommentIs("another jsDocComment\njsdoc comment ");
 goTo.marker('11q');
-verify.quickInfoIs("(function) jsDocMixedComments6(): void", "another jsDocComment\njsdoc comment ");
+verify.quickInfoIs("function jsDocMixedComments6(): void", "another jsDocComment\njsdoc comment ");
 
 goTo.marker('12');
 verify.currentSignatureHelpDocCommentIs("");
 goTo.marker('12q');
-verify.quickInfoIs("(function) noHelpComment1(): void", "");
+verify.quickInfoIs("function noHelpComment1(): void", "");
 
 goTo.marker('13');
 verify.currentSignatureHelpDocCommentIs("");
 goTo.marker('13q');
-verify.quickInfoIs("(function) noHelpComment2(): void", "");
+verify.quickInfoIs("function noHelpComment2(): void", "");
 
 goTo.marker('14');
 verify.currentSignatureHelpDocCommentIs("");
 goTo.marker('14q');
-verify.quickInfoIs("(function) noHelpComment3(): void", "");
+verify.quickInfoIs("function noHelpComment3(): void", "");
 
 goTo.marker('15');
-verify.completionListContains("sum", "(function) sum(a: number, b: number): number", "Adds two integers and returns the result");
+verify.completionListContains("sum", "function sum(a: number, b: number): number", "Adds two integers and returns the result");
 
 goTo.marker('16');
 verify.currentSignatureHelpDocCommentIs("Adds two integers and returns the result");
 verify.currentParameterHelpArgumentDocCommentIs("first number");
 goTo.marker('16q');
-verify.quickInfoIs("(function) sum(a: number, b: number): number", "Adds two integers and returns the result");
+verify.quickInfoIs("function sum(a: number, b: number): number", "Adds two integers and returns the result");
 goTo.marker('16aq');
 verify.quickInfoIs("(parameter) a: number", "first number");
 
@@ -298,7 +298,7 @@ goTo.marker('19');
 verify.currentSignatureHelpDocCommentIs("This is multiplication function\n@anotherTag\n@anotherTag");
 verify.currentParameterHelpArgumentDocCommentIs("first number");
 goTo.marker('19q');
-verify.quickInfoIs("(function) multiply(a: number, b: number, c?: number, d?: any, e?: any): void", "This is multiplication function\n@anotherTag\n@anotherTag");
+verify.quickInfoIs("function multiply(a: number, b: number, c?: number, d?: any, e?: any): void", "This is multiplication function\n@anotherTag\n@anotherTag");
 goTo.marker('19aq');
 verify.quickInfoIs("(parameter) a: number", "first number");
 
@@ -334,7 +334,7 @@ goTo.marker('25');
 verify.currentSignatureHelpDocCommentIs("fn f1 with number");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('25q');
-verify.quickInfoIs("(function) f1(a: number): any (+1 overload)", "fn f1 with number");
+verify.quickInfoIs("function f1(a: number): any (+1 overload)", "fn f1 with number");
 goTo.marker('25aq');
 verify.quickInfoIs("(parameter) a: number", "");
 
@@ -342,19 +342,19 @@ goTo.marker('26');
 verify.currentSignatureHelpDocCommentIs("");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('26q');
-verify.quickInfoIs("(function) f1(b: string): any (+1 overload)", "");
+verify.quickInfoIs("function f1(b: string): any (+1 overload)", "");
 goTo.marker('26aq');
 verify.quickInfoIs("(parameter) b: string", "");
 
 goTo.marker('27');
-verify.completionListContains("multiply", "(function) multiply(a: number, b: number, c?: number, d?: any, e?: any): void", "This is multiplication function\n@anotherTag\n@anotherTag");
-verify.completionListContains("f1", "(function) f1(a: number): any (+1 overload)", "fn f1 with number");
+verify.completionListContains("multiply", "function multiply(a: number, b: number, c?: number, d?: any, e?: any): void", "This is multiplication function\n@anotherTag\n@anotherTag");
+verify.completionListContains("f1", "function f1(a: number): any (+1 overload)", "fn f1 with number");
 
 goTo.marker('28');
 verify.currentSignatureHelpDocCommentIs("This is subtract function");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('28q');
-verify.quickInfoIs("(function) subtract(a: number, b: number, c?: () => string, d?: () => string, e?: () => string, f?: () => string): void", "This is subtract function");
+verify.quickInfoIs("function subtract(a: number, b: number, c?: () => string, d?: () => string, e?: () => string, f?: () => string): void", "This is subtract function");
 goTo.marker('28aq');
 verify.quickInfoIs("(parameter) a: number", "");
 
@@ -392,7 +392,7 @@ goTo.marker('34');
 verify.currentSignatureHelpDocCommentIs("this is square function\n@paramTag { number } a this is input number of paramTag\n@returnType { number } it is return type");
 verify.currentParameterHelpArgumentDocCommentIs("this is input number");
 goTo.marker('34q');
-verify.quickInfoIs("(function) square(a: number): number", "this is square function\n@paramTag { number } a this is input number of paramTag\n@returnType { number } it is return type");
+verify.quickInfoIs("function square(a: number): number", "this is square function\n@paramTag { number } a this is input number of paramTag\n@returnType { number } it is return type");
 goTo.marker('34aq');
 verify.quickInfoIs("(parameter) a: number", "this is input number");
 
@@ -400,7 +400,7 @@ goTo.marker('35');
 verify.currentSignatureHelpDocCommentIs("this is divide function\n@paramTag { number } g this is optional param g");
 verify.currentParameterHelpArgumentDocCommentIs("this is a");
 goTo.marker('35q');
-verify.quickInfoIs("(function) divide(a: number, b: number): void", "this is divide function\n@paramTag { number } g this is optional param g");
+verify.quickInfoIs("function divide(a: number, b: number): void", "this is divide function\n@paramTag { number } g this is optional param g");
 goTo.marker('35aq');
 verify.quickInfoIs("(parameter) a: number", "this is a");
 
@@ -414,7 +414,7 @@ goTo.marker('37');
 verify.currentSignatureHelpDocCommentIs("Function returns string concat of foo and bar");
 verify.currentParameterHelpArgumentDocCommentIs("is string");
 goTo.marker('37q');
-verify.quickInfoIs("(function) fooBar(foo: string, bar: string): string", "Function returns string concat of foo and bar");
+verify.quickInfoIs("function fooBar(foo: string, bar: string): string", "Function returns string concat of foo and bar");
 goTo.marker('37aq');
 verify.quickInfoIs("(parameter) foo: string", "is string");
 
@@ -434,7 +434,7 @@ goTo.marker('40');
 verify.currentSignatureHelpDocCommentIs("this is jsdoc style function with param tag as well as inline parameter help");
 verify.currentParameterHelpArgumentDocCommentIs("it is first parameter\nthis is inline comment for a ");
 goTo.marker('40q');
-verify.quickInfoIs("(function) jsDocParamTest(a: number, b: number, c: number, d: number): number", "this is jsdoc style function with param tag as well as inline parameter help");
+verify.quickInfoIs("function jsDocParamTest(a: number, b: number, c: number, d: number): number", "this is jsdoc style function with param tag as well as inline parameter help");
 goTo.marker('40aq');
 verify.quickInfoIs("(parameter) a: number", "it is first parameter\nthis is inline comment for a ");
 
@@ -457,25 +457,25 @@ goTo.marker('43aq');
 verify.quickInfoIs("(parameter) d: number", "");
 
 goTo.marker('44');
-verify.completionListContains("jsDocParamTest", "(function) jsDocParamTest(a: number, b: number, c: number, d: number): number", "this is jsdoc style function with param tag as well as inline parameter help");
-verify.completionListContains("x", "(var) x: any", "This is a comment ");
-verify.completionListContains("y", "(var) y: any", "This is a comment ");
+verify.completionListContains("jsDocParamTest", "function jsDocParamTest(a: number, b: number, c: number, d: number): number", "this is jsdoc style function with param tag as well as inline parameter help");
+verify.completionListContains("x", "var x: any", "This is a comment ");
+verify.completionListContains("y", "var y: any", "This is a comment ");
 
 goTo.marker('45');
 verify.currentSignatureHelpDocCommentIs("This is function comment\nAnd properly aligned comment ");
 goTo.marker('45q');
-verify.quickInfoIs("(function) jsDocCommentAlignmentTest1(): void", "This is function comment\nAnd properly aligned comment ");
+verify.quickInfoIs("function jsDocCommentAlignmentTest1(): void", "This is function comment\nAnd properly aligned comment ");
 
 goTo.marker('46');
 verify.currentSignatureHelpDocCommentIs("This is function comment\n    And aligned with 4 space char margin");
 goTo.marker('46q');
-verify.quickInfoIs("(function) jsDocCommentAlignmentTest2(): void", "This is function comment\n    And aligned with 4 space char margin");
+verify.quickInfoIs("function jsDocCommentAlignmentTest2(): void", "This is function comment\n    And aligned with 4 space char margin");
 
 goTo.marker('47');
 verify.currentSignatureHelpDocCommentIs("This is function comment\n    And aligned with 4 space char margin");
 verify.currentParameterHelpArgumentDocCommentIs("this is info about a\nspanning on two lines and aligned perfectly");
 goTo.marker('47q');
-verify.quickInfoIs("(function) jsDocCommentAlignmentTest3(a: string, b: any, c: any): void", "This is function comment\n    And aligned with 4 space char margin");
+verify.quickInfoIs("function jsDocCommentAlignmentTest3(a: string, b: any, c: any): void", "This is function comment\n    And aligned with 4 space char margin");
 goTo.marker('47aq');
 verify.quickInfoIs("(parameter) a: string", "this is info about a\nspanning on two lines and aligned perfectly");
 
diff --git a/tests/cases/fourslash/commentsEnums.ts b/tests/cases/fourslash/commentsEnums.ts
index 9e3213a090357..0f312d2992e17 100644
--- a/tests/cases/fourslash/commentsEnums.ts
+++ b/tests/cases/fourslash/commentsEnums.ts
@@ -20,7 +20,7 @@ goTo.marker('3');
 verify.quickInfoIs("(enum member) Colors.FancyPink = 1", "Fancy name for 'pink'");
 
 goTo.marker('4');
-verify.quickInfoIs("(var) x: Colors", "");
+verify.quickInfoIs("var x: Colors", "");
 
 goTo.marker('5');
 verify.completionListContains("Colors", "enum Colors", "Enum of colors");
diff --git a/tests/cases/fourslash/commentsExternalModules.ts b/tests/cases/fourslash/commentsExternalModules.ts
index ad0440a3218bc..1b000b854b16a 100644
--- a/tests/cases/fourslash/commentsExternalModules.ts
+++ b/tests/cases/fourslash/commentsExternalModules.ts
@@ -39,33 +39,33 @@ goTo.marker('1');
 verify.quickInfoIs("module m1", "Module comment");
 
 goTo.marker('2');
-verify.completionListContains("b", "(var) m1.b: number", "b's comment");
-verify.completionListContains("foo", "(function) foo(): number", "foo's comment");
+verify.completionListContains("b", "var m1.b: number", "b's comment");
+verify.completionListContains("foo", "function foo(): number", "foo's comment");
 
 goTo.marker('3');
 verify.currentSignatureHelpDocCommentIs("foo's comment");
 goTo.marker('3q');
-verify.quickInfoIs("(function) foo(): number", "foo's comment");
+verify.quickInfoIs("function foo(): number", "foo's comment");
 
 goTo.marker('4');
 verify.completionListContains("m1", "module m1", "Module comment");
 
 goTo.marker('5');
-verify.memberListContains("b", "(var) m1.b: number", "b's comment");
-verify.memberListContains("fooExport", "(function) m1.fooExport(): number", "exported function");
+verify.memberListContains("b", "var m1.b: number", "b's comment");
+verify.memberListContains("fooExport", "function m1.fooExport(): number", "exported function");
 verify.memberListContains("m2", "module m1.m2");
 
 goTo.marker('6');
 verify.currentSignatureHelpDocCommentIs("exported function");
 goTo.marker('6q');
-verify.quickInfoIs("(function) m1.fooExport(): number", "exported function");
+verify.quickInfoIs("function m1.fooExport(): number", "exported function");
 
 goTo.marker('7');
-verify.quickInfoIs("(var) myvar: m1.m2.c", "");
+verify.quickInfoIs("var myvar: m1.m2.c", "");
 
 goTo.marker('8');
-verify.memberListContains("c", "(constructor) m1.m2.c(): m1.m2.c", "");
-verify.memberListContains("i", "(var) m1.m2.i: m1.m2.c", "i");
+verify.memberListContains("c", "constructor m1.m2.c(): m1.m2.c", "");
+verify.memberListContains("i", "var m1.m2.i: m1.m2.c", "i");
 
 goTo.file("commentsExternalModules_file1.ts");
 goTo.marker('9');
@@ -78,18 +78,18 @@ goTo.marker('11');
 verify.memberListContains("m1", "module extMod.m1");
 
 goTo.marker('12');
-verify.memberListContains("b", "(var) extMod.m1.b: number", "b's comment");
-verify.memberListContains("fooExport", "(function) extMod.m1.fooExport(): number", "exported function");
+verify.memberListContains("b", "var extMod.m1.b: number", "b's comment");
+verify.memberListContains("fooExport", "function extMod.m1.fooExport(): number", "exported function");
 verify.memberListContains("m2", "module extMod.m1.m2");
 
 goTo.marker('13');
 verify.currentSignatureHelpDocCommentIs("exported function");
 goTo.marker('13q');
-verify.quickInfoIs("(function) extMod.m1.fooExport(): number", "exported function");
+verify.quickInfoIs("function extMod.m1.fooExport(): number", "exported function");
 
 goTo.marker('14');
-verify.quickInfoIs("(var) newVar: extMod.m1.m2.c", "");
+verify.quickInfoIs("var newVar: extMod.m1.m2.c", "");
 
 goTo.marker('15');
-verify.memberListContains("c", "(constructor) extMod.m1.m2.c(): extMod.m1.m2.c", "");
-verify.memberListContains("i", "(var) extMod.m1.m2.i: extMod.m1.m2.c", "i");
+verify.memberListContains("c", "constructor extMod.m1.m2.c(): extMod.m1.m2.c", "");
+verify.memberListContains("i", "var extMod.m1.m2.i: extMod.m1.m2.c", "i");
diff --git a/tests/cases/fourslash/commentsFunction.ts b/tests/cases/fourslash/commentsFunction.ts
index 4cd750d603910..ac1e7f5effdd1 100644
--- a/tests/cases/fourslash/commentsFunction.ts
+++ b/tests/cases/fourslash/commentsFunction.ts
@@ -46,36 +46,36 @@ verify.currentSignatureHelpDocCommentIs("This is comment for function signature"
 verify.currentParameterHelpArgumentDocCommentIs("this is comment for b");
 
 goTo.marker('4');
-verify.completionListContains('foo', '(function) foo(): void', 'This comment should appear for foo');
+verify.completionListContains('foo', 'function foo(): void', 'This comment should appear for foo');
 
 goTo.marker('5');
-verify.completionListContains('fooWithParameters', '(function) fooWithParameters(a: string, b: number): void', 'This is comment for function signature');
+verify.completionListContains('fooWithParameters', 'function fooWithParameters(a: string, b: number): void', 'This is comment for function signature');
 
 goTo.marker('6');
-verify.quickInfoIs("(function) foo(): void", "This comment should appear for foo");
+verify.quickInfoIs("function foo(): void", "This comment should appear for foo");
 
 goTo.marker('7');
-verify.quickInfoIs("(function) foo(): void", "This comment should appear for foo");
+verify.quickInfoIs("function foo(): void", "This comment should appear for foo");
 
 goTo.marker('8');
-verify.quickInfoIs("(function) fooWithParameters(a: string, b: number): void", "This is comment for function signature");
+verify.quickInfoIs("function fooWithParameters(a: string, b: number): void", "This is comment for function signature");
 
 goTo.marker('9');
-verify.quickInfoIs("(function) fooWithParameters(a: string, b: number): void", "This is comment for function signature");
+verify.quickInfoIs("function fooWithParameters(a: string, b: number): void", "This is comment for function signature");
 
 goTo.marker('10');
 verify.completionListContains('a', '(parameter) a: string', 'this is comment about a');
 verify.completionListContains('b', '(parameter) b: number', 'this is comment for b');
 
 goTo.marker('11');
-verify.quickInfoIs("(var) lambdaFoo: (a: number, b: number) => number", "lamdaFoo var comment");
+verify.quickInfoIs("var lambdaFoo: (a: number, b: number) => number", "lamdaFoo var comment");
 
 goTo.marker('12');
-verify.quickInfoIs("(var) lambddaNoVarComment: (a: number, b: number) => number", "");
+verify.quickInfoIs("var lambddaNoVarComment: (a: number, b: number) => number", "");
 
 goTo.marker('13');
-verify.completionListContains('lambdaFoo', '(var) lambdaFoo: (a: number, b: number) => number', '');
-verify.completionListContains('lambddaNoVarComment', '(var) lambddaNoVarComment: (a: number, b: number) => number', '');
+verify.completionListContains('lambdaFoo', 'var lambdaFoo: (a: number, b: number) => number', '');
+verify.completionListContains('lambddaNoVarComment', 'var lambddaNoVarComment: (a: number, b: number) => number', '');
 
 goTo.marker('14');
 verify.currentParameterHelpArgumentDocCommentIs("param a");
@@ -101,7 +101,7 @@ goTo.marker('20');
 verify.quickInfoIs('(local var) d: string', '');
 
 goTo.marker('20a');
-verify.quickInfoIs('(var) lambdaAnotherFunc: (a: number) => number', '');
+verify.quickInfoIs('var lambdaAnotherFunc: (a: number) => number', '');
 goTo.marker('21');
 verify.quickInfoIs('(parameter) a: number', '');
 goTo.marker('22');
@@ -112,7 +112,7 @@ goTo.marker('24');
 verify.quickInfoIs('(parameter) a: number', '');
 
 goTo.marker('25');
-verify.quickInfoIs('(function) anotherFunc(a: number): string', '');
+verify.quickInfoIs('function anotherFunc(a: number): string', '');
 goTo.marker('26');
 verify.quickInfoIs('(parameter) a: number', '');
 goTo.marker('27a');
diff --git a/tests/cases/fourslash/commentsImportDeclaration.ts b/tests/cases/fourslash/commentsImportDeclaration.ts
index 88abbed8618ec..d5c6a7fa537e1 100644
--- a/tests/cases/fourslash/commentsImportDeclaration.ts
+++ b/tests/cases/fourslash/commentsImportDeclaration.ts
@@ -34,18 +34,18 @@ goTo.marker('6');
 verify.memberListContains("m1", "module extMod.m1");
 
 goTo.marker('7');
-verify.memberListContains("b", "(var) extMod.m1.b: number", "b's comment");
-verify.memberListContains("fooExport", "(function) extMod.m1.fooExport(): number", "exported function");
+verify.memberListContains("b", "var extMod.m1.b: number", "b's comment");
+verify.memberListContains("fooExport", "function extMod.m1.fooExport(): number", "exported function");
 verify.memberListContains("m2", "module extMod.m1.m2");
 
 goTo.marker('8');
 verify.currentSignatureHelpDocCommentIs("exported function");
 goTo.marker('8q');
-verify.quickInfoIs("(function) extMod.m1.fooExport(): number", "exported function");
+verify.quickInfoIs("function extMod.m1.fooExport(): number", "exported function");
 
 goTo.marker('9');
-verify.quickInfoIs("(var) newVar: extMod.m1.m2.c", "");
+verify.quickInfoIs("var newVar: extMod.m1.m2.c", "");
 
 goTo.marker('10');
-verify.memberListContains("c", "(constructor) extMod.m1.m2.c(): extMod.m1.m2.c", "");
-verify.memberListContains("i", "(var) extMod.m1.m2.i: extMod.m1.m2.c", "i");
+verify.memberListContains("c", "constructor extMod.m1.m2.c(): extMod.m1.m2.c", "");
+verify.memberListContains("i", "var extMod.m1.m2.i: extMod.m1.m2.c", "i");
diff --git a/tests/cases/fourslash/commentsInheritance.ts b/tests/cases/fourslash/commentsInheritance.ts
index e8c2084d38daa..dd53a04cdd772 100644
--- a/tests/cases/fourslash/commentsInheritance.ts
+++ b/tests/cases/fourslash/commentsInheritance.ts
@@ -251,7 +251,7 @@ goTo.marker('l5');
 verify.currentSignatureHelpDocCommentIs("");
 
 goTo.marker('1iq');
-verify.quickInfoIs("(var) i1_i: i1", "");
+verify.quickInfoIs("var i1_i: i1", "");
 goTo.marker('2q');
 verify.quickInfoIs("(method) i1.i1_f1(): void", "i1_f1");
 goTo.marker('3q');
@@ -300,7 +300,7 @@ goTo.marker('l10');
 verify.currentSignatureHelpDocCommentIs("");
 
 goTo.marker('6iq');
-verify.quickInfoIs("(var) c1_i: c1", "");
+verify.quickInfoIs("var c1_i: c1", "");
 goTo.marker('7q');
 verify.quickInfoIs("(method) c1.i1_f1(): void", "");
 goTo.marker('8q');
@@ -366,17 +366,17 @@ verify.quickInfoIs("(property) i1.nc_l1: () => void", "");
 
 goTo.marker('16');
 verify.completionListContains("i1", "interface i1", "i1 is interface with properties");
-verify.completionListContains("i1_i", "(var) i1_i: i1", "");
+verify.completionListContains("i1_i", "var i1_i: i1", "");
 verify.completionListContains("c1", "class c1", "");
-verify.completionListContains("c1_i", "(var) c1_i: c1", "");
+verify.completionListContains("c1_i", "var c1_i: c1", "");
 
 goTo.marker('16i');
 verify.completionListContains("i1", "interface i1", "i1 is interface with properties");
 
 goTo.marker('17iq');
-verify.quickInfoIs("(var) c2_i: c2", "");
+verify.quickInfoIs("var c2_i: c2", "");
 goTo.marker('18iq');
-verify.quickInfoIs("(var) c3_i: c3", "");
+verify.quickInfoIs("var c3_i: c3", "");
 
 goTo.marker('17');
 verify.currentSignatureHelpDocCommentIs("c2 constructor");
@@ -385,7 +385,7 @@ goTo.marker('18');
 verify.currentSignatureHelpDocCommentIs("");
 
 goTo.marker('18sq');
-verify.quickInfoIs("(constructor) c2(a: number): c2", "c2 constructor");
+verify.quickInfoIs("constructor c2(a: number): c2", "c2 constructor");
 
 goTo.marker('18spropq');
 verify.quickInfoIs("class c2", "");
@@ -393,9 +393,9 @@ goTo.marker('18spropProp');
 verify.quickInfoIs("(property) c2.c2_p1: number", "c2 c2_p1");
 
 goTo.marker('17q');
-verify.quickInfoIs("(constructor) c2(a: number): c2", "c2 constructor");
+verify.quickInfoIs("constructor c2(a: number): c2", "c2 constructor");
 goTo.marker('18q');
-verify.quickInfoIs("(constructor) c3(): c3", "");
+verify.quickInfoIs("constructor c3(): c3", "");
 
 goTo.marker('19');
 verify.memberListContains("c2_p1", "(property) c2.c2_p1: number", "c2 c2_p1");
@@ -493,17 +493,17 @@ verify.quickInfoIs("(method) c2.nc_f1(): void", "");
 goTo.marker('34');
 verify.currentSignatureHelpDocCommentIs("c2 constructor");
 goTo.marker('34iq');
-verify.quickInfoIs("(var) c4_i: c4", "");
+verify.quickInfoIs("var c4_i: c4", "");
 goTo.marker('34q');
-verify.quickInfoIs("(constructor) c4(a: number): c4", "c2 constructor");
+verify.quickInfoIs("constructor c4(a: number): c4", "c2 constructor");
 
 goTo.marker('35');
 verify.completionListContains("c2", "class c2", "");
-verify.completionListContains("c2_i", "(var) c2_i: c2", "");
+verify.completionListContains("c2_i", "var c2_i: c2", "");
 verify.completionListContains("c3", "class c3", "");
-verify.completionListContains("c3_i", "(var) c3_i: c3", "");
+verify.completionListContains("c3_i", "var c3_i: c3", "");
 verify.completionListContains("c4", "class c4", "");
-verify.completionListContains("c4_i", "(var) c4_i: c4", "");
+verify.completionListContains("c4_i", "var c4_i: c4", "");
 
 goTo.marker('36');
 verify.memberListContains("i2_p1", "(property) i2.i2_p1: number", "i2_p1");
@@ -536,9 +536,9 @@ goTo.marker('l40');
 verify.currentSignatureHelpDocCommentIs("");
 
 goTo.marker('36iq');
-verify.quickInfoIs("(var) i2_i: i2", "");
+verify.quickInfoIs("var i2_i: i2", "");
 goTo.marker('37iq');
-verify.quickInfoIs("(var) i3_i: i3", "");
+verify.quickInfoIs("var i3_i: i3", "");
 goTo.marker('37q');
 verify.quickInfoIs("(method) i2.i2_f1(): void", "i2_f1");
 goTo.marker('38q');
@@ -652,16 +652,16 @@ verify.quickInfoIs("(property) i2.nc_l1: () => void", "");
 
 goTo.marker('51');
 verify.completionListContains("i2", "interface i2", "");
-verify.completionListContains("i2_i", "(var) i2_i: i2", "");
+verify.completionListContains("i2_i", "var i2_i: i2", "");
 verify.completionListContains("i3", "interface i3", "");
-verify.completionListContains("i3_i", "(var) i3_i: i3", "");
+verify.completionListContains("i3_i", "var i3_i: i3", "");
 
 goTo.marker('51i');
 verify.completionListContains("i2", "interface i2", "");
 verify.completionListContains("i3", "interface i3", "");
 
 goTo.marker('52');
-verify.quickInfoIs("(constructor) c5(): c5", "");
+verify.quickInfoIs("constructor c5(): c5", "");
 
 goTo.marker('53');
 verify.quickInfoIs("class c5", "c5 class");
@@ -670,10 +670,10 @@ goTo.marker('54');
 verify.quickInfoIs("(property) c5.b: number", "");
 
 goTo.marker('55');
-verify.quickInfoIs("(constructor) c2(a: number): c2", "c2 constructor");
+verify.quickInfoIs("constructor c2(a: number): c2", "c2 constructor");
 
 goTo.marker('56');
-verify.quickInfoIs("(constructor) c3(): c3", "");
+verify.quickInfoIs("constructor c3(): c3", "");
 
 goTo.marker('57');
-verify.quickInfoIs("(constructor) c6(): c6", "");
\ No newline at end of file
+verify.quickInfoIs("constructor c6(): c6", "");
diff --git a/tests/cases/fourslash/commentsInterface.ts b/tests/cases/fourslash/commentsInterface.ts
index d4a3d2dd924fe..cdaafa31faa09 100644
--- a/tests/cases/fourslash/commentsInterface.ts
+++ b/tests/cases/fourslash/commentsInterface.ts
@@ -72,22 +72,22 @@ goTo.marker('1');
 verify.quickInfoIs("interface i1", "this is interface 1");
 
 goTo.marker('2');
-verify.quickInfoIs("(var) i1_i: i1", "");
+verify.quickInfoIs("var i1_i: i1", "");
 
 goTo.marker('3');
 verify.quickInfoIs("interface nc_i1", "");
 
 goTo.marker('4');
-verify.quickInfoIs("(var) nc_i1_i: nc_i1", "");
+verify.quickInfoIs("var nc_i1_i: nc_i1", "");
 
 goTo.marker('5');
 verify.quickInfoIs("interface i2", "this is interface 2 with memebers");
 
 goTo.marker('6');
-verify.quickInfoIs("(var) i2_i: i2", "");
+verify.quickInfoIs("var i2_i: i2", "");
 
 goTo.marker('7');
-verify.quickInfoIs("(var) i2_i_x: number", "");
+verify.quickInfoIs("var i2_i_x: number", "");
 
 goTo.marker('8');
 verify.quickInfoIs("(property) i2.x: number", "this is x");
@@ -99,13 +99,13 @@ verify.memberListContains("fnfoo", "(method) i2.fnfoo(b: number): string", "this
 verify.memberListContains("nc_fnfoo", "(method) i2.nc_fnfoo(b: number): string", "");
 
 goTo.marker('9');
-verify.quickInfoIs("(var) i2_i_foo: (b: number) => string", "");
+verify.quickInfoIs("var i2_i_foo: (b: number) => string", "");
 
 goTo.marker('10');
 verify.quickInfoIs("(property) i2.foo: (b: number) => string", "this is foo");
 
 goTo.marker('11');
-verify.quickInfoIs("(var) i2_i_foo_r: string", "");
+verify.quickInfoIs("var i2_i_foo_r: string", "");
 
 goTo.marker('12');
 verify.currentSignatureHelpDocCommentIs("");
@@ -114,38 +114,38 @@ goTo.marker('12q');
 verify.quickInfoIs("(property) i2.foo: (b: number) => string", "");
 
 goTo.marker('13');
-verify.quickInfoIs("(var) i2_i_i2_si: number", "");
+verify.quickInfoIs("var i2_i_i2_si: number", "");
 goTo.marker('13q');
-verify.quickInfoIs("(var) i2_i: i2", "");
+verify.quickInfoIs("var i2_i: i2", "");
 
 goTo.marker('14');
-verify.quickInfoIs("(var) i2_i_i2_ii: number", "");
+verify.quickInfoIs("var i2_i_i2_ii: number", "");
 goTo.marker('14q');
-verify.quickInfoIs("(var) i2_i: i2", "");
+verify.quickInfoIs("var i2_i: i2", "");
 
 goTo.marker('15');
-verify.quickInfoIs("(var) i2_i_n: any", "");
+verify.quickInfoIs("var i2_i_n: any", "");
 
 goTo.marker('16');
 verify.currentSignatureHelpDocCommentIs("new method");
 verify.currentParameterHelpArgumentDocCommentIs("param");
 goTo.marker('16q');
-verify.quickInfoIs("(var) i2_i: new i2(i: i1) => any", "new method");
+verify.quickInfoIs("var i2_i: new i2(i: i1) => any", "new method");
 
 goTo.marker('17');
-verify.quickInfoIs("(var) i2_i_nc_x: number", "");
+verify.quickInfoIs("var i2_i_nc_x: number", "");
 
 goTo.marker('18');
 verify.quickInfoIs("(property) i2.nc_x: number", "");
 
 goTo.marker('19');
-verify.quickInfoIs("(var) i2_i_nc_foo: (b: number) => string", "");
+verify.quickInfoIs("var i2_i_nc_foo: (b: number) => string", "");
 
 goTo.marker('20');
 verify.quickInfoIs("(property) i2.nc_foo: (b: number) => string", "");
 
 goTo.marker('21');
-verify.quickInfoIs("(var) i2_i_nc_foo_r: string", "");
+verify.quickInfoIs("var i2_i_nc_foo_r: string", "");
 
 goTo.marker('22');
 verify.currentSignatureHelpDocCommentIs("");
@@ -154,26 +154,26 @@ goTo.marker('22q');
 verify.quickInfoIs("(property) i2.nc_foo: (b: number) => string", "");
 
 goTo.marker('23');
-verify.quickInfoIs("(var) i2_i_r: number", "");
+verify.quickInfoIs("var i2_i_r: number", "");
 
 goTo.marker('24');
 verify.currentSignatureHelpDocCommentIs("this is call signature");
 verify.currentParameterHelpArgumentDocCommentIs("paramhelp a");
 goTo.marker('24q');
-verify.quickInfoIs("(var) i2_i: i2(a: number, b: number) => number", "this is call signature");
+verify.quickInfoIs("var i2_i: i2(a: number, b: number) => number", "this is call signature");
 
 goTo.marker('25');
 verify.currentSignatureHelpDocCommentIs("this is call signature");
 verify.currentParameterHelpArgumentDocCommentIs("paramhelp b");
 
 goTo.marker('26');
-verify.quickInfoIs("(var) i2_i_fnfoo: (b: number) => string", "");
+verify.quickInfoIs("var i2_i_fnfoo: (b: number) => string", "");
 
 goTo.marker('27');
 verify.quickInfoIs("(method) i2.fnfoo(b: number): string", "this is fnfoo");
 
 goTo.marker('28');
-verify.quickInfoIs("(var) i2_i_fnfoo_r: string", "");
+verify.quickInfoIs("var i2_i_fnfoo_r: string", "");
 
 goTo.marker('29');
 verify.currentSignatureHelpDocCommentIs("this is fnfoo");
@@ -182,13 +182,13 @@ goTo.marker('29q');
 verify.quickInfoIs("(method) i2.fnfoo(b: number): string", "this is fnfoo");
 
 goTo.marker('30');
-verify.quickInfoIs("(var) i2_i_nc_fnfoo: (b: number) => string", "");
+verify.quickInfoIs("var i2_i_nc_fnfoo: (b: number) => string", "");
 
 goTo.marker('31');
 verify.quickInfoIs("(method) i2.nc_fnfoo(b: number): string", "");
 
 goTo.marker('32');
-verify.quickInfoIs("(var) i2_i_nc_fnfoo_r: string", "");
+verify.quickInfoIs("var i2_i_nc_fnfoo_r: string", "");
 
 goTo.marker('33');
 verify.currentSignatureHelpDocCommentIs("");
@@ -198,25 +198,25 @@ verify.quickInfoIs("(method) i2.nc_fnfoo(b: number): string", "");
 
 goTo.marker('34');
 verify.completionListContains("i1", "interface i1", "this is interface 1");
-verify.completionListContains("i1_i", "(var) i1_i: i1", "");
+verify.completionListContains("i1_i", "var i1_i: i1", "");
 verify.completionListContains("nc_i1", "interface nc_i1", "");
-verify.completionListContains("nc_i1_i", "(var) nc_i1_i: nc_i1", "");
+verify.completionListContains("nc_i1_i", "var nc_i1_i: nc_i1", "");
 verify.completionListContains("i2", "interface i2", "this is interface 2 with memebers");
-verify.completionListContains("i2_i", "(var) i2_i: i2", "");
-verify.completionListContains("i2_i_x", "(var) i2_i_x: number", "");
-verify.completionListContains("i2_i_foo", "(var) i2_i_foo: (b: number) => string", "");
-verify.completionListContains("i2_i_foo_r", "(var) i2_i_foo_r: string", "");
-verify.completionListContains("i2_i_i2_si", "(var) i2_i_i2_si: number", "");
-verify.completionListContains("i2_i_i2_ii", "(var) i2_i_i2_ii: number", "");
-verify.completionListContains("i2_i_n", "(var) i2_i_n: any", "");
-verify.completionListContains("i2_i_nc_x", "(var) i2_i_nc_x: number", "");
-verify.completionListContains("i2_i_nc_foo", "(var) i2_i_nc_foo: (b: number) => string", "");
-verify.completionListContains("i2_i_nc_foo_r", "(var) i2_i_nc_foo_r: string", "");
-verify.completionListContains("i2_i_r", "(var) i2_i_r: number", "");
-verify.completionListContains("i2_i_fnfoo", "(var) i2_i_fnfoo: (b: number) => string", "");
-verify.completionListContains("i2_i_fnfoo_r", "(var) i2_i_fnfoo_r: string", "");
-verify.completionListContains("i2_i_nc_fnfoo", "(var) i2_i_nc_fnfoo: (b: number) => string", "");
-verify.completionListContains("i2_i_nc_fnfoo_r", "(var) i2_i_nc_fnfoo_r: string", "");
+verify.completionListContains("i2_i", "var i2_i: i2", "");
+verify.completionListContains("i2_i_x", "var i2_i_x: number", "");
+verify.completionListContains("i2_i_foo", "var i2_i_foo: (b: number) => string", "");
+verify.completionListContains("i2_i_foo_r", "var i2_i_foo_r: string", "");
+verify.completionListContains("i2_i_i2_si", "var i2_i_i2_si: number", "");
+verify.completionListContains("i2_i_i2_ii", "var i2_i_i2_ii: number", "");
+verify.completionListContains("i2_i_n", "var i2_i_n: any", "");
+verify.completionListContains("i2_i_nc_x", "var i2_i_nc_x: number", "");
+verify.completionListContains("i2_i_nc_foo", "var i2_i_nc_foo: (b: number) => string", "");
+verify.completionListContains("i2_i_nc_foo_r", "var i2_i_nc_foo_r: string", "");
+verify.completionListContains("i2_i_r", "var i2_i_r: number", "");
+verify.completionListContains("i2_i_fnfoo", "var i2_i_fnfoo: (b: number) => string", "");
+verify.completionListContains("i2_i_fnfoo_r", "var i2_i_fnfoo_r: string", "");
+verify.completionListContains("i2_i_nc_fnfoo", "var i2_i_nc_fnfoo: (b: number) => string", "");
+verify.completionListContains("i2_i_nc_fnfoo_r", "var i2_i_nc_fnfoo_r: string", "");
 
 goTo.marker('34i');
 verify.completionListContains("i1", "interface i1", "this is interface 1");
@@ -227,10 +227,10 @@ goTo.marker('36');
 verify.completionListContains("a", "(parameter) a: number", "i3_i a");
 
 goTo.marker('40q');
-verify.quickInfoIs("(var) i3_i: i3", "");
+verify.quickInfoIs("var i3_i: i3", "");
 goTo.marker('40');
 verify.completionListContains("i3", "interface i3", "");
-verify.completionListContains("i3_i", "(var) i3_i: i3", "");
+verify.completionListContains("i3_i", "var i3_i: i3", "");
 
 goTo.marker('41');
 verify.quickInfoIs("(method) i3.f(a: number): string", "Function i3 f");
diff --git a/tests/cases/fourslash/commentsModules.ts b/tests/cases/fourslash/commentsModules.ts
index 9025707956947..4954359fedff1 100644
--- a/tests/cases/fourslash/commentsModules.ts
+++ b/tests/cases/fourslash/commentsModules.ts
@@ -100,33 +100,33 @@ goTo.marker('1');
 verify.quickInfoIs("module m1", "Module comment");
 
 goTo.marker('2');
-verify.completionListContains("b", "(var) m1.b: number", "b's comment");
-verify.completionListContains("foo", "(function) foo(): number", "foo's comment");
+verify.completionListContains("b", "var m1.b: number", "b's comment");
+verify.completionListContains("foo", "function foo(): number", "foo's comment");
 
 goTo.marker('3');
 verify.currentSignatureHelpDocCommentIs("foo's comment");
 goTo.marker('3q');
-verify.quickInfoIs("(function) foo(): number", "foo's comment");
+verify.quickInfoIs("function foo(): number", "foo's comment");
 
 goTo.marker('4');
 verify.completionListContains("m1", "module m1", "Module comment");
 
 goTo.marker('5');
-verify.memberListContains("b", "(var) m1.b: number", "b's comment");
-verify.memberListContains("fooExport", "(function) m1.fooExport(): number", "exported function");
+verify.memberListContains("b", "var m1.b: number", "b's comment");
+verify.memberListContains("fooExport", "function m1.fooExport(): number", "exported function");
 verify.memberListContains("m2", "module m1.m2");
-verify.quickInfoIs("(function) m1.fooExport(): number", "exported function");
+verify.quickInfoIs("function m1.fooExport(): number", "exported function");
 
 goTo.marker('6');
 verify.currentSignatureHelpDocCommentIs("exported function");
 
 goTo.marker('7');
-verify.quickInfoIs("(var) myvar: m1.m2.c", "");
+verify.quickInfoIs("var myvar: m1.m2.c", "");
 
 goTo.marker('8');
-verify.quickInfoIs("(constructor) m1.m2.c(): m1.m2.c", "");
-verify.memberListContains("c", "(constructor) m1.m2.c(): m1.m2.c", "");
-verify.memberListContains("i", "(var) m1.m2.i: m1.m2.c", "i");
+verify.quickInfoIs("constructor m1.m2.c(): m1.m2.c", "");
+verify.memberListContains("c", "constructor m1.m2.c(): m1.m2.c", "");
+verify.memberListContains("i", "var m1.m2.i: m1.m2.c", "i");
 
 goTo.marker('9');
 verify.completionListContains("m2", "module m2", "");
@@ -137,8 +137,8 @@ verify.memberListContains("m3", "module m2.m3");
 verify.quickInfoIs("module m2.m3", "module comment of m2.m3");
 
 goTo.marker('11');
-verify.quickInfoIs("(constructor) m2.m3.c(): m2.m3.c", "");
-verify.memberListContains("c", "(constructor) m2.m3.c(): m2.m3.c", "");
+verify.quickInfoIs("constructor m2.m3.c(): m2.m3.c", "");
+verify.memberListContains("c", "constructor m2.m3.c(): m2.m3.c", "");
 
 goTo.marker('12');
 verify.completionListContains("m3", "module m3", "");
@@ -153,8 +153,8 @@ verify.memberListContains("m5", "module m3.m4.m5");
 verify.quickInfoIs("module m3.m4.m5", "module comment of m3.m4.m5");
 
 goTo.marker('15');
-verify.quickInfoIs("(constructor) m3.m4.m5.c(): m3.m4.m5.c", "");
-verify.memberListContains("c", "(constructor) m3.m4.m5.c(): m3.m4.m5.c", "");
+verify.quickInfoIs("constructor m3.m4.m5.c(): m3.m4.m5.c", "");
+verify.memberListContains("c", "constructor m3.m4.m5.c(): m3.m4.m5.c", "");
 
 goTo.marker('16');
 verify.completionListContains("m4", "module m4", "");
@@ -173,8 +173,8 @@ verify.memberListContains("m7", "module m4.m5.m6.m7");
 verify.quickInfoIs("module m4.m5.m6.m7", "");
 
 goTo.marker('20');
-verify.memberListContains("c", "(constructor) m4.m5.m6.m7.c(): m4.m5.m6.m7.c", "");
-verify.quickInfoIs("(constructor) m4.m5.m6.m7.c(): m4.m5.m6.m7.c", "");
+verify.memberListContains("c", "constructor m4.m5.m6.m7.c(): m4.m5.m6.m7.c", "");
+verify.quickInfoIs("constructor m4.m5.m6.m7.c(): m4.m5.m6.m7.c", "");
 
 goTo.marker('21');
 verify.completionListContains("m5", "module m5");
@@ -193,8 +193,8 @@ verify.memberListContains("m8", "module m5.m6.m7.m8");
 verify.quickInfoIs("module m5.m6.m7.m8", "module m8 comment");
 
 goTo.marker('25');
-verify.memberListContains("c", "(constructor) m5.m6.m7.m8.c(): m5.m6.m7.m8.c", "");
-verify.quickInfoIs("(constructor) m5.m6.m7.m8.c(): m5.m6.m7.m8.c", "");
+verify.memberListContains("c", "constructor m5.m6.m7.m8.c(): m5.m6.m7.m8.c", "");
+verify.quickInfoIs("constructor m5.m6.m7.m8.c(): m5.m6.m7.m8.c", "");
 
 goTo.marker('26');
 verify.completionListContains("m6", "module m6");
@@ -209,8 +209,8 @@ verify.memberListContains("m8", "module m6.m7.m8");
 verify.quickInfoIs("module m6.m7.m8", "");
 
 goTo.marker('29');
-verify.memberListContains("c", "(constructor) m6.m7.m8.c(): m6.m7.m8.c", "");
-verify.quickInfoIs("(constructor) m6.m7.m8.c(): m6.m7.m8.c", "");
+verify.memberListContains("c", "constructor m6.m7.m8.c(): m6.m7.m8.c", "");
+verify.quickInfoIs("constructor m6.m7.m8.c(): m6.m7.m8.c", "");
 
 goTo.marker('30');
 verify.completionListContains("m7", "module m7");
@@ -225,15 +225,15 @@ verify.memberListContains("m9", "module m7.m8.m9");
 verify.quickInfoIs("module m7.m8.m9", "module m9 comment");
 
 goTo.marker('33');
-verify.memberListContains("c", "(constructor) m7.m8.m9.c(): m7.m8.m9.c", "");
-verify.quickInfoIs("(constructor) m7.m8.m9.c(): m7.m8.m9.c", "");
+verify.memberListContains("c", "constructor m7.m8.m9.c(): m7.m8.m9.c", "");
+verify.quickInfoIs("constructor m7.m8.m9.c(): m7.m8.m9.c", "");
 
 goTo.marker('34');
 verify.completionListContains("c", 'class c', "");
 verify.quickInfoIs('class c', "");
 
 goTo.marker('35');
-verify.quickInfoIs("(var) myComplexVal: number", "");
+verify.quickInfoIs("var myComplexVal: number", "");
 
 goTo.marker('36');
 verify.quickInfoIs("module complexM", "");
@@ -242,7 +242,7 @@ goTo.marker('37');
 verify.quickInfoIs("module complexM.m2", "");
 
 goTo.marker('38');
-verify.quickInfoIs("(constructor) complexM.m2.c(): complexM.m2.c", "");
+verify.quickInfoIs("constructor complexM.m2.c(): complexM.m2.c", "");
 
 goTo.marker('39');
 verify.quickInfoIs("(method) complexM.m2.c.foo2(): complexM.m1.c", "");
diff --git a/tests/cases/fourslash/commentsOverloads.ts b/tests/cases/fourslash/commentsOverloads.ts
index 1e85346a17abc..878ea8ea00415 100644
--- a/tests/cases/fourslash/commentsOverloads.ts
+++ b/tests/cases/fourslash/commentsOverloads.ts
@@ -226,15 +226,15 @@
 ////foo(null);
 
 goTo.marker('1');
-verify.quickInfoIs("(function) f1(a: number): number (+1 overload)", "this is signature 1");
+verify.quickInfoIs("function f1(a: number): number (+1 overload)", "this is signature 1");
 goTo.marker('2');
-verify.quickInfoIs("(function) f1(b: string): number (+1 overload)", "");
+verify.quickInfoIs("function f1(b: string): number (+1 overload)", "");
 goTo.marker('3');
-verify.quickInfoIs("(function) f1(a: number): number (+1 overload)", "this is signature 1");
+verify.quickInfoIs("function f1(a: number): number (+1 overload)", "this is signature 1");
 goTo.marker('4q');
-verify.quickInfoIs("(function) f1(b: string): number (+1 overload)", "");
+verify.quickInfoIs("function f1(b: string): number (+1 overload)", "");
 goTo.marker('o4q');
-verify.quickInfoIs("(function) f1(a: number): number (+1 overload)", "this is signature 1");
+verify.quickInfoIs("function f1(a: number): number (+1 overload)", "this is signature 1");
 
 goTo.marker('4');
 verify.currentSignatureHelpDocCommentIs("");
@@ -244,15 +244,15 @@ verify.currentSignatureHelpDocCommentIs("this is signature 1");
 verify.currentParameterHelpArgumentDocCommentIs("param a");
 
 goTo.marker('5');
-verify.quickInfoIs("(function) f2(a: number): number (+1 overload)", "");
+verify.quickInfoIs("function f2(a: number): number (+1 overload)", "");
 goTo.marker('6');
-verify.quickInfoIs("(function) f2(b: string): number (+1 overload)", "this is signature 2");
+verify.quickInfoIs("function f2(b: string): number (+1 overload)", "this is signature 2");
 goTo.marker('7');
-verify.quickInfoIs("(function) f2(a: number): number (+1 overload)", "");
+verify.quickInfoIs("function f2(a: number): number (+1 overload)", "");
 goTo.marker('8q');
-verify.quickInfoIs("(function) f2(b: string): number (+1 overload)", "this is signature 2");
+verify.quickInfoIs("function f2(b: string): number (+1 overload)", "this is signature 2");
 goTo.marker('o8q');
-verify.quickInfoIs("(function) f2(a: number): number (+1 overload)", "");
+verify.quickInfoIs("function f2(a: number): number (+1 overload)", "");
 
 goTo.marker('8');
 verify.currentSignatureHelpDocCommentIs("this is signature 2");
@@ -263,15 +263,15 @@ verify.currentSignatureHelpDocCommentIs("");
 verify.currentParameterHelpArgumentDocCommentIs("param a");
 
 goTo.marker('9');
-verify.quickInfoIs("(function) f3(a: number): number (+1 overload)", "");
+verify.quickInfoIs("function f3(a: number): number (+1 overload)", "");
 goTo.marker('10');
-verify.quickInfoIs("(function) f3(b: string): number (+1 overload)", "");
+verify.quickInfoIs("function f3(b: string): number (+1 overload)", "");
 goTo.marker('11');
-verify.quickInfoIs("(function) f3(a: number): number (+1 overload)", "");
+verify.quickInfoIs("function f3(a: number): number (+1 overload)", "");
 goTo.marker('12q');
-verify.quickInfoIs("(function) f3(b: string): number (+1 overload)", "");
+verify.quickInfoIs("function f3(b: string): number (+1 overload)", "");
 goTo.marker('o12q');
-verify.quickInfoIs("(function) f3(a: number): number (+1 overload)", "");
+verify.quickInfoIs("function f3(a: number): number (+1 overload)", "");
 
 goTo.marker('12');
 verify.currentSignatureHelpDocCommentIs("");
@@ -282,15 +282,15 @@ verify.currentSignatureHelpDocCommentIs("");
 verify.currentParameterHelpArgumentDocCommentIs("");
 
 goTo.marker('13');
-verify.quickInfoIs("(function) f4(a: number): number (+1 overload)", "this is signature 4 - with number parameter");
+verify.quickInfoIs("function f4(a: number): number (+1 overload)", "this is signature 4 - with number parameter");
 goTo.marker('14');
-verify.quickInfoIs("(function) f4(b: string): number (+1 overload)", "this is signature 4 - with string parameter");
+verify.quickInfoIs("function f4(b: string): number (+1 overload)", "this is signature 4 - with string parameter");
 goTo.marker('15');
-verify.quickInfoIs("(function) f4(a: number): number (+1 overload)", "this is signature 4 - with number parameter");
+verify.quickInfoIs("function f4(a: number): number (+1 overload)", "this is signature 4 - with number parameter");
 goTo.marker('16q');
-verify.quickInfoIs("(function) f4(b: string): number (+1 overload)", "this is signature 4 - with string parameter");
+verify.quickInfoIs("function f4(b: string): number (+1 overload)", "this is signature 4 - with string parameter");
 goTo.marker('o16q');
-verify.quickInfoIs("(function) f4(a: number): number (+1 overload)", "this is signature 4 - with number parameter");
+verify.quickInfoIs("function f4(a: number): number (+1 overload)", "this is signature 4 - with number parameter");
 
 goTo.marker('16');
 verify.currentSignatureHelpDocCommentIs("this is signature 4 - with string parameter");
@@ -301,44 +301,44 @@ verify.currentSignatureHelpDocCommentIs("this is signature 4 - with number param
 verify.currentParameterHelpArgumentDocCommentIs("param a");
 
 goTo.marker('17');
-verify.completionListContains('f1', '(function) f1(a: number): number (+1 overload)', 'this is signature 1');
-verify.completionListContains('f2', '(function) f2(a: number): number (+1 overload)', '');
-verify.completionListContains('f3', '(function) f3(a: number): number (+1 overload)', '');
-verify.completionListContains('f4', '(function) f4(a: number): number (+1 overload)', 'this is signature 4 - with number parameter');
+verify.completionListContains('f1', 'function f1(a: number): number (+1 overload)', 'this is signature 1');
+verify.completionListContains('f2', 'function f2(a: number): number (+1 overload)', '');
+verify.completionListContains('f3', 'function f3(a: number): number (+1 overload)', '');
+verify.completionListContains('f4', 'function f4(a: number): number (+1 overload)', 'this is signature 4 - with number parameter');
 
 goTo.marker('18');
 verify.completionListContains('i1', 'interface i1', '');
-verify.completionListContains('i1_i', '(var) i1_i: new i1(b: number) => any (+1 overload)', '');
+verify.completionListContains('i1_i', 'var i1_i: new i1(b: number) => any (+1 overload)', '');
 verify.completionListContains('i2', 'interface i2', '');
-verify.completionListContains('i2_i', '(var) i2_i: new i2(a: string) => any (+1 overload)', '');
+verify.completionListContains('i2_i', 'var i2_i: new i2(a: string) => any (+1 overload)', '');
 verify.completionListContains('i3', 'interface i3', '');
-verify.completionListContains('i3_i', '(var) i3_i: new i3(a: string) => any (+1 overload)', 'new 1');
+verify.completionListContains('i3_i', 'var i3_i: new i3(a: string) => any (+1 overload)', 'new 1');
 verify.completionListContains('i4', 'interface i4', '');
-verify.completionListContains('i4_i', '(var) i4_i: new i4(a: string) => any (+1 overload)', '');
+verify.completionListContains('i4_i', 'var i4_i: new i4(a: string) => any (+1 overload)', '');
 
 goTo.marker('19');
 verify.currentSignatureHelpDocCommentIs("");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('19q');
-verify.quickInfoIs("(var) i1_i: new i1(b: number) => any (+1 overload)", "");
+verify.quickInfoIs("var i1_i: new i1(b: number) => any (+1 overload)", "");
 
 goTo.marker('20');
 verify.currentSignatureHelpDocCommentIs("new 1");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('20q');
-verify.quickInfoIs("(var) i1_i: new i1(a: string) => any (+1 overload)", "new 1");
+verify.quickInfoIs("var i1_i: new i1(a: string) => any (+1 overload)", "new 1");
 
 goTo.marker('21');
 verify.currentSignatureHelpDocCommentIs("this signature 1");
 verify.currentParameterHelpArgumentDocCommentIs("param a");
 goTo.marker('21q');
-verify.quickInfoIs("(var) i1_i: i1(a: number) => number (+1 overload)", "this signature 1");
+verify.quickInfoIs("var i1_i: i1(a: number) => number (+1 overload)", "this signature 1");
 
 goTo.marker('22');
 verify.currentSignatureHelpDocCommentIs("this is signature 2");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('22q');
-verify.quickInfoIs("(var) i1_i: i1(b: string) => number (+1 overload)", "this is signature 2");
+verify.quickInfoIs("var i1_i: i1(b: string) => number (+1 overload)", "this is signature 2");
 
 goTo.marker('23');
 verify.memberListContains('foo', '(method) i1.foo(a: number): number (+1 overload)', 'foo 1');
@@ -398,73 +398,73 @@ goTo.marker('32');
 verify.currentSignatureHelpDocCommentIs("new 2");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('32q');
-verify.quickInfoIs("(var) i2_i: new i2(b: number) => any (+1 overload)", "new 2");
+verify.quickInfoIs("var i2_i: new i2(b: number) => any (+1 overload)", "new 2");
 
 goTo.marker('33');
 verify.currentSignatureHelpDocCommentIs("");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('33q');
-verify.quickInfoIs("(var) i2_i: new i2(a: string) => any (+1 overload)", "");
+verify.quickInfoIs("var i2_i: new i2(a: string) => any (+1 overload)", "");
 
 goTo.marker('34');
 verify.currentSignatureHelpDocCommentIs("");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('34q');
-verify.quickInfoIs("(var) i2_i: i2(a: number) => number (+1 overload)", "");
+verify.quickInfoIs("var i2_i: i2(a: number) => number (+1 overload)", "");
 
 goTo.marker('35');
 verify.currentSignatureHelpDocCommentIs("this is signature 2");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('35q');
-verify.quickInfoIs("(var) i2_i: i2(b: string) => number (+1 overload)", "this is signature 2");
+verify.quickInfoIs("var i2_i: i2(b: string) => number (+1 overload)", "this is signature 2");
 
 goTo.marker('36');
 verify.currentSignatureHelpDocCommentIs("new 2");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('36q');
-verify.quickInfoIs("(var) i3_i: new i3(b: number) => any (+1 overload)", "new 2");
+verify.quickInfoIs("var i3_i: new i3(b: number) => any (+1 overload)", "new 2");
 
 goTo.marker('37');
 verify.currentSignatureHelpDocCommentIs("new 1");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('37q');
-verify.quickInfoIs("(var) i3_i: new i3(a: string) => any (+1 overload)", "new 1");
+verify.quickInfoIs("var i3_i: new i3(a: string) => any (+1 overload)", "new 1");
 
 goTo.marker('38');
 verify.currentSignatureHelpDocCommentIs("this is signature 1");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('38q');
-verify.quickInfoIs("(var) i3_i: i3(a: number) => number (+1 overload)", "this is signature 1");
+verify.quickInfoIs("var i3_i: i3(a: number) => number (+1 overload)", "this is signature 1");
 
 goTo.marker('39');
 verify.currentSignatureHelpDocCommentIs("");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('39q');
-verify.quickInfoIs("(var) i3_i: i3(b: string) => number (+1 overload)", "");
+verify.quickInfoIs("var i3_i: i3(b: string) => number (+1 overload)", "");
 
 goTo.marker('40');
 verify.currentSignatureHelpDocCommentIs("");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('40q');
-verify.quickInfoIs("(var) i4_i: new i4(b: number) => any (+1 overload)", "");
+verify.quickInfoIs("var i4_i: new i4(b: number) => any (+1 overload)", "");
 
 goTo.marker('41');
 verify.currentSignatureHelpDocCommentIs("");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('41q');
-verify.quickInfoIs("(var) i4_i: new i4(a: string) => any (+1 overload)", "");
+verify.quickInfoIs("var i4_i: new i4(a: string) => any (+1 overload)", "");
 
 goTo.marker('42');
 verify.currentSignatureHelpDocCommentIs("");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('42q');
-verify.quickInfoIs("(var) i4_i: i4(a: number) => number (+1 overload)", "");
+verify.quickInfoIs("var i4_i: i4(a: number) => number (+1 overload)", "");
 
 goTo.marker('43');
 verify.currentSignatureHelpDocCommentIs("");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('43q');
-verify.quickInfoIs("(var) i4_i: i4(b: string) => number (+1 overload)", "");
+verify.quickInfoIs("var i4_i: i4(b: string) => number (+1 overload)", "");
 
 goTo.marker('44');
 verify.memberListContains('prop1', '(method) c.prop1(a: number): number (+1 overload)', '');
@@ -537,61 +537,61 @@ goTo.marker('55');
 verify.currentSignatureHelpDocCommentIs("");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('55q');
-verify.quickInfoIs("(constructor) c1(a: number): c1 (+1 overload)", "");
+verify.quickInfoIs("constructor c1(a: number): c1 (+1 overload)", "");
 
 goTo.marker('56');
 verify.currentSignatureHelpDocCommentIs("");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('56q');
-verify.quickInfoIs("(constructor) c1(b: string): c1 (+1 overload)", "");
+verify.quickInfoIs("constructor c1(b: string): c1 (+1 overload)", "");
 
 goTo.marker('57');
 verify.currentSignatureHelpDocCommentIs("c2 1");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('57q');
-verify.quickInfoIs("(constructor) c2(a: number): c2 (+1 overload)", "c2 1");
+verify.quickInfoIs("constructor c2(a: number): c2 (+1 overload)", "c2 1");
 
 goTo.marker('58');
 verify.currentSignatureHelpDocCommentIs("");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('58q');
-verify.quickInfoIs("(constructor) c2(b: string): c2 (+1 overload)", "");
+verify.quickInfoIs("constructor c2(b: string): c2 (+1 overload)", "");
 
 goTo.marker('59');
 verify.currentSignatureHelpDocCommentIs("");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('59q');
-verify.quickInfoIs("(constructor) c3(a: number): c3 (+1 overload)", "");
+verify.quickInfoIs("constructor c3(a: number): c3 (+1 overload)", "");
 
 goTo.marker('60');
 verify.currentSignatureHelpDocCommentIs("c3 2");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('60q');
-verify.quickInfoIs("(constructor) c3(b: string): c3 (+1 overload)", "c3 2");
+verify.quickInfoIs("constructor c3(b: string): c3 (+1 overload)", "c3 2");
 
 goTo.marker('61');
 verify.currentSignatureHelpDocCommentIs("c4 1");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('61q');
-verify.quickInfoIs("(constructor) c4(a: number): c4 (+1 overload)", "c4 1");
+verify.quickInfoIs("constructor c4(a: number): c4 (+1 overload)", "c4 1");
 
 goTo.marker('62');
 verify.currentSignatureHelpDocCommentIs("c4 2");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('62q');
-verify.quickInfoIs("(constructor) c4(b: string): c4 (+1 overload)", "c4 2");
+verify.quickInfoIs("constructor c4(b: string): c4 (+1 overload)", "c4 2");
 
 goTo.marker('63');
 verify.currentSignatureHelpDocCommentIs("c5 1");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('63q');
-verify.quickInfoIs("(constructor) c5(a: number): c5 (+1 overload)", "c5 1");
+verify.quickInfoIs("constructor c5(a: number): c5 (+1 overload)", "c5 1");
 
 goTo.marker('64');
 verify.currentSignatureHelpDocCommentIs("c5 2");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('64q');
-verify.quickInfoIs("(constructor) c5(b: string): c5 (+1 overload)", "c5 2");
+verify.quickInfoIs("constructor c5(b: string): c5 (+1 overload)", "c5 2");
 
 goTo.marker('65');
 verify.completionListContains("c", "class c", "");
@@ -600,92 +600,92 @@ verify.completionListContains("c2", "class c2", "");
 verify.completionListContains("c3", "class c3", "");
 verify.completionListContains("c4", "class c4", "");
 verify.completionListContains("c5", "class c5", "");
-verify.completionListContains("c_i", "(var) c_i: c", "");
-verify.completionListContains("c1_i_1", "(var) c1_i_1: c1", "");
-verify.completionListContains("c2_i_1", "(var) c2_i_1: c2", "");
-verify.completionListContains("c3_i_1", "(var) c3_i_1: c3", "");
-verify.completionListContains("c4_i_1", "(var) c4_i_1: c4", "");
-verify.completionListContains("c5_i_1", "(var) c5_i_1: c5", "");
-verify.completionListContains("c1_i_2", "(var) c1_i_2: c1", "");
-verify.completionListContains("c2_i_2", "(var) c2_i_2: c2", "");
-verify.completionListContains("c3_i_2", "(var) c3_i_2: c3", "");
-verify.completionListContains("c4_i_2", "(var) c4_i_2: c4", "");
-verify.completionListContains("c5_i_2", "(var) c5_i_2: c5", "");
-verify.completionListContains('multiOverload', '(function) multiOverload(a: number): string (+2 overloads)', 'This is multiOverload F1 1');
-verify.completionListContains('ambientF1', '(function) ambientF1(a: number): string (+2 overloads)', 'This is ambient F1 1');
+verify.completionListContains("c_i", "var c_i: c", "");
+verify.completionListContains("c1_i_1", "var c1_i_1: c1", "");
+verify.completionListContains("c2_i_1", "var c2_i_1: c2", "");
+verify.completionListContains("c3_i_1", "var c3_i_1: c3", "");
+verify.completionListContains("c4_i_1", "var c4_i_1: c4", "");
+verify.completionListContains("c5_i_1", "var c5_i_1: c5", "");
+verify.completionListContains("c1_i_2", "var c1_i_2: c1", "");
+verify.completionListContains("c2_i_2", "var c2_i_2: c2", "");
+verify.completionListContains("c3_i_2", "var c3_i_2: c3", "");
+verify.completionListContains("c4_i_2", "var c4_i_2: c4", "");
+verify.completionListContains("c5_i_2", "var c5_i_2: c5", "");
+verify.completionListContains('multiOverload', 'function multiOverload(a: number): string (+2 overloads)', 'This is multiOverload F1 1');
+verify.completionListContains('ambientF1', 'function ambientF1(a: number): string (+2 overloads)', 'This is ambient F1 1');
 
 goTo.marker('66');
-verify.quickInfoIs("(var) c1_i_1: c1", "");
+verify.quickInfoIs("var c1_i_1: c1", "");
 goTo.marker('67');
-verify.quickInfoIs("(var) c2_i_2: c2", "");
+verify.quickInfoIs("var c2_i_2: c2", "");
 goTo.marker('68');
-verify.quickInfoIs("(var) c3_i_2: c3", "");
+verify.quickInfoIs("var c3_i_2: c3", "");
 goTo.marker('69');
-verify.quickInfoIs("(var) c4_i_1: c4", "");
+verify.quickInfoIs("var c4_i_1: c4", "");
 goTo.marker('70');
-verify.quickInfoIs("(var) c5_i_1: c5", "");
+verify.quickInfoIs("var c5_i_1: c5", "");
 
 goTo.marker('71');
-verify.quickInfoIs("(function) multiOverload(a: number): string (+2 overloads)", "This is multiOverload F1 1");
+verify.quickInfoIs("function multiOverload(a: number): string (+2 overloads)", "This is multiOverload F1 1");
 goTo.marker('72');
-verify.quickInfoIs("(function) multiOverload(b: string): string (+2 overloads)", "This is multiOverload F1 2");
+verify.quickInfoIs("function multiOverload(b: string): string (+2 overloads)", "This is multiOverload F1 2");
 goTo.marker('73');
-verify.quickInfoIs("(function) multiOverload(c: boolean): string (+2 overloads)", "This is multiOverload F1 3");
+verify.quickInfoIs("function multiOverload(c: boolean): string (+2 overloads)", "This is multiOverload F1 3");
 
 goTo.marker('74');
-verify.quickInfoIs("(function) ambientF1(a: number): string (+2 overloads)", "This is ambient F1 1");
+verify.quickInfoIs("function ambientF1(a: number): string (+2 overloads)", "This is ambient F1 1");
 goTo.marker('75');
-verify.quickInfoIs("(function) ambientF1(b: string): string (+2 overloads)", "This is ambient F1 2");
+verify.quickInfoIs("function ambientF1(b: string): string (+2 overloads)", "This is ambient F1 2");
 goTo.marker('76');
-verify.quickInfoIs("(function) ambientF1(c: boolean): boolean (+2 overloads)", "This is ambient F1 3");
+verify.quickInfoIs("function ambientF1(c: boolean): boolean (+2 overloads)", "This is ambient F1 3");
 
 goTo.marker('77');
 verify.quickInfoIs("(parameter) aa: i3", "");
 
 goTo.marker('78');
-verify.quickInfoIs("(constructor) c1(a: number): c1 (+1 overload)", "");
+verify.quickInfoIs("constructor c1(a: number): c1 (+1 overload)", "");
 
 goTo.marker('79');
-verify.quickInfoIs("(constructor) c1(b: string): c1 (+1 overload)", "");
+verify.quickInfoIs("constructor c1(b: string): c1 (+1 overload)", "");
 
 goTo.marker('80');
-verify.quickInfoIs("(constructor) c1(a: number): c1 (+1 overload)", "");
+verify.quickInfoIs("constructor c1(a: number): c1 (+1 overload)", "");
 
 goTo.marker('81');
-verify.quickInfoIs("(constructor) c2(a: number): c2 (+1 overload)", "c2 1");
+verify.quickInfoIs("constructor c2(a: number): c2 (+1 overload)", "c2 1");
 
 goTo.marker('82');
-verify.quickInfoIs("(constructor) c2(b: string): c2 (+1 overload)", "");
+verify.quickInfoIs("constructor c2(b: string): c2 (+1 overload)", "");
 
 goTo.marker('83');
-verify.quickInfoIs("(constructor) c2(a: number): c2 (+1 overload)", "c2 1");
+verify.quickInfoIs("constructor c2(a: number): c2 (+1 overload)", "c2 1");
 
 goTo.marker('84');
-verify.quickInfoIs("(constructor) c3(a: number): c3 (+1 overload)", "");
+verify.quickInfoIs("constructor c3(a: number): c3 (+1 overload)", "");
 
 goTo.marker('85');
-verify.quickInfoIs("(constructor) c3(b: string): c3 (+1 overload)", "c3 2");
+verify.quickInfoIs("constructor c3(b: string): c3 (+1 overload)", "c3 2");
 
 goTo.marker('86');
-verify.quickInfoIs("(constructor) c3(a: number): c3 (+1 overload)", "");
+verify.quickInfoIs("constructor c3(a: number): c3 (+1 overload)", "");
 
 goTo.marker('87');
-verify.quickInfoIs("(constructor) c4(a: number): c4 (+1 overload)", "c4 1");
+verify.quickInfoIs("constructor c4(a: number): c4 (+1 overload)", "c4 1");
 
 goTo.marker('88');
-verify.quickInfoIs("(constructor) c4(b: string): c4 (+1 overload)", "c4 2");
+verify.quickInfoIs("constructor c4(b: string): c4 (+1 overload)", "c4 2");
 
 goTo.marker('89');
-verify.quickInfoIs("(constructor) c4(a: number): c4 (+1 overload)", "c4 1");
+verify.quickInfoIs("constructor c4(a: number): c4 (+1 overload)", "c4 1");
 
 goTo.marker('90');
-verify.quickInfoIs("(constructor) c5(a: number): c5 (+1 overload)", "c5 1");
+verify.quickInfoIs("constructor c5(a: number): c5 (+1 overload)", "c5 1");
 
 goTo.marker('91');
-verify.quickInfoIs("(constructor) c5(b: string): c5 (+1 overload)", "c5 2");
+verify.quickInfoIs("constructor c5(b: string): c5 (+1 overload)", "c5 2");
 
 goTo.marker('92');
-verify.quickInfoIs("(constructor) c5(a: number): c5 (+1 overload)", "c5 1");
+verify.quickInfoIs("constructor c5(a: number): c5 (+1 overload)", "c5 1");
 
 goTo.marker('93');
 verify.quickInfoIs("(method) c.prop1(a: number): number (+1 overload)", "");
diff --git a/tests/cases/fourslash/commentsVariables.ts b/tests/cases/fourslash/commentsVariables.ts
index d5ada916a9883..d62e1e9bee817 100644
--- a/tests/cases/fourslash/commentsVariables.ts
+++ b/tests/cases/fourslash/commentsVariables.ts
@@ -42,59 +42,59 @@
 ////var x = fo/*15*/o2;
 
 goTo.marker('1');
-verify.quickInfoIs("(var) myVariable: number", "This is my variable");
+verify.quickInfoIs("var myVariable: number", "This is my variable");
 
 goTo.marker('2');
-verify.completionListContains("myVariable", "(var) myVariable: number", "This is my variable");
+verify.completionListContains("myVariable", "var myVariable: number", "This is my variable");
 
 goTo.marker('3');
-verify.completionListContains("myVariable", "(var) myVariable: number", "This is my variable");
-verify.completionListContains("d", "(var) d: number", "d variable");
+verify.completionListContains("myVariable", "var myVariable: number", "This is my variable");
+verify.completionListContains("d", "var d: number", "d variable");
 
 goTo.marker('4');
-verify.completionListContains("foo", "(function) foo(): void", "foos comment");
-verify.completionListContains("fooVar", "(var) fooVar: () => void", "fooVar comment");
+verify.completionListContains("foo", "function foo(): void", "foos comment");
+verify.completionListContains("fooVar", "var fooVar: () => void", "fooVar comment");
 
 goTo.marker('5');
 verify.currentSignatureHelpDocCommentIs("foos comment");
 goTo.marker('5q');
-verify.quickInfoIs("(function) foo(): void", "foos comment");
+verify.quickInfoIs("function foo(): void", "foos comment");
 
 goTo.marker('6');
 verify.currentSignatureHelpDocCommentIs("");
 goTo.marker('6q');
-verify.quickInfoIs("(var) fooVar: () => void", "");
+verify.quickInfoIs("var fooVar: () => void", "");
 
 goTo.marker('7');
-verify.completionListContains("foo", "(function) foo(): void", "foos comment");
-verify.completionListContains("fooVar", "(var) fooVar: () => void", "fooVar comment");
+verify.completionListContains("foo", "function foo(): void", "foos comment");
+verify.completionListContains("fooVar", "var fooVar: () => void", "fooVar comment");
 
 goTo.marker('8');
 verify.currentSignatureHelpDocCommentIs("foos comment");
 goTo.marker('8q');
-verify.quickInfoIs("(function) foo(): void", "foos comment");
+verify.quickInfoIs("function foo(): void", "foos comment");
 
 goTo.marker('9');
 verify.currentSignatureHelpDocCommentIs("");
 goTo.marker('9q');
-verify.quickInfoIs("(var) fooVar: () => void", "");
+verify.quickInfoIs("var fooVar: () => void", "");
 goTo.marker('9aq');
-verify.quickInfoIs("(var) fooVar: () => void", "fooVar comment");
+verify.quickInfoIs("var fooVar: () => void", "fooVar comment");
 
 goTo.marker('10');
-verify.completionListContains("i", "(var) i: c", "instance comment");
+verify.completionListContains("i", "var i: c", "instance comment");
 
 goTo.marker('11');
-verify.completionListContains("i1_i", "(var) i1_i: i1", "interface instance comments");
+verify.completionListContains("i1_i", "var i1_i: i1", "interface instance comments");
 
 goTo.marker('12');
-verify.quickInfoIs("(var) fooVar: () => void", "fooVar comment");
+verify.quickInfoIs("var fooVar: () => void", "fooVar comment");
 
 goTo.marker('13');
-verify.quickInfoIs("(var) fooVar: () => void", "fooVar comment");
+verify.quickInfoIs("var fooVar: () => void", "fooVar comment");
 
 goTo.marker('14');
-verify.quickInfoIs("(function) foo(): void", "foos comment");
+verify.quickInfoIs("function foo(): void", "foos comment");
 
 goTo.marker('15');
-verify.quickInfoIs("(function) foo2(a: number): void (+1 overload)", "");
\ No newline at end of file
+verify.quickInfoIs("function foo2(a: number): void (+1 overload)", "");
diff --git a/tests/cases/fourslash/completionEntryForConst.ts b/tests/cases/fourslash/completionEntryForConst.ts
index dc2b2358b0ab8..42de1c20b523e 100644
--- a/tests/cases/fourslash/completionEntryForConst.ts
+++ b/tests/cases/fourslash/completionEntryForConst.ts
@@ -4,4 +4,4 @@
 /////**/
 
 goTo.marker();
-verify.completionListContains("c", "(const) c: string", /*documentation*/ undefined, "const");
\ No newline at end of file
+verify.completionListContains("c", "const c: string", /*documentation*/ undefined, "const");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListForGenericInstance1.ts b/tests/cases/fourslash/completionListForGenericInstance1.ts
index 9a3fcab631db7..5f323c1269172 100644
--- a/tests/cases/fourslash/completionListForGenericInstance1.ts
+++ b/tests/cases/fourslash/completionListForGenericInstance1.ts
@@ -7,4 +7,4 @@
 ////i/**/
 
 goTo.marker();
-verify.completionListContains('i', '(var) i: Iterator<string, number>');
\ No newline at end of file
+verify.completionListContains('i', 'var i: Iterator<string, number>');
diff --git a/tests/cases/fourslash/completionListInNamedFunctionExpression.ts b/tests/cases/fourslash/completionListInNamedFunctionExpression.ts
index 6321018f5b580..dc48db75b4ba5 100644
--- a/tests/cases/fourslash/completionListInNamedFunctionExpression.ts
+++ b/tests/cases/fourslash/completionListInNamedFunctionExpression.ts
@@ -27,4 +27,4 @@ goTo.marker("referenceInsideFunctionExpression");
 verify.quickInfoIs("(local function) foo(): number");
 
 goTo.marker("referenceInGlobalScope");
-verify.quickInfoIs("(function) foo(a: number): string");
\ No newline at end of file
+verify.quickInfoIs("function foo(a: number): string");
diff --git a/tests/cases/fourslash/completionListOnPrivateVariableInModule.ts b/tests/cases/fourslash/completionListOnPrivateVariableInModule.ts
index eecb5724d1061..b22113b856f13 100644
--- a/tests/cases/fourslash/completionListOnPrivateVariableInModule.ts
+++ b/tests/cases/fourslash/completionListOnPrivateVariableInModule.ts
@@ -3,4 +3,4 @@
 //// module Foo {     var testing = "";     test/**/ }
 
 goTo.marker();
-verify.completionListContains('testing', '(var) testing: string');
\ No newline at end of file
+verify.completionListContains('testing', 'var testing: string');
diff --git a/tests/cases/fourslash/completionListWithModulesFromModule.ts b/tests/cases/fourslash/completionListWithModulesFromModule.ts
index 96610b203a10f..3db8cc0490cc7 100644
--- a/tests/cases/fourslash/completionListWithModulesFromModule.ts
+++ b/tests/cases/fourslash/completionListWithModulesFromModule.ts
@@ -278,16 +278,16 @@ function goToMarkAndVerifyShadow()
 
 // from a shadow module with no export
 goTo.marker('shadowModuleWithNoExport');
-verify.completionListContains('shwvar', '(var) shwvar: string');
-verify.completionListContains('shwfn', '(function) shwfn(shadow: any): void');
+verify.completionListContains('shwvar', 'var shwvar: string');
+verify.completionListContains('shwfn', 'function shwfn(shadow: any): void');
 verify.completionListContains('shwcls', 'class shwcls');
 verify.completionListContains('shwint', 'interface shwint');
 goToMarkAndVerifyShadow();
 
 // from a shadow module with export
 goTo.marker('shadowModuleWithExport');
-verify.completionListContains('shwvar', '(var) mod4.shwvar: string');
-verify.completionListContains('shwfn', '(function) mod4.shwfn(shadow: any): void');
+verify.completionListContains('shwvar', 'var mod4.shwvar: string');
+verify.completionListContains('shwfn', 'function mod4.shwfn(shadow: any): void');
 verify.completionListContains('shwcls', 'class mod4.shwcls');
 verify.completionListContains('shwint', 'interface mod4.shwint');
 goToMarkAndVerifyShadow();
@@ -297,8 +297,8 @@ goTo.marker('moduleWithImport');
 verify.completionListContains('mod1', 'module mod1');
 verify.completionListContains('mod2', 'module mod2');
 verify.completionListContains('mod3', 'module mod3');
-verify.completionListContains('shwvar', '(var) shwvar: number');
-verify.completionListContains('shwfn', '(function) shwfn(): void');
+verify.completionListContains('shwvar', 'var shwvar: number');
+verify.completionListContains('shwfn', 'function shwfn(): void');
 verify.completionListContains('shwcls', 'class shwcls');
 verify.completionListContains('shwint', 'interface shwint');
 
diff --git a/tests/cases/fourslash/completionListWithModulesInsideModuleScope.ts b/tests/cases/fourslash/completionListWithModulesInsideModuleScope.ts
index 49180cb95d526..f7fdea277c777 100644
--- a/tests/cases/fourslash/completionListWithModulesInsideModuleScope.ts
+++ b/tests/cases/fourslash/completionListWithModulesInsideModuleScope.ts
@@ -229,21 +229,21 @@ function goToMarkAndGeneralVerify(marker: string)
 {
     goTo.marker(marker);
 
-    verify.completionListContains('mod1var', '(var) mod1var: number');
-    verify.completionListContains('mod1fn', '(function) mod1fn(): void');
+    verify.completionListContains('mod1var', 'var mod1var: number');
+    verify.completionListContains('mod1fn', 'function mod1fn(): void');
     verify.completionListContains('mod1cls', 'class mod1cls');
     verify.completionListContains('mod1int', 'interface mod1int');
     verify.completionListContains('mod1mod', 'module mod1mod');
-    verify.completionListContains('mod1evar', '(var) mod1.mod1evar: number');
-    verify.completionListContains('mod1efn', '(function) mod1.mod1efn(): void');
+    verify.completionListContains('mod1evar', 'var mod1.mod1evar: number');
+    verify.completionListContains('mod1efn', 'function mod1.mod1efn(): void');
     verify.completionListContains('mod1ecls', 'class mod1.mod1ecls');
     verify.completionListContains('mod1eint', 'interface mod1.mod1eint');
     verify.completionListContains('mod1emod', 'module mod1.mod1emod');
-    verify.completionListContains('mod1eexvar', '(var) mod1.mod1eexvar: number');
+    verify.completionListContains('mod1eexvar', 'var mod1.mod1eexvar: number');
     verify.completionListContains('mod2', 'module mod2');
     verify.completionListContains('mod3', 'module mod3');
-    verify.completionListContains('shwvar', '(var) shwvar: number');
-    verify.completionListContains('shwfn', '(function) shwfn(): void');
+    verify.completionListContains('shwvar', 'var shwvar: number');
+    verify.completionListContains('shwfn', 'function shwfn(): void');
     verify.completionListContains('shwcls', 'class shwcls');
     verify.completionListContains('shwint', 'interface shwint');
 
@@ -289,13 +289,13 @@ goToMarkAndGeneralVerify('interface');
 
 // from module in mod1
 goToMarkAndGeneralVerify('module');
-verify.completionListContains('m1X', '(var) m1X: number');
-verify.completionListContains('m1Func', '(function) m1Func(): void');
+verify.completionListContains('m1X', 'var m1X: number');
+verify.completionListContains('m1Func', 'function m1Func(): void');
 verify.completionListContains('m1Class', 'class m1Class');
 verify.completionListContains('m1Int', 'interface m1Int');
 verify.completionListContains('m1Mod', 'module m1Mod');
-verify.completionListContains('m1eX', '(var) mod1mod.m1eX: number');
-verify.completionListContains('m1eFunc', '(function) mod1mod.m1eFunc(): void');
+verify.completionListContains('m1eX', 'var mod1mod.m1eX: number');
+verify.completionListContains('m1eFunc', 'function mod1mod.m1eFunc(): void');
 verify.completionListContains('m1eClass', 'class mod1mod.m1eClass');
 verify.completionListContains('m1eInt', 'interface mod1mod.m1eInt');
 verify.completionListContains('m1eMod', 'module mod1mod.m1eMod');
@@ -315,29 +315,29 @@ goToMarkAndGeneralVerify('exportedInterface');
 
 // from exported module in mod1
 goToMarkAndGeneralVerify('exportedModule');
-verify.completionListContains('mX', '(var) mX: number');
-verify.completionListContains('mFunc', '(function) mFunc(): void');
+verify.completionListContains('mX', 'var mX: number');
+verify.completionListContains('mFunc', 'function mFunc(): void');
 verify.completionListContains('mClass', 'class mClass');
 verify.completionListContains('mInt', 'interface mInt');
 verify.completionListContains('mMod', 'module mMod');
-verify.completionListContains('meX', '(var) mod1.mod1emod.meX: number');
-verify.completionListContains('meFunc', '(function) mod1.mod1emod.meFunc(): void');
+verify.completionListContains('meX', 'var mod1.mod1emod.meX: number');
+verify.completionListContains('meFunc', 'function mod1.mod1emod.meFunc(): void');
 verify.completionListContains('meClass', 'class mod1.mod1emod.meClass');
 verify.completionListContains('meInt', 'interface mod1.mod1emod.meInt');
 verify.completionListContains('meMod', 'module mod1.mod1emod.meMod');
 
 // from extended module
 goTo.marker('extendedModule');
-verify.completionListContains('mod1evar', '(var) mod1.mod1evar: number');
-verify.completionListContains('mod1efn', '(function) mod1.mod1efn(): void');
+verify.completionListContains('mod1evar', 'var mod1.mod1evar: number');
+verify.completionListContains('mod1efn', 'function mod1.mod1efn(): void');
 verify.completionListContains('mod1ecls', 'class mod1.mod1ecls');
 verify.completionListContains('mod1eint', 'interface mod1.mod1eint');
 verify.completionListContains('mod1emod', 'module mod1.mod1emod');
-verify.completionListContains('mod1eexvar', '(var) mod1.mod1eexvar: number');
+verify.completionListContains('mod1eexvar', 'var mod1.mod1eexvar: number');
 verify.completionListContains('mod2', 'module mod2');
 verify.completionListContains('mod3', 'module mod3');
-verify.completionListContains('shwvar', '(var) shwvar: number');
-verify.completionListContains('shwfn', '(function) shwfn(): void');
+verify.completionListContains('shwvar', 'var shwvar: number');
+verify.completionListContains('shwfn', 'function shwfn(): void');
 verify.completionListContains('shwcls', 'class shwcls');
 verify.completionListContains('shwint', 'interface shwint');
 
diff --git a/tests/cases/fourslash/completionListWithModulesOutsideModuleScope.ts b/tests/cases/fourslash/completionListWithModulesOutsideModuleScope.ts
index b228b244feea8..03ba952fde7da 100644
--- a/tests/cases/fourslash/completionListWithModulesOutsideModuleScope.ts
+++ b/tests/cases/fourslash/completionListWithModulesOutsideModuleScope.ts
@@ -263,8 +263,8 @@ goToMarkAndGeneralVerify('global');
 verify.completionListContains('mod1', 'module mod1');
 verify.completionListContains('mod2', 'module mod2');
 verify.completionListContains('mod3', 'module mod3');
-verify.completionListContains('shwvar', '(var) shwvar: number');
-verify.completionListContains('shwfn', '(function) shwfn(): void');
+verify.completionListContains('shwvar', 'var shwvar: number');
+verify.completionListContains('shwfn', 'function shwfn(): void');
 verify.completionListContains('shwcls', 'class shwcls');
 verify.completionListContains('shwint', 'interface shwint');
 
diff --git a/tests/cases/fourslash/completionListWithModulesOutsideModuleScope2.ts b/tests/cases/fourslash/completionListWithModulesOutsideModuleScope2.ts
index aed914657ae1c..865887661e94b 100644
--- a/tests/cases/fourslash/completionListWithModulesOutsideModuleScope2.ts
+++ b/tests/cases/fourslash/completionListWithModulesOutsideModuleScope2.ts
@@ -238,8 +238,8 @@ function goToMarkerAndVerify(marker: string)
     verify.completionListContains('mod1');
     verify.completionListContains('mod2');
     verify.completionListContains('mod3');
-    verify.completionListContains('shwvar', '(var) shwvar: number');
-    verify.completionListContains('shwfn', '(function) shwfn(): void');
+    verify.completionListContains('shwvar', 'var shwvar: number');
+    verify.completionListContains('shwfn', 'function shwfn(): void');
     verify.completionListContains('shwcls', 'class shwcls');
     verify.completionListContains('shwint', 'interface shwint');
 
diff --git a/tests/cases/fourslash/constQuickInfoAndCompletionList.ts b/tests/cases/fourslash/constQuickInfoAndCompletionList.ts
index 59a793df40bf0..c2505835dcecd 100644
--- a/tests/cases/fourslash/constQuickInfoAndCompletionList.ts
+++ b/tests/cases/fourslash/constQuickInfoAndCompletionList.ts
@@ -10,28 +10,28 @@
 ////    /*7*/
 ////}
 goTo.marker('1');
-verify.quickInfoIs("(const) a: number");
+verify.quickInfoIs("const a: number");
 
 goTo.marker('2');
-verify.completionListContains("a", "(const) a: number");
-verify.quickInfoIs("(const) a: number");
+verify.completionListContains("a", "const a: number");
+verify.quickInfoIs("const a: number");
 
 goTo.marker('3');
-verify.completionListContains("a", "(const) a: number");
+verify.completionListContains("a", "const a: number");
 
 goTo.marker('4');
-verify.quickInfoIs("(const) b: number");
+verify.quickInfoIs("const b: number");
 
 goTo.marker('5');
-verify.completionListContains("a", "(const) a: number");
-verify.completionListContains("b", "(const) b: number");
-verify.quickInfoIs("(const) b: number");
+verify.completionListContains("a", "const a: number");
+verify.completionListContains("b", "const b: number");
+verify.quickInfoIs("const b: number");
 
 goTo.marker('6');
-verify.completionListContains("a", "(const) a: number");
-verify.completionListContains("b", "(const) b: number");
-verify.quickInfoIs("(const) a: number");
+verify.completionListContains("a", "const a: number");
+verify.completionListContains("b", "const b: number");
+verify.quickInfoIs("const a: number");
 
 goTo.marker('7');
-verify.completionListContains("a", "(const) a: number");
-verify.completionListContains("b", "(const) b: number");
\ No newline at end of file
+verify.completionListContains("a", "const a: number");
+verify.completionListContains("b", "const b: number");
diff --git a/tests/cases/fourslash/constructorQuickInfo.ts b/tests/cases/fourslash/constructorQuickInfo.ts
index 6c9fc7cf7958c..ef201f6709670 100644
--- a/tests/cases/fourslash/constructorQuickInfo.ts
+++ b/tests/cases/fourslash/constructorQuickInfo.ts
@@ -7,10 +7,10 @@
 ////var x/*3*/3 = new SS;
 
 goTo.marker('1');
-verify.quickInfoIs('(var) x1: SS<number>');
+verify.quickInfoIs('var x1: SS<number>');
 
 goTo.marker('2');
-verify.quickInfoIs('(var) x2: SS<{}>');
+verify.quickInfoIs('var x2: SS<{}>');
 
 goTo.marker('3');
-verify.quickInfoIs('(var) x3: SS<{}>');
\ No newline at end of file
+verify.quickInfoIs('var x3: SS<{}>');
diff --git a/tests/cases/fourslash/contextualTyping.ts b/tests/cases/fourslash/contextualTyping.ts
index c363302f7a181..6861ca84915bd 100644
--- a/tests/cases/fourslash/contextualTyping.ts
+++ b/tests/cases/fourslash/contextualTyping.ts
@@ -204,55 +204,55 @@ verify.quickInfoIs("(parameter) i: number");
 goTo.marker('3');
 verify.quickInfoIs("(parameter) i: number");
 goTo.marker('4');
-verify.quickInfoIs("(var) C2T5.foo: (i: number, s: string) => number");
+verify.quickInfoIs("var C2T5.foo: (i: number, s: string) => number");
 goTo.marker('5');
 verify.quickInfoIs("(parameter) i: number");
 goTo.marker('6');
 verify.quickInfoIs("(parameter) i: number");
 goTo.marker('7');
-verify.quickInfoIs("(var) c3t1: (s: string) => string");
+verify.quickInfoIs("var c3t1: (s: string) => string");
 goTo.marker('8');
 verify.quickInfoIs("(parameter) s: string");
 goTo.marker('9');
 verify.quickInfoIs("(parameter) s: string");
 goTo.marker('10');
-verify.quickInfoIs("(var) c3t2: IFoo");
+verify.quickInfoIs("var c3t2: IFoo");
 goTo.marker('11');
-verify.quickInfoIs("(var) c3t3: number[]");
+verify.quickInfoIs("var c3t3: number[]");
 goTo.marker('12');
-verify.quickInfoIs("(var) c3t4: () => IFoo");
+verify.quickInfoIs("var c3t4: () => IFoo");
 goTo.marker('13');
-verify.quickInfoIs("(var) c3t5: (n: number) => IFoo");
+verify.quickInfoIs("var c3t5: (n: number) => IFoo");
 goTo.marker('14');
 verify.quickInfoIs("(parameter) n: number");
 goTo.marker('15');
-verify.quickInfoIs("(var) c3t6: (n: number, s: string) => IFoo");
+verify.quickInfoIs("var c3t6: (n: number, s: string) => IFoo");
 goTo.marker('16');
 verify.quickInfoIs("(parameter) n: number");
 goTo.marker('17');
 verify.quickInfoIs("(parameter) s: string");
 goTo.marker('18');
-verify.quickInfoIs("(var) c3t7: {\n    (n: number): number;\n    (s1: string): number;\n}");
+verify.quickInfoIs("var c3t7: {\n    (n: number): number;\n    (s1: string): number;\n}");
 goTo.marker('20');
-verify.quickInfoIs("(var) c3t8: (n: number, s: string) => number");
+verify.quickInfoIs("var c3t8: (n: number, s: string) => number");
 goTo.marker('21');
 verify.quickInfoIs("(parameter) n: number");
 goTo.marker('22');
-verify.quickInfoIs("(var) c3t9: number[][]");
+verify.quickInfoIs("var c3t9: number[][]");
 goTo.marker('23');
-verify.quickInfoIs("(var) c3t10: IFoo[]");
+verify.quickInfoIs("var c3t10: IFoo[]");
 goTo.marker('24');
-verify.quickInfoIs("(var) c3t11: ((n: number, s: string) => string)[]");
+verify.quickInfoIs("var c3t11: ((n: number, s: string) => string)[]");
 goTo.marker('25');
 verify.quickInfoIs("(parameter) n: number");
 goTo.marker('26');
 verify.quickInfoIs("(parameter) s: string");
 goTo.marker('27');
-verify.quickInfoIs("(var) c3t12: IBar");
+verify.quickInfoIs("var c3t12: IBar");
 goTo.marker('28');
 verify.quickInfoIs("(property) foo: IFoo");
 goTo.marker('29');
-verify.quickInfoIs("(var) c3t13: IFoo");
+verify.quickInfoIs("var c3t13: IFoo");
 goTo.marker('30');
 verify.quickInfoIs("(property) f: (i: number, s: string) => string");
 goTo.marker('31');
@@ -260,7 +260,7 @@ verify.quickInfoIs("(parameter) i: number");
 goTo.marker('32');
 verify.quickInfoIs("(parameter) s: string");
 goTo.marker('33');
-verify.quickInfoIs("(var) c3t14: IFoo");
+verify.quickInfoIs("var c3t14: IFoo");
 goTo.marker('34');
 verify.quickInfoIs("(property) a: undefined[]");
 goTo.marker('35');
@@ -270,19 +270,19 @@ verify.quickInfoIs("(parameter) i: number");
 goTo.marker('37');
 verify.quickInfoIs("(parameter) s: string");
 goTo.marker('38');
-verify.quickInfoIs("(var) C5T5.foo: (i: number, s: string) => string");
+verify.quickInfoIs("var C5T5.foo: (i: number, s: string) => string");
 goTo.marker('39');
 verify.quickInfoIs("(parameter) i: number");
 goTo.marker('40');
 verify.quickInfoIs("(parameter) s: string");
 goTo.marker('41');
-verify.quickInfoIs("(var) c6t5: (n: number) => IFoo");
+verify.quickInfoIs("var c6t5: (n: number) => IFoo");
 goTo.marker('42');
 verify.quickInfoIs("(parameter) n: number");
 goTo.marker('43');
-verify.quickInfoIs("(var) c7t2: IFoo[]");
+verify.quickInfoIs("var c7t2: IFoo[]");
 goTo.marker('44');
-verify.quickInfoIs("(var) c7t2: IFoo[]");
+verify.quickInfoIs("var c7t2: IFoo[]");
 goTo.marker('45');
 verify.quickInfoIs("(property) t1: (s: string) => string");
 goTo.marker('46');
@@ -338,53 +338,53 @@ verify.quickInfoIs("(property) a: undefined[]");
 goTo.marker('71');
 verify.quickInfoIs("(parameter) n: number");
 goTo.marker('72');
-verify.quickInfoIs("(var) c10t5: () => (n: number) => IFoo");
+verify.quickInfoIs("var c10t5: () => (n: number) => IFoo");
 goTo.marker('73');
 verify.quickInfoIs("(parameter) n: number");
 goTo.marker('74');
 verify.quickInfoIs("(parameter) n: number");
 goTo.marker('75');
-verify.quickInfoIs("(var) c12t1: (s: string) => string");
+verify.quickInfoIs("var c12t1: (s: string) => string");
 goTo.marker('76');
 verify.quickInfoIs("(parameter) s: string");
 goTo.marker('77');
-verify.quickInfoIs("(var) c12t2: IFoo");
+verify.quickInfoIs("var c12t2: IFoo");
 goTo.marker('78');
-verify.quickInfoIs("(var) c12t3: number[]");
+verify.quickInfoIs("var c12t3: number[]");
 goTo.marker('79');
-verify.quickInfoIs("(var) c12t4: () => IFoo");
+verify.quickInfoIs("var c12t4: () => IFoo");
 goTo.marker('80');
-verify.quickInfoIs("(var) c12t5: (n: number) => IFoo");
+verify.quickInfoIs("var c12t5: (n: number) => IFoo");
 goTo.marker('81');
 verify.quickInfoIs("(parameter) n: number");
 goTo.marker('82');
-verify.quickInfoIs("(var) c12t6: (n: number, s: string) => IFoo");
+verify.quickInfoIs("var c12t6: (n: number, s: string) => IFoo");
 goTo.marker('83');
 verify.quickInfoIs("(parameter) n: number");
 goTo.marker('84');
 verify.quickInfoIs("(parameter) s: string");
 goTo.marker('85');
-verify.quickInfoIs("(var) c12t7: (n: number, s: string) => number");
+verify.quickInfoIs("var c12t7: (n: number, s: string) => number");
 goTo.marker('86');
-verify.quickInfoIs("(var) c12t8: (n: number, s: string) => number");
+verify.quickInfoIs("var c12t8: (n: number, s: string) => number");
 goTo.marker('87');
 verify.quickInfoIs("(parameter) n: number");
 goTo.marker('88');
-verify.quickInfoIs("(var) c12t9: number[][]");
+verify.quickInfoIs("var c12t9: number[][]");
 goTo.marker('89');
-verify.quickInfoIs("(var) c12t10: IFoo[]");
+verify.quickInfoIs("var c12t10: IFoo[]");
 goTo.marker('90');
-verify.quickInfoIs("(var) c12t11: ((n: number, s: string) => string)[]");
+verify.quickInfoIs("var c12t11: ((n: number, s: string) => string)[]");
 goTo.marker('91');
 verify.quickInfoIs("(parameter) n: number");
 goTo.marker('92');
 verify.quickInfoIs("(parameter) s: string");
 goTo.marker('93');
-verify.quickInfoIs("(var) c12t12: IBar");
+verify.quickInfoIs("var c12t12: IBar");
 goTo.marker('94');
 verify.quickInfoIs("(property) foo: IFoo");
 goTo.marker('95');
-verify.quickInfoIs("(var) c12t13: IFoo");
+verify.quickInfoIs("var c12t13: IFoo");
 goTo.marker('96');
 verify.quickInfoIs("(property) f: (i: number, s: string) => string");
 goTo.marker('97');
@@ -392,11 +392,11 @@ verify.quickInfoIs("(parameter) i: number");
 goTo.marker('98');
 verify.quickInfoIs("(parameter) s: string");
 goTo.marker('99');
-verify.quickInfoIs("(var) c12t14: IFoo");
+verify.quickInfoIs("var c12t14: IFoo");
 goTo.marker('100');
 verify.quickInfoIs("(property) a: undefined[]");
 goTo.marker('101');
-verify.quickInfoIs("(function) EF1(a: number, b: number): number");
+verify.quickInfoIs("function EF1(a: number, b: number): number");
 goTo.marker('102');
 verify.quickInfoIs("(parameter) a: any");
 goTo.marker('103');
@@ -404,7 +404,7 @@ verify.quickInfoIs("(parameter) b: any");
 goTo.marker('110');
 verify.quickInfoIs("(property) Point.origin: Point");
 goTo.marker('111');
-verify.quickInfoIs("(constructor) Point(x: number, y: number): Point");
+verify.quickInfoIs("constructor Point(x: number, y: number): Point");
 goTo.marker('112');
 verify.quickInfoIs("(method) Point.add(dx: number, dy: number): Point");
 goTo.marker('113');
diff --git a/tests/cases/fourslash/contextualTypingOfArrayLiterals1.ts b/tests/cases/fourslash/contextualTypingOfArrayLiterals1.ts
index 128f801300b50..6b36bdde23bcb 100644
--- a/tests/cases/fourslash/contextualTypingOfArrayLiterals1.ts
+++ b/tests/cases/fourslash/contextualTypingOfArrayLiterals1.ts
@@ -31,19 +31,19 @@
 verify.not.errorExistsBetweenMarkers('1', '6');
 
 goTo.marker('1');
-verify.quickInfoIs('(var) x: any[]');
+verify.quickInfoIs('var x: any[]');
 
 goTo.marker('2');
-verify.quickInfoIs('(var) r: C');
+verify.quickInfoIs('var r: C');
 
 goTo.marker('3');
-verify.quickInfoIs('(var) r3: C');
+verify.quickInfoIs('var r3: C');
 
 goTo.marker('4');
-verify.quickInfoIs('(var) r4: C');
+verify.quickInfoIs('var r4: C');
 
 goTo.marker('5');
-verify.quickInfoIs('(var) x5: C[]');
+verify.quickInfoIs('var x5: C[]');
 
 goTo.marker('6');
-verify.quickInfoIs('(var) r5: C');
\ No newline at end of file
+verify.quickInfoIs('var r5: C');
diff --git a/tests/cases/fourslash/derivedTypeIndexerWithGenericConstraints.ts b/tests/cases/fourslash/derivedTypeIndexerWithGenericConstraints.ts
index 5a62cac01fea3..9859cc9f89553 100644
--- a/tests/cases/fourslash/derivedTypeIndexerWithGenericConstraints.ts
+++ b/tests/cases/fourslash/derivedTypeIndexerWithGenericConstraints.ts
@@ -25,5 +25,5 @@
 ////var result2 = r2.x;
 
 goTo.marker('');
-verify.quickInfoIs('(var) r: CollectionItem');
+verify.quickInfoIs('var r: CollectionItem');
 verify.numberOfErrorsInCurrentFile(0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/duplicateIndexers.ts b/tests/cases/fourslash/duplicateIndexers.ts
index 9c25994c3479f..f1fdad697d8f0 100644
--- a/tests/cases/fourslash/duplicateIndexers.ts
+++ b/tests/cases/fourslash/duplicateIndexers.ts
@@ -9,4 +9,4 @@
 ////var /**/r = i[1];
 
 goTo.marker();
-verify.quickInfoIs('(var) r: string');
\ No newline at end of file
+verify.quickInfoIs('var r: string');
diff --git a/tests/cases/fourslash/emptyArrayInference.ts b/tests/cases/fourslash/emptyArrayInference.ts
index 71f80653420a7..dd9bf1df0c20b 100644
--- a/tests/cases/fourslash/emptyArrayInference.ts
+++ b/tests/cases/fourslash/emptyArrayInference.ts
@@ -4,7 +4,7 @@
 ////var y/*2*/y = true ? [1] : [];
 
 goTo.marker('1');
-verify.quickInfoIs('(var) xx: number[]');
+verify.quickInfoIs('var xx: number[]');
 
 goTo.marker('2');
-verify.quickInfoIs('(var) yy: number[]');
+verify.quickInfoIs('var yy: number[]');
diff --git a/tests/cases/fourslash/enumAddition.ts b/tests/cases/fourslash/enumAddition.ts
index a2f2efd38d690..65f7db0312d1a 100644
--- a/tests/cases/fourslash/enumAddition.ts
+++ b/tests/cases/fourslash/enumAddition.ts
@@ -5,4 +5,4 @@
 
 goTo.marker();
 verify.quickInfoExists();
-verify.quickInfoIs('(var) t: number');
+verify.quickInfoIs('var t: number');
diff --git a/tests/cases/fourslash/errorsAfterResolvingVariableDeclOfMergedVariableAndClassDecl.ts b/tests/cases/fourslash/errorsAfterResolvingVariableDeclOfMergedVariableAndClassDecl.ts
index 58cddff3dfb9d..b98eec4eaf4cf 100644
--- a/tests/cases/fourslash/errorsAfterResolvingVariableDeclOfMergedVariableAndClassDecl.ts
+++ b/tests/cases/fourslash/errorsAfterResolvingVariableDeclOfMergedVariableAndClassDecl.ts
@@ -16,7 +16,7 @@ verify.numberOfErrorsInCurrentFile(0);
 goTo.marker("1");
 edit.backspace(1);
 edit.insert(" ");
-verify.quickInfoIs("(var) M.C.C: typeof M.C");
+verify.quickInfoIs("var M.C.C: typeof M.C");
 
 // Verify there are no errors
 verify.numberOfErrorsInCurrentFile(0);
diff --git a/tests/cases/fourslash/exportEqualTypes.ts b/tests/cases/fourslash/exportEqualTypes.ts
index 8cfe931d87bb5..3fa3b71fef60c 100644
--- a/tests/cases/fourslash/exportEqualTypes.ts
+++ b/tests/cases/fourslash/exportEqualTypes.ts
@@ -17,9 +17,9 @@
 goTo.marker('1');
 verify.quickInfoIs("import test = require('exportEqualTypes_file0')");
 goTo.marker('2');
-verify.quickInfoIs('(var) r1: Date');
+verify.quickInfoIs('var r1: Date');
 goTo.marker('3');
-verify.quickInfoIs('(var) r2: string');
+verify.quickInfoIs('var r2: string');
 goTo.marker('4');
 verify.memberListContains('foo');
 verify.numberOfErrorsInCurrentFile(0);
diff --git a/tests/cases/fourslash/extendArray.ts b/tests/cases/fourslash/extendArray.ts
index 7c7c15475e4ba..c5c73c16d2129 100644
--- a/tests/cases/fourslash/extendArray.ts
+++ b/tests/cases/fourslash/extendArray.ts
@@ -9,7 +9,7 @@
 ////var /*2*/r2 = x2[0];
 
 goTo.marker('1');
-verify.quickInfoIs('(var) r: string');
+verify.quickInfoIs('var r: string');
 
 goTo.marker('2');
-verify.quickInfoIs('(var) r2: string');
\ No newline at end of file
+verify.quickInfoIs('var r2: string');
diff --git a/tests/cases/fourslash/extendArrayInterfaceMember.ts b/tests/cases/fourslash/extendArrayInterfaceMember.ts
index 6795dfd51441c..5c62aed98dc61 100644
--- a/tests/cases/fourslash/extendArrayInterfaceMember.ts
+++ b/tests/cases/fourslash/extendArrayInterfaceMember.ts
@@ -11,12 +11,12 @@ verify.numberOfErrorsInCurrentFile(1);
 // - Could not select overload for 'call' expression.
 
 goTo.marker("y");
-verify.quickInfoIs("(var) y: any");
+verify.quickInfoIs("var y: any");
 
 goTo.eof();
 edit.insert("interface Array<T> { pop(def: T): T; }");
 
 verify.not.errorExistsBetweenMarkers("1", "2");
 goTo.marker("y");
-verify.quickInfoIs("(var) y: number");
+verify.quickInfoIs("var y: number");
 verify.numberOfErrorsInCurrentFile(0);
diff --git a/tests/cases/fourslash/extendInterfaceOverloadedMethod.ts b/tests/cases/fourslash/extendInterfaceOverloadedMethod.ts
index 5cd1d8d94a526..43a476303f604 100644
--- a/tests/cases/fourslash/extendInterfaceOverloadedMethod.ts
+++ b/tests/cases/fourslash/extendInterfaceOverloadedMethod.ts
@@ -15,5 +15,5 @@
 edit.insert('');
 
 goTo.marker();
-verify.quickInfoIs('(var) x: void');
+verify.quickInfoIs('var x: void');
 verify.numberOfErrorsInCurrentFile(0);
diff --git a/tests/cases/fourslash/extendsTArray.ts b/tests/cases/fourslash/extendsTArray.ts
index 5bf798358fd74..f104c7a02c675 100644
--- a/tests/cases/fourslash/extendsTArray.ts
+++ b/tests/cases/fourslash/extendsTArray.ts
@@ -11,5 +11,5 @@
 ////y.length;
 
 goTo.marker();
-verify.quickInfoIs('(var) y: Date[]');
+verify.quickInfoIs('var y: Date[]');
 verify.numberOfErrorsInCurrentFile(0);
diff --git a/tests/cases/fourslash/externalModuleWithExportAssignment.ts b/tests/cases/fourslash/externalModuleWithExportAssignment.ts
index 4d5f600317d0d..09798ec5492d3 100644
--- a/tests/cases/fourslash/externalModuleWithExportAssignment.ts
+++ b/tests/cases/fourslash/externalModuleWithExportAssignment.ts
@@ -33,7 +33,7 @@ goTo.marker('1');
 verify.quickInfoIs('import a1 = require("externalModuleWithExportAssignment_file0")');
 
 goTo.marker('2');
-verify.quickInfoIs("(var) a: {\n    (): a1.connectExport;\n    test1: a1.connectModule;\n    test2(): a1.connectModule;\n}", undefined);
+verify.quickInfoIs("var a: {\n    (): a1.connectExport;\n    test1: a1.connectModule;\n    test2(): a1.connectModule;\n}", undefined);
 
 goTo.marker('3');
 verify.quickInfoIs("(property) test1: a1.connectModule(res: any, req: any, next: any) => void", undefined);
@@ -49,13 +49,13 @@ goTo.marker('5');
 verify.currentSignatureHelpIs("test2(): a1.connectModule");
 
 goTo.marker('6');
-verify.quickInfoIs("(var) r1: a1.connectModule", undefined);
+verify.quickInfoIs("var r1: a1.connectModule", undefined);
 
 goTo.marker('7');
 verify.currentSignatureHelpIs("a(): a1.connectExport");
 
 goTo.marker('8');
-verify.quickInfoIs("(var) r2: a1.connectExport", undefined);
+verify.quickInfoIs("var r2: a1.connectExport", undefined);
 
 goTo.marker('9');
 verify.quickInfoIs("(property) test1: a1.connectModule(res: any, req: any, next: any) => void", undefined);
@@ -71,13 +71,13 @@ goTo.marker('11');
 verify.currentSignatureHelpIs("test2(): a1.connectModule");
 
 goTo.marker('12');
-verify.quickInfoIs("(var) r3: a1.connectModule", undefined);
+verify.quickInfoIs("var r3: a1.connectModule", undefined);
 
 goTo.marker('13');
 verify.currentSignatureHelpIs("a1(): a1.connectExport");
 
 goTo.marker('14');
-verify.quickInfoIs("(var) r4: a1.connectExport", undefined);
+verify.quickInfoIs("var r4: a1.connectExport", undefined);
 
 goTo.marker('15');
 verify.not.completionListContains("test1", "(property) test1: a1.connectModule", undefined);
diff --git a/tests/cases/fourslash/forIn.ts b/tests/cases/fourslash/forIn.ts
index 87eb1ea356b1f..e24e161d96b8c 100644
--- a/tests/cases/fourslash/forIn.ts
+++ b/tests/cases/fourslash/forIn.ts
@@ -5,4 +5,4 @@
 
 goTo.marker();
 
-verify.quickInfoIs('(var) p: any', "");
\ No newline at end of file
+verify.quickInfoIs('var p: any', "");
diff --git a/tests/cases/fourslash/funduleWithRecursiveReference.ts b/tests/cases/fourslash/funduleWithRecursiveReference.ts
index c3aaf36317dc7..c93d2cc0e1ae7 100644
--- a/tests/cases/fourslash/funduleWithRecursiveReference.ts
+++ b/tests/cases/fourslash/funduleWithRecursiveReference.ts
@@ -11,5 +11,5 @@
 edit.insert('');
 
 goTo.marker();
-verify.quickInfoIs('(var) M.C.C: typeof M.C');
+verify.quickInfoIs('var M.C.C: typeof M.C');
 verify.numberOfErrorsInCurrentFile(0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/genericCallSignaturesInNonGenericTypes1.ts b/tests/cases/fourslash/genericCallSignaturesInNonGenericTypes1.ts
index c3e3fccbc767a..d7d9daf1f4334 100644
--- a/tests/cases/fourslash/genericCallSignaturesInNonGenericTypes1.ts
+++ b/tests/cases/fourslash/genericCallSignaturesInNonGenericTypes1.ts
@@ -16,4 +16,4 @@
 ////var /**/b = _(a); 
 
 goTo.marker();
-verify.quickInfoIs('(var) b: WrappedArray<number>');
+verify.quickInfoIs('var b: WrappedArray<number>');
diff --git a/tests/cases/fourslash/genericCallSignaturesInNonGenericTypes2.ts b/tests/cases/fourslash/genericCallSignaturesInNonGenericTypes2.ts
index 7f3d1c4a654c8..0b0ff19920d38 100644
--- a/tests/cases/fourslash/genericCallSignaturesInNonGenericTypes2.ts
+++ b/tests/cases/fourslash/genericCallSignaturesInNonGenericTypes2.ts
@@ -13,4 +13,4 @@
 ////var /**/b = _(a);  // WrappedArray<any>, should be WrappedArray<number>
 
 goTo.marker();
-verify.quickInfoIs('(var) b: WrappedArray<number>');
\ No newline at end of file
+verify.quickInfoIs('var b: WrappedArray<number>');
diff --git a/tests/cases/fourslash/genericCallsWithOptionalParams1.ts b/tests/cases/fourslash/genericCallsWithOptionalParams1.ts
index 1f5ec1562c5a2..c5915b9aa0f11 100644
--- a/tests/cases/fourslash/genericCallsWithOptionalParams1.ts
+++ b/tests/cases/fourslash/genericCallsWithOptionalParams1.ts
@@ -13,7 +13,7 @@
 ////var /*2*/r2 = utils.fold(c, (s, t) => t);
 
 goTo.marker('1');
-verify.quickInfoIs('(var) r: string');
+verify.quickInfoIs('var r: string');
 
 goTo.marker('2');
-verify.quickInfoIs('(var) r2: string');
\ No newline at end of file
+verify.quickInfoIs('var r2: string');
diff --git a/tests/cases/fourslash/genericCombinators1.ts b/tests/cases/fourslash/genericCombinators1.ts
index 8d10869fa4183..40f524c9dbab4 100644
--- a/tests/cases/fourslash/genericCombinators1.ts
+++ b/tests/cases/fourslash/genericCombinators1.ts
@@ -64,38 +64,38 @@ verify.quickInfoIs('(parameter) x: B<any>');
 goTo.marker('5');
 verify.quickInfoIs('(parameter) x: number');
 goTo.marker('6');
-verify.quickInfoIs('(var) c3: Collection<Collection<number>>');
+verify.quickInfoIs('var c3: Collection<Collection<number>>');
 goTo.marker('7');
 verify.quickInfoIs('(parameter) x: A');
 goTo.marker('8');
 verify.quickInfoIs('(parameter) x: any'); // Specialized to any because no type argument was specified
 goTo.marker('9');
-verify.quickInfoIs('(var) r1a: Collection<string>');
+verify.quickInfoIs('var r1a: Collection<string>');
 goTo.marker('10');
-verify.quickInfoIs('(var) r1b: Collection<string>');
+verify.quickInfoIs('var r1b: Collection<string>');
 goTo.marker('11');
-verify.quickInfoIs('(var) r2a: Collection<number>');
+verify.quickInfoIs('var r2a: Collection<number>');
 goTo.marker('12');
-verify.quickInfoIs('(var) r2b: Collection<number>');
+verify.quickInfoIs('var r2b: Collection<number>');
 goTo.marker('13');
-verify.quickInfoIs('(var) r3a: Collection<A>');
+verify.quickInfoIs('var r3a: Collection<A>');
 goTo.marker('14');
-verify.quickInfoIs('(var) r3b: Collection<A>');
+verify.quickInfoIs('var r3b: Collection<A>');
 goTo.marker('15');
-verify.quickInfoIs('(var) r4a: Collection<any>');
+verify.quickInfoIs('var r4a: Collection<any>');
 goTo.marker('17');
-verify.quickInfoIs('(var) r5a: Collection<string>');
+verify.quickInfoIs('var r5a: Collection<string>');
 goTo.marker('18');
-verify.quickInfoIs('(var) r5b: Collection<string>');
+verify.quickInfoIs('var r5b: Collection<string>');
 goTo.marker('19');
-verify.quickInfoIs('(var) r6a: Collection<number>');
+verify.quickInfoIs('var r6a: Collection<number>');
 goTo.marker('20');
-verify.quickInfoIs('(var) r6b: Collection<number>');
+verify.quickInfoIs('var r6b: Collection<number>');
 goTo.marker('21');
-verify.quickInfoIs('(var) r7a: Collection<A>');
+verify.quickInfoIs('var r7a: Collection<A>');
 goTo.marker('22');
-verify.quickInfoIs('(var) r7b: Collection<A>');
+verify.quickInfoIs('var r7b: Collection<A>');
 goTo.marker('23');
-verify.quickInfoIs('(var) r8a: Collection<string>');
+verify.quickInfoIs('var r8a: Collection<string>');
 
 verify.errorExistsBetweenMarkers('error1', 'error2');
\ No newline at end of file
diff --git a/tests/cases/fourslash/genericCombinators2.ts b/tests/cases/fourslash/genericCombinators2.ts
index 73adb487e2d64..4d38ffd079683 100644
--- a/tests/cases/fourslash/genericCombinators2.ts
+++ b/tests/cases/fourslash/genericCombinators2.ts
@@ -95,40 +95,40 @@ goTo.marker('8b');
 verify.quickInfoIs('(parameter) y: any'); // Specialized to any because no type argument was specified
 
 goTo.marker('9');
-verify.quickInfoIs('(var) r1a: Collection<number, string>');
+verify.quickInfoIs('var r1a: Collection<number, string>');
 goTo.marker('10');
-verify.quickInfoIs('(var) r1b: Collection<number, string>');
+verify.quickInfoIs('var r1b: Collection<number, string>');
 goTo.marker('11');
-verify.quickInfoIs('(var) r2a: Collection<Collection<number, number>, number>');
+verify.quickInfoIs('var r2a: Collection<Collection<number, number>, number>');
 goTo.marker('12');
-verify.quickInfoIs('(var) r2b: Collection<Collection<number, number>, number>');
+verify.quickInfoIs('var r2b: Collection<Collection<number, number>, number>');
 goTo.marker('13');
-verify.quickInfoIs('(var) r3a: Collection<number, {}>');
+verify.quickInfoIs('var r3a: Collection<number, {}>');
 goTo.marker('14');
-verify.quickInfoIs('(var) r3b: Collection<number, {}>');
+verify.quickInfoIs('var r3b: Collection<number, {}>');
 goTo.marker('15');
-verify.quickInfoIs('(var) r4a: Collection<number, any>');
+verify.quickInfoIs('var r4a: Collection<number, any>');
 
 goTo.marker('17');
-verify.quickInfoIs('(var) r5a: Collection<T, V>'); // This is actually due to an error because toFixed does not return a Date
+verify.quickInfoIs('var r5a: Collection<T, V>'); // This is actually due to an error because toFixed does not return a Date
 
 goTo.marker('18');
-verify.quickInfoIs('(var) r5b: Collection<number, Date>');
+verify.quickInfoIs('var r5b: Collection<number, Date>');
 
 goTo.marker('19');
-verify.quickInfoIs('(var) r6a: Collection<Collection<number, number>, Date>');
+verify.quickInfoIs('var r6a: Collection<Collection<number, number>, Date>');
 
 goTo.marker('20');
-verify.quickInfoIs('(var) r6b: Collection<Collection<number, number>, Date>');
+verify.quickInfoIs('var r6b: Collection<Collection<number, number>, Date>');
 
 goTo.marker('21');
-verify.quickInfoIs('(var) r7a: Collection<T, V>'); // This call is an error because y.foo() does not return a string
+verify.quickInfoIs('var r7a: Collection<T, V>'); // This call is an error because y.foo() does not return a string
 
 goTo.marker('22');
-verify.quickInfoIs('(var) r7b: Collection<T, V>'); // This call is an error because y.foo() does not return a string
+verify.quickInfoIs('var r7b: Collection<T, V>'); // This call is an error because y.foo() does not return a string
 
 goTo.marker('23');
-verify.quickInfoIs('(var) r8a: Collection<number, string>');
+verify.quickInfoIs('var r8a: Collection<number, string>');
 
 verify.errorExistsBetweenMarkers('error1', 'error2');
 verify.errorExistsBetweenMarkers('17error1', '17error2');
diff --git a/tests/cases/fourslash/genericCombinators3.ts b/tests/cases/fourslash/genericCombinators3.ts
index 6871614d86859..382a670a836d3 100644
--- a/tests/cases/fourslash/genericCombinators3.ts
+++ b/tests/cases/fourslash/genericCombinators3.ts
@@ -24,4 +24,4 @@ goTo.marker('1c');
 verify.quickInfoIs('(method) Combinators.map<number, string, string>(c: Collection<number, string>, f: (x: number, y: string) => string): Collection<number, string> (+1 overload)');
 
 goTo.marker('9');
-verify.quickInfoIs('(var) r1a: Collection<number, string>');
+verify.quickInfoIs('var r1a: Collection<number, string>');
diff --git a/tests/cases/fourslash/genericDerivedTypeAcrossModuleBoundary1.ts b/tests/cases/fourslash/genericDerivedTypeAcrossModuleBoundary1.ts
index ca44ceb765c71..de81007b72f4b 100644
--- a/tests/cases/fourslash/genericDerivedTypeAcrossModuleBoundary1.ts
+++ b/tests/cases/fourslash/genericDerivedTypeAcrossModuleBoundary1.ts
@@ -17,7 +17,7 @@
 ////var /*2*/n3 = new N.D2();
 
 goTo.marker('1');
-verify.quickInfoIs('(var) n2: N.D2<number>');
+verify.quickInfoIs('var n2: N.D2<number>');
 
 goTo.marker('2')
-verify.quickInfoIs('(var) n3: N.D2<{}>');
\ No newline at end of file
+verify.quickInfoIs('var n3: N.D2<{}>');
diff --git a/tests/cases/fourslash/genericFunctionReturnType.ts b/tests/cases/fourslash/genericFunctionReturnType.ts
index 737c26744c5f5..0b59d50563b95 100644
--- a/tests/cases/fourslash/genericFunctionReturnType.ts
+++ b/tests/cases/fourslash/genericFunctionReturnType.ts
@@ -12,10 +12,10 @@
 // verify.currentSignatureHelpIs('foo(x: number, y: string): (a: string) => number');
 
 goTo.marker('2');
-verify.quickInfoIs('(var) r: (a: string) => number');
+verify.quickInfoIs('var r: (a: string) => number');
 
 goTo.marker('3');
 verify.currentSignatureHelpIs('r(a: string): number');
 
 goTo.marker('4');
-verify.quickInfoIs('(var) r2: number');
\ No newline at end of file
+verify.quickInfoIs('var r2: number');
diff --git a/tests/cases/fourslash/genericFunctionReturnType2.ts b/tests/cases/fourslash/genericFunctionReturnType2.ts
index 9658d72c6766b..a8097cf2a2b45 100644
--- a/tests/cases/fourslash/genericFunctionReturnType2.ts
+++ b/tests/cases/fourslash/genericFunctionReturnType2.ts
@@ -15,10 +15,10 @@ goTo.marker('1');
 verify.currentSignatureHelpIs('foo(x: number): (a: number) => number');
 
 goTo.marker('2');
-verify.quickInfoIs('(var) r: (a: number) => number');
+verify.quickInfoIs('var r: (a: number) => number');
 
 goTo.marker('3');
 verify.currentSignatureHelpIs('r(a: number): number');
 
 goTo.marker('4');
-verify.quickInfoIs('(var) r2: number');
\ No newline at end of file
+verify.quickInfoIs('var r2: number');
diff --git a/tests/cases/fourslash/genericInterfacePropertyInference1.ts b/tests/cases/fourslash/genericInterfacePropertyInference1.ts
index c7a644a201d21..578c54c4fadc6 100644
--- a/tests/cases/fourslash/genericInterfacePropertyInference1.ts
+++ b/tests/cases/fourslash/genericInterfacePropertyInference1.ts
@@ -90,98 +90,98 @@
 verify.numberOfErrorsInCurrentFile(0);
 
 goTo.marker('a1');
-verify.quickInfoIs('(var) f_r1: number');
+verify.quickInfoIs('var f_r1: number');
 goTo.marker('a2');
-verify.quickInfoIs('(var) f_r2: string');
+verify.quickInfoIs('var f_r2: string');
 goTo.marker('a3');
-verify.quickInfoIs('(var) f_r3: any');
+verify.quickInfoIs('var f_r3: any');
 goTo.marker('a4');
-verify.quickInfoIs('(var) f_r5: Foo<number>');
+verify.quickInfoIs('var f_r5: Foo<number>');
 goTo.marker('a5');
-verify.quickInfoIs('(var) f_r8: I');
+verify.quickInfoIs('var f_r8: I');
 goTo.marker('a6');
-verify.quickInfoIs('(var) f_r12: {\n    x: number;\n}');
+verify.quickInfoIs('var f_r12: {\n    x: number;\n}');
 goTo.marker('a7');
-verify.quickInfoIs('(var) f_r14: {\n    x: any;\n}');
+verify.quickInfoIs('var f_r14: {\n    x: any;\n}');
 goTo.marker('a8');
-verify.quickInfoIs('(var) f_r18: C<number>');
+verify.quickInfoIs('var f_r18: C<number>');
 goTo.marker('a9');
-verify.quickInfoIs('(var) f_r20: C<{\n    x: any;\n}>');
+verify.quickInfoIs('var f_r20: C<{\n    x: any;\n}>');
 
 goTo.marker('b1');
-verify.quickInfoIs('(var) f2_r1: number');
+verify.quickInfoIs('var f2_r1: number');
 goTo.marker('b2');
-verify.quickInfoIs('(var) f2_r2: string');
+verify.quickInfoIs('var f2_r2: string');
 goTo.marker('b3');
-verify.quickInfoIs('(var) f2_r3: number');
+verify.quickInfoIs('var f2_r3: number');
 goTo.marker('b4');
-verify.quickInfoIs('(var) f2_r5: Foo<number>'); 
+verify.quickInfoIs('var f2_r5: Foo<number>'); 
 goTo.marker('b5');
-verify.quickInfoIs('(var) f2_r8: I');
+verify.quickInfoIs('var f2_r8: I');
 goTo.marker('b6');
-verify.quickInfoIs('(var) f2_r12: {\n    x: number;\n}');
+verify.quickInfoIs('var f2_r12: {\n    x: number;\n}');
 goTo.marker('b7');
-verify.quickInfoIs('(var) f2_r14: {\n    x: number;\n}');
+verify.quickInfoIs('var f2_r14: {\n    x: number;\n}');
 goTo.marker('b8');
-verify.quickInfoIs('(var) f2_r18: C<number>');
+verify.quickInfoIs('var f2_r18: C<number>');
 goTo.marker('b9');
-verify.quickInfoIs('(var) f2_r20: C<{\n    x: number;\n}>');
+verify.quickInfoIs('var f2_r20: C<{\n    x: number;\n}>');
 
 goTo.marker('c1');
-verify.quickInfoIs('(var) f3_r1: number');
+verify.quickInfoIs('var f3_r1: number');
 goTo.marker('c2');
-verify.quickInfoIs('(var) f3_r2: string');
+verify.quickInfoIs('var f3_r2: string');
 goTo.marker('c3');
-verify.quickInfoIs('(var) f3_r3: I');
+verify.quickInfoIs('var f3_r3: I');
 goTo.marker('c4');
-verify.quickInfoIs('(var) f3_r5: Foo<number>');
+verify.quickInfoIs('var f3_r5: Foo<number>');
 goTo.marker('c5');
-verify.quickInfoIs('(var) f3_r8: I');
+verify.quickInfoIs('var f3_r8: I');
 goTo.marker('c6');
-verify.quickInfoIs('(var) f3_r12: {\n    x: number;\n}');
+verify.quickInfoIs('var f3_r12: {\n    x: number;\n}');
 goTo.marker('c7');
-verify.quickInfoIs('(var) f3_r14: {\n    x: I;\n}');
+verify.quickInfoIs('var f3_r14: {\n    x: I;\n}');
 goTo.marker('c8');
-verify.quickInfoIs('(var) f3_r18: C<number>');
+verify.quickInfoIs('var f3_r18: C<number>');
 goTo.marker('c9');
-verify.quickInfoIs('(var) f3_r20: C<{\n    x: I;\n}>');
+verify.quickInfoIs('var f3_r20: C<{\n    x: I;\n}>');
 
 goTo.marker('d1');
-verify.quickInfoIs('(var) f4_r1: number');
+verify.quickInfoIs('var f4_r1: number');
 goTo.marker('d2');
-verify.quickInfoIs('(var) f4_r2: string');
+verify.quickInfoIs('var f4_r2: string');
 goTo.marker('d3');
-verify.quickInfoIs('(var) f4_r3: {\n    x: number;\n}');
+verify.quickInfoIs('var f4_r3: {\n    x: number;\n}');
 goTo.marker('d4');
-verify.quickInfoIs('(var) f4_r5: Foo<number>');
+verify.quickInfoIs('var f4_r5: Foo<number>');
 goTo.marker('d5');
-verify.quickInfoIs('(var) f4_r8: I');
+verify.quickInfoIs('var f4_r8: I');
 goTo.marker('d6');
-verify.quickInfoIs('(var) f4_r12: {\n    x: number;\n}');
+verify.quickInfoIs('var f4_r12: {\n    x: number;\n}');
 goTo.marker('d7');
-verify.quickInfoIs('(var) f4_r14: {\n    x: {\n        x: number;\n    };\n}');
+verify.quickInfoIs('var f4_r14: {\n    x: {\n        x: number;\n    };\n}');
 goTo.marker('d8');
-verify.quickInfoIs('(var) f4_r18: C<number>');
+verify.quickInfoIs('var f4_r18: C<number>');
 goTo.marker('d9');
-verify.quickInfoIs('(var) f4_r20: C<{\n    x: {\n        x: number;\n    };\n}>');
+verify.quickInfoIs('var f4_r20: C<{\n    x: {\n        x: number;\n    };\n}>');
 
 goTo.marker('e1');
-verify.quickInfoIs('(var) f5_r1: number');
+verify.quickInfoIs('var f5_r1: number');
 goTo.marker('e2');
-verify.quickInfoIs('(var) f5_r2: string');
+verify.quickInfoIs('var f5_r2: string');
 goTo.marker('e3');
-verify.quickInfoIs('(var) f5_r3: Foo<number>');
+verify.quickInfoIs('var f5_r3: Foo<number>');
 goTo.marker('e4');
-verify.quickInfoIs('(var) f5_r5: Foo<number>');
+verify.quickInfoIs('var f5_r5: Foo<number>');
 goTo.marker('e5');
-verify.quickInfoIs('(var) f5_r8: I');
+verify.quickInfoIs('var f5_r8: I');
 goTo.marker('e6');
-verify.quickInfoIs('(var) f5_r12: {\n    x: number;\n}');
+verify.quickInfoIs('var f5_r12: {\n    x: number;\n}');
 goTo.marker('e7');
-verify.quickInfoIs('(var) f5_r14: {\n    x: Foo<number>;\n}');
+verify.quickInfoIs('var f5_r14: {\n    x: Foo<number>;\n}');
 goTo.marker('e8');
-verify.quickInfoIs('(var) f5_r18: C<number>');
+verify.quickInfoIs('var f5_r18: C<number>');
 goTo.marker('e9');
-verify.quickInfoIs('(var) f5_r20: C<{\n    x: Foo<number>;\n}>');
+verify.quickInfoIs('var f5_r20: C<{\n    x: Foo<number>;\n}>');
 
 
diff --git a/tests/cases/fourslash/genericInterfacePropertyInference2.ts b/tests/cases/fourslash/genericInterfacePropertyInference2.ts
index edfc0db3ba438..9b9201609385f 100644
--- a/tests/cases/fourslash/genericInterfacePropertyInference2.ts
+++ b/tests/cases/fourslash/genericInterfacePropertyInference2.ts
@@ -66,56 +66,56 @@
 verify.numberOfErrorsInCurrentFile(0);
 
 goTo.marker('a1');
-verify.quickInfoIs('(var) f_r4: Foo<any>');
+verify.quickInfoIs('var f_r4: Foo<any>');
 goTo.marker('a2');
-verify.quickInfoIs('(var) f_r7: Foo<Foo<number>>');
+verify.quickInfoIs('var f_r7: Foo<Foo<number>>');
 goTo.marker('a3');
-verify.quickInfoIs('(var) f_r9: IG<any>');
+verify.quickInfoIs('var f_r9: IG<any>');
 goTo.marker('a5');
-verify.quickInfoIs('(var) f_r13: {\n    x: Foo<any>;\n}');
+verify.quickInfoIs('var f_r13: {\n    x: Foo<any>;\n}');
 goTo.marker('a7');
-verify.quickInfoIs('(var) f_r17: C<any>');
+verify.quickInfoIs('var f_r17: C<any>');
 
 goTo.marker('b1');
-verify.quickInfoIs('(var) f2_r4: Foo<number>');
+verify.quickInfoIs('var f2_r4: Foo<number>');
 goTo.marker('b2');
-verify.quickInfoIs('(var) f2_r7: Foo<Foo<number>>'); 
+verify.quickInfoIs('var f2_r7: Foo<Foo<number>>'); 
 goTo.marker('b3');
-verify.quickInfoIs('(var) f2_r9: IG<number>');
+verify.quickInfoIs('var f2_r9: IG<number>');
 goTo.marker('b5');
-verify.quickInfoIs('(var) f2_r13: {\n    x: Foo<number>;\n}');
+verify.quickInfoIs('var f2_r13: {\n    x: Foo<number>;\n}');
 goTo.marker('b7');
-verify.quickInfoIs('(var) f2_r17: C<number>');
+verify.quickInfoIs('var f2_r17: C<number>');
 
 goTo.marker('c1');
-verify.quickInfoIs('(var) f3_r4: Foo<I>');
+verify.quickInfoIs('var f3_r4: Foo<I>');
 goTo.marker('c2');
-verify.quickInfoIs('(var) f3_r7: Foo<Foo<number>>');
+verify.quickInfoIs('var f3_r7: Foo<Foo<number>>');
 goTo.marker('c3');
-verify.quickInfoIs('(var) f3_r9: IG<I>');
+verify.quickInfoIs('var f3_r9: IG<I>');
 goTo.marker('c5');
-verify.quickInfoIs('(var) f3_r13: {\n    x: Foo<I>;\n}');
+verify.quickInfoIs('var f3_r13: {\n    x: Foo<I>;\n}');
 goTo.marker('c7');
-verify.quickInfoIs('(var) f3_r17: C<I>');
+verify.quickInfoIs('var f3_r17: C<I>');
 
 goTo.marker('d1');
-verify.quickInfoIs('(var) f4_r4: Foo<{\n    x: number;\n}>');
+verify.quickInfoIs('var f4_r4: Foo<{\n    x: number;\n}>');
 goTo.marker('d2');
-verify.quickInfoIs('(var) f4_r7: Foo<Foo<number>>');
+verify.quickInfoIs('var f4_r7: Foo<Foo<number>>');
 goTo.marker('d3');
-verify.quickInfoIs('(var) f4_r9: IG<{\n    x: number;\n}>');
+verify.quickInfoIs('var f4_r9: IG<{\n    x: number;\n}>');
 goTo.marker('d5');
-verify.quickInfoIs('(var) f4_r13: {\n    x: Foo<{\n        x: number;\n    }>;\n}');
+verify.quickInfoIs('var f4_r13: {\n    x: Foo<{\n        x: number;\n    }>;\n}');
 goTo.marker('d7');
-verify.quickInfoIs('(var) f4_r17: C<{\n    x: number;\n}>');
+verify.quickInfoIs('var f4_r17: C<{\n    x: number;\n}>');
 
 goTo.marker('e1');
-verify.quickInfoIs('(var) f5_r4: Foo<Foo<number>>');
+verify.quickInfoIs('var f5_r4: Foo<Foo<number>>');
 goTo.marker('e2');
-verify.quickInfoIs('(var) f5_r7: Foo<Foo<number>>');
+verify.quickInfoIs('var f5_r7: Foo<Foo<number>>');
 goTo.marker('e3');
-verify.quickInfoIs('(var) f5_r9: IG<Foo<number>>');
+verify.quickInfoIs('var f5_r9: IG<Foo<number>>');
 goTo.marker('e5');
-verify.quickInfoIs('(var) f5_r13: {\n    x: Foo<Foo<number>>;\n}');
+verify.quickInfoIs('var f5_r13: {\n    x: Foo<Foo<number>>;\n}');
 goTo.marker('e7');
-verify.quickInfoIs('(var) f5_r17: C<Foo<number>>');
\ No newline at end of file
+verify.quickInfoIs('var f5_r17: C<Foo<number>>');
diff --git a/tests/cases/fourslash/genericInterfacesWithConstraints1.ts b/tests/cases/fourslash/genericInterfacesWithConstraints1.ts
index b75c364855c69..e800eb063461f 100644
--- a/tests/cases/fourslash/genericInterfacesWithConstraints1.ts
+++ b/tests/cases/fourslash/genericInterfacesWithConstraints1.ts
@@ -12,8 +12,8 @@
 ////var v/*3*/3: G<G<A, B>, C>;         // Ok
 
 goTo.marker('1');
-verify.quickInfoIs('(var) v1: G<A, C>', null);
+verify.quickInfoIs('var v1: G<A, C>', null);
 goTo.marker('2');
-verify.quickInfoIs('(var) v2: G<{\n    a: string;\n}, C>', null);
+verify.quickInfoIs('var v2: G<{\n    a: string;\n}, C>', null);
 goTo.marker('3');
-verify.quickInfoIs('(var) v3: G<G<A, B>, C>', null);
\ No newline at end of file
+verify.quickInfoIs('var v3: G<G<A, B>, C>', null);
diff --git a/tests/cases/fourslash/genericMapTyping1.ts b/tests/cases/fourslash/genericMapTyping1.ts
index ecddc229ac2ce..ea60fe0e0d65e 100644
--- a/tests/cases/fourslash/genericMapTyping1.ts
+++ b/tests/cases/fourslash/genericMapTyping1.ts
@@ -22,22 +22,22 @@
 
 verify.numberOfErrorsInCurrentFile(0);
 goTo.marker('1');
-verify.quickInfoIs('(var) bb: number[]');
+verify.quickInfoIs('var bb: number[]');
 
 goTo.marker('2');
-verify.quickInfoIs('(var) cc: number[]');
+verify.quickInfoIs('var cc: number[]');
 
 goTo.marker('3');
-verify.quickInfoIs('(var) dd: number[]');
+verify.quickInfoIs('var dd: number[]');
 
 goTo.marker('4');
-verify.quickInfoIs('(var) bbb: any[]');
+verify.quickInfoIs('var bbb: any[]');
 
 goTo.marker('5');
-verify.quickInfoIs('(var) ccc: any[]');
+verify.quickInfoIs('var ccc: any[]');
 
 goTo.marker('6');
-verify.quickInfoIs('(var) ddd: any[]');
+verify.quickInfoIs('var ddd: any[]');
 
 goTo.marker('7');
 verify.quickInfoIs('(parameter) xx: string');
diff --git a/tests/cases/fourslash/genericTypeArgumentInference1.ts b/tests/cases/fourslash/genericTypeArgumentInference1.ts
index 5c30363d35ce1..d8c332449e177 100644
--- a/tests/cases/fourslash/genericTypeArgumentInference1.ts
+++ b/tests/cases/fourslash/genericTypeArgumentInference1.ts
@@ -18,22 +18,22 @@
 ////var /*4*/r4 = _./*41*/all([<any>true], _.identity);
 
 goTo.marker('1');
-verify.quickInfoIs('(var) r: string | number | boolean');
+verify.quickInfoIs('var r: string | number | boolean');
 goTo.marker('11');
 verify.quickInfoIs('(method) Underscore.Static.all<string | number | boolean>(list: (string | number | boolean)[], iterator?: Underscore.Iterator<string | number | boolean, boolean>, context?: any): string | number | boolean');
 
 goTo.marker('2');
-verify.quickInfoIs('(var) r2: boolean');
+verify.quickInfoIs('var r2: boolean');
 goTo.marker('21');
 verify.quickInfoIs('(method) Underscore.Static.all<boolean>(list: boolean[], iterator?: Underscore.Iterator<boolean, boolean>, context?: any): boolean');
 
 goTo.marker('3');
-verify.quickInfoIs('(var) r3: any');
+verify.quickInfoIs('var r3: any');
 goTo.marker('31');
 verify.quickInfoIs('(method) Underscore.Static.all<any>(list: any[], iterator?: Underscore.Iterator<any, boolean>, context?: any): any');
 
 goTo.marker('4');
-verify.quickInfoIs('(var) r4: any');
+verify.quickInfoIs('var r4: any');
 goTo.marker('41');
 verify.quickInfoIs('(method) Underscore.Static.all<any>(list: any[], iterator?: Underscore.Iterator<any, boolean>, context?: any): any');
 
diff --git a/tests/cases/fourslash/genericTypeArgumentInference2.ts b/tests/cases/fourslash/genericTypeArgumentInference2.ts
index bb59cc8eed650..aaf0d138f2f76 100644
--- a/tests/cases/fourslash/genericTypeArgumentInference2.ts
+++ b/tests/cases/fourslash/genericTypeArgumentInference2.ts
@@ -18,22 +18,22 @@
 ////var /*4*/r4 = _./*41*/all([<any>true], _.identity);
 
 goTo.marker('1');
-verify.quickInfoIs('(var) r: string | number | boolean');
+verify.quickInfoIs('var r: string | number | boolean');
 goTo.marker('11');
 verify.quickInfoIs('(method) Underscore.Static.all<string | number | boolean>(list: (string | number | boolean)[], iterator?: Underscore.Iterator<string | number | boolean, boolean>, context?: any): string | number | boolean');
 
 goTo.marker('2');
-verify.quickInfoIs('(var) r2: boolean');
+verify.quickInfoIs('var r2: boolean');
 goTo.marker('21');
 verify.quickInfoIs('(method) Underscore.Static.all<boolean>(list: boolean[], iterator?: Underscore.Iterator<boolean, boolean>, context?: any): boolean');
 
 goTo.marker('3');
-verify.quickInfoIs('(var) r3: any');
+verify.quickInfoIs('var r3: any');
 goTo.marker('31');
 verify.quickInfoIs('(method) Underscore.Static.all<any>(list: any[], iterator?: Underscore.Iterator<any, boolean>, context?: any): any');
 
 goTo.marker('4');
-verify.quickInfoIs('(var) r4: any');
+verify.quickInfoIs('var r4: any');
 goTo.marker('41');
 verify.quickInfoIs('(method) Underscore.Static.all<any>(list: any[], iterator?: Underscore.Iterator<any, boolean>, context?: any): any');
 
diff --git a/tests/cases/fourslash/genericTypeParamUnrelatedToArguments1.ts b/tests/cases/fourslash/genericTypeParamUnrelatedToArguments1.ts
index f7e2d7d27fb5a..e4a679a4b22ae 100644
--- a/tests/cases/fourslash/genericTypeParamUnrelatedToArguments1.ts
+++ b/tests/cases/fourslash/genericTypeParamUnrelatedToArguments1.ts
@@ -11,19 +11,19 @@
 ////var f/*6*/6: Foo<number> = new Foo<number>(3);
 
 goTo.marker('1');
-verify.quickInfoIs('(var) f1: Foo<number>', null);
+verify.quickInfoIs('var f1: Foo<number>', null);
 
 goTo.marker('2');
-verify.quickInfoIs('(var) f2: Foo<number>', null);
+verify.quickInfoIs('var f2: Foo<number>', null);
 
 goTo.marker('3');
-verify.quickInfoIs('(var) f3: any', null);
+verify.quickInfoIs('var f3: any', null);
 
 goTo.marker('4');
-verify.quickInfoIs('(var) f4: Foo<number>', null);
+verify.quickInfoIs('var f4: Foo<number>', null);
 
 goTo.marker('5');
-verify.quickInfoIs('(var) f5: any', null);
+verify.quickInfoIs('var f5: any', null);
 
 goTo.marker('6');
-verify.quickInfoIs('(var) f6: Foo<number>', null);
\ No newline at end of file
+verify.quickInfoIs('var f6: Foo<number>', null);
diff --git a/tests/cases/fourslash/genericWithSpecializedProperties1.ts b/tests/cases/fourslash/genericWithSpecializedProperties1.ts
index ea6df9a034e37..03d1569cd281d 100644
--- a/tests/cases/fourslash/genericWithSpecializedProperties1.ts
+++ b/tests/cases/fourslash/genericWithSpecializedProperties1.ts
@@ -14,11 +14,11 @@
 ////var /*4*/y2 = f2.y;
 
 goTo.marker('1');
-verify.quickInfoIs('(var) xx: Foo<string>');
+verify.quickInfoIs('var xx: Foo<string>');
 goTo.marker('2');
-verify.quickInfoIs('(var) yy: Foo<number>');
+verify.quickInfoIs('var yy: Foo<number>');
 
 goTo.marker('3');
-verify.quickInfoIs('(var) x2: Foo<string>');
+verify.quickInfoIs('var x2: Foo<string>');
 goTo.marker('4');
-verify.quickInfoIs('(var) y2: Foo<number>');
\ No newline at end of file
+verify.quickInfoIs('var y2: Foo<number>');
diff --git a/tests/cases/fourslash/genericWithSpecializedProperties2.ts b/tests/cases/fourslash/genericWithSpecializedProperties2.ts
index 21754c9ec9acc..e645a8a058794 100644
--- a/tests/cases/fourslash/genericWithSpecializedProperties2.ts
+++ b/tests/cases/fourslash/genericWithSpecializedProperties2.ts
@@ -13,11 +13,11 @@
 ////var /*4*/y2 = f2.y; 
 
 goTo.marker('1');
-verify.quickInfoIs('(var) x: Foo<string>');
+verify.quickInfoIs('var x: Foo<string>');
 goTo.marker('2');
-verify.quickInfoIs('(var) y: Foo<number>');
+verify.quickInfoIs('var y: Foo<number>');
 
 goTo.marker('3');
-verify.quickInfoIs('(var) x2: Foo<string>');
+verify.quickInfoIs('var x2: Foo<string>');
 goTo.marker('4');
-verify.quickInfoIs('(var) y2: Foo<number>');
\ No newline at end of file
+verify.quickInfoIs('var y2: Foo<number>');
diff --git a/tests/cases/fourslash/genericWithSpecializedProperties3.ts b/tests/cases/fourslash/genericWithSpecializedProperties3.ts
index d5f02813de441..e5d7867d13095 100644
--- a/tests/cases/fourslash/genericWithSpecializedProperties3.ts
+++ b/tests/cases/fourslash/genericWithSpecializedProperties3.ts
@@ -14,11 +14,11 @@
 ////var /*4*/y2 = f2.y;
 
 goTo.marker('1');
-verify.quickInfoIs('(var) xx: Foo<number, string>');
+verify.quickInfoIs('var xx: Foo<number, string>');
 goTo.marker('2');
-verify.quickInfoIs('(var) yy: Foo<string, string>');
+verify.quickInfoIs('var yy: Foo<string, string>');
 
 goTo.marker('3');
-verify.quickInfoIs('(var) x2: Foo<string, number>');
+verify.quickInfoIs('var x2: Foo<string, number>');
 goTo.marker('4');
-verify.quickInfoIs('(var) y2: Foo<number, number>');
\ No newline at end of file
+verify.quickInfoIs('var y2: Foo<number, number>');
diff --git a/tests/cases/fourslash/getCompletionEntryDetails.ts b/tests/cases/fourslash/getCompletionEntryDetails.ts
index 078e84cf55340..1ed680b667800 100644
--- a/tests/cases/fourslash/getCompletionEntryDetails.ts
+++ b/tests/cases/fourslash/getCompletionEntryDetails.ts
@@ -14,17 +14,17 @@ verify.completionListContains("ccc");
 verify.completionListContains("ddd");
 
 // Checking for completion details before edit should work
-verify.completionEntryDetailIs("aaa", "(var) aaa: number");
-verify.completionEntryDetailIs("ccc", "(var) ccc: number");
+verify.completionEntryDetailIs("aaa", "var aaa: number");
+verify.completionEntryDetailIs("ccc", "var ccc: number");
 
 // Make an edit
 edit.insert("a");
 edit.backspace();
 
 // Checking for completion details after edit should work too
-verify.completionEntryDetailIs("bbb", "(var) bbb: string");
-verify.completionEntryDetailIs("ddd", "(var) ddd: string");
+verify.completionEntryDetailIs("bbb", "var bbb: string");
+verify.completionEntryDetailIs("ddd", "var ddd: string");
 
 // Checking for completion details again before edit should work
-verify.completionEntryDetailIs("aaa", "(var) aaa: number");
-verify.completionEntryDetailIs("ccc", "(var) ccc: number");
+verify.completionEntryDetailIs("aaa", "var aaa: number");
+verify.completionEntryDetailIs("ccc", "var ccc: number");
diff --git a/tests/cases/fourslash/getCompletionEntryDetails2.ts b/tests/cases/fourslash/getCompletionEntryDetails2.ts
index b34aad66ba264..3e7e77b588c8d 100644
--- a/tests/cases/fourslash/getCompletionEntryDetails2.ts
+++ b/tests/cases/fourslash/getCompletionEntryDetails2.ts
@@ -15,4 +15,4 @@ edit.insert("a");
 edit.backspace();
 
 // Checking for completion details after edit should work too
-verify.completionEntryDetailIs("x", "(var) Foo.x: number");
+verify.completionEntryDetailIs("x", "var Foo.x: number");
diff --git a/tests/cases/fourslash/incrementalResolveAccessor.ts b/tests/cases/fourslash/incrementalResolveAccessor.ts
index 812146398f188..94a296cc0e959 100644
--- a/tests/cases/fourslash/incrementalResolveAccessor.ts
+++ b/tests/cases/fourslash/incrementalResolveAccessor.ts
@@ -14,7 +14,7 @@
 
 // Resolve without typeCheck
 goTo.marker('1');
-verify.quickInfoIs("(var) b: string");
+verify.quickInfoIs("var b: string");
 
 // TypeCheck
 verify.numberOfErrorsInCurrentFile(3);
\ No newline at end of file
diff --git a/tests/cases/fourslash/incrementalResolveConstructorDeclaration.ts b/tests/cases/fourslash/incrementalResolveConstructorDeclaration.ts
index 3eb516312440f..8e488b286d39f 100644
--- a/tests/cases/fourslash/incrementalResolveConstructorDeclaration.ts
+++ b/tests/cases/fourslash/incrementalResolveConstructorDeclaration.ts
@@ -11,7 +11,7 @@
 
 // Do resolve without typeCheck
 goTo.marker('1');
-verify.quickInfoIs("(var) val: c1");
+verify.quickInfoIs("var val: c1");
 
 // TypeCheck
 verify.numberOfErrorsInCurrentFile(1);
diff --git a/tests/cases/fourslash/incrementalResolveFunctionPropertyAssignment.ts b/tests/cases/fourslash/incrementalResolveFunctionPropertyAssignment.ts
index c7a9c28c5749b..8f38ac6fab2cb 100644
--- a/tests/cases/fourslash/incrementalResolveFunctionPropertyAssignment.ts
+++ b/tests/cases/fourslash/incrementalResolveFunctionPropertyAssignment.ts
@@ -22,7 +22,7 @@
 /////*1*/val;
 
 goTo.marker('1');
-verify.quickInfoIs("(var) val: string");
+verify.quickInfoIs("var val: string");
 
 // TypeCheck
 verify.numberOfErrorsInCurrentFile(1);
\ No newline at end of file
diff --git a/tests/cases/fourslash/indexerReturnTypes1.ts b/tests/cases/fourslash/indexerReturnTypes1.ts
index f94a1151b13fd..c5bfa2719d689 100644
--- a/tests/cases/fourslash/indexerReturnTypes1.ts
+++ b/tests/cases/fourslash/indexerReturnTypes1.ts
@@ -63,49 +63,49 @@
 
 
 goTo.marker('1');
-verify.quickInfoIs('(var) r1: Date');
+verify.quickInfoIs('var r1: Date');
 
 goTo.marker('2');
-verify.quickInfoIs('(var) r2: any');
+verify.quickInfoIs('var r2: any');
 
 goTo.marker('3');
-verify.quickInfoIs('(var) r3: RegExp');
+verify.quickInfoIs('var r3: RegExp');
 
 goTo.marker('4');
-verify.quickInfoIs('(var) r4: RegExp');
+verify.quickInfoIs('var r4: RegExp');
 
 goTo.marker('5');
-verify.quickInfoIs('(var) r5: Date');
+verify.quickInfoIs('var r5: Date');
 
 goTo.marker('6');
-verify.quickInfoIs('(var) r6: any');
+verify.quickInfoIs('var r6: any');
 
 goTo.marker('7');
-verify.quickInfoIs('(var) r7: RegExp');
+verify.quickInfoIs('var r7: RegExp');
 
 goTo.marker('8');
-verify.quickInfoIs('(var) r8: RegExp');
+verify.quickInfoIs('var r8: RegExp');
 
 goTo.marker('9');
-verify.quickInfoIs('(var) r9: Date');
+verify.quickInfoIs('var r9: Date');
 
 goTo.marker('10');
-verify.quickInfoIs('(var) r10: any');
+verify.quickInfoIs('var r10: any');
 
 goTo.marker('11');
-verify.quickInfoIs('(var) r11: Date');
+verify.quickInfoIs('var r11: Date');
 
 goTo.marker('12');
-verify.quickInfoIs('(var) r12: Date');
+verify.quickInfoIs('var r12: Date');
 
 goTo.marker('13');
-verify.quickInfoIs('(var) r13: Ty<Date>');
+verify.quickInfoIs('var r13: Ty<Date>');
 
 goTo.marker('14');
-verify.quickInfoIs('(var) r14: any');
+verify.quickInfoIs('var r14: any');
 
 goTo.marker('15');
-verify.quickInfoIs('(var) r15: {\n    [x: number]: Date;\n}');
+verify.quickInfoIs('var r15: {\n    [x: number]: Date;\n}');
 
 goTo.marker('16');
-verify.quickInfoIs('(var) r16: any');
\ No newline at end of file
+verify.quickInfoIs('var r16: any');
diff --git a/tests/cases/fourslash/intellisenseInObjectLiteral.ts b/tests/cases/fourslash/intellisenseInObjectLiteral.ts
index f3a5cacefb6c2..404732645c09c 100644
--- a/tests/cases/fourslash/intellisenseInObjectLiteral.ts
+++ b/tests/cases/fourslash/intellisenseInObjectLiteral.ts
@@ -9,4 +9,4 @@
 //// }
 
 goTo.marker();
-verify.quickInfoIs("(var) x: number", "");
\ No newline at end of file
+verify.quickInfoIs("var x: number", "");
diff --git a/tests/cases/fourslash/letQuickInfoAndCompletionList.ts b/tests/cases/fourslash/letQuickInfoAndCompletionList.ts
index 127b4d626fd97..87c7aaf76a86e 100644
--- a/tests/cases/fourslash/letQuickInfoAndCompletionList.ts
+++ b/tests/cases/fourslash/letQuickInfoAndCompletionList.ts
@@ -8,21 +8,21 @@
 ////}
 
 goTo.marker('1');
-verify.quickInfoIs("(let) a: number");
+verify.quickInfoIs("let a: number");
 
 goTo.marker('2');
-verify.completionListContains("a", "(let) a: number");
-verify.quickInfoIs("(let) a: number");
+verify.completionListContains("a", "let a: number");
+verify.quickInfoIs("let a: number");
 
 goTo.marker('3');
-verify.quickInfoIs("(let) b: number");
+verify.quickInfoIs("let b: number");
 
 goTo.marker('4');
-verify.completionListContains("a", "(let) a: number");
-verify.completionListContains("b", "(let) b: number");
-verify.quickInfoIs("(let) b: number");
+verify.completionListContains("a", "let a: number");
+verify.completionListContains("b", "let b: number");
+verify.quickInfoIs("let b: number");
 
 goTo.marker('5');
-verify.completionListContains("a", "(let) a: number");
-verify.completionListContains("b", "(let) b: number");
-verify.quickInfoIs("(let) a: number");
\ No newline at end of file
+verify.completionListContains("a", "let a: number");
+verify.completionListContains("b", "let b: number");
+verify.quickInfoIs("let a: number");
diff --git a/tests/cases/fourslash/localFunction.ts b/tests/cases/fourslash/localFunction.ts
index bf6d7636beb50..584fbae191911 100644
--- a/tests/cases/fourslash/localFunction.ts
+++ b/tests/cases/fourslash/localFunction.ts
@@ -10,7 +10,7 @@
 ////}
 
 goTo.marker("1");
-verify.quickInfoIs('(function) foo(): void');
+verify.quickInfoIs('function foo(): void');
 goTo.marker("2");
 verify.quickInfoIs('(local function) bar2(): void');
 goTo.marker("3");
diff --git a/tests/cases/fourslash/memberListOfModuleAfterInvalidCharater.ts b/tests/cases/fourslash/memberListOfModuleAfterInvalidCharater.ts
index b5bd4fb6bb53b..76ffa87dd4f83 100644
--- a/tests/cases/fourslash/memberListOfModuleAfterInvalidCharater.ts
+++ b/tests/cases/fourslash/memberListOfModuleAfterInvalidCharater.ts
@@ -7,4 +7,4 @@
 ////testModule./**/
 
 goTo.marker();
-verify.completionListContains('foo', '(var) testModule.foo: number');
\ No newline at end of file
+verify.completionListContains('foo', 'var testModule.foo: number');
diff --git a/tests/cases/fourslash/memberListOfModuleInAnotherModule.ts b/tests/cases/fourslash/memberListOfModuleInAnotherModule.ts
index 4ac2778ac5ab5..2908e30385540 100644
--- a/tests/cases/fourslash/memberListOfModuleInAnotherModule.ts
+++ b/tests/cases/fourslash/memberListOfModuleInAnotherModule.ts
@@ -21,17 +21,17 @@
 ////}
 
 goTo.marker('1');
-verify.completionListContains('meX', '(var) mod1.meX: number');
-verify.completionListContains('meFunc', '(function) mod1.meFunc(): void');
+verify.completionListContains('meX', 'var mod1.meX: number');
+verify.completionListContains('meFunc', 'function mod1.meFunc(): void');
 verify.completionListContains('meClass', 'class mod1.meClass');
 verify.completionListContains('meMod', 'module mod1.meMod');
 verify.completionListContains('meInt', 'interface mod1.meInt');
 
 goTo.marker('2');
-verify.completionListContains('meX', '(var) mod1.meX: number');
-verify.completionListContains('meFunc', '(function) mod1.meFunc(): void');
+verify.completionListContains('meX', 'var mod1.meX: number');
+verify.completionListContains('meFunc', 'function mod1.meFunc(): void');
 verify.completionListContains('meClass', 'class mod1.meClass');
 verify.completionListContains('meMod', 'module mod1.meMod');
 
 goTo.marker('3');
-verify.completionListContains('iMex', '(var) mod1.meMod.iMex: number');
\ No newline at end of file
+verify.completionListContains('iMex', 'var mod1.meMod.iMex: number');
diff --git a/tests/cases/fourslash/mergedDeclarationsWithExportAssignment1.ts b/tests/cases/fourslash/mergedDeclarationsWithExportAssignment1.ts
index 3198b6e92434f..00b9aaf844727 100644
--- a/tests/cases/fourslash/mergedDeclarationsWithExportAssignment1.ts
+++ b/tests/cases/fourslash/mergedDeclarationsWithExportAssignment1.ts
@@ -25,11 +25,11 @@ goTo.marker('2');
 verify.completionListContains('Foo');
 
 goTo.marker('3');
-verify.quickInfoIs('(var) z: Foo');
+verify.quickInfoIs('var z: Foo');
 
 goTo.marker('4');
 verify.completionListContains('x');
 
 goTo.marker('5');
-verify.quickInfoIs('(var) r2: number');
+verify.quickInfoIs('var r2: number');
 
diff --git a/tests/cases/fourslash/moduleMembersOfGenericType.ts b/tests/cases/fourslash/moduleMembersOfGenericType.ts
index 57c08c900666a..1c5a3acff2c60 100644
--- a/tests/cases/fourslash/moduleMembersOfGenericType.ts
+++ b/tests/cases/fourslash/moduleMembersOfGenericType.ts
@@ -6,4 +6,4 @@
 ////var r = M./**/;
 
 goTo.marker();
-verify.completionListContains('x', '(var) M.x: <T>(x: T) => T');
\ No newline at end of file
+verify.completionListContains('x', 'var M.x: <T>(x: T) => T');
diff --git a/tests/cases/fourslash/moduleVariables.ts b/tests/cases/fourslash/moduleVariables.ts
index d949bf677b1e8..24e4f400472a2 100644
--- a/tests/cases/fourslash/moduleVariables.ts
+++ b/tests/cases/fourslash/moduleVariables.ts
@@ -14,10 +14,10 @@
 ////}
 
 goTo.marker('1');
-verify.quickInfoIs("(var) M.x: number", undefined);
+verify.quickInfoIs("var M.x: number", undefined);
 
 goTo.marker('2');
-verify.quickInfoIs("(var) M.x: number", undefined);
+verify.quickInfoIs("var M.x: number", undefined);
 
 goTo.marker('3');
-verify.quickInfoIs("(var) x: number", undefined);
\ No newline at end of file
+verify.quickInfoIs("var x: number", undefined);
diff --git a/tests/cases/fourslash/multiModuleFundule1.ts b/tests/cases/fourslash/multiModuleFundule1.ts
index 50acd8b495da5..bc3e1815fd88b 100644
--- a/tests/cases/fourslash/multiModuleFundule1.ts
+++ b/tests/cases/fourslash/multiModuleFundule1.ts
@@ -18,14 +18,14 @@ verify.completionListContains('C');
 edit.insert('C.x);');
 
 goTo.marker('2');
-verify.quickInfoIs('(var) r: void');
+verify.quickInfoIs('var r: void');
 
 goTo.marker('3');
 verify.completionListContains('C');
 edit.insert('C.x);');
 
 goTo.marker('4');
-verify.quickInfoIs('(var) r2: any');
+verify.quickInfoIs('var r2: any');
 
 goTo.marker('5');
 verify.completionListContains('x');
diff --git a/tests/cases/fourslash/nameOfRetypedClassInModule.ts b/tests/cases/fourslash/nameOfRetypedClassInModule.ts
index 7dea74020f8a1..9ac1362ec1566 100644
--- a/tests/cases/fourslash/nameOfRetypedClassInModule.ts
+++ b/tests/cases/fourslash/nameOfRetypedClassInModule.ts
@@ -14,19 +14,19 @@
 edit.disableFormatting();
 
 goTo.marker('check');
-verify.quickInfoIs('(constructor) Check(val: any): Check');
+verify.quickInfoIs('constructor Check(val: any): Check');
 
 goTo.marker('check2');
-verify.quickInfoIs('(constructor) M.Check2(val: any): Check2');
+verify.quickInfoIs('constructor M.Check2(val: any): Check2');
 
 goTo.marker('A');
 edit.deleteAtCaret('class A {}'.length);
 edit.insert('class A { constructor(val) {} }');
 edit.moveLeft('constructor(val) {} }'.length);
-verify.quickInfoIs('(constructor) A(val: any): A');
+verify.quickInfoIs('constructor A(val: any): A');
 
 goTo.marker('B');
 edit.deleteAtCaret('export class B {}'.length);
 edit.insert('export class B { constructor(val) {} }');
 edit.moveLeft('constructor(val) {} }'.length);
-verify.quickInfoIs('(constructor) M.B(val: any): B');
+verify.quickInfoIs('constructor M.B(val: any): B');
diff --git a/tests/cases/fourslash/noTypeParameterInLHS.ts b/tests/cases/fourslash/noTypeParameterInLHS.ts
index 729532a669972..26d8366737a55 100644
--- a/tests/cases/fourslash/noTypeParameterInLHS.ts
+++ b/tests/cases/fourslash/noTypeParameterInLHS.ts
@@ -6,6 +6,6 @@
 ////var /*2*/c: C<I>;
 
 goTo.marker('1');
-verify.quickInfoIs('(var) i: I<any>');
+verify.quickInfoIs('var i: I<any>');
 goTo.marker('2');
-verify.quickInfoIs('(var) c: C<any>');
+verify.quickInfoIs('var c: C<any>');
diff --git a/tests/cases/fourslash/numericPropertyNames.ts b/tests/cases/fourslash/numericPropertyNames.ts
index 581308560741a..193b0135218df 100644
--- a/tests/cases/fourslash/numericPropertyNames.ts
+++ b/tests/cases/fourslash/numericPropertyNames.ts
@@ -3,4 +3,4 @@
 ////var /**/t2 = { 0: 1, 1: "" };
 
 goTo.marker();
-verify.quickInfoIs('(var) t2: {\n    0: number;\n    1: string;\n}');
\ No newline at end of file
+verify.quickInfoIs('var t2: {\n    0: number;\n    1: string;\n}');
diff --git a/tests/cases/fourslash/objectLiteralCallSignatures.ts b/tests/cases/fourslash/objectLiteralCallSignatures.ts
index d1bc919508638..4be651b7a1554 100644
--- a/tests/cases/fourslash/objectLiteralCallSignatures.ts
+++ b/tests/cases/fourslash/objectLiteralCallSignatures.ts
@@ -22,8 +22,8 @@
 
 verify.not.errorExistsAfterMarker('1');
 goTo.marker('1');
-verify.quickInfoIs('(var) x: {\n    func1(x: number): number;\n    func2: (x: number) => number;\n    func3: (x: number) => number;\n}');
+verify.quickInfoIs('var x: {\n    func1(x: number): number;\n    func2: (x: number) => number;\n    func3: (x: number) => number;\n}');
 
 goTo.marker('2');
-verify.quickInfoIs('(var) y: {\n    func4(x: number): number;\n    func4(s: string): string;\n    func5: {\n        (x: number): number;\n        (s: string): string;\n    };\n}');
+verify.quickInfoIs('var y: {\n    func4(x: number): number;\n    func4(s: string): string;\n    func5: {\n        (x: number): number;\n        (s: string): string;\n    };\n}');
 
diff --git a/tests/cases/fourslash/overloadOnConstCallSignature.ts b/tests/cases/fourslash/overloadOnConstCallSignature.ts
index 7e8075e365293..d729fd4da6f8d 100644
--- a/tests/cases/fourslash/overloadOnConstCallSignature.ts
+++ b/tests/cases/fourslash/overloadOnConstCallSignature.ts
@@ -15,4 +15,4 @@ verify.currentSignatureHelpIs('foo(name: \'order\'): string');
 edit.insert('"hi"');
 
 goTo.marker('2');
-verify.quickInfoIs('(var) x: string');
+verify.quickInfoIs('var x: string');
diff --git a/tests/cases/fourslash/overloadQuickInfo.ts b/tests/cases/fourslash/overloadQuickInfo.ts
index 41cba67b391d4..5b5260d94a62f 100644
--- a/tests/cases/fourslash/overloadQuickInfo.ts
+++ b/tests/cases/fourslash/overloadQuickInfo.ts
@@ -18,6 +18,6 @@
 ////Fo/**/o();
 
 goTo.marker();
-verify.quickInfoIs("(function) Foo(): any (+12 overloads)");
+verify.quickInfoIs("function Foo(): any (+12 overloads)");
 
 
diff --git a/tests/cases/fourslash/promiseTyping1.ts b/tests/cases/fourslash/promiseTyping1.ts
index 9a79c0eb7a9fb..9b03ecf64b300 100644
--- a/tests/cases/fourslash/promiseTyping1.ts
+++ b/tests/cases/fourslash/promiseTyping1.ts
@@ -15,7 +15,7 @@
 //// } );
 
 goTo.marker("1");
-verify.quickInfoIs('(var) p2: IPromise<string>');
+verify.quickInfoIs('var p2: IPromise<string>');
 
 goTo.marker("2");
 verify.quickInfoIs('(parameter) xx: string');
diff --git a/tests/cases/fourslash/promiseTyping2.ts b/tests/cases/fourslash/promiseTyping2.ts
index e4e8039519916..b848238713dbe 100644
--- a/tests/cases/fourslash/promiseTyping2.ts
+++ b/tests/cases/fourslash/promiseTyping2.ts
@@ -16,19 +16,19 @@
 
 
 goTo.marker("1");
-verify.quickInfoIs('(var) p1: IPromise<number>');
+verify.quickInfoIs('var p1: IPromise<number>');
 
 goTo.marker("2");
 verify.quickInfoIs('(parameter) xx: number');
 
 goTo.marker("3");
-verify.quickInfoIs('(var) p2: IPromise<string>');
+verify.quickInfoIs('var p2: IPromise<string>');
 
 goTo.marker("4");
 verify.quickInfoIs('(parameter) xx: number');
 
 goTo.marker("5");
-verify.quickInfoIs('(var) p3: IPromise<string>');
+verify.quickInfoIs('var p3: IPromise<string>');
 
 goTo.marker("6");
 verify.quickInfoIs('(parameter) xx: string');
diff --git a/tests/cases/fourslash/proto.ts b/tests/cases/fourslash/proto.ts
index cdb279b5009bc..d99a3d8b5b580 100644
--- a/tests/cases/fourslash/proto.ts
+++ b/tests/cases/fourslash/proto.ts
@@ -10,11 +10,11 @@
 goTo.marker('1');
 verify.quickInfoIs("interface M.__proto__", "");
 goTo.marker('2');
-verify.quickInfoIs("(var) __proto__: M.__proto__", "");
+verify.quickInfoIs("var __proto__: M.__proto__", "");
 goTo.marker('3');
-verify.completionListContains("__proto__", "(var) __proto__: M.__proto__", "");
+verify.completionListContains("__proto__", "var __proto__: M.__proto__", "");
 edit.insert("__proto__");
 goTo.definition();
 verify.caretAtMarker('2');
 goTo.marker('4');
-verify.quickInfoIs("(var) fun: (__proto__: any) => boolean", "");
\ No newline at end of file
+verify.quickInfoIs("var fun: (__proto__: any) => boolean", "");
diff --git a/tests/cases/fourslash/protoVarVisibleWithOuterScopeUnderscoreProto.ts b/tests/cases/fourslash/protoVarVisibleWithOuterScopeUnderscoreProto.ts
index a36f5ddbfe2d6..c0c7eb9f3ce21 100644
--- a/tests/cases/fourslash/protoVarVisibleWithOuterScopeUnderscoreProto.ts
+++ b/tests/cases/fourslash/protoVarVisibleWithOuterScopeUnderscoreProto.ts
@@ -9,4 +9,4 @@
 
 goTo.marker('');
 verify.completionListContains("__proto__", '(local var) __proto__: string');
-verify.completionListContains("___proto__", '(var) ___proto__: number');
\ No newline at end of file
+verify.completionListContains("___proto__", 'var ___proto__: number');
diff --git a/tests/cases/fourslash/qualifiedName_import-declaration-with-variable-entity-names.ts b/tests/cases/fourslash/qualifiedName_import-declaration-with-variable-entity-names.ts
index b6f64e4be42df..97e5750241f2a 100644
--- a/tests/cases/fourslash/qualifiedName_import-declaration-with-variable-entity-names.ts
+++ b/tests/cases/fourslash/qualifiedName_import-declaration-with-variable-entity-names.ts
@@ -11,7 +11,7 @@
 ////var x = Alpha.[|{| "name" : "mem" |}x|]
 
 goTo.marker('import');
-verify.completionListContains('x', '(var) Alpha.x: number');
+verify.completionListContains('x', 'var Alpha.x: number');
 
 var def: FourSlashInterface.Range = test.ranges().filter(range => range.marker.data.name === "def")[0];
 var imp: FourSlashInterface.Range = test.ranges().filter(range => range.marker.data.name === "import")[0];
diff --git a/tests/cases/fourslash/quickInfoDisplayPartsArrowFunctionExpression.ts b/tests/cases/fourslash/quickInfoDisplayPartsArrowFunctionExpression.ts
index 3d996ae53caf2..5300e2f897b20 100644
--- a/tests/cases/fourslash/quickInfoDisplayPartsArrowFunctionExpression.ts
+++ b/tests/cases/fourslash/quickInfoDisplayPartsArrowFunctionExpression.ts
@@ -9,7 +9,7 @@ var marker = 0;
 function verifyInstance(instanceName: string, paramCount: number, type: string) {
     marker++;
     goTo.marker(marker.toString());
-    var displayParts = [{ text: "(", kind: "punctuation" }, { text: "var", kind: "text" }, { text: ")", kind: "punctuation" },
+    var displayParts = [{ text: "var", kind: "keyword" },
         { text: " ", kind: "space" }, { text: instanceName, kind: "localName" }, { text: ":", kind: "punctuation" },
         { text: " ", kind: "space" }, { text: "(", kind: "punctuation" }];
     
diff --git a/tests/cases/fourslash/quickInfoDisplayPartsClass.ts b/tests/cases/fourslash/quickInfoDisplayPartsClass.ts
index ee38c71792284..a0b5b2e64fc80 100644
--- a/tests/cases/fourslash/quickInfoDisplayPartsClass.ts
+++ b/tests/cases/fourslash/quickInfoDisplayPartsClass.ts
@@ -12,14 +12,14 @@ verify.verifyQuickInfoDisplayParts("class", "", { start: test.markerByName("1").
 
 goTo.marker('2');
 verify.verifyQuickInfoDisplayParts("var", "", { start: test.markerByName("2").position, length: "cInstance".length },
-    [{ text: "(", kind: "punctuation" }, { text: "var", kind: "text" }, { text: ")", kind: "punctuation" },
+    [{ text: "var", kind: "keyword" },
         { text: " ", kind: "space" }, { text: "cInstance", kind: "localName" }, { text: ":", kind: "punctuation" },
         { text: " ", kind: "space" }, { text: "c", kind: "className" }],
     []);
 
 goTo.marker('3');
 verify.verifyQuickInfoDisplayParts("constructor", "", { start: test.markerByName("3").position, length: "c".length },
-    [{ text: "(", kind: "punctuation" }, { text: "constructor", kind: "text" }, { text: ")", kind: "punctuation" },
+    [{ text: "constructor", kind: "keyword" },
         { text: " ", kind: "space" }, { text: "c", kind: "className" },
         { text: "(", kind: "punctuation" }, { text: ")", kind: "punctuation" }, { text: ":", kind: "punctuation" },
         { text: " ", kind: "space" }, { text: "c", kind: "className" }],
@@ -27,7 +27,7 @@ verify.verifyQuickInfoDisplayParts("constructor", "", { start: test.markerByName
 
 goTo.marker('4');
 verify.verifyQuickInfoDisplayParts("var", "", { start: test.markerByName("4").position, length: "cVal".length },
-    [{ text: "(", kind: "punctuation" }, { text: "var", kind: "text" }, { text: ")", kind: "punctuation" },
+    [{ text: "var", kind: "keyword" },
         { text: " ", kind: "space" }, { text: "cVal", kind: "localName" }, { text: ":", kind: "punctuation" },
         { text: " ", kind: "space" },
         { text: "typeof", kind: "keyword" }, { text: " ", kind: "space" }, { text: "c", kind: "className" }],
diff --git a/tests/cases/fourslash/quickInfoDisplayPartsClassAccessors.ts b/tests/cases/fourslash/quickInfoDisplayPartsClassAccessors.ts
index f3a0f90ea33fb..a6d2eea0b9b94 100644
--- a/tests/cases/fourslash/quickInfoDisplayPartsClassAccessors.ts
+++ b/tests/cases/fourslash/quickInfoDisplayPartsClassAccessors.ts
@@ -98,7 +98,7 @@ verifyProtectedStaticProperty('81s');
 
 goTo.marker('9');
 verify.verifyQuickInfoDisplayParts("var", "", { start: test.markerByName("9").position, length: "cInstance".length },
-    [{ text: "(", kind: "punctuation" }, { text: "var", kind: "text" }, { text: ")", kind: "punctuation" },
+    [{ text: "var", kind: "keyword" },
         { text: " ", kind: "space" }, { text: "cInstance", kind: "localName" }, { text: ":", kind: "punctuation" },
         { text: " ", kind: "space" }, { text: "c", kind: "className" }],
     []);
@@ -114,7 +114,7 @@ verifyStaticProperty('12');
 
 goTo.marker('9s');
 verify.verifyQuickInfoDisplayParts("var", "", { start: test.markerByName("9s").position, length: "cInstance".length },
-    [{ text: "(", kind: "punctuation" }, { text: "var", kind: "text" }, { text: ")", kind: "punctuation" },
+    [{ text: "var", kind: "keyword" },
         { text: " ", kind: "space" }, { text: "cInstance", kind: "localName" }, { text: ":", kind: "punctuation" },
         { text: " ", kind: "space" }, { text: "c", kind: "className" }],
     []);
diff --git a/tests/cases/fourslash/quickInfoDisplayPartsClassConstructor.ts b/tests/cases/fourslash/quickInfoDisplayPartsClassConstructor.ts
index 1145e43e1dac2..a3ec3f3eb321b 100644
--- a/tests/cases/fourslash/quickInfoDisplayPartsClassConstructor.ts
+++ b/tests/cases/fourslash/quickInfoDisplayPartsClassConstructor.ts
@@ -30,7 +30,7 @@
 function verifyNonOverloadSignature(marker: string, textSpanLength: number) {
     goTo.marker(marker);
     verify.verifyQuickInfoDisplayParts("constructor", "", { start: test.markerByName(marker).position, length: textSpanLength },
-        [{ text: "(", kind: "punctuation" }, { text: "constructor", kind: "text" }, { text: ")", kind: "punctuation" },
+        [{ text: "constructor", kind: "keyword" },
             { text: " ", kind: "space" }, { text: "c", kind: "className" },
             { text: "(", kind: "punctuation" }, { text: ")", kind: "punctuation" }, { text: ":", kind: "punctuation" },
             { text: " ", kind: "space" }, { text: "c", kind: "className" }],
@@ -40,7 +40,7 @@ function verifyNonOverloadSignature(marker: string, textSpanLength: number) {
 function verifyClassInstance(markerName: string, instanceName: string, className: string) {
     goTo.marker(markerName);
     verify.verifyQuickInfoDisplayParts("var", "", { start: test.markerByName(markerName).position, length: instanceName.length },
-        [{ text: "(", kind: "punctuation" }, { text: "var", kind: "text" }, { text: ")", kind: "punctuation" },
+        [{ text: "var", kind: "keyword" },
             { text: " ", kind: "space" }, { text: instanceName, kind: "localName" }, { text: ":", kind: "punctuation" },
             { text: " ", kind: "space" }, { text: className, kind: "className" }],
         []);
@@ -56,7 +56,7 @@ function verifyClass(markerName: string, className: string) {
 function verifyTypeOfClass(markerName: string, typeOfVarName: string, className: string) {
     goTo.marker(markerName);
     verify.verifyQuickInfoDisplayParts("var", "", { start: test.markerByName(markerName).position, length: typeOfVarName.length },
-        [{ text: "(", kind: "punctuation" }, { text: "var", kind: "text" }, { text: ")", kind: "punctuation" },
+        [{ text: "var", kind: "keyword" },
             { text: " ", kind: "space" }, { text: typeOfVarName, kind: "localName" }, { text: ":", kind: "punctuation" },
             { text: " ", kind: "space" },
             { text: "typeof", kind: "keyword" }, { text: " ", kind: "space" }, { text: className, kind: "className" }],
@@ -66,7 +66,7 @@ function verifyTypeOfClass(markerName: string, typeOfVarName: string, className:
 function verifySingleOverloadSignature(marker: string, textSpanLength: number, parameterType: string) {
     goTo.marker(marker);
     verify.verifyQuickInfoDisplayParts("constructor", "", { start: test.markerByName(marker).position, length: textSpanLength },
-        [{ text: "(", kind: "punctuation" }, { text: "constructor", kind: "text" }, { text: ")", kind: "punctuation" },
+        [{ text: "constructor", kind: "keyword" },
             { text: " ", kind: "space" }, { text: "cWithOverloads", kind: "className" }, { text: "(", kind: "punctuation" },
             { text: "x", kind: "parameterName" }, { text: ":", kind: "punctuation" },
             { text: " ", kind: "space" }, { text: parameterType, kind: "keyword" },
@@ -82,7 +82,7 @@ function verifySingleOverloadSignature(marker: string, textSpanLength: number, p
 function verifyMultipleOverloadSignature(marker: string, textSpanLength: number, parameterType: string) {
     goTo.marker(marker);
     verify.verifyQuickInfoDisplayParts("constructor", "", { start: test.markerByName(marker).position, length: textSpanLength },
-        [{ text: "(", kind: "punctuation" }, { text: "constructor", kind: "text" }, { text: ")", kind: "punctuation" },
+        [{ text: "constructor", kind: "keyword" },
             { text: " ", kind: "space" }, { text: "cWithMultipleOverloads", kind: "className" }, { text: "(", kind: "punctuation" },
             { text: "x", kind: "parameterName" }, { text: ":", kind: "punctuation" },
             { text: " ", kind: "space" }, { text: parameterType, kind: "keyword" },
diff --git a/tests/cases/fourslash/quickInfoDisplayPartsClassMethod.ts b/tests/cases/fourslash/quickInfoDisplayPartsClassMethod.ts
index dbe225aa124fc..9ac30d09210b5 100644
--- a/tests/cases/fourslash/quickInfoDisplayPartsClassMethod.ts
+++ b/tests/cases/fourslash/quickInfoDisplayPartsClassMethod.ts
@@ -71,7 +71,7 @@ verifyProtectedStaticMethod('81');
 
 goTo.marker('9');
 verify.verifyQuickInfoDisplayParts("var", "", { start: test.markerByName("9").position, length: "cInstance".length },
-    [{ text: "(", kind: "punctuation" }, { text: "var", kind: "text" }, { text: ")", kind: "punctuation" },
+    [{ text: "var", kind: "keyword" },
         { text: " ", kind: "space" }, { text: "cInstance", kind: "localName" }, { text: ":", kind: "punctuation" },
         { text: " ", kind: "space" }, { text: "c", kind: "className" }],
     []);
diff --git a/tests/cases/fourslash/quickInfoDisplayPartsClassProperty.ts b/tests/cases/fourslash/quickInfoDisplayPartsClassProperty.ts
index a03bc3cd42b99..c5606881fcf21 100644
--- a/tests/cases/fourslash/quickInfoDisplayPartsClassProperty.ts
+++ b/tests/cases/fourslash/quickInfoDisplayPartsClassProperty.ts
@@ -70,7 +70,7 @@ verifyProtectedStaticProperty('81');
 
 goTo.marker('9');
 verify.verifyQuickInfoDisplayParts("var", "", { start: test.markerByName("9").position, length: "cInstance".length },
-    [{ text: "(", kind: "punctuation" }, { text: "var", kind: "text" }, { text: ")", kind: "punctuation" },
+    [{ text: "var", kind: "keyword" },
         { text: " ", kind: "space" }, { text: "cInstance", kind: "localName" }, { text: ":", kind: "punctuation" },
         { text: " ", kind: "space" }, { text: "c", kind: "className" }],
     []);
diff --git a/tests/cases/fourslash/quickInfoDisplayPartsConst.ts b/tests/cases/fourslash/quickInfoDisplayPartsConst.ts
index 8871a6cc15ee3..b3d601368b99b 100644
--- a/tests/cases/fourslash/quickInfoDisplayPartsConst.ts
+++ b/tests/cases/fourslash/quickInfoDisplayPartsConst.ts
@@ -28,7 +28,7 @@ function verifyConst(name: string, typeDisplay: ts.SymbolDisplayPart[], optional
     marker++;
     goTo.marker(marker.toString());
     verify.verifyQuickInfoDisplayParts("const", optionalKindModifiers || "", { start: test.markerByName(marker.toString()).position, length: name.length },
-        [{ text: "(", kind: "punctuation" }, { text: "const", kind: "text" }, { text: ")", kind: "punctuation" },
+        [{ text: "const", kind: "keyword" },
             { text: " ", kind: "space" }].concat(optionalNameDisplay || [{ text: name, kind: "localName" }]).concat(
             { text: ":", kind: "punctuation" }, { text: " ", kind: "space" }).concat(typeDisplay),
         []);
diff --git a/tests/cases/fourslash/quickInfoDisplayPartsEnum.ts b/tests/cases/fourslash/quickInfoDisplayPartsEnum.ts
index 405f9db936e8b..a42179d039fa9 100644
--- a/tests/cases/fourslash/quickInfoDisplayPartsEnum.ts
+++ b/tests/cases/fourslash/quickInfoDisplayPartsEnum.ts
@@ -65,7 +65,7 @@ function verifyEnumDeclaration(enumName: string, instanceName: string, isConst?:
         marker++;
         goTo.marker(marker.toString());
         verify.verifyQuickInfoDisplayParts("var", "", { start: test.markerByName(marker.toString()).position, length: instanceName.length },
-            [{ text: "(", kind: "punctuation" }, { text: "var", kind: "text" }, { text: ")", kind: "punctuation" },
+            [{ text: "var", kind: "keyword" },
                 { text: " ", kind: "space" }, { text: instanceName, kind: "localName" }, { text: ":", kind: "punctuation" },
                 { text: " ", kind: "space" }, { text: enumName, kind: "enumName" }],
             []);
diff --git a/tests/cases/fourslash/quickInfoDisplayPartsExternalModules.ts b/tests/cases/fourslash/quickInfoDisplayPartsExternalModules.ts
index 5a2f5e76d7f38..070b908d90103 100644
--- a/tests/cases/fourslash/quickInfoDisplayPartsExternalModules.ts
+++ b/tests/cases/fourslash/quickInfoDisplayPartsExternalModules.ts
@@ -33,7 +33,7 @@ function verifyModule(name: string, optionalParentName?: string) {
 function verifyVar(name: string, optionalFullName?: ts.SymbolDisplayPart[], typeDisplay: ts.SymbolDisplayPart[]= [{ text: "number", kind: "keyword" }]) {
     goToMarker();
     verify.verifyQuickInfoDisplayParts("var", name === "moduleElemWithoutExport" ? "" : "export", { start: test.markerByName(marker.toString()).position, length: name.length },
-        [{ text: "(", kind: "punctuation" }, { text: "var", kind: "text" }, { text: ")", kind: "punctuation" },
+        [{ text: "var", kind: "keyword" },
             { text: " ", kind: "space" }].concat(optionalFullName || [{ text: name, kind: "localName" }]).concat(
             { text: ":", kind: "punctuation" }, { text: " ", kind: "space" }).concat(typeDisplay),
         []);
diff --git a/tests/cases/fourslash/quickInfoDisplayPartsFunction.ts b/tests/cases/fourslash/quickInfoDisplayPartsFunction.ts
index a3c94a511b905..64726aec3dba6 100644
--- a/tests/cases/fourslash/quickInfoDisplayPartsFunction.ts
+++ b/tests/cases/fourslash/quickInfoDisplayPartsFunction.ts
@@ -25,7 +25,7 @@ function verifyFunctionWithoutOverload() {
     marker++;
     goTo.marker(marker.toString());
     verify.verifyQuickInfoDisplayParts("function", "", { start: test.markerByName(marker.toString()).position, length: "foo".length },
-        [{ text: "(", kind: "punctuation" }, { text: "function", kind: "text" }, { text: ")", kind: "punctuation" },
+        [{ text: "function", kind: "keyword" },
             { text: " ", kind: "space" }, { text: "foo", kind: "functionName" }, { text: "(", kind: "punctuation" },
             { text: "param", kind: "parameterName" }, { text: ":", kind: "punctuation" }, { text: " ", kind: "space" }, { text: "string", kind: "keyword" },
             { text: ",", kind: "punctuation" }, { text: " ", kind: "space" },
@@ -43,7 +43,7 @@ function verifyFunctionWithOverload(functionName: string, type: string, overload
     marker++;
     goTo.marker(marker.toString());
     verify.verifyQuickInfoDisplayParts("function", "", { start: test.markerByName(marker.toString()).position, length: functionName.length },
-        [{ text: "(", kind: "punctuation" }, { text: "function", kind: "text" }, { text: ")", kind: "punctuation" },
+        [{ text: "function", kind: "keyword" },
             { text: " ", kind: "space" }, { text: functionName, kind: "functionName" }, { text: "(", kind: "punctuation" },
             { text: "a", kind: "parameterName" }, { text: ":", kind: "punctuation" }, { text: " ", kind: "space" }, { text: type, kind: "keyword" },
             { text: ")", kind: "punctuation" }, { text: ":", kind: "punctuation" }, { text: " ", kind: "space" }, { text: type, kind: "keyword" },
diff --git a/tests/cases/fourslash/quickInfoDisplayPartsFunctionExpression.ts b/tests/cases/fourslash/quickInfoDisplayPartsFunctionExpression.ts
index 2b88812d60df4..539ebeb066938 100644
--- a/tests/cases/fourslash/quickInfoDisplayPartsFunctionExpression.ts
+++ b/tests/cases/fourslash/quickInfoDisplayPartsFunctionExpression.ts
@@ -14,7 +14,7 @@ function verifyInstance(instanceName: string) {
     marker++;
     goTo.marker(marker.toString());
     verify.verifyQuickInfoDisplayParts("var", "", { start: test.markerByName(marker.toString()).position, length: instanceName.length },
-        [{ text: "(", kind: "punctuation" }, { text: "var", kind: "text" }, { text: ")", kind: "punctuation" },
+        [{ text: "var", kind: "keyword" },
             { text: " ", kind: "space" }, { text: instanceName, kind: "localName" }, { text: ":", kind: "punctuation" },
             { text: " ", kind: "space" }, { text: "(", kind: "punctuation" }, { text: ")", kind: "punctuation" },
             { text: " ", kind: "space" }, { text: "=>", kind: "punctuation" }, { text: " ", kind: "space" }, { text: "void", kind: "keyword" }],
diff --git a/tests/cases/fourslash/quickInfoDisplayPartsInterface.ts b/tests/cases/fourslash/quickInfoDisplayPartsInterface.ts
index 410d45d32a156..0c18f1154fdc6 100644
--- a/tests/cases/fourslash/quickInfoDisplayPartsInterface.ts
+++ b/tests/cases/fourslash/quickInfoDisplayPartsInterface.ts
@@ -11,7 +11,7 @@ verify.verifyQuickInfoDisplayParts("interface", "", { start: test.markerByName("
 
 goTo.marker('2');
 verify.verifyQuickInfoDisplayParts("var", "", { start: test.markerByName("2").position, length: "iInstance".length },
-    [{ text: "(", kind: "punctuation" }, { text: "var", kind: "text" }, { text: ")", kind: "punctuation" },
+    [{ text: "var", kind: "keyword" },
         { text: " ", kind: "space" }, { text: "iInstance", kind: "localName" }, { text: ":", kind: "punctuation" },
         { text: " ", kind: "space" }, { text: "i", kind: "interfaceName" }],
     []);
diff --git a/tests/cases/fourslash/quickInfoDisplayPartsInterfaceMembers.ts b/tests/cases/fourslash/quickInfoDisplayPartsInterfaceMembers.ts
index 1b7fdad23aafc..e81c71a2a8dd1 100644
--- a/tests/cases/fourslash/quickInfoDisplayPartsInterfaceMembers.ts
+++ b/tests/cases/fourslash/quickInfoDisplayPartsInterfaceMembers.ts
@@ -35,7 +35,7 @@ function verifyInterfaceMethod(markerName: string) {
 function verifyInterfaceInstanceVar(markerName: string, instanceName: string) {
     goTo.marker(markerName);
     verify.verifyQuickInfoDisplayParts("var", "", { start: test.markerByName(markerName).position, length: instanceName.length },
-        [{ text: "(", kind: "punctuation" }, { text: "var", kind: "text" }, { text: ")", kind: "punctuation" },
+        [{ text: "var", kind: "keyword" },
             { text: " ", kind: "space" }, { text: instanceName, kind: "localName" }, { text: ":", kind: "punctuation" },
             { text: " ", kind: "space" }, { text: "I", kind: "interfaceName" }],
         []);
@@ -52,7 +52,7 @@ verifyInterfaceMethod("6");
 // Call signature
 goTo.marker("7");
 verify.verifyQuickInfoDisplayParts("var", "", { start: test.markerByName("7").position, length: "iInstance".length },
-    [{ text: "(", kind: "punctuation" }, { text: "var", kind: "text" }, { text: ")", kind: "punctuation" },
+    [{ text: "var", kind: "keyword" },
         { text: " ", kind: "space" }, { text: "iInstance", kind: "localName" },
         { text: ":", kind: "punctuation" }, { text: " ", kind: "space" }, { text: "I", kind: "interfaceName" },
         { text: "(", kind: "punctuation" }, { text: ")", kind: "punctuation" },
@@ -65,7 +65,7 @@ verifyInterfaceInstanceVar("8", "anotherInstance");
 // Cosntruct signature
 goTo.marker("9");
 verify.verifyQuickInfoDisplayParts("var", "", { start: test.markerByName("9").position, length: "iInstance".length },
-    [{ text: "(", kind: "punctuation" }, { text: "var", kind: "text" }, { text: ")", kind: "punctuation" },
+    [{ text: "var", kind: "keyword" },
         { text: " ", kind: "space" }, { text: "iInstance", kind: "localName" },
         { text: ":", kind: "punctuation" }, { text: " ", kind: "space" },
         { text: "new", kind: "keyword" }, { text: " ", kind: "space" }, { text: "I", kind: "interfaceName" },
diff --git a/tests/cases/fourslash/quickInfoDisplayPartsLet.ts b/tests/cases/fourslash/quickInfoDisplayPartsLet.ts
index b54617faa0e9f..71cad3db66f7e 100644
--- a/tests/cases/fourslash/quickInfoDisplayPartsLet.ts
+++ b/tests/cases/fourslash/quickInfoDisplayPartsLet.ts
@@ -27,7 +27,7 @@ function verifyVar(name: string, typeDisplay: ts.SymbolDisplayPart[], optionalNa
     marker++;
     goTo.marker(marker.toString());
     verify.verifyQuickInfoDisplayParts("let", optionalKindModifiers || "", { start: test.markerByName(marker.toString()).position, length: name.length },
-        [{ text: "(", kind: "punctuation" }, { text: "let", kind: "text" }, { text: ")", kind: "punctuation" },
+        [{ text: "let", kind: "keyword" },
             { text: " ", kind: "space" }].concat(optionalNameDisplay || [{ text: name, kind: "localName" }]).concat(
             { text: ":", kind: "punctuation" }, { text: " ", kind: "space" }).concat(typeDisplay),
         []);
diff --git a/tests/cases/fourslash/quickInfoDisplayPartsLocalFunction.ts b/tests/cases/fourslash/quickInfoDisplayPartsLocalFunction.ts
index b9578c7f5227f..8a449538383dc 100644
--- a/tests/cases/fourslash/quickInfoDisplayPartsLocalFunction.ts
+++ b/tests/cases/fourslash/quickInfoDisplayPartsLocalFunction.ts
@@ -28,7 +28,7 @@ function verifyOuterFunction() {
     marker++;
     goTo.marker(marker.toString());
     verify.verifyQuickInfoDisplayParts("function", "", { start: test.markerByName(marker.toString()).position, length: "outerFoo".length },
-        [{ text: "(", kind: "punctuation" }, { text: "function", kind: "text" }, { text: ")", kind: "punctuation" },
+        [{ text: "function", kind: "keyword" },
             { text: " ", kind: "space" }, { text: "outerFoo", kind: "functionName" }, { text: "(", kind: "punctuation" },
             { text: ")", kind: "punctuation" }, { text: ":", kind: "punctuation" }, { text: " ", kind: "space" }, { text: "void", kind: "keyword" }],
         []);
diff --git a/tests/cases/fourslash/quickInfoDisplayPartsModules.ts b/tests/cases/fourslash/quickInfoDisplayPartsModules.ts
index c86bce474ffd6..aaa415708f430 100644
--- a/tests/cases/fourslash/quickInfoDisplayPartsModules.ts
+++ b/tests/cases/fourslash/quickInfoDisplayPartsModules.ts
@@ -33,7 +33,7 @@ function verifyModule(name: string, optionalParentName?: string) {
 function verifyVar(name: string, optionalFullName?: ts.SymbolDisplayPart[], typeDisplay: ts.SymbolDisplayPart[]= [{ text: "number", kind: "keyword" }]) {
     goToMarker();
     verify.verifyQuickInfoDisplayParts("var", optionalFullName ? "export" : "", { start: test.markerByName(marker.toString()).position, length: name.length },
-        [{ text: "(", kind: "punctuation" }, { text: "var", kind: "text" }, { text: ")", kind: "punctuation" },
+        [{ text: "var", kind: "keyword" },
             { text: " ", kind: "space" }].concat(optionalFullName || [{ text: name, kind: "localName" }]).concat(
             { text: ":", kind: "punctuation" }, { text: " ", kind: "space" }).concat(typeDisplay),
         []);
diff --git a/tests/cases/fourslash/quickInfoDisplayPartsParameters.ts b/tests/cases/fourslash/quickInfoDisplayPartsParameters.ts
index a825030c98701..deea68aaf0ba4 100644
--- a/tests/cases/fourslash/quickInfoDisplayPartsParameters.ts
+++ b/tests/cases/fourslash/quickInfoDisplayPartsParameters.ts
@@ -9,7 +9,7 @@
 
 goTo.marker("1");
 verify.verifyQuickInfoDisplayParts("function", "", { start: test.markerByName('1').position, length: "foo".length },
-    [{ text: "(", kind: "punctuation" }, { text: "function", kind: "text" }, { text: ")", kind: "punctuation" },
+    [{ text: "function", kind: "keyword" },
         { text: " ", kind: "space" }, { text: "foo", kind: "functionName" }, { text: "(", kind: "punctuation" }, 
         { text: "param", kind: "parameterName" }, { text: ":", kind: "punctuation" }, { text: " ", kind: "space" }, { text: "string", kind: "keyword" },
         { text: ",", kind: "punctuation" }, { text: " ", kind: "space" }, 
diff --git a/tests/cases/fourslash/quickInfoDisplayPartsTypeAlias.ts b/tests/cases/fourslash/quickInfoDisplayPartsTypeAlias.ts
index 5441ca353647c..dfbc5a6522145 100644
--- a/tests/cases/fourslash/quickInfoDisplayPartsTypeAlias.ts
+++ b/tests/cases/fourslash/quickInfoDisplayPartsTypeAlias.ts
@@ -26,7 +26,7 @@ verifyClassDisplay('3');
 
 goTo.marker('4');
 verify.verifyQuickInfoDisplayParts("var", "", { start: test.markerByName("4").position, length: "cInstance".length },
-    [{ text: "(", kind: "punctuation" }, { text: "var", kind: "text" }, { text: ")", kind: "punctuation" },
+    [{ text: "var", kind: "keyword" },
         { text: " ", kind: "space" }, { text: "cInstance", kind: "localName" }, { text: ":", kind: "punctuation" },
         { text: " ", kind: "space" }, { text: "c", kind: "className" }],
     []);
@@ -35,7 +35,7 @@ verifyTypeAliasDisplay('5');
 
 goTo.marker('6');
 verify.verifyQuickInfoDisplayParts("constructor", "", { start: test.markerByName("6").position, length: "c".length },
-    [{ text: "(", kind: "punctuation" }, { text: "constructor", kind: "text" }, { text: ")", kind: "punctuation" },
+    [{ text: "constructor", kind: "keyword" },
         { text: " ", kind: "space" }, { text: "c", kind: "className" },
         { text: "(", kind: "punctuation" }, { text: ")", kind: "punctuation" }, { text: ":", kind: "punctuation" },
         { text: " ", kind: "space" }, { text: "c", kind: "className" }],
diff --git a/tests/cases/fourslash/quickInfoDisplayPartsTypeParameterInClass.ts b/tests/cases/fourslash/quickInfoDisplayPartsTypeParameterInClass.ts
index dd32c8b236abe..ed4da7dac91d7 100644
--- a/tests/cases/fourslash/quickInfoDisplayPartsTypeParameterInClass.ts
+++ b/tests/cases/fourslash/quickInfoDisplayPartsTypeParameterInClass.ts
@@ -75,7 +75,7 @@ function verifyTypeParameter(name: string, inDisplay: ts.SymbolDisplayPart[]) {
 function verifyConstructor(name: string, optionalInstanceType?: ts.SymbolDisplayPart[],
     optionalExtends?: ts.SymbolDisplayPart[]) {
     goToMarker();
-    var constructorDisplay = [{ text: "(", kind: "punctuation" }, { text: "constructor", kind: "text" }, { text: ")", kind: "punctuation" },
+    var constructorDisplay = [{ text: "constructor", kind: "keyword" },
         { text: " ", kind: "space" }];
     constructorDisplay = constructorDisplay.concat(getClassDisplay(name, optionalInstanceType, optionalExtends));
 
@@ -153,7 +153,7 @@ function verifyMethodDisplay(name: string, className: string,
 function verifyClassInstance(name: string, typeDisplay: ts.SymbolDisplayPart[]) {
     goToMarker();
     verify.verifyQuickInfoDisplayParts("var", "", { start: test.markerByName(markerName).position, length: name.length },
-        [{ text: "(", kind: "punctuation" }, { text: "var", kind: "text" }, { text: ")", kind: "punctuation" },
+        [{ text: "var", kind: "keyword" },
             { text: " ", kind: "space" }, { text: name, kind: "localName" }, { text: ":", kind: "punctuation" },
             { text: " ", kind: "space" }].concat(typeDisplay),
         []);
@@ -162,7 +162,7 @@ function verifyClassInstance(name: string, typeDisplay: ts.SymbolDisplayPart[])
 function verifyVarTypeOf(name: string, typeOfSymbol: ts.SymbolDisplayPart) {
     goToMarker();
     verify.verifyQuickInfoDisplayParts("var", "", { start: test.markerByName(markerName).position, length: name.length },
-        [{ text: "(", kind: "punctuation" }, { text: "var", kind: "text" }, { text: ")", kind: "punctuation" },
+        [{ text: "var", kind: "keyword" },
             { text: " ", kind: "space" }, { text: name, kind: "localName" }, { text: ":", kind: "punctuation" },
             { text: " ", kind: "space" }, { text: "typeof", kind: "keyword" },
             { text: " ", kind: "space" }].concat(typeOfSymbol),
diff --git a/tests/cases/fourslash/quickInfoDisplayPartsTypeParameterInFunction.ts b/tests/cases/fourslash/quickInfoDisplayPartsTypeParameterInFunction.ts
index 0daabd43ad7c4..ff843b00db42a 100644
--- a/tests/cases/fourslash/quickInfoDisplayPartsTypeParameterInFunction.ts
+++ b/tests/cases/fourslash/quickInfoDisplayPartsTypeParameterInFunction.ts
@@ -85,8 +85,7 @@ function getFunctionDisplay(name: string, optionalInstanceType?: ts.SymbolDispla
 function verifyFunctionDisplay(name: string, optionalInstanceType?: ts.SymbolDisplayPart[],
     optionalExtends?: ts.SymbolDisplayPart[]) {
     goToMarker();
-    var functionDisplay = [{ text: "(", kind: "punctuation" }, { text: "function", kind: "text" },
-        { text: ")", kind: "punctuation" }, { text: " ", kind: "space" }].concat(
+    var functionDisplay = [{ text: "function", kind: "keyword" }, { text: " ", kind: "space" }].concat(
         getFunctionDisplay(name, optionalInstanceType, optionalExtends));
 
     verify.verifyQuickInfoDisplayParts("function", "",
diff --git a/tests/cases/fourslash/quickInfoDisplayPartsTypeParameterInInterface.ts b/tests/cases/fourslash/quickInfoDisplayPartsTypeParameterInInterface.ts
index 95797166ea28b..d9ffd3fb922f4 100644
--- a/tests/cases/fourslash/quickInfoDisplayPartsTypeParameterInInterface.ts
+++ b/tests/cases/fourslash/quickInfoDisplayPartsTypeParameterInInterface.ts
@@ -154,7 +154,7 @@ function verifyMethodDisplay(name: string, interfaceName: string,
 function verifyInterfaceVar(name: string, typeDisplay: ts.SymbolDisplayPart[]) {
     goToMarker();
     verify.verifyQuickInfoDisplayParts("var", "", { start: test.markerByName(markerName).position, length: name.length },
-        [{ text: "(", kind: "punctuation" }, { text: "var", kind: "text" }, { text: ")", kind: "punctuation" },
+        [{ text: "var", kind: "keyword" },
             { text: " ", kind: "space" }, { text: name, kind: "localName" }, { text: ":", kind: "punctuation" },
             { text: " ", kind: "space" }].concat(typeDisplay),
         []);
diff --git a/tests/cases/fourslash/quickInfoDisplayPartsVar.ts b/tests/cases/fourslash/quickInfoDisplayPartsVar.ts
index 56ccceb3ab376..a1f150d24576f 100644
--- a/tests/cases/fourslash/quickInfoDisplayPartsVar.ts
+++ b/tests/cases/fourslash/quickInfoDisplayPartsVar.ts
@@ -15,12 +15,22 @@
 ////var /*11*/i = /*12*/h;
 /////*13*/h(10);
 /////*14*/h("hello");
-
+debugger;
 var marker = 0;
-function verifyVar(name: string, isLocal: boolean, typeDisplay: ts.SymbolDisplayPart[], optionalNameDisplay?: ts.SymbolDisplayPart[], optionalKindModifiers?: string) {
+function verifyVar(name: string, typeDisplay: ts.SymbolDisplayPart[], optionalNameDisplay?: ts.SymbolDisplayPart[], optionalKindModifiers?: string) {
     marker++;
     goTo.marker(marker.toString());
-    var kind = isLocal ? "local var" : "var";
+    var kind = "var";
+    verify.verifyQuickInfoDisplayParts(kind, optionalKindModifiers || "", { start: test.markerByName(marker.toString()).position, length: name.length },
+        [{ text: "var", kind: "keyword" },
+            { text: " ", kind: "space" }].concat(optionalNameDisplay || [{ text: name, kind: "localName" }]).concat(
+            { text: ":", kind: "punctuation" }, { text: " ", kind: "space" }).concat(typeDisplay),
+        []);
+}
+function verifyLocalVar(name: string, typeDisplay: ts.SymbolDisplayPart[], optionalNameDisplay?: ts.SymbolDisplayPart[], optionalKindModifiers?: string) {
+    marker++;
+    goTo.marker(marker.toString());
+    var kind = "local var";
     verify.verifyQuickInfoDisplayParts(kind, optionalKindModifiers || "", { start: test.markerByName(marker.toString()).position, length: name.length },
         [{ text: "(", kind: "punctuation" }, { text: kind, kind: "text" }, { text: ")", kind: "punctuation" },
             { text: " ", kind: "space" }].concat(optionalNameDisplay || [{ text: name, kind: "localName" }]).concat(
@@ -28,20 +38,21 @@ function verifyVar(name: string, isLocal: boolean, typeDisplay: ts.SymbolDisplay
         []);
 }
 
+
 var numberTypeDisplay: ts.SymbolDisplayPart[] = [{ text: "number", kind: "keyword" }];
 
-verifyVar("a", /*isLocal*/false, numberTypeDisplay);
-verifyVar("b", /*isLocal*/true, numberTypeDisplay);
-verifyVar("a", /*isLocal*/false, numberTypeDisplay);
-verifyVar("c", /*isLocal*/false, numberTypeDisplay);
-verifyVar("d", /*isLocal*/false, numberTypeDisplay, [{ text: "m", kind: "moduleName" }, { text: ".", kind: "punctuation" }, { text: "d", kind: "localName" }], "export");
+verifyVar("a", numberTypeDisplay);
+verifyLocalVar("b", numberTypeDisplay);
+verifyVar("a", numberTypeDisplay);
+verifyVar("c", numberTypeDisplay);
+verifyVar("d", numberTypeDisplay, [{ text: "m", kind: "moduleName" }, { text: ".", kind: "punctuation" }, { text: "d", kind: "localName" }], "export");
 
 var functionTypeReturningNumber: ts.SymbolDisplayPart[] = [{ text: "(", kind: "punctuation" }, { text: ")", kind: "punctuation" },
     { text: " ", kind: "space" }, { text: "=>", kind: "punctuation" }, { text: " ", kind: "space" }, { text: "number", kind: "keyword" }];
-verifyVar("f", /*isLocal*/ false, functionTypeReturningNumber);
-verifyVar("g", /*isLocal*/ false, functionTypeReturningNumber);
-verifyVar("f", /*isLocal*/ false, functionTypeReturningNumber);
-verifyVar("f", /*isLocal*/ false, functionTypeReturningNumber);
+verifyVar("f", functionTypeReturningNumber);
+verifyVar("g", functionTypeReturningNumber);
+verifyVar("f", functionTypeReturningNumber);
+verifyVar("f", functionTypeReturningNumber);
 
 
 function getFunctionType(parametertype: string, returnType: string, isArrow?: boolean): ts.SymbolDisplayPart[] {
@@ -64,13 +75,13 @@ var typeLiteralWithOverloadCall: ts.SymbolDisplayPart[] = [{ text: "{", kind: "p
     { text: "    ", kind: "space" }).concat(getFunctionType("number", "string")).concat(
     { text: ";", kind: "punctuation" }, { text: "\n", kind: "lineBreak" }, { text: "}", kind: "punctuation" });
 
-verifyVar("h", /*isLocal*/ false, typeLiteralWithOverloadCall);
-verifyVar("i", /*isLocal*/ false, typeLiteralWithOverloadCall);
-verifyVar("h", /*isLocal*/ false, typeLiteralWithOverloadCall);
+verifyVar("h", typeLiteralWithOverloadCall);
+verifyVar("i", typeLiteralWithOverloadCall);
+verifyVar("h", typeLiteralWithOverloadCall);
 
 var overloadDisplay: ts.SymbolDisplayPart[] = [{ text: " ", kind: "space" }, { text: "(", kind: "punctuation" },
     { text: "+", kind: "operator" }, { text: "1", kind: "numericLiteral" },
     { text: " ", kind: "space" }, { text: "overload", kind: "text" }, { text: ")", kind: "punctuation" }];
 
-verifyVar("h", /*isLocal*/ false, getFunctionType("number", "string", /*isArrow*/true).concat(overloadDisplay));
-verifyVar("h", /*isLocal*/ false, getFunctionType("string", "number", /*isArrow*/true).concat(overloadDisplay));
\ No newline at end of file
+verifyVar("h", getFunctionType("number", "string", /*isArrow*/true).concat(overloadDisplay));
+verifyVar("h", getFunctionType("string", "number", /*isArrow*/true).concat(overloadDisplay));
\ No newline at end of file
diff --git a/tests/cases/fourslash/quickInfoExportAssignmentOfGenericInterface.ts b/tests/cases/fourslash/quickInfoExportAssignmentOfGenericInterface.ts
index 7a3b3b9d603a9..bf77d12669fce 100644
--- a/tests/cases/fourslash/quickInfoExportAssignmentOfGenericInterface.ts
+++ b/tests/cases/fourslash/quickInfoExportAssignmentOfGenericInterface.ts
@@ -13,4 +13,4 @@
 
 goTo.file("quickInfoExportAssignmentOfGenericInterface_1.ts");
 goTo.marker('1');
-verify.quickInfoIs("(var) x: a<a<string>>", undefined);
\ No newline at end of file
+verify.quickInfoIs("var x: a<a<string>>", undefined);
diff --git a/tests/cases/fourslash/quickInfoForAliasedGeneric.ts b/tests/cases/fourslash/quickInfoForAliasedGeneric.ts
index 30b8a16ba8970..1568fa79076eb 100644
--- a/tests/cases/fourslash/quickInfoForAliasedGeneric.ts
+++ b/tests/cases/fourslash/quickInfoForAliasedGeneric.ts
@@ -11,7 +11,7 @@
 ////var /*2*/bb: d.D;
 
 goTo.marker('1');
-verify.quickInfoIs('(var) aa: d.C<number>');
+verify.quickInfoIs('var aa: d.C<number>');
 
 goTo.marker('2');
-verify.quickInfoIs('(var) bb: d.D');
\ No newline at end of file
+verify.quickInfoIs('var bb: d.D');
diff --git a/tests/cases/fourslash/quickInfoForConstDeclaration.ts b/tests/cases/fourslash/quickInfoForConstDeclaration.ts
index 2b1f108c57940..a617e374b8ba0 100644
--- a/tests/cases/fourslash/quickInfoForConstDeclaration.ts
+++ b/tests/cases/fourslash/quickInfoForConstDeclaration.ts
@@ -3,4 +3,4 @@
 ////const /**/c = 0 ;
 
 goTo.marker();
-verify.quickInfoIs("(const) c: number");
\ No newline at end of file
+verify.quickInfoIs("const c: number");
diff --git a/tests/cases/fourslash/quickInfoForDerivedGenericTypeWithConstructor.ts b/tests/cases/fourslash/quickInfoForDerivedGenericTypeWithConstructor.ts
index 34274a9c64317..066be20ff37c3 100644
--- a/tests/cases/fourslash/quickInfoForDerivedGenericTypeWithConstructor.ts
+++ b/tests/cases/fourslash/quickInfoForDerivedGenericTypeWithConstructor.ts
@@ -14,7 +14,7 @@
 ////var /*2*/b2: B<number>;
 
 goTo.marker('1');
-verify.quickInfoIs('(var) b: B<number>');
+verify.quickInfoIs('var b: B<number>');
 
 goTo.marker('2');
-verify.quickInfoIs('(var) b2: B<number>');
\ No newline at end of file
+verify.quickInfoIs('var b2: B<number>');
diff --git a/tests/cases/fourslash/quickInfoForFunctionDeclaration.ts b/tests/cases/fourslash/quickInfoForFunctionDeclaration.ts
index 525959adc9a66..c19f2203f4455 100644
--- a/tests/cases/fourslash/quickInfoForFunctionDeclaration.ts
+++ b/tests/cases/fourslash/quickInfoForFunctionDeclaration.ts
@@ -12,7 +12,7 @@
 ////var y = makeA(0);
 
 goTo.marker("makeA");
-verify.quickInfoIs("(function) makeA<T>(t: T): A<T>", undefined);
+verify.quickInfoIs("function makeA<T>(t: T): A<T>", undefined);
 
 goTo.marker("f");
-verify.quickInfoIs("(function) f<T>(t: T): A<T>", undefined);
\ No newline at end of file
+verify.quickInfoIs("function f<T>(t: T): A<T>", undefined);
diff --git a/tests/cases/fourslash/quickInfoForGenericPrototypeMember.ts b/tests/cases/fourslash/quickInfoForGenericPrototypeMember.ts
index 895a897452ddd..48821bcd8f2b0 100644
--- a/tests/cases/fourslash/quickInfoForGenericPrototypeMember.ts
+++ b/tests/cases/fourslash/quickInfoForGenericPrototypeMember.ts
@@ -7,7 +7,7 @@
 ////var y = C.proto/*2*/type;
 
 goTo.marker('1');
-verify.quickInfoIs('(constructor) C<any>(): C<any>');
+verify.quickInfoIs('constructor C<any>(): C<any>');
 
 goTo.marker('2');
 verify.quickInfoIs('(property) C<T>.prototype: C<any>');
\ No newline at end of file
diff --git a/tests/cases/fourslash/quickInfoForShorthandProperty.ts b/tests/cases/fourslash/quickInfoForShorthandProperty.ts
index d4b30b0d736e2..0742459fc2083 100644
--- a/tests/cases/fourslash/quickInfoForShorthandProperty.ts
+++ b/tests/cases/fourslash/quickInfoForShorthandProperty.ts
@@ -7,14 +7,14 @@
 //// var /*obj2*/obj2 = {/*name2*/name2, /*id2*/id2};
 
 goTo.marker("obj1");
-verify.quickInfoIs("(var) obj1: {\n    name1: any;\n    id1: any;\n}");
+verify.quickInfoIs("var obj1: {\n    name1: any;\n    id1: any;\n}");
 goTo.marker("name1");
 verify.quickInfoIs("(property) name1: any");
 goTo.marker("id1");
 verify.quickInfoIs("(property) id1: any");
 
 goTo.marker("obj2");
-verify.quickInfoIs("(var) obj2: {\n    name2: string;\n    id2: number;\n}");
+verify.quickInfoIs("var obj2: {\n    name2: string;\n    id2: number;\n}");
 goTo.marker("name2");
 verify.quickInfoIs("(property) name2: string");
 goTo.marker("id2");
diff --git a/tests/cases/fourslash/quickInfoFromEmptyBlockComment.ts b/tests/cases/fourslash/quickInfoFromEmptyBlockComment.ts
index 39da310bb251f..45c88ffc02f0b 100644
--- a/tests/cases/fourslash/quickInfoFromEmptyBlockComment.ts
+++ b/tests/cases/fourslash/quickInfoFromEmptyBlockComment.ts
@@ -7,4 +7,4 @@
 ////var f/*A*/ff = new Foo();
 
 goTo.marker('A');
-verify.quickInfoIs('(var) fff: Foo');
+verify.quickInfoIs('var fff: Foo');
diff --git a/tests/cases/fourslash/quickInfoInObjectLiteral.ts b/tests/cases/fourslash/quickInfoInObjectLiteral.ts
index 94afb172be913..5c9828a7c52c2 100644
--- a/tests/cases/fourslash/quickInfoInObjectLiteral.ts
+++ b/tests/cases/fourslash/quickInfoInObjectLiteral.ts
@@ -22,4 +22,4 @@ goTo.marker("1");
 verify.quickInfoIs("(property) y1: () => string", undefined);
 
 goTo.marker("2");
-verify.quickInfoIs("(var) value: number");
+verify.quickInfoIs("var value: number");
diff --git a/tests/cases/fourslash/quickInfoOfGenericTypeAssertions1.ts b/tests/cases/fourslash/quickInfoOfGenericTypeAssertions1.ts
index b08026970b99f..b02767a025b85 100644
--- a/tests/cases/fourslash/quickInfoOfGenericTypeAssertions1.ts
+++ b/tests/cases/fourslash/quickInfoOfGenericTypeAssertions1.ts
@@ -8,10 +8,10 @@
 ////var /*3*/r3 = < <T>(x: <A>(y: A) => A) => T>a;
 
 goTo.marker('1');
-verify.quickInfoIs('(var) r: <T>(x: T) => T');
+verify.quickInfoIs('var r: <T>(x: T) => T');
 
 goTo.marker('2');
-verify.quickInfoIs('(var) r2: <T>(x: T) => T');
+verify.quickInfoIs('var r2: <T>(x: T) => T');
 
 goTo.marker('3');
-verify.quickInfoIs('(var) r3: <T>(x: <A>(y: A) => A) => T');
\ No newline at end of file
+verify.quickInfoIs('var r3: <T>(x: <A>(y: A) => A) => T');
diff --git a/tests/cases/fourslash/quickInfoOfStringPropertyNames1.ts b/tests/cases/fourslash/quickInfoOfStringPropertyNames1.ts
index e44e5eb213bae..551db382668ea 100644
--- a/tests/cases/fourslash/quickInfoOfStringPropertyNames1.ts
+++ b/tests/cases/fourslash/quickInfoOfStringPropertyNames1.ts
@@ -21,13 +21,13 @@
 ////var /*4*/r5 = b[1];
 
 goTo.marker('1');
-verify.quickInfoIs('(var) r: string');
+verify.quickInfoIs('var r: string');
 
 goTo.marker('2');
-verify.quickInfoIs('(var) r2: number');
+verify.quickInfoIs('var r2: number');
 
 goTo.marker('3');
-verify.quickInfoIs('(var) r4: string');
+verify.quickInfoIs('var r4: string');
 
 goTo.marker('4');
-verify.quickInfoIs('(var) r5: string');
+verify.quickInfoIs('var r5: string');
diff --git a/tests/cases/fourslash/quickInfoOnCircularTypes.ts b/tests/cases/fourslash/quickInfoOnCircularTypes.ts
index e6a5277308706..92814e7818fbc 100644
--- a/tests/cases/fourslash/quickInfoOnCircularTypes.ts
+++ b/tests/cases/fourslash/quickInfoOnCircularTypes.ts
@@ -15,7 +15,7 @@
 ////x/*B*/x = y/*C*/y;
 
 goTo.marker('B');
-verify.quickInfoIs('(var) xx: B');
+verify.quickInfoIs('var xx: B');
 
 goTo.marker('C');
-verify.quickInfoIs('(var) yy: C');
+verify.quickInfoIs('var yy: C');
diff --git a/tests/cases/fourslash/quickInfoOnConstructorWithGenericParameter.ts b/tests/cases/fourslash/quickInfoOnConstructorWithGenericParameter.ts
index 83cbd2bddb02e..d2ec8ca4f1417 100644
--- a/tests/cases/fourslash/quickInfoOnConstructorWithGenericParameter.ts
+++ b/tests/cases/fourslash/quickInfoOnConstructorWithGenericParameter.ts
@@ -26,4 +26,4 @@ verify.currentSignatureHelpIs("B(a: Foo<I>, b: number): B");
 edit.insert("10);");
 
 goTo.marker("2");
-verify.quickInfoIs("(constructor) B(a: Foo<I>, b: number): B", undefined);
\ No newline at end of file
+verify.quickInfoIs("constructor B(a: Foo<I>, b: number): B", undefined);
diff --git a/tests/cases/fourslash/quickInfoOnErrorTypes1.ts b/tests/cases/fourslash/quickInfoOnErrorTypes1.ts
index 097c9ff15d3b7..ba0c055762cf1 100644
--- a/tests/cases/fourslash/quickInfoOnErrorTypes1.ts
+++ b/tests/cases/fourslash/quickInfoOnErrorTypes1.ts
@@ -6,4 +6,4 @@
 ////};
 
 goTo.marker('A');
-verify.quickInfoIs('(var) f: {\n    (): any;\n    x: number;\n}', "");
+verify.quickInfoIs('var f: {\n    (): any;\n    x: number;\n}', "");
diff --git a/tests/cases/fourslash/quickInfoOnInternalAliases.ts b/tests/cases/fourslash/quickInfoOnInternalAliases.ts
index b1c562df494eb..27ade4ff70fef 100644
--- a/tests/cases/fourslash/quickInfoOnInternalAliases.ts
+++ b/tests/cases/fourslash/quickInfoOnInternalAliases.ts
@@ -29,13 +29,13 @@ goTo.marker('3');
 verify.quickInfoIs("class m1.m2.c", "class comment;");
 
 goTo.marker('4');
-verify.quickInfoIs("(var) newVar: internalAlias", "");
+verify.quickInfoIs("var newVar: internalAlias", "");
 
 goTo.marker('5');
 verify.quickInfoIs("(alias) new internalAlias(): internalAlias\nimport internalAlias = m1.m2.c", "");
 
 goTo.marker('6');
-verify.quickInfoIs("(var) anotherAliasVar: typeof internalAlias", "");
+verify.quickInfoIs("var anotherAliasVar: typeof internalAlias", "");
 
 goTo.marker('7');
 verify.quickInfoIs("import internalAlias = m1.m2.c", "This is on import declaration");
@@ -44,16 +44,16 @@ goTo.marker('8');
 verify.quickInfoIs('import internalFoo = m1.foo', "");
 
 goTo.marker('9');
-verify.quickInfoIs("(function) m1.foo(): void", "");
+verify.quickInfoIs("function m1.foo(): void", "");
 
 goTo.marker('10');
-verify.quickInfoIs("(var) callVar: void", "");
+verify.quickInfoIs("var callVar: void", "");
 
 goTo.marker('11');
 verify.quickInfoIs("(alias) internalFoo(): void\nimport internalFoo = m1.foo", "");
 
 goTo.marker('12');
-verify.quickInfoIs("(var) anotherAliasFoo: () => void", "");
+verify.quickInfoIs("var anotherAliasFoo: () => void", "");
 
 goTo.marker('13');
 verify.quickInfoIs("import internalFoo = m1.foo", "");
\ No newline at end of file
diff --git a/tests/cases/fourslash/quickInfoOnMergedInterfaces.ts b/tests/cases/fourslash/quickInfoOnMergedInterfaces.ts
index a8e6e292d4454..5b3cdfcb63a16 100644
--- a/tests/cases/fourslash/quickInfoOnMergedInterfaces.ts
+++ b/tests/cases/fourslash/quickInfoOnMergedInterfaces.ts
@@ -17,4 +17,4 @@
 ////}
 
 goTo.marker('1');
-verify.quickInfoIs("(var) r4: number");
\ No newline at end of file
+verify.quickInfoIs("var r4: number");
diff --git a/tests/cases/fourslash/quickInfoOnMergedInterfacesWithIncrementalEdits.ts b/tests/cases/fourslash/quickInfoOnMergedInterfacesWithIncrementalEdits.ts
index c08c16f1b6681..8ad8389b6020d 100644
--- a/tests/cases/fourslash/quickInfoOnMergedInterfacesWithIncrementalEdits.ts
+++ b/tests/cases/fourslash/quickInfoOnMergedInterfacesWithIncrementalEdits.ts
@@ -22,5 +22,5 @@ edit.backspace(1);
 edit.insert('a');
 verify.quickInfoIs("(property) B<string>.bar: string", undefined);
 goTo.marker('2');
-verify.quickInfoIs("(var) r4: string", undefined);
+verify.quickInfoIs("var r4: string", undefined);
 verify.numberOfErrorsInCurrentFile(0);
diff --git a/tests/cases/fourslash/quickInfoOnNarrowedTypeInModule.ts b/tests/cases/fourslash/quickInfoOnNarrowedTypeInModule.ts
index 79d794a9c0de7..b2826d016509e 100644
--- a/tests/cases/fourslash/quickInfoOnNarrowedTypeInModule.ts
+++ b/tests/cases/fourslash/quickInfoOnNarrowedTypeInModule.ts
@@ -27,25 +27,25 @@
 ////}
 
 goTo.marker('1');
-verify.quickInfoIs('(var) nonExportedStrOrNum: string | number');
-verify.completionListContains("nonExportedStrOrNum", "(var) nonExportedStrOrNum: string | number");
+verify.quickInfoIs('var nonExportedStrOrNum: string | number');
+verify.completionListContains("nonExportedStrOrNum", "var nonExportedStrOrNum: string | number");
 
 goTo.marker('2');
-verify.quickInfoIs('(var) nonExportedStrOrNum: number');
-verify.completionListContains("nonExportedStrOrNum", "(var) nonExportedStrOrNum: number");
+verify.quickInfoIs('var nonExportedStrOrNum: number');
+verify.completionListContains("nonExportedStrOrNum", "var nonExportedStrOrNum: number");
 
 goTo.marker('3');
-verify.quickInfoIs('(var) nonExportedStrOrNum: string');
-verify.completionListContains("nonExportedStrOrNum", "(var) nonExportedStrOrNum: string");
+verify.quickInfoIs('var nonExportedStrOrNum: string');
+verify.completionListContains("nonExportedStrOrNum", "var nonExportedStrOrNum: string");
 
 ['4', '5', '6', '7', '8', '9'].forEach((marker, index, arr) => {
     goTo.marker(marker);
-    verify.quickInfoIs('(var) m.exportedStrOrNum: string | number');
-    verify.completionListContains("exportedStrOrNum", "(var) m.exportedStrOrNum: string | number");
+    verify.quickInfoIs('var m.exportedStrOrNum: string | number');
+    verify.completionListContains("exportedStrOrNum", "var m.exportedStrOrNum: string | number");
 });
 
 ['7', '8', '9'].forEach((marker, index, arr) => {
     goTo.marker(marker);
-    verify.quickInfoIs('(var) m.exportedStrOrNum: string | number');
-    verify.memberListContains("exportedStrOrNum", "(var) m.exportedStrOrNum: string | number");
+    verify.quickInfoIs('var m.exportedStrOrNum: string | number');
+    verify.memberListContains("exportedStrOrNum", "var m.exportedStrOrNum: string | number");
 });
\ No newline at end of file
diff --git a/tests/cases/fourslash/quickInfoOnObjectLiteralWithAccessors.ts b/tests/cases/fourslash/quickInfoOnObjectLiteralWithAccessors.ts
index 0803bc6910988..c326cb0236adb 100644
--- a/tests/cases/fourslash/quickInfoOnObjectLiteralWithAccessors.ts
+++ b/tests/cases/fourslash/quickInfoOnObjectLiteralWithAccessors.ts
@@ -12,10 +12,10 @@
 ////point./*3*/x = 30;
 
 goTo.marker('1');
-verify.quickInfoIs("(function) makePoint(x: number): {\n    b: number;\n    x: number;\n}", undefined);
+verify.quickInfoIs("function makePoint(x: number): {\n    b: number;\n    x: number;\n}", undefined);
 
 goTo.marker('2');
-verify.quickInfoIs("(var) x: number", undefined);
+verify.quickInfoIs("var x: number", undefined);
 
 goTo.marker('3');
 verify.memberListContains("x", "(property) x: number", undefined);
@@ -23,4 +23,4 @@ verify.memberListContains("b", "(property) b: number", undefined);
 verify.quickInfoIs("(property) x: number", undefined);
 
 goTo.marker('4');
-verify.quickInfoIs("(var) point: {\n    b: number;\n    x: number;\n}", undefined);
\ No newline at end of file
+verify.quickInfoIs("var point: {\n    b: number;\n    x: number;\n}", undefined);
diff --git a/tests/cases/fourslash/quickInfoOnObjectLiteralWithOnlyGetter.ts b/tests/cases/fourslash/quickInfoOnObjectLiteralWithOnlyGetter.ts
index b85a82c63d5eb..53f5e6988b7fe 100644
--- a/tests/cases/fourslash/quickInfoOnObjectLiteralWithOnlyGetter.ts
+++ b/tests/cases/fourslash/quickInfoOnObjectLiteralWithOnlyGetter.ts
@@ -9,13 +9,13 @@
 ////var /*2*/x = point./*3*/x;
 
 goTo.marker('1');
-verify.quickInfoIs("(function) makePoint(x: number): {\n    x: number;\n}", undefined);
+verify.quickInfoIs("function makePoint(x: number): {\n    x: number;\n}", undefined);
 
 goTo.marker('2');
-verify.quickInfoIs("(var) x: number", undefined);
+verify.quickInfoIs("var x: number", undefined);
 
 goTo.marker('3');
 verify.memberListContains("x", "(property) x: number", undefined);
 
 goTo.marker('4');
-verify.quickInfoIs("(var) point: {\n    x: number;\n}", undefined);
+verify.quickInfoIs("var point: {\n    x: number;\n}", undefined);
diff --git a/tests/cases/fourslash/quickInfoOnObjectLiteralWithOnlySetter.ts b/tests/cases/fourslash/quickInfoOnObjectLiteralWithOnlySetter.ts
index 0cc7b6d0ed3cf..94bf486fef69e 100644
--- a/tests/cases/fourslash/quickInfoOnObjectLiteralWithOnlySetter.ts
+++ b/tests/cases/fourslash/quickInfoOnObjectLiteralWithOnlySetter.ts
@@ -10,7 +10,7 @@
 ////point./*2*/x = 30;
 
 goTo.marker('1');
-verify.quickInfoIs("(function) makePoint(x: number): {\n    b: number;\n    x: number;\n}", undefined);
+verify.quickInfoIs("function makePoint(x: number): {\n    b: number;\n    x: number;\n}", undefined);
 
 goTo.marker('2');
 verify.memberListContains("x", "(property) x: number", undefined);
@@ -18,4 +18,4 @@ verify.memberListContains("b", "(property) b: number", undefined);
 verify.quickInfoIs("(property) x: number", undefined);
 
 goTo.marker('3');
-verify.quickInfoIs("(var) point: {\n    b: number;\n    x: number;\n}", undefined);
\ No newline at end of file
+verify.quickInfoIs("var point: {\n    b: number;\n    x: number;\n}", undefined);
diff --git a/tests/cases/fourslash/quickInfoOnUndefined.ts b/tests/cases/fourslash/quickInfoOnUndefined.ts
index 1bb516d2c18dc..6be4a7edc70c8 100644
--- a/tests/cases/fourslash/quickInfoOnUndefined.ts
+++ b/tests/cases/fourslash/quickInfoOnUndefined.ts
@@ -9,7 +9,7 @@
 ////x./*2*/undefined = 30;
 
 goTo.marker('1');
-verify.quickInfoIs('(var) undefined');
+verify.quickInfoIs('var undefined');
 
 goTo.marker('2');
 verify.quickInfoIs('(property) undefined: number');
\ No newline at end of file
diff --git a/tests/cases/fourslash/quickInfoShowsGenericSpecialization.ts b/tests/cases/fourslash/quickInfoShowsGenericSpecialization.ts
index ab8454a3a27c7..86d24bd31ab21 100644
--- a/tests/cases/fourslash/quickInfoShowsGenericSpecialization.ts
+++ b/tests/cases/fourslash/quickInfoShowsGenericSpecialization.ts
@@ -4,4 +4,4 @@
 ////var /**/foo = new A<number>();
 
 goTo.marker();
-verify.quickInfoIs('(var) foo: A<number>');
+verify.quickInfoIs('var foo: A<number>');
diff --git a/tests/cases/fourslash/quickinfoForUnionProperty.ts b/tests/cases/fourslash/quickinfoForUnionProperty.ts
index b5c7dc0a01c0f..5292eb6c2c889 100644
--- a/tests/cases/fourslash/quickinfoForUnionProperty.ts
+++ b/tests/cases/fourslash/quickinfoForUnionProperty.ts
@@ -17,7 +17,7 @@
 
 
 goTo.marker("1");
-verify.quickInfoIs('(var) x: One | Two');
+verify.quickInfoIs('var x: One | Two');
 
 
 goTo.marker("2");
diff --git a/tests/cases/fourslash/quickinfoIsConsistent.ts b/tests/cases/fourslash/quickinfoIsConsistent.ts
index cc27e698d34e5..d4b14f00ec1ef 100644
--- a/tests/cases/fourslash/quickinfoIsConsistent.ts
+++ b/tests/cases/fourslash/quickinfoIsConsistent.ts
@@ -8,5 +8,5 @@
 
 [1, 2, 3].forEach((val) => {
     goTo.marker("" + val);
-    verify.quickInfoIs("(var) f: (x: number) => number", "");
+    verify.quickInfoIs("var f: (x: number) => number", "");
 } );
\ No newline at end of file
diff --git a/tests/cases/fourslash/recursiveObjectLiteral.ts b/tests/cases/fourslash/recursiveObjectLiteral.ts
index c384ab135c50f..a1d15d0d9a4a5 100644
--- a/tests/cases/fourslash/recursiveObjectLiteral.ts
+++ b/tests/cases/fourslash/recursiveObjectLiteral.ts
@@ -3,4 +3,4 @@
 ////var a = { f: /**/a
 
 goTo.marker();
-verify.quickInfoIs("(var) a: any", null);
\ No newline at end of file
+verify.quickInfoIs("var a: any", null);
diff --git a/tests/cases/fourslash/recursiveWrappedTypeParameters1.ts b/tests/cases/fourslash/recursiveWrappedTypeParameters1.ts
index c7794b6674719..197e0a60722c1 100644
--- a/tests/cases/fourslash/recursiveWrappedTypeParameters1.ts
+++ b/tests/cases/fourslash/recursiveWrappedTypeParameters1.ts
@@ -15,22 +15,22 @@
 ////var f/*7*/f = x.c.c; 
 
 goTo.marker('1');
-verify.quickInfoIs('(var) yy: I<I<I<I<I<I<number>>>>>>');
+verify.quickInfoIs('var yy: I<I<I<I<I<I<number>>>>>>');
 
 goTo.marker('2');
-verify.quickInfoIs('(var) aa: number');
+verify.quickInfoIs('var aa: number');
 
 goTo.marker('3');
-verify.quickInfoIs('(var) bb: I<number>');
+verify.quickInfoIs('var bb: I<number>');
 
 goTo.marker('4');
-verify.quickInfoIs('(var) cc: I<I<number>>');
+verify.quickInfoIs('var cc: I<I<number>>');
 
 goTo.marker('5');
-verify.quickInfoIs('(var) dd: I<number>');
+verify.quickInfoIs('var dd: I<number>');
 
 goTo.marker('6');
-verify.quickInfoIs('(var) ee: I<I<number>>');
+verify.quickInfoIs('var ee: I<I<number>>');
 
 goTo.marker('7');
-verify.quickInfoIs('(var) ff: I<I<I<number>>>');
\ No newline at end of file
+verify.quickInfoIs('var ff: I<I<I<number>>>');
diff --git a/tests/cases/fourslash/regexp.ts b/tests/cases/fourslash/regexp.ts
index 6aae13993f33f..8431268923522 100644
--- a/tests/cases/fourslash/regexp.ts
+++ b/tests/cases/fourslash/regexp.ts
@@ -3,4 +3,4 @@
 ////var /**/x = /aa/;
  
 goTo.marker();
-verify.quickInfoIs("(var) x: RegExp");
+verify.quickInfoIs("var x: RegExp");
diff --git a/tests/cases/fourslash/returnRecursiveType.ts b/tests/cases/fourslash/returnRecursiveType.ts
index d87eac63f68c6..f72452f377039 100644
--- a/tests/cases/fourslash/returnRecursiveType.ts
+++ b/tests/cases/fourslash/returnRecursiveType.ts
@@ -8,4 +8,4 @@
 ////var My/**/Var = MyFn();
 
 goTo.marker();
-verify.quickInfoIs('(var) MyVar: MyInt');
\ No newline at end of file
+verify.quickInfoIs('var MyVar: MyInt');
diff --git a/tests/cases/fourslash/returnTypeOfGenericFunction1.ts b/tests/cases/fourslash/returnTypeOfGenericFunction1.ts
index 7d8d7e335c57e..1baca5cd92785 100644
--- a/tests/cases/fourslash/returnTypeOfGenericFunction1.ts
+++ b/tests/cases/fourslash/returnTypeOfGenericFunction1.ts
@@ -7,4 +7,4 @@
 ////var /**/y = x.map(s => s.length);
 
 goTo.marker();
-verify.quickInfoIs('(var) y: number[]');
+verify.quickInfoIs('var y: number[]');
diff --git a/tests/cases/fourslash/selfReferencedExternalModule.ts b/tests/cases/fourslash/selfReferencedExternalModule.ts
index f5e955839c743..39d785ffb0dc0 100644
--- a/tests/cases/fourslash/selfReferencedExternalModule.ts
+++ b/tests/cases/fourslash/selfReferencedExternalModule.ts
@@ -6,4 +6,4 @@
 
 goTo.marker();
 verify.completionListContains("A", "import A = require('app')");
-verify.completionListContains("I", "(var) I: number");
\ No newline at end of file
+verify.completionListContains("I", "var I: number");
diff --git a/tests/cases/fourslash/selfReferencedExternalModule2.ts b/tests/cases/fourslash/selfReferencedExternalModule2.ts
index 9b1c4470c993f..ab1f7a6c9018e 100644
--- a/tests/cases/fourslash/selfReferencedExternalModule2.ts
+++ b/tests/cases/fourslash/selfReferencedExternalModule2.ts
@@ -10,7 +10,7 @@
 ////export var Y = 1;
 
 goTo.marker("1");
-verify.quickInfoIs("(var) A.Y: number");
+verify.quickInfoIs("var A.Y: number");
 
 goTo.marker("2");
-verify.quickInfoIs("(var) I: number");
+verify.quickInfoIs("var I: number");
diff --git a/tests/cases/fourslash/server/completions2.ts b/tests/cases/fourslash/server/completions2.ts
index b34aad66ba264..3e7e77b588c8d 100644
--- a/tests/cases/fourslash/server/completions2.ts
+++ b/tests/cases/fourslash/server/completions2.ts
@@ -15,4 +15,4 @@ edit.insert("a");
 edit.backspace();
 
 // Checking for completion details after edit should work too
-verify.completionEntryDetailIs("x", "(var) Foo.x: number");
+verify.completionEntryDetailIs("x", "var Foo.x: number");
diff --git a/tests/cases/fourslash/server/quickinfo.ts b/tests/cases/fourslash/server/quickinfo.ts
index b5c7dc0a01c0f..5292eb6c2c889 100644
--- a/tests/cases/fourslash/server/quickinfo.ts
+++ b/tests/cases/fourslash/server/quickinfo.ts
@@ -17,7 +17,7 @@
 
 
 goTo.marker("1");
-verify.quickInfoIs('(var) x: One | Two');
+verify.quickInfoIs('var x: One | Two');
 
 
 goTo.marker("2");
diff --git a/tests/cases/fourslash/shims/getQuickInfoAtPosition.ts b/tests/cases/fourslash/shims/getQuickInfoAtPosition.ts
index 6c9fc7cf7958c..ef201f6709670 100644
--- a/tests/cases/fourslash/shims/getQuickInfoAtPosition.ts
+++ b/tests/cases/fourslash/shims/getQuickInfoAtPosition.ts
@@ -7,10 +7,10 @@
 ////var x/*3*/3 = new SS;
 
 goTo.marker('1');
-verify.quickInfoIs('(var) x1: SS<number>');
+verify.quickInfoIs('var x1: SS<number>');
 
 goTo.marker('2');
-verify.quickInfoIs('(var) x2: SS<{}>');
+verify.quickInfoIs('var x2: SS<{}>');
 
 goTo.marker('3');
-verify.quickInfoIs('(var) x3: SS<{}>');
\ No newline at end of file
+verify.quickInfoIs('var x3: SS<{}>');
diff --git a/tests/cases/fourslash/shims/quickInfoDisplayPartsVar.ts b/tests/cases/fourslash/shims/quickInfoDisplayPartsVar.ts
index 56ccceb3ab376..234c23277b6a0 100644
--- a/tests/cases/fourslash/shims/quickInfoDisplayPartsVar.ts
+++ b/tests/cases/fourslash/shims/quickInfoDisplayPartsVar.ts
@@ -17,10 +17,20 @@
 /////*14*/h("hello");
 
 var marker = 0;
-function verifyVar(name: string, isLocal: boolean, typeDisplay: ts.SymbolDisplayPart[], optionalNameDisplay?: ts.SymbolDisplayPart[], optionalKindModifiers?: string) {
+function verifyVar(name: string, typeDisplay: ts.SymbolDisplayPart[], optionalNameDisplay?: ts.SymbolDisplayPart[], optionalKindModifiers?: string) {
     marker++;
     goTo.marker(marker.toString());
-    var kind = isLocal ? "local var" : "var";
+    var kind = "var";
+    verify.verifyQuickInfoDisplayParts(kind, optionalKindModifiers || "", { start: test.markerByName(marker.toString()).position, length: name.length },
+        [{ text: kind, kind: "keyword" },
+            { text: " ", kind: "space" }].concat(optionalNameDisplay || [{ text: name, kind: "localName" }]).concat(
+            { text: ":", kind: "punctuation" }, { text: " ", kind: "space" }).concat(typeDisplay),
+        []);
+}
+function verifyLocalVar(name: string, typeDisplay: ts.SymbolDisplayPart[], optionalNameDisplay?: ts.SymbolDisplayPart[], optionalKindModifiers?: string) {
+    marker++;
+    goTo.marker(marker.toString());
+    var kind = "local var";
     verify.verifyQuickInfoDisplayParts(kind, optionalKindModifiers || "", { start: test.markerByName(marker.toString()).position, length: name.length },
         [{ text: "(", kind: "punctuation" }, { text: kind, kind: "text" }, { text: ")", kind: "punctuation" },
             { text: " ", kind: "space" }].concat(optionalNameDisplay || [{ text: name, kind: "localName" }]).concat(
@@ -30,18 +40,18 @@ function verifyVar(name: string, isLocal: boolean, typeDisplay: ts.SymbolDisplay
 
 var numberTypeDisplay: ts.SymbolDisplayPart[] = [{ text: "number", kind: "keyword" }];
 
-verifyVar("a", /*isLocal*/false, numberTypeDisplay);
-verifyVar("b", /*isLocal*/true, numberTypeDisplay);
-verifyVar("a", /*isLocal*/false, numberTypeDisplay);
-verifyVar("c", /*isLocal*/false, numberTypeDisplay);
-verifyVar("d", /*isLocal*/false, numberTypeDisplay, [{ text: "m", kind: "moduleName" }, { text: ".", kind: "punctuation" }, { text: "d", kind: "localName" }], "export");
+verifyVar("a", numberTypeDisplay);
+verifyLocalVar("b", numberTypeDisplay);
+verifyVar("a", numberTypeDisplay);
+verifyVar("c", numberTypeDisplay);
+verifyVar("d", numberTypeDisplay, [{ text: "m", kind: "moduleName" }, { text: ".", kind: "punctuation" }, { text: "d", kind: "localName" }], "export");
 
 var functionTypeReturningNumber: ts.SymbolDisplayPart[] = [{ text: "(", kind: "punctuation" }, { text: ")", kind: "punctuation" },
     { text: " ", kind: "space" }, { text: "=>", kind: "punctuation" }, { text: " ", kind: "space" }, { text: "number", kind: "keyword" }];
-verifyVar("f", /*isLocal*/ false, functionTypeReturningNumber);
-verifyVar("g", /*isLocal*/ false, functionTypeReturningNumber);
-verifyVar("f", /*isLocal*/ false, functionTypeReturningNumber);
-verifyVar("f", /*isLocal*/ false, functionTypeReturningNumber);
+verifyVar("f", functionTypeReturningNumber);
+verifyVar("g", functionTypeReturningNumber);
+verifyVar("f", functionTypeReturningNumber);
+verifyVar("f", functionTypeReturningNumber);
 
 
 function getFunctionType(parametertype: string, returnType: string, isArrow?: boolean): ts.SymbolDisplayPart[] {
@@ -64,13 +74,13 @@ var typeLiteralWithOverloadCall: ts.SymbolDisplayPart[] = [{ text: "{", kind: "p
     { text: "    ", kind: "space" }).concat(getFunctionType("number", "string")).concat(
     { text: ";", kind: "punctuation" }, { text: "\n", kind: "lineBreak" }, { text: "}", kind: "punctuation" });
 
-verifyVar("h", /*isLocal*/ false, typeLiteralWithOverloadCall);
-verifyVar("i", /*isLocal*/ false, typeLiteralWithOverloadCall);
-verifyVar("h", /*isLocal*/ false, typeLiteralWithOverloadCall);
+verifyVar("h", typeLiteralWithOverloadCall);
+verifyVar("i", typeLiteralWithOverloadCall);
+verifyVar("h", typeLiteralWithOverloadCall);
 
 var overloadDisplay: ts.SymbolDisplayPart[] = [{ text: " ", kind: "space" }, { text: "(", kind: "punctuation" },
     { text: "+", kind: "operator" }, { text: "1", kind: "numericLiteral" },
     { text: " ", kind: "space" }, { text: "overload", kind: "text" }, { text: ")", kind: "punctuation" }];
 
-verifyVar("h", /*isLocal*/ false, getFunctionType("number", "string", /*isArrow*/true).concat(overloadDisplay));
-verifyVar("h", /*isLocal*/ false, getFunctionType("string", "number", /*isArrow*/true).concat(overloadDisplay));
\ No newline at end of file
+verifyVar("h", getFunctionType("number", "string", /*isArrow*/true).concat(overloadDisplay));
+verifyVar("h", getFunctionType("string", "number", /*isArrow*/true).concat(overloadDisplay));
\ No newline at end of file
diff --git a/tests/cases/fourslash/stringPropertyNames1.ts b/tests/cases/fourslash/stringPropertyNames1.ts
index e3def4e34d559..446ac52aaacf4 100644
--- a/tests/cases/fourslash/stringPropertyNames1.ts
+++ b/tests/cases/fourslash/stringPropertyNames1.ts
@@ -7,4 +7,4 @@
 ////var /**/x = a['artist'];
 
 goTo.marker();
-verify.quickInfoIs('(var) x: number');
\ No newline at end of file
+verify.quickInfoIs('var x: number');
diff --git a/tests/cases/fourslash/stringPropertyNames2.ts b/tests/cases/fourslash/stringPropertyNames2.ts
index b9250bc7616ec..58ccbacc09dc4 100644
--- a/tests/cases/fourslash/stringPropertyNames2.ts
+++ b/tests/cases/fourslash/stringPropertyNames2.ts
@@ -7,4 +7,4 @@
 ////var /**/x = a['artist']; 
 
 goTo.marker();
-verify.quickInfoIs('(var) x: number');
\ No newline at end of file
+verify.quickInfoIs('var x: number');
diff --git a/tests/cases/fourslash/typeOfAFundule.ts b/tests/cases/fourslash/typeOfAFundule.ts
index d2ddb4e6df5ce..c2b615d25e567 100644
--- a/tests/cases/fourslash/typeOfAFundule.ts
+++ b/tests/cases/fourslash/typeOfAFundule.ts
@@ -8,4 +8,4 @@
 ////var /**/r13 = foo13();
 
 goTo.marker();
-verify.quickInfoIs('(var) r13: typeof m1');
+verify.quickInfoIs('var r13: typeof m1');
diff --git a/tests/cases/fourslash/typedGenericPrototypeMember.ts b/tests/cases/fourslash/typedGenericPrototypeMember.ts
index 016a7f7329800..5c348a3246d76 100644
--- a/tests/cases/fourslash/typedGenericPrototypeMember.ts
+++ b/tests/cases/fourslash/typedGenericPrototypeMember.ts
@@ -7,7 +7,7 @@
 ////var /*2*/y = C.prototype; // Quick Info for y is C<{}>
 
 goTo.marker('1');
-verify.quickInfoIs('(var) x: C<any>');
+verify.quickInfoIs('var x: C<any>');
 
 goTo.marker('2');
-verify.quickInfoIs('(var) y: C<any>');
+verify.quickInfoIs('var y: C<any>');
diff --git a/tests/cases/fourslash/underscoreTypings1.ts b/tests/cases/fourslash/underscoreTypings1.ts
index 9a0bada65f2d7..6ad1c902b701d 100644
--- a/tests/cases/fourslash/underscoreTypings1.ts
+++ b/tests/cases/fourslash/underscoreTypings1.ts
@@ -28,32 +28,32 @@
 ////var e = a.map(x => x./*13*/
 
 goTo.marker('1');
-verify.quickInfoIs('(var) b: number[]');
+verify.quickInfoIs('var b: number[]');
 goTo.marker('2');
 verify.quickInfoIs('(parameter) x: string');
 
 goTo.marker('3');
-verify.quickInfoIs('(var) c: number[]');
+verify.quickInfoIs('var c: number[]');
 goTo.marker('4');
 verify.quickInfoIs('(parameter) x: string');
 
 goTo.marker('5');
-verify.quickInfoIs('(var) d: number[]');
+verify.quickInfoIs('var d: number[]');
 goTo.marker('6');
 verify.quickInfoIs('(parameter) x: string');
 
 goTo.marker('7');
-verify.quickInfoIs('(var) bb: any[]');
+verify.quickInfoIs('var bb: any[]');
 goTo.marker('8');
 verify.quickInfoIs('(parameter) x: any');
 
 goTo.marker('9');
-verify.quickInfoIs('(var) cc: any[]');
+verify.quickInfoIs('var cc: any[]');
 goTo.marker('10');
 verify.quickInfoIs('(parameter) x: any');
 
 goTo.marker('11');
-verify.quickInfoIs('(var) dd: any[]');
+verify.quickInfoIs('var dd: any[]');
 goTo.marker('12');
 verify.quickInfoIs('(parameter) x: any');
 
diff --git a/tests/cases/fourslash/verifySingleFileEmitOutput1.ts b/tests/cases/fourslash/verifySingleFileEmitOutput1.ts
index cd8c123c5b24a..f1c9002390fab 100644
--- a/tests/cases/fourslash/verifySingleFileEmitOutput1.ts
+++ b/tests/cases/fourslash/verifySingleFileEmitOutput1.ts
@@ -11,4 +11,4 @@
 ////var /**/b = new f.A();
 
 goTo.marker();
-verify.quickInfoIs('(var) b: f.A');
\ No newline at end of file
+verify.quickInfoIs('var b: f.A');
diff --git a/tests/cases/fourslash/widenedTypes.ts b/tests/cases/fourslash/widenedTypes.ts
index d657d5a40546b..3bc2f31d9acdd 100644
--- a/tests/cases/fourslash/widenedTypes.ts
+++ b/tests/cases/fourslash/widenedTypes.ts
@@ -6,13 +6,13 @@
 ////var /*4*/d = [null, undefined];      // var d: any[]
 
 goTo.marker('1');
-verify.quickInfoIs('(var) a: any');
+verify.quickInfoIs('var a: any');
 
 goTo.marker('2');
-verify.quickInfoIs('(var) b: any');
+verify.quickInfoIs('var b: any');
 
 goTo.marker('3');
-verify.quickInfoIs('(var) c: {\n    x: number;\n    y: any;\n}');
+verify.quickInfoIs('var c: {\n    x: number;\n    y: any;\n}');
 
 goTo.marker('4');
-verify.quickInfoIs('(var) d: any[]');
+verify.quickInfoIs('var d: any[]');