diff --git a/bin/lib.core.d.ts b/bin/lib.core.d.ts
index a8b5fdbcf7c..132f5ffaccf 100644
--- a/bin/lib.core.d.ts
+++ b/bin/lib.core.d.ts
@@ -179,19 +179,19 @@ interface ObjectConstructor {
       * Prevents the modification of attributes of existing properties, and prevents the addition of new properties.
       * @param o Object on which to lock the attributes. 
       */
-    seal(o: any): any;
+    seal<T>(o: T): T;
 
     /**
       * Prevents the modification of existing property attributes and values, and prevents the addition of new properties.
       * @param o Object on which to lock the attributes.
       */
-    freeze(o: any): any;
+    freeze<T>(o: T): T;
 
     /**
       * Prevents the addition of new properties to an object.
       * @param o Object to make non-extensible. 
       */
-    preventExtensions(o: any): any;
+    preventExtensions<T>(o: T): T;
 
     /**
       * Returns true if existing property attributes cannot be modified in an object and new properties cannot be added to the object.
@@ -425,6 +425,9 @@ interface String {
       */
     substr(from: number, length?: number): string;
 
+    /** Returns the primitive value of the specified object. */
+    valueOf(): string;
+
     [index: number]: string;
 }
 
@@ -477,6 +480,9 @@ interface Number {
       * @param precision Number of significant digits. Must be in the range 1 - 21, inclusive.
       */
     toPrecision(precision?: number): string;
+
+    /** Returns the primitive value of the specified object. */
+    valueOf(): number;
 }
 
 interface NumberConstructor {
diff --git a/bin/lib.core.es6.d.ts b/bin/lib.core.es6.d.ts
index b3c400f11a2..c6f3d1d1f97 100644
--- a/bin/lib.core.es6.d.ts
+++ b/bin/lib.core.es6.d.ts
@@ -179,19 +179,19 @@ interface ObjectConstructor {
       * Prevents the modification of attributes of existing properties, and prevents the addition of new properties.
       * @param o Object on which to lock the attributes. 
       */
-    seal(o: any): any;
+    seal<T>(o: T): T;
 
     /**
       * Prevents the modification of existing property attributes and values, and prevents the addition of new properties.
       * @param o Object on which to lock the attributes.
       */
-    freeze(o: any): any;
+    freeze<T>(o: T): T;
 
     /**
       * Prevents the addition of new properties to an object.
       * @param o Object to make non-extensible. 
       */
-    preventExtensions(o: any): any;
+    preventExtensions<T>(o: T): T;
 
     /**
       * Returns true if existing property attributes cannot be modified in an object and new properties cannot be added to the object.
@@ -425,6 +425,9 @@ interface String {
       */
     substr(from: number, length?: number): string;
 
+    /** Returns the primitive value of the specified object. */
+    valueOf(): string;
+
     [index: number]: string;
 }
 
@@ -477,6 +480,9 @@ interface Number {
       * @param precision Number of significant digits. Must be in the range 1 - 21, inclusive.
       */
     toPrecision(precision?: number): string;
+
+    /** Returns the primitive value of the specified object. */
+    valueOf(): number;
 }
 
 interface NumberConstructor {
diff --git a/bin/lib.d.ts b/bin/lib.d.ts
index 02c45824aa8..e22c7351931 100644
--- a/bin/lib.d.ts
+++ b/bin/lib.d.ts
@@ -179,19 +179,19 @@ interface ObjectConstructor {
       * Prevents the modification of attributes of existing properties, and prevents the addition of new properties.
       * @param o Object on which to lock the attributes. 
       */
-    seal(o: any): any;
+    seal<T>(o: T): T;
 
     /**
       * Prevents the modification of existing property attributes and values, and prevents the addition of new properties.
       * @param o Object on which to lock the attributes.
       */
-    freeze(o: any): any;
+    freeze<T>(o: T): T;
 
     /**
       * Prevents the addition of new properties to an object.
       * @param o Object to make non-extensible. 
       */
-    preventExtensions(o: any): any;
+    preventExtensions<T>(o: T): T;
 
     /**
       * Returns true if existing property attributes cannot be modified in an object and new properties cannot be added to the object.
@@ -425,6 +425,9 @@ interface String {
       */
     substr(from: number, length?: number): string;
 
+    /** Returns the primitive value of the specified object. */
+    valueOf(): string;
+
     [index: number]: string;
 }
 
@@ -477,6 +480,9 @@ interface Number {
       * @param precision Number of significant digits. Must be in the range 1 - 21, inclusive.
       */
     toPrecision(precision?: number): string;
+
+    /** Returns the primitive value of the specified object. */
+    valueOf(): number;
 }
 
 interface NumberConstructor {
diff --git a/bin/lib.es6.d.ts b/bin/lib.es6.d.ts
index 935f78f1603..cf849d5c72d 100644
--- a/bin/lib.es6.d.ts
+++ b/bin/lib.es6.d.ts
@@ -179,19 +179,19 @@ interface ObjectConstructor {
       * Prevents the modification of attributes of existing properties, and prevents the addition of new properties.
       * @param o Object on which to lock the attributes. 
       */
-    seal(o: any): any;
+    seal<T>(o: T): T;
 
     /**
       * Prevents the modification of existing property attributes and values, and prevents the addition of new properties.
       * @param o Object on which to lock the attributes.
       */
-    freeze(o: any): any;
+    freeze<T>(o: T): T;
 
     /**
       * Prevents the addition of new properties to an object.
       * @param o Object to make non-extensible. 
       */
-    preventExtensions(o: any): any;
+    preventExtensions<T>(o: T): T;
 
     /**
       * Returns true if existing property attributes cannot be modified in an object and new properties cannot be added to the object.
@@ -425,6 +425,9 @@ interface String {
       */
     substr(from: number, length?: number): string;
 
+    /** Returns the primitive value of the specified object. */
+    valueOf(): string;
+
     [index: number]: string;
 }
 
@@ -477,6 +480,9 @@ interface Number {
       * @param precision Number of significant digits. Must be in the range 1 - 21, inclusive.
       */
     toPrecision(precision?: number): string;
+
+    /** Returns the primitive value of the specified object. */
+    valueOf(): number;
 }
 
 interface NumberConstructor {
diff --git a/bin/tsc.js b/bin/tsc.js
index 32d4e894340..a19101dc546 100644
--- a/bin/tsc.js
+++ b/bin/tsc.js
@@ -254,8 +254,11 @@ var ts;
     }
     ts.getLocaleSpecificMessage = getLocaleSpecificMessage;
     function createFileDiagnostic(file, start, length, message) {
+        var end = start + length;
         Debug.assert(start >= 0, "start must be non-negative, is " + start);
         Debug.assert(length >= 0, "length must be non-negative, is " + length);
+        Debug.assert(start <= file.text.length, "start must be within the bounds of the file. " + start + " > " + file.text.length);
+        Debug.assert(end <= file.text.length, "end must be the bounds of the file. " + end + " > " + file.text.length);
         var text = getLocaleSpecificMessage(message.key);
         if (arguments.length > 4) {
             text = formatStringFromArgs(text, arguments, 4);
@@ -1188,7 +1191,6 @@ var ts;
         Property_0_does_not_exist_on_const_enum_1: { code: 2479, category: 1, key: "Property '{0}' does not exist on 'const' enum '{1}'." },
         let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations: { code: 2480, category: 1, key: "'let' is not allowed to be used as a name in 'let' or 'const' declarations." },
         Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1: { code: 2481, category: 1, key: "Cannot initialize outer scoped variable '{0}' in the same scope as block scoped declaration '{1}'." },
-        for_of_statements_are_only_available_when_targeting_ECMAScript_6_or_higher: { code: 2482, category: 1, key: "'for...of' statements are only available when targeting ECMAScript 6 or higher." },
         The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: { code: 2483, category: 1, key: "The left-hand side of a 'for...of' statement cannot use a type annotation." },
         Export_declaration_conflicts_with_exported_declaration_of_0: { code: 2484, category: 1, key: "Export declaration conflicts with exported declaration of '{0}'" },
         The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant: { code: 2485, category: 1, key: "The left-hand side of a 'for...of' statement cannot be a previously defined constant." },
@@ -1199,6 +1201,9 @@ var ts;
         The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: { code: 2490, category: 1, key: "The type returned by the 'next()' method of an iterator must have a 'value' property." },
         The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern: { code: 2491, category: 1, key: "The left-hand side of a 'for...in' statement cannot be a destructuring pattern." },
         Cannot_redeclare_identifier_0_in_catch_clause: { code: 2492, category: 1, key: "Cannot redeclare identifier '{0}' in catch clause" },
+        Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2: { code: 2493, category: 1, key: "Tuple type '{0}' with length '{1}' cannot be assigned to tuple with length '{2}'." },
+        Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher: { code: 2494, category: 1, key: "Using a string in a 'for...of' statement is only supported in ECMAScript 5 and higher." },
+        Type_0_is_not_an_array_type_or_a_string_type: { code: 2461, category: 1, key: "Type '{0}' is not an array type or a string type." },
         Import_declaration_0_is_using_private_name_1: { code: 4000, category: 1, key: "Import declaration '{0}' is using private name '{1}'." },
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: 1, key: "Type parameter '{0}' of exported class has or is using private name '{1}'." },
         Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4004, category: 1, key: "Type parameter '{0}' of exported interface has or is using private name '{1}'." },
@@ -1324,6 +1329,7 @@ var ts;
         File_0_must_have_extension_ts_or_d_ts: { code: 6054, category: 1, key: "File '{0}' must have extension '.ts' or '.d.ts'." },
         Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures: { code: 6055, category: 2, key: "Suppress noImplicitAny errors for indexing objects lacking index signatures." },
         Do_not_emit_declarations_for_code_that_has_an_internal_annotation: { code: 6056, category: 2, key: "Do not emit declarations for code that has an '@internal' annotation." },
+        Preserve_new_lines_when_emitting_code: { code: 6057, category: 2, key: "Preserve new-lines when emitting code." },
         Variable_0_implicitly_has_an_1_type: { code: 7005, category: 1, key: "Variable '{0}' implicitly has an '{1}' type." },
         Parameter_0_implicitly_has_an_1_type: { code: 7006, category: 1, key: "Parameter '{0}' implicitly has an '{1}' type." },
         Member_0_implicitly_has_an_1_type: { code: 7008, category: 1, key: "Member '{0}' implicitly has an '{1}' type." },
@@ -2608,7 +2614,7 @@ var ts;
         }
     }
     function getSourceFileOfNode(node) {
-        while (node && node.kind !== 220) {
+        while (node && node.kind !== 221) {
             node = node.parent;
         }
         return node;
@@ -2683,11 +2689,35 @@ var ts;
             isCatchClauseVariableDeclaration(declaration);
     }
     ts.isBlockOrCatchScoped = isBlockOrCatchScoped;
+    function getEnclosingBlockScopeContainer(node) {
+        var current = node;
+        while (current) {
+            if (isFunctionLike(current)) {
+                return current;
+            }
+            switch (current.kind) {
+                case 221:
+                case 202:
+                case 217:
+                case 200:
+                case 181:
+                case 182:
+                case 183:
+                    return current;
+                case 174:
+                    if (!isFunctionLike(current.parent)) {
+                        return current;
+                    }
+            }
+            current = current.parent;
+        }
+    }
+    ts.getEnclosingBlockScopeContainer = getEnclosingBlockScopeContainer;
     function isCatchClauseVariableDeclaration(declaration) {
         return declaration &&
             declaration.kind === 193 &&
             declaration.parent &&
-            declaration.parent.kind === 216;
+            declaration.parent.kind === 217;
     }
     ts.isCatchClauseVariableDeclaration = isCatchClauseVariableDeclaration;
     function declarationNameToString(name) {
@@ -2730,7 +2760,7 @@ var ts;
             case 197:
             case 200:
             case 199:
-            case 219:
+            case 220:
             case 195:
             case 160:
                 errorNode = node.name;
@@ -2817,6 +2847,7 @@ var ts;
             switch (node.kind) {
                 case 186:
                     return visitor(node);
+                case 202:
                 case 174:
                 case 178:
                 case 179:
@@ -2826,11 +2857,11 @@ var ts;
                 case 183:
                 case 187:
                 case 188:
-                case 213:
                 case 214:
+                case 215:
                 case 189:
                 case 191:
-                case 216:
+                case 217:
                     return ts.forEachChild(node, traverse);
             }
         }
@@ -2840,12 +2871,12 @@ var ts;
         if (node) {
             switch (node.kind) {
                 case 150:
-                case 219:
+                case 220:
                 case 128:
-                case 217:
+                case 218:
                 case 130:
                 case 129:
-                case 218:
+                case 219:
                 case 193:
                     return true;
             }
@@ -2923,7 +2954,7 @@ var ts;
                 case 134:
                 case 135:
                 case 199:
-                case 220:
+                case 221:
                     return node;
             }
         }
@@ -3014,8 +3045,8 @@ var ts;
                     case 128:
                     case 130:
                     case 129:
-                    case 219:
-                    case 217:
+                    case 220:
+                    case 218:
                     case 150:
                         return parent.initializer === node;
                     case 177:
@@ -3025,7 +3056,7 @@ var ts;
                     case 186:
                     case 187:
                     case 188:
-                    case 213:
+                    case 214:
                     case 190:
                     case 188:
                         return parent.expression === node;
@@ -3061,7 +3092,7 @@ var ts;
     }
     ts.isInstantiatedModule = isInstantiatedModule;
     function isExternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 202 && node.moduleReference.kind === 212;
+        return node.kind === 203 && node.moduleReference.kind === 213;
     }
     ts.isExternalModuleImportEqualsDeclaration = isExternalModuleImportEqualsDeclaration;
     function getExternalModuleImportEqualsDeclarationExpression(node) {
@@ -3070,20 +3101,20 @@ var ts;
     }
     ts.getExternalModuleImportEqualsDeclarationExpression = getExternalModuleImportEqualsDeclarationExpression;
     function isInternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 202 && node.moduleReference.kind !== 212;
+        return node.kind === 203 && node.moduleReference.kind !== 213;
     }
     ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration;
     function getExternalModuleName(node) {
-        if (node.kind === 203) {
+        if (node.kind === 204) {
             return node.moduleSpecifier;
         }
-        if (node.kind === 202) {
+        if (node.kind === 203) {
             var reference = node.moduleReference;
-            if (reference.kind === 212) {
+            if (reference.kind === 213) {
                 return reference.expression;
             }
         }
-        if (node.kind === 209) {
+        if (node.kind === 210) {
             return node.moduleSpecifier;
         }
     }
@@ -3100,8 +3131,8 @@ var ts;
                 case 132:
                 case 131:
                     return node.questionToken !== undefined;
+                case 219:
                 case 218:
-                case 217:
                 case 130:
                 case 129:
                     return node.questionToken !== undefined;
@@ -3147,25 +3178,25 @@ var ts;
             case 196:
             case 133:
             case 199:
-            case 219:
-            case 211:
+            case 220:
+            case 212:
             case 195:
             case 160:
             case 134:
-            case 204:
-            case 202:
-            case 207:
+            case 205:
+            case 203:
+            case 208:
             case 197:
             case 132:
             case 131:
             case 200:
-            case 205:
+            case 206:
             case 128:
-            case 217:
+            case 218:
             case 130:
             case 129:
             case 135:
-            case 218:
+            case 219:
             case 198:
             case 127:
             case 193:
@@ -3194,7 +3225,7 @@ var ts;
             case 175:
             case 180:
             case 187:
-            case 208:
+            case 209:
                 return true;
             default:
                 return false;
@@ -3206,7 +3237,7 @@ var ts;
             return false;
         }
         var parent = name.parent;
-        if (parent.kind === 207 || parent.kind === 211) {
+        if (parent.kind === 208 || parent.kind === 212) {
             if (parent.propertyName) {
                 return true;
             }
@@ -3460,11 +3491,11 @@ var ts;
     }
     ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions;
     function nodeStartsNewLexicalEnvironment(n) {
-        return isFunctionLike(n) || n.kind === 200 || n.kind === 220;
+        return isFunctionLike(n) || n.kind === 200 || n.kind === 221;
     }
     ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment;
     function nodeIsSynthesized(node) {
-        return node.pos === -1 && node.end === -1;
+        return node.pos === -1;
     }
     ts.nodeIsSynthesized = nodeIsSynthesized;
     function createSynthesizedNode(kind, startsOnNewLine) {
@@ -3598,7 +3629,7 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    var nodeConstructors = new Array(222);
+    var nodeConstructors = new Array(223);
     ts.parseTime = 0;
     function getNodeConstructor(kind) {
         return nodeConstructors[kind] || (nodeConstructors[kind] = ts.objectAllocator.getNodeConstructor(kind));
@@ -3645,8 +3676,8 @@ var ts;
             case 128:
             case 130:
             case 129:
-            case 217:
             case 218:
+            case 219:
             case 193:
             case 150:
                 return visitNodes(cbNodes, node.modifiers) ||
@@ -3751,7 +3782,7 @@ var ts;
             case 174:
             case 201:
                 return visitNodes(cbNodes, node.statements);
-            case 220:
+            case 221:
                 return visitNodes(cbNodes, node.statements) ||
                     visitNode(cbNode, node.endOfFileToken);
             case 175:
@@ -3794,11 +3825,13 @@ var ts;
                     visitNode(cbNode, node.statement);
             case 188:
                 return visitNode(cbNode, node.expression) ||
-                    visitNodes(cbNodes, node.clauses);
-            case 213:
+                    visitNode(cbNode, node.caseBlock);
+            case 202:
+                return visitNodes(cbNodes, node.clauses);
+            case 214:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNodes, node.statements);
-            case 214:
+            case 215:
                 return visitNodes(cbNodes, node.statements);
             case 189:
                 return visitNode(cbNode, node.label) ||
@@ -3809,7 +3842,7 @@ var ts;
                 return visitNode(cbNode, node.tryBlock) ||
                     visitNode(cbNode, node.catchClause) ||
                     visitNode(cbNode, node.finallyBlock);
-            case 216:
+            case 217:
                 return visitNode(cbNode, node.variableDeclaration) ||
                     visitNode(cbNode, node.block);
             case 196:
@@ -3832,38 +3865,38 @@ var ts;
                 return visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.members);
-            case 219:
+            case 220:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
             case 200:
                 return visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.body);
-            case 202:
+            case 203:
                 return visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.moduleReference);
-            case 203:
+            case 204:
                 return visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.importClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 204:
+            case 205:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.namedBindings);
-            case 205:
-                return visitNode(cbNode, node.name);
             case 206:
-            case 210:
+                return visitNode(cbNode, node.name);
+            case 207:
+            case 211:
                 return visitNodes(cbNodes, node.elements);
-            case 209:
+            case 210:
                 return visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.exportClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 207:
-            case 211:
+            case 208:
+            case 212:
                 return visitNode(cbNode, node.propertyName) ||
                     visitNode(cbNode, node.name);
-            case 208:
+            case 209:
                 return visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.expression);
             case 169:
@@ -3872,9 +3905,9 @@ var ts;
                 return visitNode(cbNode, node.expression) || visitNode(cbNode, node.literal);
             case 126:
                 return visitNode(cbNode, node.expression);
-            case 215:
+            case 216:
                 return visitNodes(cbNodes, node.types);
-            case 212:
+            case 213:
                 return visitNode(cbNode, node.expression);
         }
     }
@@ -4228,7 +4261,7 @@ var ts;
         var identifierCount = 0;
         var nodeCount = 0;
         var token;
-        var sourceFile = createNode(220, 0);
+        var sourceFile = createNode(221, 0);
         sourceFile.pos = 0;
         sourceFile.end = sourceText.length;
         sourceFile.text = sourceText;
@@ -4778,10 +4811,10 @@ var ts;
         function isReusableModuleElement(node) {
             if (node) {
                 switch (node.kind) {
+                    case 204:
                     case 203:
-                    case 202:
+                    case 210:
                     case 209:
-                    case 208:
                     case 196:
                     case 197:
                     case 200:
@@ -4809,8 +4842,8 @@ var ts;
         function isReusableSwitchClause(node) {
             if (node) {
                 switch (node.kind) {
-                    case 213:
                     case 214:
+                    case 215:
                         return true;
                 }
             }
@@ -4845,7 +4878,7 @@ var ts;
             return false;
         }
         function isReusableEnumMember(node) {
-            return node.kind === 219;
+            return node.kind === 220;
         }
         function isReusableTypeMember(node) {
             if (node) {
@@ -5967,13 +6000,13 @@ var ts;
                 return parseMethodDeclaration(fullStart, modifiers, asteriskToken, propertyName, questionToken);
             }
             if ((token === 23 || token === 15) && tokenIsIdentifier) {
-                var shorthandDeclaration = createNode(218, fullStart);
+                var shorthandDeclaration = createNode(219, fullStart);
                 shorthandDeclaration.name = propertyName;
                 shorthandDeclaration.questionToken = questionToken;
                 return finishNode(shorthandDeclaration);
             }
             else {
-                var propertyAssignment = createNode(217, fullStart);
+                var propertyAssignment = createNode(218, fullStart);
                 propertyAssignment.name = propertyName;
                 propertyAssignment.questionToken = questionToken;
                 parseExpected(51);
@@ -6139,7 +6172,7 @@ var ts;
             return finishNode(node);
         }
         function parseCaseClause() {
-            var node = createNode(213);
+            var node = createNode(214);
             parseExpected(66);
             node.expression = allowInAnd(parseExpression);
             parseExpected(51);
@@ -6147,7 +6180,7 @@ var ts;
             return finishNode(node);
         }
         function parseDefaultClause() {
-            var node = createNode(214);
+            var node = createNode(215);
             parseExpected(72);
             parseExpected(51);
             node.statements = parseList(4, false, parseStatement);
@@ -6162,9 +6195,11 @@ var ts;
             parseExpected(16);
             node.expression = allowInAnd(parseExpression);
             parseExpected(17);
+            var caseBlock = createNode(202, scanner.getStartPos());
             parseExpected(14);
-            node.clauses = parseList(3, false, parseCaseOrDefaultClause);
+            caseBlock.clauses = parseList(3, false, parseCaseOrDefaultClause);
             parseExpected(15);
+            node.caseBlock = finishNode(caseBlock);
             return finishNode(node);
         }
         function parseThrowStatement() {
@@ -6186,7 +6221,7 @@ var ts;
             return finishNode(node);
         }
         function parseCatchClause() {
-            var result = createNode(216);
+            var result = createNode(217);
             parseExpected(67);
             if (parseExpected(16)) {
                 result.variableDeclaration = parseVariableDeclaration();
@@ -6616,7 +6651,7 @@ var ts;
         }
         function parseHeritageClause() {
             if (token === 78 || token === 102) {
-                var node = createNode(215);
+                var node = createNode(216);
                 node.token = token;
                 nextToken();
                 node.types = parseDelimitedList(8, parseTypeReference);
@@ -6651,7 +6686,7 @@ var ts;
             return finishNode(node);
         }
         function parseEnumMember() {
-            var node = createNode(219, scanner.getStartPos());
+            var node = createNode(220, scanner.getStartPos());
             node.name = parsePropertyName();
             node.initializer = allowInAnd(parseNonParameterInitializer);
             return finishNode(node);
@@ -6723,7 +6758,7 @@ var ts;
             if (isIdentifier()) {
                 identifier = parseIdentifier();
                 if (token !== 23 && token !== 123) {
-                    var importEqualsDeclaration = createNode(202, fullStart);
+                    var importEqualsDeclaration = createNode(203, fullStart);
                     setModifiers(importEqualsDeclaration, modifiers);
                     importEqualsDeclaration.name = identifier;
                     parseExpected(52);
@@ -6732,7 +6767,7 @@ var ts;
                     return finishNode(importEqualsDeclaration);
                 }
             }
-            var importDeclaration = createNode(203, fullStart);
+            var importDeclaration = createNode(204, fullStart);
             setModifiers(importDeclaration, modifiers);
             if (identifier ||
                 token === 35 ||
@@ -6745,13 +6780,13 @@ var ts;
             return finishNode(importDeclaration);
         }
         function parseImportClause(identifier, fullStart) {
-            var importClause = createNode(204, fullStart);
+            var importClause = createNode(205, fullStart);
             if (identifier) {
                 importClause.name = identifier;
             }
             if (!importClause.name ||
                 parseOptional(23)) {
-                importClause.namedBindings = token === 35 ? parseNamespaceImport() : parseNamedImportsOrExports(206);
+                importClause.namedBindings = token === 35 ? parseNamespaceImport() : parseNamedImportsOrExports(207);
             }
             return finishNode(importClause);
         }
@@ -6761,7 +6796,7 @@ var ts;
                 : parseEntityName(false);
         }
         function parseExternalModuleReference() {
-            var node = createNode(212);
+            var node = createNode(213);
             parseExpected(117);
             parseExpected(16);
             node.expression = parseModuleSpecifier();
@@ -6776,7 +6811,7 @@ var ts;
             return result;
         }
         function parseNamespaceImport() {
-            var namespaceImport = createNode(205);
+            var namespaceImport = createNode(206);
             parseExpected(35);
             parseExpected(101);
             namespaceImport.name = parseIdentifier();
@@ -6784,14 +6819,14 @@ var ts;
         }
         function parseNamedImportsOrExports(kind) {
             var node = createNode(kind);
-            node.elements = parseBracketedList(20, kind === 206 ? parseImportSpecifier : parseExportSpecifier, 14, 15);
+            node.elements = parseBracketedList(20, kind === 207 ? parseImportSpecifier : parseExportSpecifier, 14, 15);
             return finishNode(node);
         }
         function parseExportSpecifier() {
-            return parseImportOrExportSpecifier(211);
+            return parseImportOrExportSpecifier(212);
         }
         function parseImportSpecifier() {
-            return parseImportOrExportSpecifier(207);
+            return parseImportOrExportSpecifier(208);
         }
         function parseImportOrExportSpecifier(kind) {
             var node = createNode(kind);
@@ -6817,14 +6852,14 @@ var ts;
             return finishNode(node);
         }
         function parseExportDeclaration(fullStart, modifiers) {
-            var node = createNode(209, fullStart);
+            var node = createNode(210, fullStart);
             setModifiers(node, modifiers);
             if (parseOptional(35)) {
                 parseExpected(123);
                 node.moduleSpecifier = parseModuleSpecifier();
             }
             else {
-                node.exportClause = parseNamedImportsOrExports(210);
+                node.exportClause = parseNamedImportsOrExports(211);
                 if (parseOptional(123)) {
                     node.moduleSpecifier = parseModuleSpecifier();
                 }
@@ -6833,7 +6868,7 @@ var ts;
             return finishNode(node);
         }
         function parseExportAssignment(fullStart, modifiers) {
-            var node = createNode(208, fullStart);
+            var node = createNode(209, fullStart);
             setModifiers(node, modifiers);
             if (parseOptional(52)) {
                 node.isExportEquals = true;
@@ -7009,10 +7044,10 @@ var ts;
         function setExternalModuleIndicator(sourceFile) {
             sourceFile.externalModuleIndicator = ts.forEach(sourceFile.statements, function (node) {
                 return node.flags & 1
-                    || node.kind === 202 && node.moduleReference.kind === 212
-                    || node.kind === 203
-                    || node.kind === 208
+                    || node.kind === 203 && node.moduleReference.kind === 213
+                    || node.kind === 204
                     || node.kind === 209
+                    || node.kind === 210
                     ? node
                     : undefined;
             });
@@ -7062,7 +7097,7 @@ var ts;
         else if (ts.isConstEnumDeclaration(node)) {
             return 2;
         }
-        else if ((node.kind === 203 || node.kind === 202) && !(node.flags & 1)) {
+        else if ((node.kind === 204 || node.kind === 203) && !(node.flags & 1)) {
             return 0;
         }
         else if (node.kind === 201) {
@@ -7155,9 +7190,9 @@ var ts;
                     return "__new";
                 case 138:
                     return "__index";
-                case 209:
+                case 210:
                     return "__export";
-                case 208:
+                case 209:
                     return "default";
                 case 195:
                 case 196:
@@ -7215,7 +7250,7 @@ var ts;
         function declareModuleMember(node, symbolKind, symbolExcludes) {
             var hasExportModifier = ts.getCombinedNodeFlags(node) & 1;
             if (symbolKind & 8388608) {
-                if (node.kind === 211 || (node.kind === 202 && hasExportModifier)) {
+                if (node.kind === 212 || (node.kind === 203 && hasExportModifier)) {
                     declareSymbol(container.symbol.exports, container.symbol, node, symbolKind, symbolExcludes);
                 }
                 else {
@@ -7252,7 +7287,7 @@ var ts;
                 lastContainer = container;
             }
             if (isBlockScopeContainer) {
-                setBlockScopeContainer(node, (symbolKind & 255504) === 0 && node.kind !== 220);
+                setBlockScopeContainer(node, (symbolKind & 255504) === 0 && node.kind !== 221);
             }
             ts.forEachChild(node, bind);
             container = saveContainer;
@@ -7264,7 +7299,7 @@ var ts;
                 case 200:
                     declareModuleMember(node, symbolKind, symbolExcludes);
                     break;
-                case 220:
+                case 221:
                     if (ts.isExternalModule(container)) {
                         declareModuleMember(node, symbolKind, symbolExcludes);
                         break;
@@ -7342,7 +7377,7 @@ var ts;
                 case 200:
                     declareModuleMember(node, 2, 107455);
                     break;
-                case 220:
+                case 221:
                     if (ts.isExternalModule(container)) {
                         declareModuleMember(node, 2, 107455);
                         break;
@@ -7383,11 +7418,11 @@ var ts;
                 case 129:
                     bindPropertyOrMethodOrAccessor(node, 4 | (node.questionToken ? 536870912 : 0), 107455, false);
                     break;
-                case 217:
                 case 218:
+                case 219:
                     bindPropertyOrMethodOrAccessor(node, 4, 107455, false);
                     break;
-                case 219:
+                case 220:
                     bindPropertyOrMethodOrAccessor(node, 8, 107455, false);
                     break;
                 case 136:
@@ -7425,7 +7460,7 @@ var ts;
                 case 161:
                     bindAnonymousDeclaration(node, 16, "__function", true);
                     break;
-                case 216:
+                case 217:
                     bindCatchVariableDeclaration(node);
                     break;
                 case 196:
@@ -7448,13 +7483,13 @@ var ts;
                 case 200:
                     bindModuleDeclaration(node);
                     break;
-                case 202:
-                case 205:
-                case 207:
-                case 211:
+                case 203:
+                case 206:
+                case 208:
+                case 212:
                     bindDeclaration(node, 8388608, 8388608, false);
                     break;
-                case 204:
+                case 205:
                     if (node.name) {
                         bindDeclaration(node, 8388608, 8388608, false);
                     }
@@ -7462,13 +7497,13 @@ var ts;
                         bindChildren(node, 0, false);
                     }
                     break;
-                case 209:
+                case 210:
                     if (!node.exportClause) {
                         declareSymbol(container.symbol.exports, container.symbol, node, 1073741824, 0);
                     }
                     bindChildren(node, 0, false);
                     break;
-                case 208:
+                case 209:
                     if (node.expression.kind === 64) {
                         declareSymbol(container.symbol.exports, container.symbol, node, 8388608, 8388608);
                     }
@@ -7477,7 +7512,7 @@ var ts;
                     }
                     bindChildren(node, 0, false);
                     break;
-                case 220:
+                case 221:
                     if (ts.isExternalModule(node)) {
                         bindAnonymousDeclaration(node, 512, '"' + ts.removeFileExtension(node.fileName) + '"', true);
                         break;
@@ -7485,11 +7520,11 @@ var ts;
                 case 174:
                     bindChildren(node, 0, !ts.isFunctionLike(node.parent));
                     break;
-                case 216:
+                case 217:
                 case 181:
                 case 182:
                 case 183:
-                case 188:
+                case 202:
                     bindChildren(node, 0, true);
                     break;
                 default:
@@ -7777,10 +7812,10 @@ var ts;
             return nodeLinks[node.id] || (nodeLinks[node.id] = {});
         }
         function getSourceFile(node) {
-            return ts.getAncestor(node, 220);
+            return ts.getAncestor(node, 221);
         }
         function isGlobalSourceFile(node) {
-            return node.kind === 220 && !ts.isExternalModule(node);
+            return node.kind === 221 && !ts.isExternalModule(node);
         }
         function getSymbol(symbols, name, meaning) {
             if (meaning && ts.hasProperty(symbols, name)) {
@@ -7821,12 +7856,12 @@ var ts;
                     }
                 }
                 switch (location.kind) {
-                    case 220:
+                    case 221:
                         if (!ts.isExternalModule(location))
                             break;
                     case 200:
                         if (result = getSymbol(getSymbolOfNode(location).exports, name, meaning & 8914931)) {
-                            if (!(result.flags & 8388608 && getDeclarationOfAliasSymbol(result).kind === 211)) {
+                            if (!(result.flags & 8388608 && getDeclarationOfAliasSymbol(result).kind === 212)) {
                                 break loop;
                             }
                             result = undefined;
@@ -7910,28 +7945,57 @@ var ts;
                     return undefined;
                 }
                 if (result.flags & 2) {
-                    var declaration = ts.forEach(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) ? d : undefined; });
-                    ts.Debug.assert(declaration !== undefined, "Block-scoped variable declaration is undefined");
-                    if (!isDefinedBefore(declaration, errorLocation)) {
-                        error(errorLocation, ts.Diagnostics.Block_scoped_variable_0_used_before_its_declaration, ts.declarationNameToString(declaration.name));
-                    }
+                    checkResolvedBlockScopedVariable(result, errorLocation);
                 }
             }
             return result;
         }
+        function checkResolvedBlockScopedVariable(result, errorLocation) {
+            ts.Debug.assert((result.flags & 2) !== 0);
+            var declaration = ts.forEach(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) ? d : undefined; });
+            ts.Debug.assert(declaration !== undefined, "Block-scoped variable declaration is undefined");
+            var isUsedBeforeDeclaration = !isDefinedBefore(declaration, errorLocation);
+            if (!isUsedBeforeDeclaration) {
+                var variableDeclaration = ts.getAncestor(declaration, 193);
+                var container = ts.getEnclosingBlockScopeContainer(variableDeclaration);
+                if (variableDeclaration.parent.parent.kind === 175 ||
+                    variableDeclaration.parent.parent.kind === 181) {
+                    isUsedBeforeDeclaration = isSameScopeDescendentOf(errorLocation, variableDeclaration, container);
+                }
+                else if (variableDeclaration.parent.parent.kind === 183 ||
+                    variableDeclaration.parent.parent.kind === 182) {
+                    var expression = variableDeclaration.parent.parent.expression;
+                    isUsedBeforeDeclaration = isSameScopeDescendentOf(errorLocation, expression, container);
+                }
+            }
+            if (isUsedBeforeDeclaration) {
+                error(errorLocation, ts.Diagnostics.Block_scoped_variable_0_used_before_its_declaration, ts.declarationNameToString(declaration.name));
+            }
+        }
+        function isSameScopeDescendentOf(initial, parent, stopAt) {
+            if (!parent) {
+                return false;
+            }
+            for (var current = initial; current && current !== stopAt && !ts.isFunctionLike(current); current = current.parent) {
+                if (current === parent) {
+                    return true;
+                }
+            }
+            return false;
+        }
         function isAliasSymbolDeclaration(node) {
-            return node.kind === 202 ||
-                node.kind === 204 && !!node.name ||
-                node.kind === 205 ||
-                node.kind === 207 ||
-                node.kind === 211 ||
-                node.kind === 208;
+            return node.kind === 203 ||
+                node.kind === 205 && !!node.name ||
+                node.kind === 206 ||
+                node.kind === 208 ||
+                node.kind === 212 ||
+                node.kind === 209;
         }
         function getDeclarationOfAliasSymbol(symbol) {
             return ts.forEach(symbol.declarations, function (d) { return isAliasSymbolDeclaration(d) ? d : undefined; });
         }
         function getTargetOfImportEqualsDeclaration(node) {
-            if (node.moduleReference.kind === 212) {
+            if (node.moduleReference.kind === 213) {
                 var moduleSymbol = resolveExternalModuleName(node, ts.getExternalModuleImportEqualsDeclarationExpression(node));
                 var exportAssignmentSymbol = moduleSymbol && getResolvedExportAssignmentSymbol(moduleSymbol);
                 return exportAssignmentSymbol || moduleSymbol;
@@ -7978,17 +8042,17 @@ var ts;
         }
         function getTargetOfImportDeclaration(node) {
             switch (node.kind) {
-                case 202:
+                case 203:
                     return getTargetOfImportEqualsDeclaration(node);
-                case 204:
-                    return getTargetOfImportClause(node);
                 case 205:
+                    return getTargetOfImportClause(node);
+                case 206:
                     return getTargetOfNamespaceImport(node);
-                case 207:
-                    return getTargetOfImportSpecifier(node);
-                case 211:
-                    return getTargetOfExportSpecifier(node);
                 case 208:
+                    return getTargetOfImportSpecifier(node);
+                case 212:
+                    return getTargetOfExportSpecifier(node);
+                case 209:
                     return getTargetOfExportAssignment(node);
             }
         }
@@ -8023,10 +8087,10 @@ var ts;
             if (!links.referenced) {
                 links.referenced = true;
                 var node = getDeclarationOfAliasSymbol(symbol);
-                if (node.kind === 208) {
+                if (node.kind === 209) {
                     checkExpressionCached(node.expression);
                 }
-                else if (node.kind === 211) {
+                else if (node.kind === 212) {
                     checkExpressionCached(node.propertyName || node.name);
                 }
                 else if (ts.isInternalModuleImportEqualsDeclaration(node)) {
@@ -8036,7 +8100,7 @@ var ts;
         }
         function getSymbolOfPartOfRightHandSideOfImportEquals(entityName, importDeclaration) {
             if (!importDeclaration) {
-                importDeclaration = ts.getAncestor(entityName, 202);
+                importDeclaration = ts.getAncestor(entityName, 203);
                 ts.Debug.assert(importDeclaration !== undefined);
             }
             if (entityName.kind === 64 && isRightSideOfQualifiedNameOrPropertyAccess(entityName)) {
@@ -8046,7 +8110,7 @@ var ts;
                 return resolveEntityName(entityName, 1536);
             }
             else {
-                ts.Debug.assert(entityName.parent.kind === 202);
+                ts.Debug.assert(entityName.parent.kind === 203);
                 return resolveEntityName(entityName, 107455 | 793056 | 1536);
             }
         }
@@ -8271,7 +8335,7 @@ var ts;
                     }
                 }
                 switch (location.kind) {
-                    case 220:
+                    case 221:
                         if (!ts.isExternalModule(location)) {
                             break;
                         }
@@ -8397,7 +8461,7 @@ var ts;
         }
         function hasExternalModuleSymbol(declaration) {
             return (declaration.kind === 200 && declaration.name.kind === 8) ||
-                (declaration.kind === 220 && ts.isExternalModule(declaration));
+                (declaration.kind === 221 && ts.isExternalModule(declaration));
         }
         function hasVisibleDeclarations(symbol) {
             var aliasesToMakeVisible;
@@ -8407,7 +8471,7 @@ var ts;
             return { accessibility: 0, aliasesToMakeVisible: aliasesToMakeVisible };
             function getIsDeclarationVisible(declaration) {
                 if (!isDeclarationVisible(declaration)) {
-                    if (declaration.kind === 202 &&
+                    if (declaration.kind === 203 &&
                         !(declaration.flags & 1) &&
                         isDeclarationVisible(declaration.parent)) {
                         getNodeLinks(declaration).isVisible = true;
@@ -8432,7 +8496,7 @@ var ts;
                 meaning = 107455 | 1048576;
             }
             else if (entityName.kind === 125 ||
-                entityName.parent.kind === 202) {
+                entityName.parent.kind === 203) {
                 meaning = 1536;
             }
             else {
@@ -8650,7 +8714,7 @@ var ts;
                             var isNonLocalFunctionSymbol = !!(type.symbol.flags & 16) &&
                                 (type.symbol.parent ||
                                     ts.forEach(type.symbol.declarations, function (declaration) {
-                                        return declaration.parent.kind === 220 || declaration.parent.kind === 201;
+                                        return declaration.parent.kind === 221 || declaration.parent.kind === 201;
                                     }));
                             if (isStaticMethodSymbol || isNonLocalFunctionSymbol) {
                                 return !!(flags & 2) ||
@@ -8884,7 +8948,7 @@ var ts;
                             return node;
                         }
                     }
-                    else if (node.kind === 220) {
+                    else if (node.kind === 221) {
                         return ts.isExternalModule(node) ? node : undefined;
                     }
                 }
@@ -8934,10 +8998,10 @@ var ts;
                     case 198:
                     case 195:
                     case 199:
-                    case 202:
+                    case 203:
                         var parent = getDeclarationContainer(node);
                         if (!(ts.getCombinedNodeFlags(node) & 1) &&
-                            !(node.kind !== 202 && parent.kind !== 220 && ts.isInAmbientContext(parent))) {
+                            !(node.kind !== 203 && parent.kind !== 221 && ts.isInAmbientContext(parent))) {
                             return isGlobalSourceFile(parent) || isUsedInExportAssignment(node);
                         }
                         return isDeclarationVisible(parent);
@@ -8966,7 +9030,7 @@ var ts;
                     case 147:
                         return isDeclarationVisible(node.parent);
                     case 127:
-                    case 220:
+                    case 221:
                         return true;
                     default:
                         ts.Debug.fail("isDeclarationVisible unknown: SyntaxKind: " + node.kind);
@@ -9029,7 +9093,12 @@ var ts;
                     var propName = "" + ts.indexOf(pattern.elements, declaration);
                     var type = isTupleLikeType(parentType) ? getTypeOfPropertyOfType(parentType, propName) : getIndexTypeOfType(parentType, 1);
                     if (!type) {
-                        error(declaration, ts.Diagnostics.Type_0_has_no_property_1, typeToString(parentType), propName);
+                        if (isTupleType(parentType)) {
+                            error(declaration, ts.Diagnostics.Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2, typeToString(parentType), parentType.elementTypes.length, pattern.elements.length);
+                        }
+                        else {
+                            error(declaration, ts.Diagnostics.Type_0_has_no_property_1, typeToString(parentType), propName);
+                        }
                         return unknownType;
                     }
                 }
@@ -9044,7 +9113,7 @@ var ts;
                 return anyType;
             }
             if (declaration.parent.parent.kind === 183) {
-                return getTypeForVariableDeclarationInForOfStatement(declaration.parent.parent);
+                return checkRightHandSideOfForOf(declaration.parent.parent.expression) || anyType;
             }
             if (ts.isBindingPattern(declaration.parent)) {
                 return getTypeForBindingElement(declaration);
@@ -9068,7 +9137,7 @@ var ts;
             if (declaration.initializer) {
                 return checkExpressionCached(declaration.initializer);
             }
-            if (declaration.kind === 218) {
+            if (declaration.kind === 219) {
                 return checkIdentifier(declaration.name);
             }
             return undefined;
@@ -9115,7 +9184,7 @@ var ts;
                 if (reportErrors) {
                     reportErrorsFromWidening(declaration, type);
                 }
-                return declaration.kind !== 217 ? getWidenedType(type) : type;
+                return declaration.kind !== 218 ? getWidenedType(type) : type;
             }
             if (ts.isBindingPattern(declaration.name)) {
                 return getTypeFromBindingPattern(declaration.name);
@@ -9136,10 +9205,10 @@ var ts;
                     return links.type = getTypeOfPrototypeProperty(symbol);
                 }
                 var declaration = symbol.valueDeclaration;
-                if (declaration.parent.kind === 216) {
+                if (declaration.parent.kind === 217) {
                     return links.type = anyType;
                 }
-                if (declaration.kind === 208) {
+                if (declaration.kind === 209) {
                     return links.type = checkExpression(declaration.expression);
                 }
                 links.type = resolvingType;
@@ -10486,7 +10555,7 @@ var ts;
                 case 167:
                     return node.operatorToken.kind === 49 &&
                         (isContextSensitive(node.left) || isContextSensitive(node.right));
-                case 217:
+                case 218:
                     return isContextSensitive(node.initializer);
                 case 132:
                 case 131:
@@ -11176,6 +11245,9 @@ var ts;
         function isTupleLikeType(type) {
             return !!getPropertyOfType(type, "0");
         }
+        function isTupleType(type) {
+            return (type.flags & 8192) && !!type.elementTypes;
+        }
         function getWidenedTypeOfObjectLiteral(type) {
             var properties = getPropertiesOfObjectType(type);
             var members = {};
@@ -11508,16 +11580,19 @@ var ts;
             }
             ts.Debug.fail("should not get here");
         }
-        function removeTypesFromUnionType(type, typeKind, isOfTypeKind) {
+        function removeTypesFromUnionType(type, typeKind, isOfTypeKind, allowEmptyUnionResult) {
             if (type.flags & 16384) {
                 var types = type.types;
                 if (ts.forEach(types, function (t) { return !!(t.flags & typeKind) === isOfTypeKind; })) {
                     var narrowedType = getUnionType(ts.filter(types, function (t) { return !(t.flags & typeKind) === isOfTypeKind; }));
-                    if (narrowedType !== emptyObjectType) {
+                    if (allowEmptyUnionResult || narrowedType !== emptyObjectType) {
                         return narrowedType;
                     }
                 }
             }
+            else if (allowEmptyUnionResult && !!(type.flags & typeKind) === isOfTypeKind) {
+                return getUnionType(emptyArray);
+            }
             return type;
         }
         function hasInitializer(node) {
@@ -11589,12 +11664,12 @@ var ts;
                     case 186:
                     case 187:
                     case 188:
-                    case 213:
                     case 214:
+                    case 215:
                     case 189:
                     case 190:
                     case 191:
-                    case 216:
+                    case 217:
                         return ts.forEachChild(node, isAssignedIn);
                 }
                 return false;
@@ -11650,7 +11725,7 @@ var ts;
                                 }
                             }
                             break;
-                        case 220:
+                        case 221:
                         case 200:
                         case 195:
                         case 132:
@@ -11684,16 +11759,16 @@ var ts;
                 }
                 if (assumeTrue) {
                     if (!typeInfo) {
-                        return removeTypesFromUnionType(type, 258 | 132 | 8 | 1048576, true);
+                        return removeTypesFromUnionType(type, 258 | 132 | 8 | 1048576, true, false);
                     }
                     if (isTypeSubtypeOf(typeInfo.type, type)) {
                         return typeInfo.type;
                     }
-                    return removeTypesFromUnionType(type, typeInfo.flags, false);
+                    return removeTypesFromUnionType(type, typeInfo.flags, false, false);
                 }
                 else {
                     if (typeInfo) {
-                        return removeTypesFromUnionType(type, typeInfo.flags, true);
+                        return removeTypesFromUnionType(type, typeInfo.flags, true, false);
                     }
                     return type;
                 }
@@ -11795,7 +11870,7 @@ var ts;
         function checkBlockScopedBindingCapturedInLoop(node, symbol) {
             if (languageVersion >= 2 ||
                 (symbol.flags & 2) === 0 ||
-                symbol.valueDeclaration.parent.kind === 216) {
+                symbol.valueDeclaration.parent.kind === 217) {
                 return;
             }
             var container = symbol.valueDeclaration;
@@ -12136,7 +12211,7 @@ var ts;
                     return getTypeFromTypeNode(parent.type);
                 case 167:
                     return getContextualTypeForBinaryOperand(node);
-                case 217:
+                case 218:
                     return getContextualTypeForObjectLiteralElement(parent);
                 case 151:
                     return getContextualTypeForElementExpression(node);
@@ -12212,7 +12287,7 @@ var ts;
             if (parent.kind === 167 && parent.operatorToken.kind === 52 && parent.left === node) {
                 return true;
             }
-            if (parent.kind === 217) {
+            if (parent.kind === 218) {
                 return isAssignmentTarget(parent.parent);
             }
             if (parent.kind === 151) {
@@ -12284,17 +12359,17 @@ var ts;
             for (var i = 0; i < node.properties.length; i++) {
                 var memberDecl = node.properties[i];
                 var member = memberDecl.symbol;
-                if (memberDecl.kind === 217 ||
-                    memberDecl.kind === 218 ||
+                if (memberDecl.kind === 218 ||
+                    memberDecl.kind === 219 ||
                     ts.isObjectLiteralMethod(memberDecl)) {
-                    if (memberDecl.kind === 217) {
+                    if (memberDecl.kind === 218) {
                         var type = checkPropertyAssignment(memberDecl, contextualMapper);
                     }
                     else if (memberDecl.kind === 132) {
                         var type = checkObjectLiteralMethod(memberDecl, contextualMapper);
                     }
                     else {
-                        ts.Debug.assert(memberDecl.kind === 218);
+                        ts.Debug.assert(memberDecl.kind === 219);
                         var type = memberDecl.name.kind === 126
                             ? unknownType
                             : checkExpression(memberDecl.name, contextualMapper);
@@ -13309,7 +13384,7 @@ var ts;
             var properties = node.properties;
             for (var i = 0; i < properties.length; i++) {
                 var p = properties[i];
-                if (p.kind === 217 || p.kind === 218) {
+                if (p.kind === 218 || p.kind === 219) {
                     var name = p.name;
                     var type = sourceType.flags & 1 ? sourceType :
                         getTypeOfPropertyOfType(sourceType, name.text) ||
@@ -13346,7 +13421,12 @@ var ts;
                             checkDestructuringAssignment(e, type, contextualMapper);
                         }
                         else {
-                            error(e, ts.Diagnostics.Type_0_has_no_property_1, typeToString(sourceType), propName);
+                            if (isTupleType(sourceType)) {
+                                error(e, ts.Diagnostics.Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2, typeToString(sourceType), sourceType.elementTypes.length, elements.length);
+                            }
+                            else {
+                                error(e, ts.Diagnostics.Type_0_has_no_property_1, typeToString(sourceType), propName);
+                            }
                         }
                     }
                     else {
@@ -14156,7 +14236,7 @@ var ts;
                     case 196:
                     case 199:
                         return 2097152 | 1048576;
-                    case 202:
+                    case 203:
                         var result = 0;
                         var target = resolveAlias(getSymbolOfNode(d));
                         ts.forEach(target.declarations, function (d) { result |= getDeclarationSpaces(d); });
@@ -14290,7 +14370,7 @@ var ts;
                 return;
             }
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 220 && ts.isExternalModule(parent)) {
+            if (parent.kind === 221 && ts.isExternalModule(parent)) {
                 error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_an_external_module, ts.declarationNameToString(name), ts.declarationNameToString(name));
             }
         }
@@ -14309,7 +14389,7 @@ var ts;
                             var namesShareScope = container &&
                                 (container.kind === 174 && ts.isFunctionLike(container.parent) ||
                                     (container.kind === 201 && container.kind === 200) ||
-                                    container.kind === 220);
+                                    container.kind === 221);
                             if (!namesShareScope) {
                                 var name = symbolToString(localDeclarationSymbol);
                                 error(node, ts.Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name, name);
@@ -14468,18 +14548,13 @@ var ts;
             checkSourceElement(node.statement);
         }
         function checkForOfStatement(node) {
-            if (languageVersion < 2) {
-                grammarErrorOnFirstToken(node, ts.Diagnostics.for_of_statements_are_only_available_when_targeting_ECMAScript_6_or_higher);
-                return;
-            }
             checkGrammarForInOrForOfStatement(node);
             if (node.initializer.kind === 194) {
                 checkForInOrForOfVariableDeclaration(node);
             }
             else {
                 var varExpr = node.initializer;
-                var rightType = checkExpression(node.expression);
-                var iteratedType = checkIteratedType(rightType, node.expression);
+                var iteratedType = checkRightHandSideOfForOf(node.expression);
                 if (varExpr.kind === 151 || varExpr.kind === 152) {
                     checkDestructuringAssignment(varExpr, iteratedType || unknownType);
                 }
@@ -14528,12 +14603,11 @@ var ts;
                 checkVariableDeclaration(decl);
             }
         }
-        function getTypeForVariableDeclarationInForOfStatement(forOfStatement) {
-            if (languageVersion < 2) {
-                return anyType;
-            }
-            var expressionType = getTypeOfExpression(forOfStatement.expression);
-            return checkIteratedType(expressionType, forOfStatement.expression) || anyType;
+        function checkRightHandSideOfForOf(rhsExpression) {
+            var expressionType = getTypeOfExpression(rhsExpression);
+            return languageVersion >= 2
+                ? checkIteratedType(expressionType, rhsExpression)
+                : checkElementTypeOfArrayOrString(expressionType, rhsExpression);
         }
         function checkIteratedType(iterable, expressionForError) {
             ts.Debug.assert(languageVersion >= 2);
@@ -14589,6 +14663,38 @@ var ts;
                 return iteratorNextValue;
             }
         }
+        function checkElementTypeOfArrayOrString(arrayOrStringType, expressionForError) {
+            ts.Debug.assert(languageVersion < 2);
+            var arrayType = removeTypesFromUnionType(arrayOrStringType, 258, true, true);
+            var hasStringConstituent = arrayOrStringType !== arrayType;
+            var reportedError = false;
+            if (hasStringConstituent) {
+                if (languageVersion < 1) {
+                    error(expressionForError, ts.Diagnostics.Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher);
+                    reportedError = true;
+                }
+                if (arrayType === emptyObjectType) {
+                    return stringType;
+                }
+            }
+            if (!isArrayLikeType(arrayType)) {
+                if (!reportedError) {
+                    var diagnostic = hasStringConstituent
+                        ? ts.Diagnostics.Type_0_is_not_an_array_type
+                        : ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type;
+                    error(expressionForError, diagnostic, typeToString(arrayType));
+                }
+                return hasStringConstituent ? stringType : unknownType;
+            }
+            var arrayElementType = getIndexTypeOfType(arrayType, 1) || unknownType;
+            if (hasStringConstituent) {
+                if (arrayElementType.flags & 258) {
+                    return stringType;
+                }
+                return getUnionType([arrayElementType, stringType]);
+            }
+            return arrayElementType;
+        }
         function checkBreakOrContinueStatement(node) {
             checkGrammarStatementInAmbientContext(node) || checkGrammarBreakOrContinueStatement(node);
         }
@@ -14637,8 +14743,8 @@ var ts;
             var firstDefaultClause;
             var hasDuplicateDefaultClause = false;
             var expressionType = checkExpression(node.expression);
-            ts.forEach(node.clauses, function (clause) {
-                if (clause.kind === 214 && !hasDuplicateDefaultClause) {
+            ts.forEach(node.caseBlock.clauses, function (clause) {
+                if (clause.kind === 215 && !hasDuplicateDefaultClause) {
                     if (firstDefaultClause === undefined) {
                         firstDefaultClause = clause;
                     }
@@ -14650,7 +14756,7 @@ var ts;
                         hasDuplicateDefaultClause = true;
                     }
                 }
-                if (produceDiagnostics && clause.kind === 213) {
+                if (produceDiagnostics && clause.kind === 214) {
                     var caseClause = clause;
                     var caseType = checkExpression(caseClause.expression);
                     if (!isTypeAssignableTo(expressionType, caseType)) {
@@ -15236,8 +15342,8 @@ var ts;
                 return false;
             }
             var inAmbientExternalModule = node.parent.kind === 201 && node.parent.parent.name.kind === 8;
-            if (node.parent.kind !== 220 && !inAmbientExternalModule) {
-                error(moduleName, node.kind === 209 ?
+            if (node.parent.kind !== 221 && !inAmbientExternalModule) {
+                error(moduleName, node.kind === 210 ?
                     ts.Diagnostics.Export_declarations_are_not_permitted_in_an_internal_module :
                     ts.Diagnostics.Import_declarations_in_an_internal_module_cannot_reference_an_external_module);
                 return false;
@@ -15256,7 +15362,7 @@ var ts;
                     (symbol.flags & 793056 ? 793056 : 0) |
                     (symbol.flags & 1536 ? 1536 : 0);
                 if (target.flags & excludedMeanings) {
-                    var message = node.kind === 211 ?
+                    var message = node.kind === 212 ?
                         ts.Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 :
                         ts.Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0;
                     error(node, message, symbolToString(symbol));
@@ -15279,7 +15385,7 @@ var ts;
                         checkImportBinding(importClause);
                     }
                     if (importClause.namedBindings) {
-                        if (importClause.namedBindings.kind === 205) {
+                        if (importClause.namedBindings.kind === 206) {
                             checkImportBinding(importClause.namedBindings);
                         }
                         else {
@@ -15329,7 +15435,7 @@ var ts;
             }
         }
         function checkExportAssignment(node) {
-            var container = node.parent.kind === 220 ? node.parent : node.parent.parent;
+            var container = node.parent.kind === 221 ? node.parent : node.parent.parent;
             if (container.kind === 200 && container.name.kind === 64) {
                 error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_an_internal_module);
                 return;
@@ -15346,7 +15452,7 @@ var ts;
             checkExternalModuleExports(container);
         }
         function getModuleStatements(node) {
-            if (node.kind === 220) {
+            if (node.kind === 221) {
                 return node.statements;
             }
             if (node.kind === 200 && node.body.kind === 201) {
@@ -15360,7 +15466,7 @@ var ts;
                 var statements = getModuleStatements(declarations[i]);
                 for (var j = 0; j < statements.length; j++) {
                     var node = statements[j];
-                    if (node.kind === 209) {
+                    if (node.kind === 210) {
                         var exportClause = node.exportClause;
                         if (!exportClause) {
                             return true;
@@ -15373,7 +15479,7 @@ var ts;
                             }
                         }
                     }
-                    else if (node.kind !== 208 && node.flags & 1 && !(node.flags & 256)) {
+                    else if (node.kind !== 209 && node.flags & 1 && !(node.flags & 256)) {
                         return true;
                     }
                 }
@@ -15483,13 +15589,13 @@ var ts;
                     return checkEnumDeclaration(node);
                 case 200:
                     return checkModuleDeclaration(node);
-                case 203:
+                case 204:
                     return checkImportDeclaration(node);
-                case 202:
+                case 203:
                     return checkImportEqualsDeclaration(node);
-                case 209:
+                case 210:
                     return checkExportDeclaration(node);
-                case 208:
+                case 209:
                     return checkExportAssignment(node);
                 case 176:
                     checkGrammarStatementInAmbientContext(node);
@@ -15530,7 +15636,7 @@ var ts;
                 case 150:
                 case 151:
                 case 152:
-                case 217:
+                case 218:
                 case 153:
                 case 154:
                 case 155:
@@ -15562,19 +15668,20 @@ var ts;
                 case 185:
                 case 186:
                 case 188:
-                case 213:
+                case 202:
                 case 214:
+                case 215:
                 case 189:
                 case 190:
                 case 191:
-                case 216:
+                case 217:
                 case 193:
                 case 194:
                 case 196:
                 case 199:
-                case 219:
-                case 208:
                 case 220:
+                case 209:
+                case 221:
                     ts.forEachChild(node, checkFunctionExpressionBodies);
                     break;
             }
@@ -15662,7 +15769,7 @@ var ts;
                     copySymbols(location.locals, meaning);
                 }
                 switch (location.kind) {
-                    case 220:
+                    case 221:
                         if (!ts.isExternalModule(location))
                             break;
                     case 200:
@@ -15774,10 +15881,10 @@ var ts;
             while (nodeOnRightSide.parent.kind === 125) {
                 nodeOnRightSide = nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 202) {
+            if (nodeOnRightSide.parent.kind === 203) {
                 return nodeOnRightSide.parent.moduleReference === nodeOnRightSide && nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 208) {
+            if (nodeOnRightSide.parent.kind === 209) {
                 return nodeOnRightSide.parent.expression === nodeOnRightSide && nodeOnRightSide.parent;
             }
             return undefined;
@@ -15793,7 +15900,7 @@ var ts;
             if (ts.isDeclarationName(entityName)) {
                 return getSymbolOfNode(entityName.parent);
             }
-            if (entityName.parent.kind === 208) {
+            if (entityName.parent.kind === 209) {
                 return resolveEntityName(entityName, 107455 | 793056 | 1536 | 8388608);
             }
             if (entityName.kind !== 153) {
@@ -15842,7 +15949,7 @@ var ts;
                 return getSymbolOfNode(node.parent);
             }
             if (node.kind === 64 && isInRightSideOfImportOrExportAssignment(node)) {
-                return node.parent.kind === 208
+                return node.parent.kind === 209
                     ? getSymbolOfEntityNameOrPropertyAccessExpression(node)
                     : getSymbolOfPartOfRightHandSideOfImportEquals(node);
             }
@@ -15865,7 +15972,7 @@ var ts;
                     var moduleName;
                     if ((ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) &&
                         ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) ||
-                        ((node.parent.kind === 203 || node.parent.kind === 209) &&
+                        ((node.parent.kind === 204 || node.parent.kind === 210) &&
                             node.parent.moduleSpecifier === node)) {
                         return resolveExternalModuleName(node, node);
                     }
@@ -15884,7 +15991,7 @@ var ts;
             return undefined;
         }
         function getShorthandAssignmentValueSymbol(location) {
-            if (location && location.kind === 218) {
+            if (location && location.kind === 219) {
                 return resolveEntityName(location.name, 107455);
             }
             return undefined;
@@ -15958,7 +16065,7 @@ var ts;
             return [symbol];
         }
         function isExternalModuleSymbol(symbol) {
-            return symbol.flags & 512 && symbol.declarations.length === 1 && symbol.declarations[0].kind === 220;
+            return symbol.flags & 512 && symbol.declarations.length === 1 && symbol.declarations[0].kind === 221;
         }
         function isNodeDescendentOf(node, ancestor) {
             while (node) {
@@ -15999,16 +16106,16 @@ var ts;
                     case 199:
                         generateNameForModuleOrEnum(node);
                         break;
-                    case 203:
+                    case 204:
                         generateNameForImportDeclaration(node);
                         break;
-                    case 209:
+                    case 210:
                         generateNameForExportDeclaration(node);
                         break;
-                    case 208:
+                    case 209:
                         generateNameForExportAssignment(node);
                         break;
-                    case 220:
+                    case 221:
                     case 201:
                         ts.forEach(node.statements, generateNames);
                         break;
@@ -16042,7 +16149,7 @@ var ts;
                 assignGeneratedName(node, makeUniqueName(baseName));
             }
             function generateNameForImportDeclaration(node) {
-                if (node.importClause && node.importClause.namedBindings && node.importClause.namedBindings.kind === 206) {
+                if (node.importClause && node.importClause.namedBindings && node.importClause.namedBindings.kind === 207) {
                     generateNameForImportOrExportDeclaration(node);
                 }
             }
@@ -16072,7 +16179,7 @@ var ts;
         }
         function getAliasNameSubstitution(symbol) {
             var declaration = getDeclarationOfAliasSymbol(symbol);
-            if (declaration && declaration.kind === 207) {
+            if (declaration && declaration.kind === 208) {
                 var moduleName = getGeneratedNameForNode(declaration.parent.parent.parent);
                 var propertyName = declaration.propertyName || declaration.name;
                 return moduleName + "." + ts.unescapeIdentifier(propertyName.text);
@@ -16111,7 +16218,7 @@ var ts;
             return symbol && symbol !== unknownSymbol && symbolIsValue(symbol) && !isConstEnumSymbol(symbol);
         }
         function isTopLevelValueImportEqualsWithEntityName(node) {
-            if (node.parent.kind !== 220 || !ts.isInternalModuleImportEqualsDeclaration(node)) {
+            if (node.parent.kind !== 221 || !ts.isInternalModuleImportEqualsDeclaration(node)) {
                 return false;
             }
             return isAliasResolvedToValue(getSymbolOfNode(node));
@@ -16149,14 +16256,14 @@ var ts;
             return getNodeLinks(node).enumMemberValue;
         }
         function getConstantValue(node) {
-            if (node.kind === 219) {
+            if (node.kind === 220) {
                 return getEnumMemberValue(node);
             }
             var symbol = getNodeLinks(node).resolvedSymbol;
             if (symbol && (symbol.flags & 8)) {
                 var declaration = symbol.valueDeclaration;
                 var constantValue;
-                if (declaration.kind === 219) {
+                if (declaration.kind === 220) {
                     return getEnumMemberValue(declaration);
                 }
             }
@@ -16174,6 +16281,7 @@ var ts;
             getSymbolDisplayBuilder().buildTypeDisplay(getReturnTypeOfSignature(signature), writer, enclosingDeclaration, flags);
         }
         function isUnknownIdentifier(location, name) {
+            ts.Debug.assert(!ts.nodeIsSynthesized(location), "isUnknownIdentifier called with a synthesized location");
             return !resolveName(location, name, 107455, undefined, undefined) &&
                 !ts.hasProperty(getGeneratedNamesForSourceFile(getSourceFile(location)), name);
         }
@@ -16196,7 +16304,7 @@ var ts;
                 resolveName(n, n.text, 2 | 8388608, undefined, undefined);
             var isLetOrConst = symbol &&
                 (symbol.flags & 2) &&
-                symbol.valueDeclaration.parent.kind !== 216;
+                symbol.valueDeclaration.parent.kind !== 217;
             if (isLetOrConst) {
                 getSymbolLinks(symbol);
                 return symbol.id;
@@ -16273,10 +16381,10 @@ var ts;
                 case 175:
                 case 195:
                 case 198:
+                case 204:
                 case 203:
-                case 202:
+                case 210:
                 case 209:
-                case 208:
                 case 128:
                     break;
                 default:
@@ -16311,7 +16419,7 @@ var ts;
                         else if (flags & 128) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "static");
                         }
-                        else if (node.parent.kind === 201 || node.parent.kind === 220) {
+                        else if (node.parent.kind === 201 || node.parent.kind === 221) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_element, text);
                         }
                         flags |= ts.modifierToFlag(modifier.kind);
@@ -16320,7 +16428,7 @@ var ts;
                         if (flags & 128) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "static");
                         }
-                        else if (node.parent.kind === 201 || node.parent.kind === 220) {
+                        else if (node.parent.kind === 201 || node.parent.kind === 221) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_element, "static");
                         }
                         else if (node.kind === 128) {
@@ -16373,7 +16481,7 @@ var ts;
                     return grammarErrorOnNode(lastPrivate, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "private");
                 }
             }
-            else if ((node.kind === 203 || node.kind === 202) && flags & 2) {
+            else if ((node.kind === 204 || node.kind === 203) && flags & 2) {
                 return grammarErrorOnNode(lastDeclare, ts.Diagnostics.A_declare_modifier_cannot_be_used_with_an_import_declaration, "declare");
             }
             else if (node.kind === 197 && flags & 2) {
@@ -16604,7 +16712,7 @@ var ts;
                     continue;
                 }
                 var currentKind;
-                if (prop.kind === 217 || prop.kind === 218) {
+                if (prop.kind === 218 || prop.kind === 219) {
                     checkGrammarForInvalidQuestionMark(prop, prop.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional);
                     if (name.kind === 7) {
                         checkGrammarNumbericLiteral(name);
@@ -16998,10 +17106,10 @@ var ts;
         }
         function checkGrammarTopLevelElementForRequiredDeclareModifier(node) {
             if (node.kind === 197 ||
+                node.kind === 204 ||
                 node.kind === 203 ||
-                node.kind === 202 ||
+                node.kind === 210 ||
                 node.kind === 209 ||
-                node.kind === 208 ||
                 (node.flags & 2)) {
                 return false;
             }
@@ -17029,7 +17137,7 @@ var ts;
                 if (!links.hasReportedStatementInAmbientContext && ts.isFunctionLike(node.parent)) {
                     return getNodeLinks(node).hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.An_implementation_cannot_be_declared_in_ambient_contexts);
                 }
-                if (node.parent.kind === 174 || node.parent.kind === 201 || node.parent.kind === 220) {
+                if (node.parent.kind === 174 || node.parent.kind === 201 || node.parent.kind === 221) {
                     var links = getNodeLinks(node.parent);
                     if (!links.hasReportedStatementInAmbientContext) {
                         return links.hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.Statements_are_not_allowed_in_ambient_contexts);
@@ -17520,7 +17628,7 @@ var ts;
                     ts.Debug.fail("Unknown type annotation: " + type.kind);
             }
             function emitEntityName(entityName) {
-                var visibilityResult = resolver.isEntityNameVisible(entityName, entityName.parent.kind === 202 ? entityName.parent : enclosingDeclaration);
+                var visibilityResult = resolver.isEntityNameVisible(entityName, entityName.parent.kind === 203 ? entityName.parent : enclosingDeclaration);
                 handleSymbolAccessibilityError(visibilityResult);
                 writeEntityName(entityName);
                 function writeEntityName(entityName) {
@@ -18260,17 +18368,17 @@ var ts;
                     return emitClassDeclaration(node);
                 case 198:
                     return emitTypeAliasDeclaration(node);
-                case 219:
+                case 220:
                     return emitEnumMemberDeclaration(node);
                 case 199:
                     return emitEnumDeclaration(node);
                 case 200:
                     return emitModuleDeclaration(node);
-                case 202:
+                case 203:
                     return emitImportEqualsDeclaration(node);
-                case 208:
+                case 209:
                     return emitExportAssignment(node);
-                case 220:
+                case 221:
                     return emitSourceFile(node);
             }
         }
@@ -18330,6 +18438,7 @@ var ts;
             var writeLine = writer.writeLine;
             var increaseIndent = writer.increaseIndent;
             var decreaseIndent = writer.decreaseIndent;
+            var preserveNewLines = compilerOptions.preserveNewLines || false;
             var currentSourceFile;
             var lastFrame;
             var currentScopeNames;
@@ -18347,9 +18456,10 @@ var ts;
             var emitLeadingCommentsOfPosition = compilerOptions.removeComments ? function (pos) { } : emitLeadingCommentsOfLocalPosition;
             var detachedCommentsInfo;
             var emitDetachedComments = compilerOptions.removeComments ? function (node) { } : emitDetachedCommentsAtPosition;
-            var emitPinnedOrTripleSlashComments = compilerOptions.removeComments ? function (node) { } : emitPinnedOrTripleSlashCommentsOfNode;
             var writeComment = writeCommentRange;
-            var emit = emitNode;
+            var emitNodeWithoutSourceMap = compilerOptions.removeComments ? emitNodeWithoutSourceMapWithoutComments : emitNodeWithoutSourceMapWithComments;
+            var emit = emitNodeWithoutSourceMap;
+            var emitWithoutComments = emitNodeWithoutSourceMapWithoutComments;
             var emitStart = function (node) { };
             var emitEnd = function (node) { };
             var emitToken = emitTokenText;
@@ -18360,18 +18470,22 @@ var ts;
                 initializeEmitterWithSourceMaps();
             }
             if (root) {
-                emit(root);
+                emitSourceFile(root);
             }
             else {
                 ts.forEach(host.getSourceFiles(), function (sourceFile) {
                     if (!isExternalModuleOrDeclarationFile(sourceFile)) {
-                        emit(sourceFile);
+                        emitSourceFile(sourceFile);
                     }
                 });
             }
             writeLine();
             writeEmittedFiles(writer.getText(), compilerOptions.emitBOM);
             return;
+            function emitSourceFile(sourceFile) {
+                currentSourceFile = sourceFile;
+                emit(sourceFile);
+            }
             function enterNameScope() {
                 var names = currentScopeNames;
                 currentScopeNames = undefined;
@@ -18398,6 +18512,9 @@ var ts;
                 else {
                     name = ts.generateUniqueName(baseName, function (n) { return isExistingName(location, n); });
                 }
+                return recordNameInCurrentScope(name);
+            }
+            function recordNameInCurrentScope(name) {
                 if (!currentScopeNames) {
                     currentScopeNames = {};
                 }
@@ -18652,21 +18769,32 @@ var ts;
                 else {
                     sourceMapDir = ts.getDirectoryPath(ts.normalizePath(jsFilePath));
                 }
-                function emitNodeWithMap(node) {
+                function emitNodeWithSourceMap(node) {
                     if (node) {
-                        if (node.kind != 220) {
+                        if (ts.nodeIsSynthesized(node)) {
+                            return emitNodeWithoutSourceMap(node);
+                        }
+                        if (node.kind != 221) {
                             recordEmitNodeStartSpan(node);
-                            emitNode(node);
+                            emitNodeWithoutSourceMap(node);
                             recordEmitNodeEndSpan(node);
                         }
                         else {
                             recordNewSourceFileStart(node);
-                            emitNode(node);
+                            emitNodeWithoutSourceMap(node);
                         }
                     }
                 }
+                function emitNodeWithSourceMapWithoutComments(node) {
+                    if (node) {
+                        recordEmitNodeStartSpan(node);
+                        emitNodeWithoutSourceMapWithoutComments(node);
+                        recordEmitNodeEndSpan(node);
+                    }
+                }
                 writeEmittedFiles = writeJavaScriptAndSourceMapFile;
-                emit = emitNodeWithMap;
+                emit = emitNodeWithSourceMap;
+                emitWithoutComments = emitNodeWithSourceMapWithoutComments;
                 emitStart = recordEmitNodeStartSpan;
                 emitEnd = recordEmitNodeEndSpan;
                 emitToken = writeTextWithSpanRecord;
@@ -18686,6 +18814,7 @@ var ts;
                     name = "_" + (tempCount < 25 ? String.fromCharCode(tempCount + (tempCount < 8 ? 0 : 1) + 97) : tempCount - 25);
                     tempCount++;
                 }
+                recordNameInCurrentScope(name);
                 var result = ts.createSynthesizedNode(64);
                 result.text = name;
                 return result;
@@ -18747,7 +18876,7 @@ var ts;
             function emitLinePreservingList(parent, nodes, allowTrailingComma, spacesBetweenBraces) {
                 ts.Debug.assert(nodes.length > 0);
                 increaseIndent();
-                if (nodeStartPositionsAreOnSameLine(parent, nodes[0])) {
+                if (preserveNewLines && nodeStartPositionsAreOnSameLine(parent, nodes[0])) {
                     if (spacesBetweenBraces) {
                         write(" ");
                     }
@@ -18757,7 +18886,7 @@ var ts;
                 }
                 for (var i = 0, n = nodes.length; i < n; i++) {
                     if (i) {
-                        if (nodeEndIsOnSameLineAsNodeStart(nodes[i - 1], nodes[i])) {
+                        if (preserveNewLines && nodeEndIsOnSameLineAsNodeStart(nodes[i - 1], nodes[i])) {
                             write(", ");
                         }
                         else {
@@ -18767,12 +18896,11 @@ var ts;
                     }
                     emit(nodes[i]);
                 }
-                var closeTokenIsOnSameLineAsLastElement = nodeEndPositionsAreOnSameLine(parent, ts.lastOrUndefined(nodes));
                 if (nodes.hasTrailingComma && allowTrailingComma) {
                     write(",");
                 }
                 decreaseIndent();
-                if (closeTokenIsOnSameLineAsLastElement) {
+                if (preserveNewLines && nodeEndPositionsAreOnSameLine(parent, ts.lastOrUndefined(nodes))) {
                     if (spacesBetweenBraces) {
                         write(" ");
                     }
@@ -19012,9 +19140,9 @@ var ts;
                     case 150:
                     case 130:
                     case 129:
-                    case 217:
                     case 218:
                     case 219:
+                    case 220:
                     case 132:
                     case 131:
                     case 195:
@@ -19025,11 +19153,11 @@ var ts;
                     case 197:
                     case 199:
                     case 200:
-                    case 202:
+                    case 203:
                         return parent.name === node;
                     case 185:
                     case 184:
-                    case 208:
+                    case 209:
                         return false;
                     case 189:
                         return node.parent.label === node;
@@ -19217,9 +19345,9 @@ var ts;
             }
             function tryGetRightHandSideOfPatchingPropertyAssignment(objectLiteral, property) {
                 switch (property.kind) {
-                    case 217:
-                        return property.initializer;
                     case 218:
+                        return property.initializer;
+                    case 219:
                         return createIdentifier(resolver.getExpressionNameSubstitution(property.name));
                     case 132:
                         return createFunctionExpression(property.parameters, property.body);
@@ -19273,6 +19401,11 @@ var ts;
                 result.right = right;
                 return result;
             }
+            function createExpressionStatement(expression) {
+                var result = ts.createSynthesizedNode(177);
+                result.expression = expression;
+                return result;
+            }
             function createMemberAccessForPropertyName(expression, memberName) {
                 if (memberName.kind === 64) {
                     return createPropertyAccessExpression(expression, memberName);
@@ -19288,7 +19421,7 @@ var ts;
                 }
             }
             function createPropertyAssignment(name, initializer) {
-                var result = ts.createSynthesizedNode(217);
+                var result = ts.createSynthesizedNode(218);
                 result.name = name;
                 result.initializer = initializer;
                 return result;
@@ -19383,29 +19516,31 @@ var ts;
                 }
                 return false;
             }
-            function indentIfOnDifferentLines(parent, node1, node2) {
-                var isSynthesized = ts.nodeIsSynthesized(parent);
-                var realNodesAreOnDifferentLines = !isSynthesized && !nodeEndIsOnSameLineAsNodeStart(node1, node2);
+            function indentIfOnDifferentLines(parent, node1, node2, valueToWriteWhenNotIndenting) {
+                var realNodesAreOnDifferentLines = preserveNewLines && !ts.nodeIsSynthesized(parent) && !nodeEndIsOnSameLineAsNodeStart(node1, node2);
                 var synthesizedNodeIsOnDifferentLine = synthesizedNodeStartsOnNewLine(node2);
                 if (realNodesAreOnDifferentLines || synthesizedNodeIsOnDifferentLine) {
                     increaseIndent();
                     writeLine();
                     return true;
                 }
-                return false;
+                else {
+                    if (valueToWriteWhenNotIndenting) {
+                        write(valueToWriteWhenNotIndenting);
+                    }
+                    return false;
+                }
             }
             function emitPropertyAccess(node) {
                 if (tryEmitConstantValue(node)) {
                     return;
                 }
                 emit(node.expression);
-                var indented = indentIfOnDifferentLines(node, node.expression, node.dotToken);
+                var indentedBeforeDot = indentIfOnDifferentLines(node, node.expression, node.dotToken);
                 write(".");
-                indented = indented || indentIfOnDifferentLines(node, node.dotToken, node.name);
+                var indentedAfterDot = indentIfOnDifferentLines(node, node.dotToken, node.name);
                 emit(node.name);
-                if (indented) {
-                    decreaseIndent();
-                }
+                decreaseIndentIf(indentedBeforeDot, indentedAfterDot);
             }
             function emitQualifiedName(node) {
                 emit(node.left);
@@ -19587,25 +19722,15 @@ var ts;
             function emitBinaryExpression(node) {
                 if (languageVersion < 2 && node.operatorToken.kind === 52 &&
                     (node.left.kind === 152 || node.left.kind === 151)) {
-                    emitDestructuring(node);
+                    emitDestructuring(node, node.parent.kind === 177);
                 }
                 else {
                     emit(node.left);
-                    var indented1 = indentIfOnDifferentLines(node, node.left, node.operatorToken);
-                    if (!indented1 && node.operatorToken.kind !== 23) {
-                        write(" ");
-                    }
+                    var indentedBeforeOperator = indentIfOnDifferentLines(node, node.left, node.operatorToken, node.operatorToken.kind !== 23 ? " " : undefined);
                     write(ts.tokenToString(node.operatorToken.kind));
-                    if (!indented1) {
-                        var indented2 = indentIfOnDifferentLines(node, node.operatorToken, node.right);
-                    }
-                    if (!indented2) {
-                        write(" ");
-                    }
+                    var indentedAfterOperator = indentIfOnDifferentLines(node, node.operatorToken, node.right, " ");
                     emit(node.right);
-                    if (indented1 || indented2) {
-                        decreaseIndent();
-                    }
+                    decreaseIndentIf(indentedBeforeOperator, indentedAfterOperator);
                 }
             }
             function synthesizedNodeStartsOnNewLine(node) {
@@ -19613,34 +19738,22 @@ var ts;
             }
             function emitConditionalExpression(node) {
                 emit(node.condition);
-                var indent1 = indentIfOnDifferentLines(node, node.condition, node.questionToken);
-                if (!indent1) {
-                    write(" ");
-                }
+                var indentedBeforeQuestion = indentIfOnDifferentLines(node, node.condition, node.questionToken, " ");
                 write("?");
-                if (!indent1) {
-                    var indent2 = indentIfOnDifferentLines(node, node.questionToken, node.whenTrue);
-                }
-                if (!indent2) {
-                    write(" ");
-                }
+                var indentedAfterQuestion = indentIfOnDifferentLines(node, node.questionToken, node.whenTrue, " ");
                 emit(node.whenTrue);
-                if (indent1 || indent2) {
+                decreaseIndentIf(indentedBeforeQuestion, indentedAfterQuestion);
+                var indentedBeforeColon = indentIfOnDifferentLines(node, node.whenTrue, node.colonToken, " ");
+                write(":");
+                var indentedAfterColon = indentIfOnDifferentLines(node, node.colonToken, node.whenFalse, " ");
+                emit(node.whenFalse);
+                decreaseIndentIf(indentedBeforeColon, indentedAfterColon);
+            }
+            function decreaseIndentIf(value1, value2) {
+                if (value1) {
                     decreaseIndent();
                 }
-                var indent3 = indentIfOnDifferentLines(node, node.whenTrue, node.colonToken);
-                if (!indent3) {
-                    write(" ");
-                }
-                write(":");
-                if (!indent3) {
-                    var indent4 = indentIfOnDifferentLines(node, node.colonToken, node.whenFalse);
-                }
-                if (!indent4) {
-                    write(" ");
-                }
-                emit(node.whenFalse);
-                if (indent3 || indent4) {
+                if (value2) {
                     decreaseIndent();
                 }
             }
@@ -19651,7 +19764,7 @@ var ts;
                 }
             }
             function emitBlock(node) {
-                if (isSingleLineEmptyBlock(node)) {
+                if (preserveNewLines && isSingleLineEmptyBlock(node)) {
                     emitToken(14, node.pos);
                     write(" ");
                     emitToken(15, node.statements.end);
@@ -19773,6 +19886,9 @@ var ts;
                 emitEmbeddedStatement(node.statement);
             }
             function emitForInOrForOfStatement(node) {
+                if (languageVersion < 2 && node.kind === 183) {
+                    return emitDownLevelForOfStatement(node);
+                }
                 var endPos = emitToken(81, node.pos);
                 write(" ");
                 endPos = emitToken(16, endPos);
@@ -19798,6 +19914,86 @@ var ts;
                 emitToken(17, node.expression.end);
                 emitEmbeddedStatement(node.statement);
             }
+            function emitDownLevelForOfStatement(node) {
+                var endPos = emitToken(81, node.pos);
+                write(" ");
+                endPos = emitToken(16, endPos);
+                var rhsIsIdentifier = node.expression.kind === 64;
+                var counter = createTempVariable(node, true);
+                var rhsReference = rhsIsIdentifier ? node.expression : createTempVariable(node, false);
+                emitStart(node.expression);
+                write("var ");
+                emitNodeWithoutSourceMap(counter);
+                write(" = 0");
+                emitEnd(node.expression);
+                if (!rhsIsIdentifier) {
+                    write(", ");
+                    emitStart(node.expression);
+                    emitNodeWithoutSourceMap(rhsReference);
+                    write(" = ");
+                    emitNodeWithoutSourceMap(node.expression);
+                    emitEnd(node.expression);
+                }
+                write("; ");
+                emitStart(node.initializer);
+                emitNodeWithoutSourceMap(counter);
+                write(" < ");
+                emitNodeWithoutSourceMap(rhsReference);
+                write(".length");
+                emitEnd(node.initializer);
+                write("; ");
+                emitStart(node.initializer);
+                emitNodeWithoutSourceMap(counter);
+                write("++");
+                emitEnd(node.initializer);
+                emitToken(17, node.expression.end);
+                write(" {");
+                writeLine();
+                increaseIndent();
+                var rhsIterationValue = createElementAccessExpression(rhsReference, counter);
+                emitStart(node.initializer);
+                if (node.initializer.kind === 194) {
+                    write("var ");
+                    var variableDeclarationList = node.initializer;
+                    if (variableDeclarationList.declarations.length > 0) {
+                        var declaration = variableDeclarationList.declarations[0];
+                        if (ts.isBindingPattern(declaration.name)) {
+                            emitDestructuring(declaration, false, rhsIterationValue);
+                        }
+                        else {
+                            emitNodeWithoutSourceMap(declaration);
+                            write(" = ");
+                            emitNodeWithoutSourceMap(rhsIterationValue);
+                        }
+                    }
+                    else {
+                        emitNodeWithoutSourceMap(createTempVariable(node, false));
+                        write(" = ");
+                        emitNodeWithoutSourceMap(rhsIterationValue);
+                    }
+                }
+                else {
+                    var assignmentExpression = createBinaryExpression(node.initializer, 52, rhsIterationValue, false);
+                    if (node.initializer.kind === 151 || node.initializer.kind === 152) {
+                        emitDestructuring(assignmentExpression, true, undefined, node);
+                    }
+                    else {
+                        emitNodeWithoutSourceMap(assignmentExpression);
+                    }
+                }
+                emitEnd(node.initializer);
+                write(";");
+                if (node.statement.kind === 174) {
+                    emitLines(node.statement.statements);
+                }
+                else {
+                    writeLine();
+                    emit(node.statement);
+                }
+                writeLine();
+                decreaseIndent();
+                write("}");
+            }
             function emitBreakOrContinueStatement(node) {
                 emitToken(node.kind === 185 ? 65 : 70, node.pos);
                 emitOptional(" ", node.label);
@@ -19821,7 +20017,10 @@ var ts;
                 emit(node.expression);
                 endPos = emitToken(17, node.expression.end);
                 write(" ");
-                emitToken(14, endPos);
+                emitCaseBlock(node.caseBlock, endPos);
+            }
+            function emitCaseBlock(node, startPos) {
+                emitToken(14, startPos);
                 increaseIndent();
                 emitLines(node.clauses);
                 decreaseIndent();
@@ -19841,7 +20040,7 @@ var ts;
                     getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node2.pos));
             }
             function emitCaseOrDefaultClause(node) {
-                if (node.kind === 213) {
+                if (node.kind === 214) {
                     write("case ");
                     emit(node.expression);
                     write(":");
@@ -19849,7 +20048,7 @@ var ts;
                 else {
                     write("default:");
                 }
-                if (node.statements.length === 1 && nodeStartPositionsAreOnSameLine(node, node.statements[0])) {
+                if (preserveNewLines && node.statements.length === 1 && nodeStartPositionsAreOnSameLine(node, node.statements[0])) {
                     write(" ");
                     emit(node.statements[0]);
                 }
@@ -19909,7 +20108,7 @@ var ts;
                     emitContainingModuleName(node);
                     write(".");
                 }
-                emitNode(node.name);
+                emitNodeWithoutSourceMap(node.name);
                 emitEnd(node.name);
             }
             function createVoidZero() {
@@ -19926,21 +20125,22 @@ var ts;
                         emitStart(specifier.name);
                         emitContainingModuleName(specifier);
                         write(".");
-                        emitNode(specifier.name);
+                        emitNodeWithoutSourceMap(specifier.name);
                         emitEnd(specifier.name);
                         write(" = ");
-                        emitNode(name);
+                        emitNodeWithoutSourceMap(name);
                         write(";");
                     });
                 }
             }
-            function emitDestructuring(root, value) {
+            function emitDestructuring(root, isAssignmentExpressionStatement, value, lowestNonSynthesizedAncestor) {
                 var emitCount = 0;
                 var isDeclaration = (root.kind === 193 && !(ts.getCombinedNodeFlags(root) & 1)) || root.kind === 128;
                 if (root.kind === 167) {
                     emitAssignmentExpression(root);
                 }
                 else {
+                    ts.Debug.assert(!isAssignmentExpressionStatement);
                     emitBindingElement(root, value);
                 }
                 function emitAssignment(name, value) {
@@ -19959,7 +20159,7 @@ var ts;
                 }
                 function ensureIdentifier(expr) {
                     if (expr.kind !== 64) {
-                        var identifier = createTempVariable(root);
+                        var identifier = createTempVariable(lowestNonSynthesizedAncestor || root);
                         if (!isDeclaration) {
                             recordTempDeclaration(identifier);
                         }
@@ -20017,7 +20217,7 @@ var ts;
                     }
                     for (var i = 0; i < properties.length; i++) {
                         var p = properties[i];
-                        if (p.kind === 217 || p.kind === 218) {
+                        if (p.kind === 218 || p.kind === 219) {
                             var propName = (p.name);
                             emitDestructuringAssignment(p.initializer || propName, createPropertyAccess(value, propName));
                         }
@@ -20062,7 +20262,7 @@ var ts;
                 function emitAssignmentExpression(root) {
                     var target = root.left;
                     var value = root.right;
-                    if (root.parent.kind === 177) {
+                    if (isAssignmentExpressionStatement) {
                         emitDestructuringAssignment(target, value);
                     }
                     else {
@@ -20119,7 +20319,7 @@ var ts;
             function emitVariableDeclaration(node) {
                 if (ts.isBindingPattern(node.name)) {
                     if (languageVersion < 2) {
-                        emitDestructuring(node);
+                        emitDestructuring(node, false);
                     }
                     else {
                         emit(node.name);
@@ -20127,7 +20327,7 @@ var ts;
                     }
                 }
                 else {
-                    var isLet = renameNonTopLevelLetAndConst(node.name);
+                    renameNonTopLevelLetAndConst(node.name);
                     emitModuleMemberName(node);
                     var initializer = node.initializer;
                     if (!initializer && languageVersion < 2) {
@@ -20151,29 +20351,6 @@ var ts;
                     ts.forEach(name.elements, emitExportVariableAssignments);
                 }
             }
-            function getEnclosingBlockScopeContainer(node) {
-                var current = node;
-                while (current) {
-                    if (ts.isFunctionLike(current)) {
-                        return current;
-                    }
-                    switch (current.kind) {
-                        case 220:
-                        case 91:
-                        case 216:
-                        case 200:
-                        case 181:
-                        case 182:
-                        case 183:
-                            return current;
-                        case 174:
-                            if (!ts.isFunctionLike(current.parent)) {
-                                return current;
-                            }
-                    }
-                    current = current.parent;
-                }
-            }
             function getCombinedFlagsForIdentifier(node) {
                 if (!node.parent || (node.parent.kind !== 193 && node.parent.kind !== 150)) {
                     return 0;
@@ -20192,11 +20369,11 @@ var ts;
                     return;
                 }
                 var list = ts.getAncestor(node, 194);
-                if (list.parent.kind === 175 && list.parent.parent.kind === 220) {
+                if (list.parent.kind === 175 && list.parent.parent.kind === 221) {
                     return;
                 }
-                var blockScopeContainer = getEnclosingBlockScopeContainer(node);
-                var parent = blockScopeContainer.kind === 220
+                var blockScopeContainer = ts.getEnclosingBlockScopeContainer(node);
+                var parent = blockScopeContainer.kind === 221
                     ? blockScopeContainer
                     : blockScopeContainer.parent;
                 var generatedName = generateUniqueNameForLocation(parent, node.text);
@@ -20245,7 +20422,7 @@ var ts;
                         if (ts.isBindingPattern(p.name)) {
                             writeLine();
                             write("var ");
-                            emitDestructuring(p, tempParameters[tempIndex]);
+                            emitDestructuring(p, false, tempParameters[tempIndex]);
                             write(";");
                             tempIndex++;
                         }
@@ -20253,14 +20430,14 @@ var ts;
                             writeLine();
                             emitStart(p);
                             write("if (");
-                            emitNode(p.name);
+                            emitNodeWithoutSourceMap(p.name);
                             write(" === void 0)");
                             emitEnd(p);
                             write(" { ");
                             emitStart(p);
-                            emitNode(p.name);
+                            emitNodeWithoutSourceMap(p.name);
                             write(" = ");
-                            emitNode(p.initializer);
+                            emitNodeWithoutSourceMap(p.initializer);
                             emitEnd(p);
                             write("; }");
                         }
@@ -20276,7 +20453,7 @@ var ts;
                     emitLeadingComments(restParam);
                     emitStart(restParam);
                     write("var ");
-                    emitNode(restParam.name);
+                    emitNodeWithoutSourceMap(restParam.name);
                     write(" = [];");
                     emitEnd(restParam);
                     emitTrailingComments(restParam);
@@ -20297,7 +20474,7 @@ var ts;
                     increaseIndent();
                     writeLine();
                     emitStart(restParam);
-                    emitNode(restParam.name);
+                    emitNodeWithoutSourceMap(restParam.name);
                     write("[" + tempName + " - " + restIndex + "] = arguments[" + tempName + "];");
                     emitEnd(restParam);
                     decreaseIndent();
@@ -20315,7 +20492,7 @@ var ts;
             }
             function emitDeclarationName(node) {
                 if (node.name) {
-                    emitNode(node.name);
+                    emitNodeWithoutSourceMap(node.name);
                 }
                 else {
                     write(resolver.getGeneratedNameForNode(node));
@@ -20432,11 +20609,11 @@ var ts;
                 emitFunctionBodyPreamble(node);
                 var preambleEmitted = writer.getTextPos() !== outPos;
                 decreaseIndent();
-                if (!preambleEmitted && nodeStartPositionsAreOnSameLine(node, body)) {
+                if (preserveNewLines && !preambleEmitted && nodeStartPositionsAreOnSameLine(node, body)) {
                     write(" ");
                     emitStart(body);
                     write("return ");
-                    emitNode(body, true);
+                    emitWithoutComments(body);
                     emitEnd(body);
                     write(";");
                     emitTempDeclarations(false);
@@ -20447,7 +20624,7 @@ var ts;
                     writeLine();
                     emitLeadingComments(node.body);
                     write("return ");
-                    emit(node.body, true);
+                    emitWithoutComments(node.body);
                     write(";");
                     emitTrailingComments(node.body);
                     emitTempDeclarations(true);
@@ -20469,7 +20646,7 @@ var ts;
                 emitFunctionBodyPreamble(node);
                 decreaseIndent();
                 var preambleEmitted = writer.getTextPos() !== initialTextPos;
-                if (!preambleEmitted && nodeEndIsOnSameLineAsNodeStart(body, body)) {
+                if (preserveNewLines && !preambleEmitted && nodeEndIsOnSameLineAsNodeStart(body, body)) {
                     for (var i = 0, n = body.statements.length; i < n; i++) {
                         write(" ");
                         emit(body.statements[i]);
@@ -20510,7 +20687,7 @@ var ts;
                         emitStart(param);
                         emitStart(param.name);
                         write("this.");
-                        emitNode(param.name);
+                        emitNodeWithoutSourceMap(param.name);
                         emitEnd(param.name);
                         write(" = ");
                         emit(param.name);
@@ -20522,7 +20699,7 @@ var ts;
             function emitMemberAccessForPropertyName(memberName) {
                 if (memberName.kind === 8 || memberName.kind === 7) {
                     write("[");
-                    emitNode(memberName);
+                    emitNodeWithoutSourceMap(memberName);
                     write("]");
                 }
                 else if (memberName.kind === 126) {
@@ -20530,7 +20707,7 @@ var ts;
                 }
                 else {
                     write(".");
-                    emitNode(memberName);
+                    emitNodeWithoutSourceMap(memberName);
                 }
             }
             function emitMemberAssignments(node, staticFlag) {
@@ -20989,11 +21166,11 @@ var ts;
                             emitStart(specifier);
                             emitContainingModuleName(specifier);
                             write(".");
-                            emitNode(specifier.name);
+                            emitNodeWithoutSourceMap(specifier.name);
                             write(" = ");
                             write(generatedName);
                             write(".");
-                            emitNode(specifier.propertyName || specifier.name);
+                            emitNodeWithoutSourceMap(specifier.propertyName || specifier.name);
                             write(";");
                             emitEnd(specifier);
                         });
@@ -21011,15 +21188,15 @@ var ts;
                 }
             }
             function createExternalImportInfo(node) {
-                if (node.kind === 202) {
-                    if (node.moduleReference.kind === 212) {
+                if (node.kind === 203) {
+                    if (node.moduleReference.kind === 213) {
                         return {
                             rootNode: node,
                             declarationNode: node
                         };
                     }
                 }
-                else if (node.kind === 203) {
+                else if (node.kind === 204) {
                     var importClause = node.importClause;
                     if (importClause) {
                         if (importClause.name) {
@@ -21028,7 +21205,7 @@ var ts;
                                 declarationNode: importClause
                             };
                         }
-                        if (importClause.namedBindings.kind === 205) {
+                        if (importClause.namedBindings.kind === 206) {
                             return {
                                 rootNode: node,
                                 declarationNode: importClause.namedBindings
@@ -21044,7 +21221,7 @@ var ts;
                         rootNode: node
                     };
                 }
-                else if (node.kind === 209) {
+                else if (node.kind === 210) {
                     if (node.moduleSpecifier) {
                         return {
                             rootNode: node
@@ -21057,7 +21234,7 @@ var ts;
                 exportSpecifiers = {};
                 exportDefault = undefined;
                 ts.forEach(sourceFile.statements, function (node) {
-                    if (node.kind === 209 && !node.moduleSpecifier) {
+                    if (node.kind === 210 && !node.moduleSpecifier) {
                         ts.forEach(node.exportClause.elements, function (specifier) {
                             if (specifier.name.text === "default") {
                                 exportDefault = exportDefault || specifier;
@@ -21066,7 +21243,7 @@ var ts;
                             (exportSpecifiers[name] || (exportSpecifiers[name] = [])).push(specifier);
                         });
                     }
-                    else if (node.kind === 208) {
+                    else if (node.kind === 209) {
                         exportDefault = exportDefault || node;
                     }
                     else if (node.kind === 195 || node.kind === 196) {
@@ -21096,7 +21273,7 @@ var ts;
             }
             function getFirstExportAssignment(sourceFile) {
                 return ts.forEach(sourceFile.statements, function (node) {
-                    if (node.kind === 208) {
+                    if (node.kind === 209) {
                         return node;
                     }
                 });
@@ -21174,10 +21351,10 @@ var ts;
                     writeLine();
                     emitStart(exportDefault);
                     write(emitAsReturn ? "return " : "module.exports = ");
-                    if (exportDefault.kind === 208) {
+                    if (exportDefault.kind === 209) {
                         emit(exportDefault.expression);
                     }
-                    else if (exportDefault.kind === 211) {
+                    else if (exportDefault.kind === 212) {
                         emit(exportDefault.propertyName);
                     }
                     else {
@@ -21201,8 +21378,7 @@ var ts;
                 }
                 return statements.length;
             }
-            function emitSourceFile(node) {
-                currentSourceFile = node;
+            function emitSourceFileNode(node) {
                 writeLine();
                 emitDetachedComments(node);
                 var startIndex = emitDirectivePrologues(node.statements, false);
@@ -21242,14 +21418,14 @@ var ts;
                 }
                 emitLeadingComments(node.endOfFileToken);
             }
-            function emitNode(node, disableComments) {
+            function emitNodeWithoutSourceMapWithComments(node) {
                 if (!node) {
                     return;
                 }
                 if (node.flags & 2) {
                     return emitPinnedOrTripleSlashComments(node);
                 }
-                var emitComments = !disableComments && shouldEmitLeadingAndTrailingComments(node);
+                var emitComments = shouldEmitLeadingAndTrailingComments(node);
                 if (emitComments) {
                     emitLeadingComments(node);
                 }
@@ -21258,14 +21434,23 @@ var ts;
                     emitTrailingComments(node);
                 }
             }
+            function emitNodeWithoutSourceMapWithoutComments(node) {
+                if (!node) {
+                    return;
+                }
+                if (node.flags & 2) {
+                    return emitPinnedOrTripleSlashComments(node);
+                }
+                emitJavaScriptWorker(node);
+            }
             function shouldEmitLeadingAndTrailingComments(node) {
                 switch (node.kind) {
                     case 197:
                     case 195:
+                    case 204:
                     case 203:
-                    case 202:
                     case 198:
-                    case 208:
+                    case 209:
                         return false;
                     case 200:
                         return shouldEmitModuleDeclaration(node);
@@ -21320,9 +21505,9 @@ var ts;
                         return emitArrayLiteral(node);
                     case 152:
                         return emitObjectLiteral(node);
-                    case 217:
-                        return emitPropertyAssignment(node);
                     case 218:
+                        return emitPropertyAssignment(node);
+                    case 219:
                         return emitShorthandPropertyAssignment(node);
                     case 126:
                         return emitComputedPropertyName(node);
@@ -21391,8 +21576,8 @@ var ts;
                         return emitWithStatement(node);
                     case 188:
                         return emitSwitchStatement(node);
-                    case 213:
                     case 214:
+                    case 215:
                         return emitCaseOrDefaultClause(node);
                     case 189:
                         return emitLabelledStatement(node);
@@ -21400,7 +21585,7 @@ var ts;
                         return emitThrowStatement(node);
                     case 191:
                         return emitTryStatement(node);
-                    case 216:
+                    case 217:
                         return emitCatchClause(node);
                     case 192:
                         return emitDebuggerStatement(node);
@@ -21412,18 +21597,18 @@ var ts;
                         return emitInterfaceDeclaration(node);
                     case 199:
                         return emitEnumDeclaration(node);
-                    case 219:
+                    case 220:
                         return emitEnumMember(node);
                     case 200:
                         return emitModuleDeclaration(node);
-                    case 203:
+                    case 204:
                         return emitImportDeclaration(node);
-                    case 202:
+                    case 203:
                         return emitImportEqualsDeclaration(node);
-                    case 209:
+                    case 210:
                         return emitExportDeclaration(node);
-                    case 220:
-                        return emitSourceFile(node);
+                    case 221:
+                        return emitSourceFileNode(node);
                 }
             }
             function hasDetachedComments(pos) {
@@ -21441,7 +21626,7 @@ var ts;
             }
             function getLeadingCommentsToEmit(node) {
                 if (node.parent) {
-                    if (node.parent.kind === 220 || node.pos !== node.parent.pos) {
+                    if (node.parent.kind === 221 || node.pos !== node.parent.pos) {
                         var leadingComments;
                         if (hasDetachedComments(node.pos)) {
                             leadingComments = getLeadingCommentsWithoutDetachedComments();
@@ -21460,7 +21645,7 @@ var ts;
             }
             function emitTrailingDeclarationComments(node) {
                 if (node.parent) {
-                    if (node.parent.kind === 220 || node.end !== node.parent.end) {
+                    if (node.parent.kind === 221 || node.end !== node.parent.end) {
                         var trailingComments = ts.getTrailingCommentRanges(currentSourceFile.text, node.end);
                         emitComments(currentSourceFile, writer, trailingComments, false, newLine, writeComment);
                     }
@@ -21510,7 +21695,7 @@ var ts;
                     }
                 }
             }
-            function emitPinnedOrTripleSlashCommentsOfNode(node) {
+            function emitPinnedOrTripleSlashComments(node) {
                 var pinnedComments = ts.filter(getLeadingCommentsToEmit(node), isPinnedOrTripleSlashComment);
                 function isPinnedOrTripleSlashComment(comment) {
                     if (currentSourceFile.text.charCodeAt(comment.pos + 1) === 42) {
@@ -21556,6 +21741,7 @@ var ts;
 (function (ts) {
     ts.emitTime = 0;
     ts.ioReadTime = 0;
+    ts.version = "1.5.0.0";
     function createCompilerHost(options) {
         var currentDirectory;
         var existingDirectories = {};
@@ -21846,7 +22032,7 @@ var ts;
         }
         function processImportedModules(file, basePath) {
             ts.forEach(file.statements, function (node) {
-                if (node.kind === 203 || node.kind === 202 || node.kind === 209) {
+                if (node.kind === 204 || node.kind === 203 || node.kind === 210) {
                     var moduleNameExpr = ts.getExternalModuleName(node);
                     if (moduleNameExpr && moduleNameExpr.kind === 8) {
                         var moduleNameText = moduleNameExpr.text;
@@ -22087,6 +22273,12 @@ var ts;
             description: ts.Diagnostics.Do_not_emit_declarations_for_code_that_has_an_internal_annotation,
             experimental: true
         },
+        {
+            name: "preserveNewLines",
+            type: "boolean",
+            description: ts.Diagnostics.Preserve_new_lines_when_emitting_code,
+            experimental: true
+        },
         {
             name: "target",
             shortName: "t",
@@ -22289,7 +22481,6 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    var version = "1.5.0.0";
     function validateLocaleAndSetLanguage(locale, errors) {
         var matchResult = /^([a-z]+)([_\-]([a-z]+))?$/.exec(locale.toLowerCase());
         if (!matchResult) {
@@ -22424,7 +22615,7 @@ var ts;
             return ts.sys.exit(1);
         }
         if (commandLine.options.version) {
-            reportDiagnostic(ts.createCompilerDiagnostic(ts.Diagnostics.Version_0, version));
+            reportDiagnostic(ts.createCompilerDiagnostic(ts.Diagnostics.Version_0, ts.version));
             return ts.sys.exit(0);
         }
         if (commandLine.options.help) {
@@ -22600,13 +22791,13 @@ var ts;
                 return 1;
             }
             if (diagnostics.length > 0 || emitOutput.diagnostics.length > 0) {
-                2;
+                return 2;
             }
             return 0;
         }
     }
     function printVersion() {
-        ts.sys.write(getDiagnosticText(ts.Diagnostics.Version_0, version) + ts.sys.newLine);
+        ts.sys.write(getDiagnosticText(ts.Diagnostics.Version_0, ts.version) + ts.sys.newLine);
     }
     function printHelp() {
         var output = "";
diff --git a/bin/tsserver.js b/bin/tsserver.js
index 3c4c266cb70..65a06ca9928 100644
--- a/bin/tsserver.js
+++ b/bin/tsserver.js
@@ -244,18 +244,21 @@ var ts;
     ts.arrayToMap = arrayToMap;
     function formatStringFromArgs(text, args, baseIndex) {
         baseIndex = baseIndex || 0;
-        return text.replace(/{(\d+)}/g, function (match, index) { return args[+index + baseIndex]; });
+        return text.replace(/{(\d+)}/g, function (match, index) {
+            return args[+index + baseIndex];
+        });
     }
     ts.localizedDiagnosticMessages = undefined;
     function getLocaleSpecificMessage(message) {
-        return ts.localizedDiagnosticMessages && ts.localizedDiagnosticMessages[message]
-            ? ts.localizedDiagnosticMessages[message]
-            : message;
+        return ts.localizedDiagnosticMessages && ts.localizedDiagnosticMessages[message] ? ts.localizedDiagnosticMessages[message] : message;
     }
     ts.getLocaleSpecificMessage = getLocaleSpecificMessage;
     function createFileDiagnostic(file, start, length, message) {
+        var end = start + length;
         Debug.assert(start >= 0, "start must be non-negative, is " + start);
         Debug.assert(length >= 0, "length must be non-negative, is " + length);
+        Debug.assert(start <= file.text.length, "start must be within the bounds of the file. " + start + " > " + file.text.length);
+        Debug.assert(end <= file.text.length, "end must be the bounds of the file. " + end + " > " + file.text.length);
         var text = getLocaleSpecificMessage(message.key);
         if (arguments.length > 4) {
             text = formatStringFromArgs(text, arguments, 4);
@@ -318,12 +321,7 @@ var ts;
         return diagnostic.file ? diagnostic.file.fileName : undefined;
     }
     function compareDiagnostics(d1, d2) {
-        return compareValues(getDiagnosticFileName(d1), getDiagnosticFileName(d2)) ||
-            compareValues(d1.start, d2.start) ||
-            compareValues(d1.length, d2.length) ||
-            compareValues(d1.code, d2.code) ||
-            compareMessageText(d1.messageText, d2.messageText) ||
-            0;
+        return compareValues(getDiagnosticFileName(d1), getDiagnosticFileName(d2)) || compareValues(d1.start, d2.start) || compareValues(d1.length, d2.length) || compareValues(d1.code, d2.code) || compareMessageText(d1.messageText, d2.messageText) || 0;
     }
     ts.compareDiagnostics = compareDiagnostics;
     function compareMessageText(text1, text2) {
@@ -350,7 +348,9 @@ var ts;
         if (diagnostics.length < 2) {
             return diagnostics;
         }
-        var newDiagnostics = [diagnostics[0]];
+        var newDiagnostics = [
+            diagnostics[0]
+        ];
         var previousDiagnostic = diagnostics[0];
         for (var i = 1; i < diagnostics.length; i++) {
             var currentDiagnostic = diagnostics[i];
@@ -427,7 +427,9 @@ var ts;
     ts.isRootedDiskPath = isRootedDiskPath;
     function normalizedPathComponents(path, rootLength) {
         var normalizedParts = getNormalizedParts(path, rootLength);
-        return [path.substr(0, rootLength)].concat(normalizedParts);
+        return [
+            path.substr(0, rootLength)
+        ].concat(normalizedParts);
     }
     function getNormalizedPathComponents(path, currentDirectory) {
         var path = normalizeSlashes(path);
@@ -461,7 +463,9 @@ var ts;
             }
         }
         if (rootLength === urlLength) {
-            return [url];
+            return [
+                url
+            ];
         }
         var indexOfNextSlash = url.indexOf(ts.directorySeparator, rootLength);
         if (indexOfNextSlash !== -1) {
@@ -469,7 +473,9 @@ var ts;
             return normalizedPathComponents(url, rootLength);
         }
         else {
-            return [url + ts.directorySeparator];
+            return [
+                url + ts.directorySeparator
+            ];
         }
     }
     function getNormalizedPathOrUrlComponents(pathOrUrl, currentDirectory) {
@@ -531,7 +537,11 @@ var ts;
         return pathLen > extLen && path.substr(pathLen - extLen, extLen) === extension;
     }
     ts.fileExtensionIs = fileExtensionIs;
-    var supportedExtensions = [".d.ts", ".ts", ".js"];
+    var supportedExtensions = [
+        ".d.ts",
+        ".ts",
+        ".js"
+    ];
     function removeFileExtension(path) {
         for (var i = 0; i < supportedExtensions.length; i++) {
             var ext = supportedExtensions[i];
@@ -585,9 +595,15 @@ var ts;
             };
             return Node;
         },
-        getSymbolConstructor: function () { return Symbol; },
-        getTypeConstructor: function () { return Type; },
-        getSignatureConstructor: function () { return Signature; }
+        getSymbolConstructor: function () {
+            return Symbol;
+        },
+        getTypeConstructor: function () {
+            return Type;
+        },
+        getSignatureConstructor: function () {
+            return Signature;
+        }
     };
     var Debug;
     (function (Debug) {
@@ -805,9 +821,14 @@ var ts;
                 readFile: readFile,
                 writeFile: writeFile,
                 watchFile: function (fileName, callback) {
-                    _fs.watchFile(fileName, { persistent: true, interval: 250 }, fileChanged);
+                    _fs.watchFile(fileName, {
+                        persistent: true,
+                        interval: 250
+                    }, fileChanged);
                     return {
-                        close: function () { _fs.unwatchFile(fileName, fileChanged); }
+                        close: function () {
+                            _fs.unwatchFile(fileName, fileChanged);
+                        }
                     };
                     function fileChanged(curr, prev) {
                         if (+curr.mtime <= +prev.mtime) {
@@ -863,488 +884,2431 @@ var ts;
 var ts;
 (function (ts) {
     ts.Diagnostics = {
-        Unterminated_string_literal: { code: 1002, category: 1, key: "Unterminated string literal." },
-        Identifier_expected: { code: 1003, category: 1, key: "Identifier expected." },
-        _0_expected: { code: 1005, category: 1, key: "'{0}' expected." },
-        A_file_cannot_have_a_reference_to_itself: { code: 1006, category: 1, key: "A file cannot have a reference to itself." },
-        Trailing_comma_not_allowed: { code: 1009, category: 1, key: "Trailing comma not allowed." },
-        Asterisk_Slash_expected: { code: 1010, category: 1, key: "'*/' expected." },
-        Unexpected_token: { code: 1012, category: 1, key: "Unexpected token." },
-        A_rest_parameter_must_be_last_in_a_parameter_list: { code: 1014, category: 1, key: "A rest parameter must be last in a parameter list." },
-        Parameter_cannot_have_question_mark_and_initializer: { code: 1015, category: 1, key: "Parameter cannot have question mark and initializer." },
-        A_required_parameter_cannot_follow_an_optional_parameter: { code: 1016, category: 1, key: "A required parameter cannot follow an optional parameter." },
-        An_index_signature_cannot_have_a_rest_parameter: { code: 1017, category: 1, key: "An index signature cannot have a rest parameter." },
-        An_index_signature_parameter_cannot_have_an_accessibility_modifier: { code: 1018, category: 1, key: "An index signature parameter cannot have an accessibility modifier." },
-        An_index_signature_parameter_cannot_have_a_question_mark: { code: 1019, category: 1, key: "An index signature parameter cannot have a question mark." },
-        An_index_signature_parameter_cannot_have_an_initializer: { code: 1020, category: 1, key: "An index signature parameter cannot have an initializer." },
-        An_index_signature_must_have_a_type_annotation: { code: 1021, category: 1, key: "An index signature must have a type annotation." },
-        An_index_signature_parameter_must_have_a_type_annotation: { code: 1022, category: 1, key: "An index signature parameter must have a type annotation." },
-        An_index_signature_parameter_type_must_be_string_or_number: { code: 1023, category: 1, key: "An index signature parameter type must be 'string' or 'number'." },
-        A_class_or_interface_declaration_can_only_have_one_extends_clause: { code: 1024, category: 1, key: "A class or interface declaration can only have one 'extends' clause." },
-        An_extends_clause_must_precede_an_implements_clause: { code: 1025, category: 1, key: "An 'extends' clause must precede an 'implements' clause." },
-        A_class_can_only_extend_a_single_class: { code: 1026, category: 1, key: "A class can only extend a single class." },
-        A_class_declaration_can_only_have_one_implements_clause: { code: 1027, category: 1, key: "A class declaration can only have one 'implements' clause." },
-        Accessibility_modifier_already_seen: { code: 1028, category: 1, key: "Accessibility modifier already seen." },
-        _0_modifier_must_precede_1_modifier: { code: 1029, category: 1, key: "'{0}' modifier must precede '{1}' modifier." },
-        _0_modifier_already_seen: { code: 1030, category: 1, key: "'{0}' modifier already seen." },
-        _0_modifier_cannot_appear_on_a_class_element: { code: 1031, category: 1, key: "'{0}' modifier cannot appear on a class element." },
-        An_interface_declaration_cannot_have_an_implements_clause: { code: 1032, category: 1, key: "An interface declaration cannot have an 'implements' clause." },
-        super_must_be_followed_by_an_argument_list_or_member_access: { code: 1034, category: 1, key: "'super' must be followed by an argument list or member access." },
-        Only_ambient_modules_can_use_quoted_names: { code: 1035, category: 1, key: "Only ambient modules can use quoted names." },
-        Statements_are_not_allowed_in_ambient_contexts: { code: 1036, category: 1, key: "Statements are not allowed in ambient contexts." },
-        A_declare_modifier_cannot_be_used_in_an_already_ambient_context: { code: 1038, category: 1, key: "A 'declare' modifier cannot be used in an already ambient context." },
-        Initializers_are_not_allowed_in_ambient_contexts: { code: 1039, category: 1, key: "Initializers are not allowed in ambient contexts." },
-        _0_modifier_cannot_appear_on_a_module_element: { code: 1044, category: 1, key: "'{0}' modifier cannot appear on a module element." },
-        A_declare_modifier_cannot_be_used_with_an_interface_declaration: { code: 1045, category: 1, key: "A 'declare' modifier cannot be used with an interface declaration." },
-        A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file: { code: 1046, category: 1, key: "A 'declare' modifier is required for a top level declaration in a .d.ts file." },
-        A_rest_parameter_cannot_be_optional: { code: 1047, category: 1, key: "A rest parameter cannot be optional." },
-        A_rest_parameter_cannot_have_an_initializer: { code: 1048, category: 1, key: "A rest parameter cannot have an initializer." },
-        A_set_accessor_must_have_exactly_one_parameter: { code: 1049, category: 1, key: "A 'set' accessor must have exactly one parameter." },
-        A_set_accessor_cannot_have_an_optional_parameter: { code: 1051, category: 1, key: "A 'set' accessor cannot have an optional parameter." },
-        A_set_accessor_parameter_cannot_have_an_initializer: { code: 1052, category: 1, key: "A 'set' accessor parameter cannot have an initializer." },
-        A_set_accessor_cannot_have_rest_parameter: { code: 1053, category: 1, key: "A 'set' accessor cannot have rest parameter." },
-        A_get_accessor_cannot_have_parameters: { code: 1054, category: 1, key: "A 'get' accessor cannot have parameters." },
-        Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher: { code: 1056, category: 1, key: "Accessors are only available when targeting ECMAScript 5 and higher." },
-        Enum_member_must_have_initializer: { code: 1061, category: 1, key: "Enum member must have initializer." },
-        An_export_assignment_cannot_be_used_in_an_internal_module: { code: 1063, category: 1, key: "An export assignment cannot be used in an internal module." },
-        Ambient_enum_elements_can_only_have_integer_literal_initializers: { code: 1066, category: 1, key: "Ambient enum elements can only have integer literal initializers." },
-        Unexpected_token_A_constructor_method_accessor_or_property_was_expected: { code: 1068, category: 1, key: "Unexpected token. A constructor, method, accessor, or property was expected." },
-        A_declare_modifier_cannot_be_used_with_an_import_declaration: { code: 1079, category: 1, key: "A 'declare' modifier cannot be used with an import declaration." },
-        Invalid_reference_directive_syntax: { code: 1084, category: 1, key: "Invalid 'reference' directive syntax." },
-        Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher: { code: 1085, category: 1, key: "Octal literals are not available when targeting ECMAScript 5 and higher." },
-        An_accessor_cannot_be_declared_in_an_ambient_context: { code: 1086, category: 1, key: "An accessor cannot be declared in an ambient context." },
-        _0_modifier_cannot_appear_on_a_constructor_declaration: { code: 1089, category: 1, key: "'{0}' modifier cannot appear on a constructor declaration." },
-        _0_modifier_cannot_appear_on_a_parameter: { code: 1090, category: 1, key: "'{0}' modifier cannot appear on a parameter." },
-        Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement: { code: 1091, category: 1, key: "Only a single variable declaration is allowed in a 'for...in' statement." },
-        Type_parameters_cannot_appear_on_a_constructor_declaration: { code: 1092, category: 1, key: "Type parameters cannot appear on a constructor declaration." },
-        Type_annotation_cannot_appear_on_a_constructor_declaration: { code: 1093, category: 1, key: "Type annotation cannot appear on a constructor declaration." },
-        An_accessor_cannot_have_type_parameters: { code: 1094, category: 1, key: "An accessor cannot have type parameters." },
-        A_set_accessor_cannot_have_a_return_type_annotation: { code: 1095, category: 1, key: "A 'set' accessor cannot have a return type annotation." },
-        An_index_signature_must_have_exactly_one_parameter: { code: 1096, category: 1, key: "An index signature must have exactly one parameter." },
-        _0_list_cannot_be_empty: { code: 1097, category: 1, key: "'{0}' list cannot be empty." },
-        Type_parameter_list_cannot_be_empty: { code: 1098, category: 1, key: "Type parameter list cannot be empty." },
-        Type_argument_list_cannot_be_empty: { code: 1099, category: 1, key: "Type argument list cannot be empty." },
-        Invalid_use_of_0_in_strict_mode: { code: 1100, category: 1, key: "Invalid use of '{0}' in strict mode." },
-        with_statements_are_not_allowed_in_strict_mode: { code: 1101, category: 1, key: "'with' statements are not allowed in strict mode." },
-        delete_cannot_be_called_on_an_identifier_in_strict_mode: { code: 1102, category: 1, key: "'delete' cannot be called on an identifier in strict mode." },
-        A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement: { code: 1104, category: 1, key: "A 'continue' statement can only be used within an enclosing iteration statement." },
-        A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement: { code: 1105, category: 1, key: "A 'break' statement can only be used within an enclosing iteration or switch statement." },
-        Jump_target_cannot_cross_function_boundary: { code: 1107, category: 1, key: "Jump target cannot cross function boundary." },
-        A_return_statement_can_only_be_used_within_a_function_body: { code: 1108, category: 1, key: "A 'return' statement can only be used within a function body." },
-        Expression_expected: { code: 1109, category: 1, key: "Expression expected." },
-        Type_expected: { code: 1110, category: 1, key: "Type expected." },
-        A_class_member_cannot_be_declared_optional: { code: 1112, category: 1, key: "A class member cannot be declared optional." },
-        A_default_clause_cannot_appear_more_than_once_in_a_switch_statement: { code: 1113, category: 1, key: "A 'default' clause cannot appear more than once in a 'switch' statement." },
-        Duplicate_label_0: { code: 1114, category: 1, key: "Duplicate label '{0}'" },
-        A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement: { code: 1115, category: 1, key: "A 'continue' statement can only jump to a label of an enclosing iteration statement." },
-        A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement: { code: 1116, category: 1, key: "A 'break' statement can only jump to a label of an enclosing statement." },
-        An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode: { code: 1117, category: 1, key: "An object literal cannot have multiple properties with the same name in strict mode." },
-        An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name: { code: 1118, category: 1, key: "An object literal cannot have multiple get/set accessors with the same name." },
-        An_object_literal_cannot_have_property_and_accessor_with_the_same_name: { code: 1119, category: 1, key: "An object literal cannot have property and accessor with the same name." },
-        An_export_assignment_cannot_have_modifiers: { code: 1120, category: 1, key: "An export assignment cannot have modifiers." },
-        Octal_literals_are_not_allowed_in_strict_mode: { code: 1121, category: 1, key: "Octal literals are not allowed in strict mode." },
-        A_tuple_type_element_list_cannot_be_empty: { code: 1122, category: 1, key: "A tuple type element list cannot be empty." },
-        Variable_declaration_list_cannot_be_empty: { code: 1123, category: 1, key: "Variable declaration list cannot be empty." },
-        Digit_expected: { code: 1124, category: 1, key: "Digit expected." },
-        Hexadecimal_digit_expected: { code: 1125, category: 1, key: "Hexadecimal digit expected." },
-        Unexpected_end_of_text: { code: 1126, category: 1, key: "Unexpected end of text." },
-        Invalid_character: { code: 1127, category: 1, key: "Invalid character." },
-        Declaration_or_statement_expected: { code: 1128, category: 1, key: "Declaration or statement expected." },
-        Statement_expected: { code: 1129, category: 1, key: "Statement expected." },
-        case_or_default_expected: { code: 1130, category: 1, key: "'case' or 'default' expected." },
-        Property_or_signature_expected: { code: 1131, category: 1, key: "Property or signature expected." },
-        Enum_member_expected: { code: 1132, category: 1, key: "Enum member expected." },
-        Type_reference_expected: { code: 1133, category: 1, key: "Type reference expected." },
-        Variable_declaration_expected: { code: 1134, category: 1, key: "Variable declaration expected." },
-        Argument_expression_expected: { code: 1135, category: 1, key: "Argument expression expected." },
-        Property_assignment_expected: { code: 1136, category: 1, key: "Property assignment expected." },
-        Expression_or_comma_expected: { code: 1137, category: 1, key: "Expression or comma expected." },
-        Parameter_declaration_expected: { code: 1138, category: 1, key: "Parameter declaration expected." },
-        Type_parameter_declaration_expected: { code: 1139, category: 1, key: "Type parameter declaration expected." },
-        Type_argument_expected: { code: 1140, category: 1, key: "Type argument expected." },
-        String_literal_expected: { code: 1141, category: 1, key: "String literal expected." },
-        Line_break_not_permitted_here: { code: 1142, category: 1, key: "Line break not permitted here." },
-        or_expected: { code: 1144, category: 1, key: "'{' or ';' expected." },
-        Modifiers_not_permitted_on_index_signature_members: { code: 1145, category: 1, key: "Modifiers not permitted on index signature members." },
-        Declaration_expected: { code: 1146, category: 1, key: "Declaration expected." },
-        Import_declarations_in_an_internal_module_cannot_reference_an_external_module: { code: 1147, category: 1, key: "Import declarations in an internal module cannot reference an external module." },
-        Cannot_compile_external_modules_unless_the_module_flag_is_provided: { code: 1148, category: 1, key: "Cannot compile external modules unless the '--module' flag is provided." },
-        File_name_0_differs_from_already_included_file_name_1_only_in_casing: { code: 1149, category: 1, key: "File name '{0}' differs from already included file name '{1}' only in casing" },
-        new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead: { code: 1150, category: 1, key: "'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead." },
-        var_let_or_const_expected: { code: 1152, category: 1, key: "'var', 'let' or 'const' expected." },
-        let_declarations_are_only_available_when_targeting_ECMAScript_6_and_higher: { code: 1153, category: 1, key: "'let' declarations are only available when targeting ECMAScript 6 and higher." },
-        const_declarations_are_only_available_when_targeting_ECMAScript_6_and_higher: { code: 1154, category: 1, key: "'const' declarations are only available when targeting ECMAScript 6 and higher." },
-        const_declarations_must_be_initialized: { code: 1155, category: 1, key: "'const' declarations must be initialized" },
-        const_declarations_can_only_be_declared_inside_a_block: { code: 1156, category: 1, key: "'const' declarations can only be declared inside a block." },
-        let_declarations_can_only_be_declared_inside_a_block: { code: 1157, category: 1, key: "'let' declarations can only be declared inside a block." },
-        Unterminated_template_literal: { code: 1160, category: 1, key: "Unterminated template literal." },
-        Unterminated_regular_expression_literal: { code: 1161, category: 1, key: "Unterminated regular expression literal." },
-        An_object_member_cannot_be_declared_optional: { code: 1162, category: 1, key: "An object member cannot be declared optional." },
-        yield_expression_must_be_contained_within_a_generator_declaration: { code: 1163, category: 1, key: "'yield' expression must be contained_within a generator declaration." },
-        Computed_property_names_are_not_allowed_in_enums: { code: 1164, category: 1, key: "Computed property names are not allowed in enums." },
-        A_computed_property_name_in_an_ambient_context_must_directly_refer_to_a_built_in_symbol: { code: 1165, category: 1, key: "A computed property name in an ambient context must directly refer to a built-in symbol." },
-        A_computed_property_name_in_a_class_property_declaration_must_directly_refer_to_a_built_in_symbol: { code: 1166, category: 1, key: "A computed property name in a class property declaration must directly refer to a built-in symbol." },
-        Computed_property_names_are_only_available_when_targeting_ECMAScript_6_and_higher: { code: 1167, category: 1, key: "Computed property names are only available when targeting ECMAScript 6 and higher." },
-        A_computed_property_name_in_a_method_overload_must_directly_refer_to_a_built_in_symbol: { code: 1168, category: 1, key: "A computed property name in a method overload must directly refer to a built-in symbol." },
-        A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol: { code: 1169, category: 1, key: "A computed property name in an interface must directly refer to a built-in symbol." },
-        A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol: { code: 1170, category: 1, key: "A computed property name in a type literal must directly refer to a built-in symbol." },
-        A_comma_expression_is_not_allowed_in_a_computed_property_name: { code: 1171, category: 1, key: "A comma expression is not allowed in a computed property name." },
-        extends_clause_already_seen: { code: 1172, category: 1, key: "'extends' clause already seen." },
-        extends_clause_must_precede_implements_clause: { code: 1173, category: 1, key: "'extends' clause must precede 'implements' clause." },
-        Classes_can_only_extend_a_single_class: { code: 1174, category: 1, key: "Classes can only extend a single class." },
-        implements_clause_already_seen: { code: 1175, category: 1, key: "'implements' clause already seen." },
-        Interface_declaration_cannot_have_implements_clause: { code: 1176, category: 1, key: "Interface declaration cannot have 'implements' clause." },
-        Binary_digit_expected: { code: 1177, category: 1, key: "Binary digit expected." },
-        Octal_digit_expected: { code: 1178, category: 1, key: "Octal digit expected." },
-        Unexpected_token_expected: { code: 1179, category: 1, key: "Unexpected token. '{' expected." },
-        Property_destructuring_pattern_expected: { code: 1180, category: 1, key: "Property destructuring pattern expected." },
-        Array_element_destructuring_pattern_expected: { code: 1181, category: 1, key: "Array element destructuring pattern expected." },
-        A_destructuring_declaration_must_have_an_initializer: { code: 1182, category: 1, key: "A destructuring declaration must have an initializer." },
-        Destructuring_declarations_are_not_allowed_in_ambient_contexts: { code: 1183, category: 1, key: "Destructuring declarations are not allowed in ambient contexts." },
-        An_implementation_cannot_be_declared_in_ambient_contexts: { code: 1184, category: 1, key: "An implementation cannot be declared in ambient contexts." },
-        Modifiers_cannot_appear_here: { code: 1184, category: 1, key: "Modifiers cannot appear here." },
-        Merge_conflict_marker_encountered: { code: 1185, category: 1, key: "Merge conflict marker encountered." },
-        A_rest_element_cannot_have_an_initializer: { code: 1186, category: 1, key: "A rest element cannot have an initializer." },
-        A_parameter_property_may_not_be_a_binding_pattern: { code: 1187, category: 1, key: "A parameter property may not be a binding pattern." },
-        Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement: { code: 1188, category: 1, key: "Only a single variable declaration is allowed in a 'for...of' statement." },
-        The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer: { code: 1189, category: 1, key: "The variable declaration of a 'for...in' statement cannot have an initializer." },
-        The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer: { code: 1190, category: 1, key: "The variable declaration of a 'for...of' statement cannot have an initializer." },
-        An_import_declaration_cannot_have_modifiers: { code: 1191, category: 1, key: "An import declaration cannot have modifiers." },
-        External_module_0_has_no_default_export_or_export_assignment: { code: 1192, category: 1, key: "External module '{0}' has no default export or export assignment." },
-        An_export_declaration_cannot_have_modifiers: { code: 1193, category: 1, key: "An export declaration cannot have modifiers." },
-        Export_declarations_are_not_permitted_in_an_internal_module: { code: 1194, category: 1, key: "Export declarations are not permitted in an internal module." },
-        Catch_clause_variable_name_must_be_an_identifier: { code: 1195, category: 1, key: "Catch clause variable name must be an identifier." },
-        Catch_clause_variable_cannot_have_a_type_annotation: { code: 1196, category: 1, key: "Catch clause variable cannot have a type annotation." },
-        Catch_clause_variable_cannot_have_an_initializer: { code: 1197, category: 1, key: "Catch clause variable cannot have an initializer." },
-        An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: { code: 1198, category: 1, key: "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive." },
-        Unterminated_Unicode_escape_sequence: { code: 1199, category: 1, key: "Unterminated Unicode escape sequence." },
-        Duplicate_identifier_0: { code: 2300, category: 1, key: "Duplicate identifier '{0}'." },
-        Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: { code: 2301, category: 1, 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: 1, key: "Static members cannot reference class type parameters." },
-        Circular_definition_of_import_alias_0: { code: 2303, category: 1, key: "Circular definition of import alias '{0}'." },
-        Cannot_find_name_0: { code: 2304, category: 1, key: "Cannot find name '{0}'." },
-        Module_0_has_no_exported_member_1: { code: 2305, category: 1, key: "Module '{0}' has no exported member '{1}'." },
-        File_0_is_not_an_external_module: { code: 2306, category: 1, key: "File '{0}' is not an external module." },
-        Cannot_find_external_module_0: { code: 2307, category: 1, key: "Cannot find external module '{0}'." },
-        A_module_cannot_have_more_than_one_export_assignment: { code: 2308, category: 1, key: "A module cannot have more than one export assignment." },
-        An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements: { code: 2309, category: 1, key: "An export assignment cannot be used in a module with other exported elements." },
-        Type_0_recursively_references_itself_as_a_base_type: { code: 2310, category: 1, key: "Type '{0}' recursively references itself as a base type." },
-        A_class_may_only_extend_another_class: { code: 2311, category: 1, key: "A class may only extend another class." },
-        An_interface_may_only_extend_a_class_or_another_interface: { code: 2312, category: 1, key: "An interface may only extend a class or another interface." },
-        Constraint_of_a_type_parameter_cannot_reference_any_type_parameter_from_the_same_type_parameter_list: { code: 2313, category: 1, key: "Constraint of a type parameter cannot reference any type parameter from the same type parameter list." },
-        Generic_type_0_requires_1_type_argument_s: { code: 2314, category: 1, key: "Generic type '{0}' requires {1} type argument(s)." },
-        Type_0_is_not_generic: { code: 2315, category: 1, key: "Type '{0}' is not generic." },
-        Global_type_0_must_be_a_class_or_interface_type: { code: 2316, category: 1, key: "Global type '{0}' must be a class or interface type." },
-        Global_type_0_must_have_1_type_parameter_s: { code: 2317, category: 1, key: "Global type '{0}' must have {1} type parameter(s)." },
-        Cannot_find_global_type_0: { code: 2318, category: 1, key: "Cannot find global type '{0}'." },
-        Named_property_0_of_types_1_and_2_are_not_identical: { code: 2319, category: 1, key: "Named property '{0}' of types '{1}' and '{2}' are not identical." },
-        Interface_0_cannot_simultaneously_extend_types_1_and_2: { code: 2320, category: 1, key: "Interface '{0}' cannot simultaneously extend types '{1}' and '{2}'." },
-        Excessive_stack_depth_comparing_types_0_and_1: { code: 2321, category: 1, key: "Excessive stack depth comparing types '{0}' and '{1}'." },
-        Type_0_is_not_assignable_to_type_1: { code: 2322, category: 1, key: "Type '{0}' is not assignable to type '{1}'." },
-        Property_0_is_missing_in_type_1: { code: 2324, category: 1, key: "Property '{0}' is missing in type '{1}'." },
-        Property_0_is_private_in_type_1_but_not_in_type_2: { code: 2325, category: 1, key: "Property '{0}' is private in type '{1}' but not in type '{2}'." },
-        Types_of_property_0_are_incompatible: { code: 2326, category: 1, key: "Types of property '{0}' are incompatible." },
-        Property_0_is_optional_in_type_1_but_required_in_type_2: { code: 2327, category: 1, key: "Property '{0}' is optional in type '{1}' but required in type '{2}'." },
-        Types_of_parameters_0_and_1_are_incompatible: { code: 2328, category: 1, key: "Types of parameters '{0}' and '{1}' are incompatible." },
-        Index_signature_is_missing_in_type_0: { code: 2329, category: 1, key: "Index signature is missing in type '{0}'." },
-        Index_signatures_are_incompatible: { code: 2330, category: 1, key: "Index signatures are incompatible." },
-        this_cannot_be_referenced_in_a_module_body: { code: 2331, category: 1, key: "'this' cannot be referenced in a module body." },
-        this_cannot_be_referenced_in_current_location: { code: 2332, category: 1, key: "'this' cannot be referenced in current location." },
-        this_cannot_be_referenced_in_constructor_arguments: { code: 2333, category: 1, key: "'this' cannot be referenced in constructor arguments." },
-        this_cannot_be_referenced_in_a_static_property_initializer: { code: 2334, category: 1, key: "'this' cannot be referenced in a static property initializer." },
-        super_can_only_be_referenced_in_a_derived_class: { code: 2335, category: 1, key: "'super' can only be referenced in a derived class." },
-        super_cannot_be_referenced_in_constructor_arguments: { code: 2336, category: 1, key: "'super' cannot be referenced in constructor arguments." },
-        Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors: { code: 2337, category: 1, key: "Super calls are not permitted outside constructors or in nested functions inside constructors" },
-        super_property_access_is_permitted_only_in_a_constructor_member_function_or_member_accessor_of_a_derived_class: { code: 2338, category: 1, key: "'super' property access is permitted only in a constructor, member function, or member accessor of a derived class" },
-        Property_0_does_not_exist_on_type_1: { code: 2339, category: 1, key: "Property '{0}' does not exist on type '{1}'." },
-        Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword: { code: 2340, category: 1, key: "Only public and protected methods of the base class are accessible via the 'super' keyword" },
-        Property_0_is_private_and_only_accessible_within_class_1: { code: 2341, category: 1, key: "Property '{0}' is private and only accessible within class '{1}'." },
-        An_index_expression_argument_must_be_of_type_string_number_symbol_or_any: { code: 2342, category: 1, key: "An index expression argument must be of type 'string', 'number', 'symbol, or 'any'." },
-        Type_0_does_not_satisfy_the_constraint_1: { code: 2344, category: 1, key: "Type '{0}' does not satisfy the constraint '{1}'." },
-        Argument_of_type_0_is_not_assignable_to_parameter_of_type_1: { code: 2345, category: 1, key: "Argument of type '{0}' is not assignable to parameter of type '{1}'." },
-        Supplied_parameters_do_not_match_any_signature_of_call_target: { code: 2346, category: 1, key: "Supplied parameters do not match any signature of call target." },
-        Untyped_function_calls_may_not_accept_type_arguments: { code: 2347, category: 1, key: "Untyped function calls may not accept type arguments." },
-        Value_of_type_0_is_not_callable_Did_you_mean_to_include_new: { code: 2348, category: 1, key: "Value of type '{0}' is not callable. Did you mean to include 'new'?" },
-        Cannot_invoke_an_expression_whose_type_lacks_a_call_signature: { code: 2349, category: 1, key: "Cannot invoke an expression whose type lacks a call signature." },
-        Only_a_void_function_can_be_called_with_the_new_keyword: { code: 2350, category: 1, key: "Only a void function can be called with the 'new' keyword." },
-        Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature: { code: 2351, category: 1, key: "Cannot use 'new' with an expression whose type lacks a call or construct signature." },
-        Neither_type_0_nor_type_1_is_assignable_to_the_other: { code: 2352, category: 1, key: "Neither type '{0}' nor type '{1}' is assignable to the other." },
-        No_best_common_type_exists_among_return_expressions: { code: 2354, category: 1, key: "No best common type exists among return expressions." },
-        A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_or_consist_of_a_single_throw_statement: { code: 2355, category: 1, key: "A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement." },
-        An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type: { code: 2356, category: 1, key: "An arithmetic operand must be of type 'any', 'number' or an enum type." },
-        The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer: { code: 2357, category: 1, key: "The operand of an increment or decrement operator must be a variable, property or indexer." },
-        The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2358, category: 1, key: "The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter." },
-        The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_Function_interface_type: { code: 2359, category: 1, key: "The right-hand side of an 'instanceof' expression must be of type 'any' or of a type assignable to the 'Function' interface type." },
-        The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol: { code: 2360, category: 1, key: "The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'." },
-        The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2361, category: 1, key: "The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter" },
-        The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2362, category: 1, key: "The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
-        The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2363, category: 1, key: "The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
-        Invalid_left_hand_side_of_assignment_expression: { code: 2364, category: 1, key: "Invalid left-hand side of assignment expression." },
-        Operator_0_cannot_be_applied_to_types_1_and_2: { code: 2365, category: 1, key: "Operator '{0}' cannot be applied to types '{1}' and '{2}'." },
-        Type_parameter_name_cannot_be_0: { code: 2368, category: 1, key: "Type parameter name cannot be '{0}'" },
-        A_parameter_property_is_only_allowed_in_a_constructor_implementation: { code: 2369, category: 1, key: "A parameter property is only allowed in a constructor implementation." },
-        A_rest_parameter_must_be_of_an_array_type: { code: 2370, category: 1, key: "A rest parameter must be of an array type." },
-        A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation: { code: 2371, category: 1, key: "A parameter initializer is only allowed in a function or constructor implementation." },
-        Parameter_0_cannot_be_referenced_in_its_initializer: { code: 2372, category: 1, key: "Parameter '{0}' cannot be referenced in its initializer." },
-        Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it: { code: 2373, category: 1, key: "Initializer of parameter '{0}' cannot reference identifier '{1}' declared after it." },
-        Duplicate_string_index_signature: { code: 2374, category: 1, key: "Duplicate string index signature." },
-        Duplicate_number_index_signature: { code: 2375, category: 1, key: "Duplicate number index signature." },
-        A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_or_has_parameter_properties: { code: 2376, category: 1, key: "A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties." },
-        Constructors_for_derived_classes_must_contain_a_super_call: { code: 2377, category: 1, key: "Constructors for derived classes must contain a 'super' call." },
-        A_get_accessor_must_return_a_value_or_consist_of_a_single_throw_statement: { code: 2378, category: 1, key: "A 'get' accessor must return a value or consist of a single 'throw' statement." },
-        Getter_and_setter_accessors_do_not_agree_in_visibility: { code: 2379, category: 1, key: "Getter and setter accessors do not agree in visibility." },
-        get_and_set_accessor_must_have_the_same_type: { code: 2380, category: 1, key: "'get' and 'set' accessor must have the same type." },
-        A_signature_with_an_implementation_cannot_use_a_string_literal_type: { code: 2381, category: 1, key: "A signature with an implementation cannot use a string literal type." },
-        Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature: { code: 2382, category: 1, key: "Specialized overload signature is not assignable to any non-specialized signature." },
-        Overload_signatures_must_all_be_exported_or_not_exported: { code: 2383, category: 1, key: "Overload signatures must all be exported or not exported." },
-        Overload_signatures_must_all_be_ambient_or_non_ambient: { code: 2384, category: 1, key: "Overload signatures must all be ambient or non-ambient." },
-        Overload_signatures_must_all_be_public_private_or_protected: { code: 2385, category: 1, key: "Overload signatures must all be public, private or protected." },
-        Overload_signatures_must_all_be_optional_or_required: { code: 2386, category: 1, key: "Overload signatures must all be optional or required." },
-        Function_overload_must_be_static: { code: 2387, category: 1, key: "Function overload must be static." },
-        Function_overload_must_not_be_static: { code: 2388, category: 1, key: "Function overload must not be static." },
-        Function_implementation_name_must_be_0: { code: 2389, category: 1, key: "Function implementation name must be '{0}'." },
-        Constructor_implementation_is_missing: { code: 2390, category: 1, key: "Constructor implementation is missing." },
-        Function_implementation_is_missing_or_not_immediately_following_the_declaration: { code: 2391, category: 1, key: "Function implementation is missing or not immediately following the declaration." },
-        Multiple_constructor_implementations_are_not_allowed: { code: 2392, category: 1, key: "Multiple constructor implementations are not allowed." },
-        Duplicate_function_implementation: { code: 2393, category: 1, key: "Duplicate function implementation." },
-        Overload_signature_is_not_compatible_with_function_implementation: { code: 2394, category: 1, key: "Overload signature is not compatible with function implementation." },
-        Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local: { code: 2395, category: 1, key: "Individual declarations in merged declaration {0} must be all exported or all local." },
-        Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters: { code: 2396, category: 1, key: "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters." },
-        Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference: { code: 2399, category: 1, key: "Duplicate identifier '_this'. Compiler uses variable declaration '_this' to capture 'this' reference." },
-        Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference: { code: 2400, category: 1, key: "Expression resolves to variable declaration '_this' that compiler uses to capture 'this' reference." },
-        Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference: { code: 2401, category: 1, key: "Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference." },
-        Expression_resolves_to_super_that_compiler_uses_to_capture_base_class_reference: { code: 2402, category: 1, key: "Expression resolves to '_super' that compiler uses to capture base class reference." },
-        Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2: { code: 2403, category: 1, key: "Subsequent variable declarations must have the same type.  Variable '{0}' must be of type '{1}', but here has type '{2}'." },
-        The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation: { code: 2404, category: 1, key: "The left-hand side of a 'for...in' statement cannot use a type annotation." },
-        The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any: { code: 2405, category: 1, key: "The left-hand side of a 'for...in' statement must be of type 'string' or 'any'." },
-        Invalid_left_hand_side_in_for_in_statement: { code: 2406, category: 1, key: "Invalid left-hand side in 'for...in' statement." },
-        The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2407, category: 1, key: "The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter." },
-        Setters_cannot_return_a_value: { code: 2408, category: 1, key: "Setters cannot return a value." },
-        Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class: { code: 2409, category: 1, key: "Return type of constructor signature must be assignable to the instance type of the class" },
-        All_symbols_within_a_with_block_will_be_resolved_to_any: { code: 2410, category: 1, key: "All symbols within a 'with' block will be resolved to 'any'." },
-        Property_0_of_type_1_is_not_assignable_to_string_index_type_2: { code: 2411, category: 1, key: "Property '{0}' of type '{1}' is not assignable to string index type '{2}'." },
-        Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2: { code: 2412, category: 1, key: "Property '{0}' of type '{1}' is not assignable to numeric index type '{2}'." },
-        Numeric_index_type_0_is_not_assignable_to_string_index_type_1: { code: 2413, category: 1, key: "Numeric index type '{0}' is not assignable to string index type '{1}'." },
-        Class_name_cannot_be_0: { code: 2414, category: 1, key: "Class name cannot be '{0}'" },
-        Class_0_incorrectly_extends_base_class_1: { code: 2415, category: 1, key: "Class '{0}' incorrectly extends base class '{1}'." },
-        Class_static_side_0_incorrectly_extends_base_class_static_side_1: { code: 2417, category: 1, key: "Class static side '{0}' incorrectly extends base class static side '{1}'." },
-        Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0: { code: 2419, category: 1, key: "Type name '{0}' in extends clause does not reference constructor function for '{0}'." },
-        Class_0_incorrectly_implements_interface_1: { code: 2420, category: 1, key: "Class '{0}' incorrectly implements interface '{1}'." },
-        A_class_may_only_implement_another_class_or_interface: { code: 2422, category: 1, key: "A class may only implement another class or interface." },
-        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_accessor: { code: 2423, category: 1, key: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member accessor." },
-        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_property: { code: 2424, category: 1, key: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member property." },
-        Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2425, category: 1, key: "Class '{0}' defines instance member property '{1}', but extended class '{2}' defines it as instance member function." },
-        Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2426, category: 1, key: "Class '{0}' defines instance member accessor '{1}', but extended class '{2}' defines it as instance member function." },
-        Interface_name_cannot_be_0: { code: 2427, category: 1, key: "Interface name cannot be '{0}'" },
-        All_declarations_of_an_interface_must_have_identical_type_parameters: { code: 2428, category: 1, key: "All declarations of an interface must have identical type parameters." },
-        Interface_0_incorrectly_extends_interface_1: { code: 2430, category: 1, key: "Interface '{0}' incorrectly extends interface '{1}'." },
-        Enum_name_cannot_be_0: { code: 2431, category: 1, key: "Enum name cannot be '{0}'" },
-        In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enum_element: { code: 2432, category: 1, key: "In an enum with multiple declarations, only one declaration can omit an initializer for its first enum element." },
-        A_module_declaration_cannot_be_in_a_different_file_from_a_class_or_function_with_which_it_is_merged: { code: 2433, category: 1, key: "A module declaration cannot be in a different file from a class or function with which it is merged" },
-        A_module_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged: { code: 2434, category: 1, key: "A module declaration cannot be located prior to a class or function with which it is merged" },
-        Ambient_external_modules_cannot_be_nested_in_other_modules: { code: 2435, category: 1, key: "Ambient external modules cannot be nested in other modules." },
-        Ambient_external_module_declaration_cannot_specify_relative_module_name: { code: 2436, category: 1, key: "Ambient external module declaration cannot specify relative module name." },
-        Module_0_is_hidden_by_a_local_declaration_with_the_same_name: { code: 2437, category: 1, key: "Module '{0}' is hidden by a local declaration with the same name" },
-        Import_name_cannot_be_0: { code: 2438, category: 1, key: "Import name cannot be '{0}'" },
-        Import_or_export_declaration_in_an_ambient_external_module_declaration_cannot_reference_external_module_through_relative_external_module_name: { code: 2439, category: 1, key: "Import or export declaration in an ambient external module declaration cannot reference external module through relative external module name." },
-        Import_declaration_conflicts_with_local_declaration_of_0: { code: 2440, category: 1, key: "Import declaration conflicts with local declaration of '{0}'" },
-        Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_an_external_module: { code: 2441, category: 1, key: "Duplicate identifier '{0}'. Compiler reserves name '{1}' in top level scope of an external module." },
-        Types_have_separate_declarations_of_a_private_property_0: { code: 2442, category: 1, key: "Types have separate declarations of a private property '{0}'." },
-        Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2: { code: 2443, category: 1, key: "Property '{0}' is protected but type '{1}' is not a class derived from '{2}'." },
-        Property_0_is_protected_in_type_1_but_public_in_type_2: { code: 2444, category: 1, key: "Property '{0}' is protected in type '{1}' but public in type '{2}'." },
-        Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses: { code: 2445, category: 1, key: "Property '{0}' is protected and only accessible within class '{1}' and its subclasses." },
-        Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1: { code: 2446, category: 1, key: "Property '{0}' is protected and only accessible through an instance of class '{1}'." },
-        The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead: { code: 2447, category: 1, key: "The '{0}' operator is not allowed for boolean types. Consider using '{1}' instead." },
-        Block_scoped_variable_0_used_before_its_declaration: { code: 2448, category: 1, key: "Block-scoped variable '{0}' used before its declaration." },
-        The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant: { code: 2449, category: 1, key: "The operand of an increment or decrement operator cannot be a constant." },
-        Left_hand_side_of_assignment_expression_cannot_be_a_constant: { code: 2450, category: 1, key: "Left-hand side of assignment expression cannot be a constant." },
-        Cannot_redeclare_block_scoped_variable_0: { code: 2451, category: 1, key: "Cannot redeclare block-scoped variable '{0}'." },
-        An_enum_member_cannot_have_a_numeric_name: { code: 2452, category: 1, key: "An enum member cannot have a numeric name." },
-        The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_type_arguments_explicitly: { code: 2453, category: 1, key: "The type argument for type parameter '{0}' cannot be inferred from the usage. Consider specifying the type arguments explicitly." },
-        Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0: { code: 2455, category: 1, key: "Type argument candidate '{1}' is not a valid type argument because it is not a supertype of candidate '{0}'." },
-        Type_alias_0_circularly_references_itself: { code: 2456, category: 1, key: "Type alias '{0}' circularly references itself." },
-        Type_alias_name_cannot_be_0: { code: 2457, category: 1, key: "Type alias name cannot be '{0}'" },
-        An_AMD_module_cannot_have_multiple_name_assignments: { code: 2458, category: 1, key: "An AMD module cannot have multiple name assignments." },
-        Type_0_has_no_property_1_and_no_string_index_signature: { code: 2459, category: 1, key: "Type '{0}' has no property '{1}' and no string index signature." },
-        Type_0_has_no_property_1: { code: 2460, category: 1, key: "Type '{0}' has no property '{1}'." },
-        Type_0_is_not_an_array_type: { code: 2461, category: 1, key: "Type '{0}' is not an array type." },
-        A_rest_element_must_be_last_in_an_array_destructuring_pattern: { code: 2462, category: 1, key: "A rest element must be last in an array destructuring pattern" },
-        A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature: { code: 2463, category: 1, key: "A binding pattern parameter cannot be optional in an implementation signature." },
-        A_computed_property_name_must_be_of_type_string_number_symbol_or_any: { code: 2464, category: 1, key: "A computed property name must be of type 'string', 'number', 'symbol', or 'any'." },
-        this_cannot_be_referenced_in_a_computed_property_name: { code: 2465, category: 1, key: "'this' cannot be referenced in a computed property name." },
-        super_cannot_be_referenced_in_a_computed_property_name: { code: 2466, category: 1, key: "'super' cannot be referenced in a computed property name." },
-        A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type: { code: 2467, category: 1, key: "A computed property name cannot reference a type parameter from its containing type." },
-        Cannot_find_global_value_0: { code: 2468, category: 1, key: "Cannot find global value '{0}'." },
-        The_0_operator_cannot_be_applied_to_type_symbol: { code: 2469, category: 1, key: "The '{0}' operator cannot be applied to type 'symbol'." },
-        Symbol_reference_does_not_refer_to_the_global_Symbol_constructor_object: { code: 2470, category: 1, key: "'Symbol' reference does not refer to the global Symbol constructor object." },
-        A_computed_property_name_of_the_form_0_must_be_of_type_symbol: { code: 2471, category: 1, key: "A computed property name of the form '{0}' must be of type 'symbol'." },
-        Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_6_and_higher: { code: 2472, category: 1, key: "Spread operator in 'new' expressions is only available when targeting ECMAScript 6 and higher." },
-        Enum_declarations_must_all_be_const_or_non_const: { code: 2473, category: 1, key: "Enum declarations must all be const or non-const." },
-        In_const_enum_declarations_member_initializer_must_be_constant_expression: { code: 2474, category: 1, key: "In 'const' enum declarations member initializer must be constant expression." },
-        const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment: { code: 2475, category: 1, key: "'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment." },
-        A_const_enum_member_can_only_be_accessed_using_a_string_literal: { code: 2476, category: 1, key: "A const enum member can only be accessed using a string literal." },
-        const_enum_member_initializer_was_evaluated_to_a_non_finite_value: { code: 2477, category: 1, key: "'const' enum member initializer was evaluated to a non-finite value." },
-        const_enum_member_initializer_was_evaluated_to_disallowed_value_NaN: { code: 2478, category: 1, key: "'const' enum member initializer was evaluated to disallowed value 'NaN'." },
-        Property_0_does_not_exist_on_const_enum_1: { code: 2479, category: 1, key: "Property '{0}' does not exist on 'const' enum '{1}'." },
-        let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations: { code: 2480, category: 1, key: "'let' is not allowed to be used as a name in 'let' or 'const' declarations." },
-        Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1: { code: 2481, category: 1, key: "Cannot initialize outer scoped variable '{0}' in the same scope as block scoped declaration '{1}'." },
-        for_of_statements_are_only_available_when_targeting_ECMAScript_6_or_higher: { code: 2482, category: 1, key: "'for...of' statements are only available when targeting ECMAScript 6 or higher." },
-        The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: { code: 2483, category: 1, key: "The left-hand side of a 'for...of' statement cannot use a type annotation." },
-        Export_declaration_conflicts_with_exported_declaration_of_0: { code: 2484, category: 1, key: "Export declaration conflicts with exported declaration of '{0}'" },
-        The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant: { code: 2485, category: 1, key: "The left-hand side of a 'for...of' statement cannot be a previously defined constant." },
-        The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant: { code: 2486, category: 1, key: "The left-hand side of a 'for...in' statement cannot be a previously defined constant." },
-        Invalid_left_hand_side_in_for_of_statement: { code: 2487, category: 1, key: "Invalid left-hand side in 'for...of' statement." },
-        The_right_hand_side_of_a_for_of_statement_must_have_a_Symbol_iterator_method_that_returns_an_iterator: { code: 2488, category: 1, key: "The right-hand side of a 'for...of' statement must have a '[Symbol.iterator]()' method that returns an iterator." },
-        The_iterator_returned_by_the_right_hand_side_of_a_for_of_statement_must_have_a_next_method: { code: 2489, category: 1, key: "The iterator returned by the right-hand side of a 'for...of' statement must have a 'next()' method." },
-        The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: { code: 2490, category: 1, key: "The type returned by the 'next()' method of an iterator must have a 'value' property." },
-        The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern: { code: 2491, category: 1, key: "The left-hand side of a 'for...in' statement cannot be a destructuring pattern." },
-        Cannot_redeclare_identifier_0_in_catch_clause: { code: 2492, category: 1, key: "Cannot redeclare identifier '{0}' in catch clause" },
-        Import_declaration_0_is_using_private_name_1: { code: 4000, category: 1, key: "Import declaration '{0}' is using private name '{1}'." },
-        Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: 1, key: "Type parameter '{0}' of exported class has or is using private name '{1}'." },
-        Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4004, category: 1, key: "Type parameter '{0}' of exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4006, category: 1, key: "Type parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4008, category: 1, key: "Type parameter '{0}' of call signature from exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: { code: 4010, category: 1, key: "Type parameter '{0}' of public static method from exported class has or is using private name '{1}'." },
-        Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: { code: 4012, category: 1, key: "Type parameter '{0}' of public method from exported class has or is using private name '{1}'." },
-        Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: { code: 4014, category: 1, key: "Type parameter '{0}' of method from exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4016, category: 1, key: "Type parameter '{0}' of exported function has or is using private name '{1}'." },
-        Implements_clause_of_exported_class_0_has_or_is_using_private_name_1: { code: 4019, category: 1, key: "Implements clause of exported class '{0}' has or is using private name '{1}'." },
-        Extends_clause_of_exported_class_0_has_or_is_using_private_name_1: { code: 4020, category: 1, key: "Extends clause of exported class '{0}' has or is using private name '{1}'." },
-        Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1: { code: 4022, category: 1, key: "Extends clause of exported interface '{0}' has or is using private name '{1}'." },
-        Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4023, category: 1, key: "Exported variable '{0}' has or is using name '{1}' from external module {2} but cannot be named." },
-        Exported_variable_0_has_or_is_using_name_1_from_private_module_2: { code: 4024, category: 1, key: "Exported variable '{0}' has or is using name '{1}' from private module '{2}'." },
-        Exported_variable_0_has_or_is_using_private_name_1: { code: 4025, category: 1, key: "Exported variable '{0}' has or is using private name '{1}'." },
-        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4026, category: 1, key: "Public static property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4027, category: 1, key: "Public static property '{0}' of exported class has or is using name '{1}' from private module '{2}'." },
-        Public_static_property_0_of_exported_class_has_or_is_using_private_name_1: { code: 4028, category: 1, key: "Public static property '{0}' of exported class has or is using private name '{1}'." },
-        Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4029, category: 1, key: "Public property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4030, category: 1, key: "Public property '{0}' of exported class has or is using name '{1}' from private module '{2}'." },
-        Public_property_0_of_exported_class_has_or_is_using_private_name_1: { code: 4031, category: 1, key: "Public property '{0}' of exported class has or is using private name '{1}'." },
-        Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4032, category: 1, key: "Property '{0}' of exported interface has or is using name '{1}' from private module '{2}'." },
-        Property_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4033, category: 1, key: "Property '{0}' of exported interface has or is using private name '{1}'." },
-        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4034, category: 1, key: "Parameter '{0}' of public static property setter from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1: { code: 4035, category: 1, key: "Parameter '{0}' of public static property setter from exported class has or is using private name '{1}'." },
-        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4036, category: 1, key: "Parameter '{0}' of public property setter from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1: { code: 4037, category: 1, key: "Parameter '{0}' of public property setter from exported class has or is using private name '{1}'." },
-        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4038, category: 1, key: "Return type of public static property getter from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4039, category: 1, key: "Return type of public static property getter from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0: { code: 4040, category: 1, key: "Return type of public static property getter from exported class has or is using private name '{0}'." },
-        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4041, category: 1, key: "Return type of public property getter from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4042, category: 1, key: "Return type of public property getter from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0: { code: 4043, category: 1, key: "Return type of public property getter from exported class has or is using private name '{0}'." },
-        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4044, category: 1, key: "Return type of constructor signature from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4045, category: 1, key: "Return type of constructor signature from exported interface has or is using private name '{0}'." },
-        Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4046, category: 1, key: "Return type of call signature from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4047, category: 1, key: "Return type of call signature from exported interface has or is using private name '{0}'." },
-        Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4048, category: 1, key: "Return type of index signature from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4049, category: 1, key: "Return type of index signature from exported interface has or is using private name '{0}'." },
-        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4050, category: 1, key: "Return type of public static method from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4051, category: 1, key: "Return type of public static method from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0: { code: 4052, category: 1, key: "Return type of public static method from exported class has or is using private name '{0}'." },
-        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4053, category: 1, key: "Return type of public method from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4054, category: 1, key: "Return type of public method from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0: { code: 4055, category: 1, key: "Return type of public method from exported class has or is using private name '{0}'." },
-        Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4056, category: 1, key: "Return type of method from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0: { code: 4057, category: 1, key: "Return type of method from exported interface has or is using private name '{0}'." },
-        Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4058, category: 1, key: "Return type of exported function has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1: { code: 4059, category: 1, key: "Return type of exported function has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_exported_function_has_or_is_using_private_name_0: { code: 4060, category: 1, key: "Return type of exported function has or is using private name '{0}'." },
-        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4061, category: 1, key: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4062, category: 1, key: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1: { code: 4063, category: 1, key: "Parameter '{0}' of constructor from exported class has or is using private name '{1}'." },
-        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4064, category: 1, key: "Parameter '{0}' of constructor signature from exported interface has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4065, category: 1, key: "Parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'." },
-        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4066, category: 1, key: "Parameter '{0}' of call signature from exported interface has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4067, category: 1, key: "Parameter '{0}' of call signature from exported interface has or is using private name '{1}'." },
-        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4068, category: 1, key: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4069, category: 1, key: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: { code: 4070, category: 1, key: "Parameter '{0}' of public static method from exported class has or is using private name '{1}'." },
-        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4071, category: 1, key: "Parameter '{0}' of public method from exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4072, category: 1, key: "Parameter '{0}' of public method from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: { code: 4073, category: 1, key: "Parameter '{0}' of public method from exported class has or is using private name '{1}'." },
-        Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4074, category: 1, key: "Parameter '{0}' of method from exported interface has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: { code: 4075, category: 1, key: "Parameter '{0}' of method from exported interface has or is using private name '{1}'." },
-        Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4076, category: 1, key: "Parameter '{0}' of exported function has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2: { code: 4077, category: 1, key: "Parameter '{0}' of exported function has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4078, category: 1, key: "Parameter '{0}' of exported function has or is using private name '{1}'." },
-        Exported_type_alias_0_has_or_is_using_private_name_1: { code: 4081, category: 1, key: "Exported type alias '{0}' has or is using private name '{1}'." },
-        Loop_contains_block_scoped_variable_0_referenced_by_a_function_in_the_loop_This_is_only_supported_in_ECMAScript_6_or_higher: { code: 4091, category: 1, key: "Loop contains block-scoped variable '{0}' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher." },
-        The_current_host_does_not_support_the_0_option: { code: 5001, category: 1, key: "The current host does not support the '{0}' option." },
-        Cannot_find_the_common_subdirectory_path_for_the_input_files: { code: 5009, category: 1, key: "Cannot find the common subdirectory path for the input files." },
-        Cannot_read_file_0_Colon_1: { code: 5012, category: 1, key: "Cannot read file '{0}': {1}" },
-        Unsupported_file_encoding: { code: 5013, category: 1, key: "Unsupported file encoding." },
-        Unknown_compiler_option_0: { code: 5023, category: 1, key: "Unknown compiler option '{0}'." },
-        Compiler_option_0_requires_a_value_of_type_1: { code: 5024, category: 1, key: "Compiler option '{0}' requires a value of type {1}." },
-        Could_not_write_file_0_Colon_1: { code: 5033, category: 1, key: "Could not write file '{0}': {1}" },
-        Option_mapRoot_cannot_be_specified_without_specifying_sourcemap_option: { code: 5038, category: 1, key: "Option 'mapRoot' cannot be specified without specifying 'sourcemap' option." },
-        Option_sourceRoot_cannot_be_specified_without_specifying_sourcemap_option: { code: 5039, category: 1, key: "Option 'sourceRoot' cannot be specified without specifying 'sourcemap' option." },
-        Option_noEmit_cannot_be_specified_with_option_out_or_outDir: { code: 5040, category: 1, key: "Option 'noEmit' cannot be specified with option 'out' or 'outDir'." },
-        Option_noEmit_cannot_be_specified_with_option_declaration: { code: 5041, category: 1, key: "Option 'noEmit' cannot be specified with option 'declaration'." },
-        Option_project_cannot_be_mixed_with_source_files_on_a_command_line: { code: 5042, category: 1, key: "Option 'project' cannot be mixed with source files on a command line." },
-        Concatenate_and_emit_output_to_single_file: { code: 6001, category: 2, key: "Concatenate and emit output to single file." },
-        Generates_corresponding_d_ts_file: { code: 6002, category: 2, key: "Generates corresponding '.d.ts' file." },
-        Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: { code: 6003, category: 2, key: "Specifies the location where debugger should locate map files instead of generated locations." },
-        Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations: { code: 6004, category: 2, key: "Specifies the location where debugger should locate TypeScript files instead of source locations." },
-        Watch_input_files: { code: 6005, category: 2, key: "Watch input files." },
-        Redirect_output_structure_to_the_directory: { code: 6006, category: 2, key: "Redirect output structure to the directory." },
-        Do_not_erase_const_enum_declarations_in_generated_code: { code: 6007, category: 2, key: "Do not erase const enum declarations in generated code." },
-        Do_not_emit_outputs_if_any_type_checking_errors_were_reported: { code: 6008, category: 2, key: "Do not emit outputs if any type checking errors were reported." },
-        Do_not_emit_comments_to_output: { code: 6009, category: 2, key: "Do not emit comments to output." },
-        Do_not_emit_outputs: { code: 6010, category: 2, key: "Do not emit outputs." },
-        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES6_experimental: { code: 6015, category: 2, key: "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES6' (experimental)" },
-        Specify_module_code_generation_Colon_commonjs_or_amd: { code: 6016, category: 2, key: "Specify module code generation: 'commonjs' or 'amd'" },
-        Print_this_message: { code: 6017, category: 2, key: "Print this message." },
-        Print_the_compiler_s_version: { code: 6019, category: 2, key: "Print the compiler's version." },
-        Compile_the_project_in_the_given_directory: { code: 6020, category: 2, key: "Compile the project in the given directory." },
-        Syntax_Colon_0: { code: 6023, category: 2, key: "Syntax: {0}" },
-        options: { code: 6024, category: 2, key: "options" },
-        file: { code: 6025, category: 2, key: "file" },
-        Examples_Colon_0: { code: 6026, category: 2, key: "Examples: {0}" },
-        Options_Colon: { code: 6027, category: 2, key: "Options:" },
-        Version_0: { code: 6029, category: 2, key: "Version {0}" },
-        Insert_command_line_options_and_files_from_a_file: { code: 6030, category: 2, key: "Insert command line options and files from a file." },
-        File_change_detected_Starting_incremental_compilation: { code: 6032, category: 2, key: "File change detected. Starting incremental compilation..." },
-        KIND: { code: 6034, category: 2, key: "KIND" },
-        FILE: { code: 6035, category: 2, key: "FILE" },
-        VERSION: { code: 6036, category: 2, key: "VERSION" },
-        LOCATION: { code: 6037, category: 2, key: "LOCATION" },
-        DIRECTORY: { code: 6038, category: 2, key: "DIRECTORY" },
-        Compilation_complete_Watching_for_file_changes: { code: 6042, category: 2, key: "Compilation complete. Watching for file changes." },
-        Generates_corresponding_map_file: { code: 6043, category: 2, key: "Generates corresponding '.map' file." },
-        Compiler_option_0_expects_an_argument: { code: 6044, category: 1, key: "Compiler option '{0}' expects an argument." },
-        Unterminated_quoted_string_in_response_file_0: { code: 6045, category: 1, key: "Unterminated quoted string in response file '{0}'." },
-        Argument_for_module_option_must_be_commonjs_or_amd: { code: 6046, category: 1, key: "Argument for '--module' option must be 'commonjs' or 'amd'." },
-        Argument_for_target_option_must_be_es3_es5_or_es6: { code: 6047, category: 1, key: "Argument for '--target' option must be 'es3', 'es5', or 'es6'." },
-        Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1: { code: 6048, category: 1, key: "Locale must be of the form <language> or <language>-<territory>. For example '{0}' or '{1}'." },
-        Unsupported_locale_0: { code: 6049, category: 1, key: "Unsupported locale '{0}'." },
-        Unable_to_open_file_0: { code: 6050, category: 1, key: "Unable to open file '{0}'." },
-        Corrupted_locale_file_0: { code: 6051, category: 1, key: "Corrupted locale file {0}." },
-        Raise_error_on_expressions_and_declarations_with_an_implied_any_type: { code: 6052, category: 2, key: "Raise error on expressions and declarations with an implied 'any' type." },
-        File_0_not_found: { code: 6053, category: 1, key: "File '{0}' not found." },
-        File_0_must_have_extension_ts_or_d_ts: { code: 6054, category: 1, key: "File '{0}' must have extension '.ts' or '.d.ts'." },
-        Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures: { code: 6055, category: 2, key: "Suppress noImplicitAny errors for indexing objects lacking index signatures." },
-        Do_not_emit_declarations_for_code_that_has_an_internal_annotation: { code: 6056, category: 2, key: "Do not emit declarations for code that has an '@internal' annotation." },
-        Variable_0_implicitly_has_an_1_type: { code: 7005, category: 1, key: "Variable '{0}' implicitly has an '{1}' type." },
-        Parameter_0_implicitly_has_an_1_type: { code: 7006, category: 1, key: "Parameter '{0}' implicitly has an '{1}' type." },
-        Member_0_implicitly_has_an_1_type: { code: 7008, category: 1, key: "Member '{0}' implicitly has an '{1}' type." },
-        new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type: { code: 7009, category: 1, key: "'new' expression, whose target lacks a construct signature, implicitly has an 'any' type." },
-        _0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type: { code: 7010, category: 1, key: "'{0}', which lacks return-type annotation, implicitly has an '{1}' return type." },
-        Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type: { code: 7011, category: 1, key: "Function expression, which lacks return-type annotation, implicitly has an '{0}' return type." },
-        Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7013, category: 1, key: "Construct signature, which lacks return-type annotation, implicitly has an 'any' return type." },
-        Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_type_annotation: { code: 7016, category: 1, key: "Property '{0}' implicitly has type 'any', because its 'set' accessor lacks a type annotation." },
-        Index_signature_of_object_type_implicitly_has_an_any_type: { code: 7017, category: 1, key: "Index signature of object type implicitly has an 'any' type." },
-        Object_literal_s_property_0_implicitly_has_an_1_type: { code: 7018, category: 1, key: "Object literal's property '{0}' implicitly has an '{1}' type." },
-        Rest_parameter_0_implicitly_has_an_any_type: { code: 7019, category: 1, key: "Rest parameter '{0}' implicitly has an 'any[]' type." },
-        Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7020, category: 1, key: "Call signature, which lacks return-type annotation, implicitly has an 'any' return type." },
-        _0_implicitly_has_type_any_because_it_is_referenced_directly_or_indirectly_in_its_own_type_annotation: { code: 7021, category: 1, key: "'{0}' implicitly has type 'any' because it is referenced directly or indirectly in its own type annotation." },
-        _0_implicitly_has_type_any_because_it_is_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer: { code: 7022, category: 1, key: "'{0}' implicitly has type 'any' because it is does not have a type annotation and is referenced directly or indirectly in its own initializer." },
-        _0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: { code: 7023, category: 1, key: "'{0}' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions." },
-        Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: { code: 7024, category: 1, key: "Function implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions." },
-        You_cannot_rename_this_element: { code: 8000, category: 1, key: "You cannot rename this element." },
-        You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: { code: 8001, category: 1, key: "You cannot rename elements that are defined in the standard TypeScript library." },
-        yield_expressions_are_not_currently_supported: { code: 9000, category: 1, key: "'yield' expressions are not currently supported." },
-        Generators_are_not_currently_supported: { code: 9001, category: 1, key: "Generators are not currently supported." },
-        The_arguments_object_cannot_be_referenced_in_an_arrow_function_Consider_using_a_standard_function_expression: { code: 9002, category: 1, key: "The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression." }
+        Unterminated_string_literal: {
+            code: 1002,
+            category: 1,
+            key: "Unterminated string literal."
+        },
+        Identifier_expected: {
+            code: 1003,
+            category: 1,
+            key: "Identifier expected."
+        },
+        _0_expected: {
+            code: 1005,
+            category: 1,
+            key: "'{0}' expected."
+        },
+        A_file_cannot_have_a_reference_to_itself: {
+            code: 1006,
+            category: 1,
+            key: "A file cannot have a reference to itself."
+        },
+        Trailing_comma_not_allowed: {
+            code: 1009,
+            category: 1,
+            key: "Trailing comma not allowed."
+        },
+        Asterisk_Slash_expected: {
+            code: 1010,
+            category: 1,
+            key: "'*/' expected."
+        },
+        Unexpected_token: {
+            code: 1012,
+            category: 1,
+            key: "Unexpected token."
+        },
+        A_rest_parameter_must_be_last_in_a_parameter_list: {
+            code: 1014,
+            category: 1,
+            key: "A rest parameter must be last in a parameter list."
+        },
+        Parameter_cannot_have_question_mark_and_initializer: {
+            code: 1015,
+            category: 1,
+            key: "Parameter cannot have question mark and initializer."
+        },
+        A_required_parameter_cannot_follow_an_optional_parameter: {
+            code: 1016,
+            category: 1,
+            key: "A required parameter cannot follow an optional parameter."
+        },
+        An_index_signature_cannot_have_a_rest_parameter: {
+            code: 1017,
+            category: 1,
+            key: "An index signature cannot have a rest parameter."
+        },
+        An_index_signature_parameter_cannot_have_an_accessibility_modifier: {
+            code: 1018,
+            category: 1,
+            key: "An index signature parameter cannot have an accessibility modifier."
+        },
+        An_index_signature_parameter_cannot_have_a_question_mark: {
+            code: 1019,
+            category: 1,
+            key: "An index signature parameter cannot have a question mark."
+        },
+        An_index_signature_parameter_cannot_have_an_initializer: {
+            code: 1020,
+            category: 1,
+            key: "An index signature parameter cannot have an initializer."
+        },
+        An_index_signature_must_have_a_type_annotation: {
+            code: 1021,
+            category: 1,
+            key: "An index signature must have a type annotation."
+        },
+        An_index_signature_parameter_must_have_a_type_annotation: {
+            code: 1022,
+            category: 1,
+            key: "An index signature parameter must have a type annotation."
+        },
+        An_index_signature_parameter_type_must_be_string_or_number: {
+            code: 1023,
+            category: 1,
+            key: "An index signature parameter type must be 'string' or 'number'."
+        },
+        A_class_or_interface_declaration_can_only_have_one_extends_clause: {
+            code: 1024,
+            category: 1,
+            key: "A class or interface declaration can only have one 'extends' clause."
+        },
+        An_extends_clause_must_precede_an_implements_clause: {
+            code: 1025,
+            category: 1,
+            key: "An 'extends' clause must precede an 'implements' clause."
+        },
+        A_class_can_only_extend_a_single_class: {
+            code: 1026,
+            category: 1,
+            key: "A class can only extend a single class."
+        },
+        A_class_declaration_can_only_have_one_implements_clause: {
+            code: 1027,
+            category: 1,
+            key: "A class declaration can only have one 'implements' clause."
+        },
+        Accessibility_modifier_already_seen: {
+            code: 1028,
+            category: 1,
+            key: "Accessibility modifier already seen."
+        },
+        _0_modifier_must_precede_1_modifier: {
+            code: 1029,
+            category: 1,
+            key: "'{0}' modifier must precede '{1}' modifier."
+        },
+        _0_modifier_already_seen: {
+            code: 1030,
+            category: 1,
+            key: "'{0}' modifier already seen."
+        },
+        _0_modifier_cannot_appear_on_a_class_element: {
+            code: 1031,
+            category: 1,
+            key: "'{0}' modifier cannot appear on a class element."
+        },
+        An_interface_declaration_cannot_have_an_implements_clause: {
+            code: 1032,
+            category: 1,
+            key: "An interface declaration cannot have an 'implements' clause."
+        },
+        super_must_be_followed_by_an_argument_list_or_member_access: {
+            code: 1034,
+            category: 1,
+            key: "'super' must be followed by an argument list or member access."
+        },
+        Only_ambient_modules_can_use_quoted_names: {
+            code: 1035,
+            category: 1,
+            key: "Only ambient modules can use quoted names."
+        },
+        Statements_are_not_allowed_in_ambient_contexts: {
+            code: 1036,
+            category: 1,
+            key: "Statements are not allowed in ambient contexts."
+        },
+        A_declare_modifier_cannot_be_used_in_an_already_ambient_context: {
+            code: 1038,
+            category: 1,
+            key: "A 'declare' modifier cannot be used in an already ambient context."
+        },
+        Initializers_are_not_allowed_in_ambient_contexts: {
+            code: 1039,
+            category: 1,
+            key: "Initializers are not allowed in ambient contexts."
+        },
+        _0_modifier_cannot_appear_on_a_module_element: {
+            code: 1044,
+            category: 1,
+            key: "'{0}' modifier cannot appear on a module element."
+        },
+        A_declare_modifier_cannot_be_used_with_an_interface_declaration: {
+            code: 1045,
+            category: 1,
+            key: "A 'declare' modifier cannot be used with an interface declaration."
+        },
+        A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file: {
+            code: 1046,
+            category: 1,
+            key: "A 'declare' modifier is required for a top level declaration in a .d.ts file."
+        },
+        A_rest_parameter_cannot_be_optional: {
+            code: 1047,
+            category: 1,
+            key: "A rest parameter cannot be optional."
+        },
+        A_rest_parameter_cannot_have_an_initializer: {
+            code: 1048,
+            category: 1,
+            key: "A rest parameter cannot have an initializer."
+        },
+        A_set_accessor_must_have_exactly_one_parameter: {
+            code: 1049,
+            category: 1,
+            key: "A 'set' accessor must have exactly one parameter."
+        },
+        A_set_accessor_cannot_have_an_optional_parameter: {
+            code: 1051,
+            category: 1,
+            key: "A 'set' accessor cannot have an optional parameter."
+        },
+        A_set_accessor_parameter_cannot_have_an_initializer: {
+            code: 1052,
+            category: 1,
+            key: "A 'set' accessor parameter cannot have an initializer."
+        },
+        A_set_accessor_cannot_have_rest_parameter: {
+            code: 1053,
+            category: 1,
+            key: "A 'set' accessor cannot have rest parameter."
+        },
+        A_get_accessor_cannot_have_parameters: {
+            code: 1054,
+            category: 1,
+            key: "A 'get' accessor cannot have parameters."
+        },
+        Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher: {
+            code: 1056,
+            category: 1,
+            key: "Accessors are only available when targeting ECMAScript 5 and higher."
+        },
+        Enum_member_must_have_initializer: {
+            code: 1061,
+            category: 1,
+            key: "Enum member must have initializer."
+        },
+        An_export_assignment_cannot_be_used_in_an_internal_module: {
+            code: 1063,
+            category: 1,
+            key: "An export assignment cannot be used in an internal module."
+        },
+        Ambient_enum_elements_can_only_have_integer_literal_initializers: {
+            code: 1066,
+            category: 1,
+            key: "Ambient enum elements can only have integer literal initializers."
+        },
+        Unexpected_token_A_constructor_method_accessor_or_property_was_expected: {
+            code: 1068,
+            category: 1,
+            key: "Unexpected token. A constructor, method, accessor, or property was expected."
+        },
+        A_declare_modifier_cannot_be_used_with_an_import_declaration: {
+            code: 1079,
+            category: 1,
+            key: "A 'declare' modifier cannot be used with an import declaration."
+        },
+        Invalid_reference_directive_syntax: {
+            code: 1084,
+            category: 1,
+            key: "Invalid 'reference' directive syntax."
+        },
+        Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher: {
+            code: 1085,
+            category: 1,
+            key: "Octal literals are not available when targeting ECMAScript 5 and higher."
+        },
+        An_accessor_cannot_be_declared_in_an_ambient_context: {
+            code: 1086,
+            category: 1,
+            key: "An accessor cannot be declared in an ambient context."
+        },
+        _0_modifier_cannot_appear_on_a_constructor_declaration: {
+            code: 1089,
+            category: 1,
+            key: "'{0}' modifier cannot appear on a constructor declaration."
+        },
+        _0_modifier_cannot_appear_on_a_parameter: {
+            code: 1090,
+            category: 1,
+            key: "'{0}' modifier cannot appear on a parameter."
+        },
+        Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement: {
+            code: 1091,
+            category: 1,
+            key: "Only a single variable declaration is allowed in a 'for...in' statement."
+        },
+        Type_parameters_cannot_appear_on_a_constructor_declaration: {
+            code: 1092,
+            category: 1,
+            key: "Type parameters cannot appear on a constructor declaration."
+        },
+        Type_annotation_cannot_appear_on_a_constructor_declaration: {
+            code: 1093,
+            category: 1,
+            key: "Type annotation cannot appear on a constructor declaration."
+        },
+        An_accessor_cannot_have_type_parameters: {
+            code: 1094,
+            category: 1,
+            key: "An accessor cannot have type parameters."
+        },
+        A_set_accessor_cannot_have_a_return_type_annotation: {
+            code: 1095,
+            category: 1,
+            key: "A 'set' accessor cannot have a return type annotation."
+        },
+        An_index_signature_must_have_exactly_one_parameter: {
+            code: 1096,
+            category: 1,
+            key: "An index signature must have exactly one parameter."
+        },
+        _0_list_cannot_be_empty: {
+            code: 1097,
+            category: 1,
+            key: "'{0}' list cannot be empty."
+        },
+        Type_parameter_list_cannot_be_empty: {
+            code: 1098,
+            category: 1,
+            key: "Type parameter list cannot be empty."
+        },
+        Type_argument_list_cannot_be_empty: {
+            code: 1099,
+            category: 1,
+            key: "Type argument list cannot be empty."
+        },
+        Invalid_use_of_0_in_strict_mode: {
+            code: 1100,
+            category: 1,
+            key: "Invalid use of '{0}' in strict mode."
+        },
+        with_statements_are_not_allowed_in_strict_mode: {
+            code: 1101,
+            category: 1,
+            key: "'with' statements are not allowed in strict mode."
+        },
+        delete_cannot_be_called_on_an_identifier_in_strict_mode: {
+            code: 1102,
+            category: 1,
+            key: "'delete' cannot be called on an identifier in strict mode."
+        },
+        A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement: {
+            code: 1104,
+            category: 1,
+            key: "A 'continue' statement can only be used within an enclosing iteration statement."
+        },
+        A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement: {
+            code: 1105,
+            category: 1,
+            key: "A 'break' statement can only be used within an enclosing iteration or switch statement."
+        },
+        Jump_target_cannot_cross_function_boundary: {
+            code: 1107,
+            category: 1,
+            key: "Jump target cannot cross function boundary."
+        },
+        A_return_statement_can_only_be_used_within_a_function_body: {
+            code: 1108,
+            category: 1,
+            key: "A 'return' statement can only be used within a function body."
+        },
+        Expression_expected: {
+            code: 1109,
+            category: 1,
+            key: "Expression expected."
+        },
+        Type_expected: {
+            code: 1110,
+            category: 1,
+            key: "Type expected."
+        },
+        A_class_member_cannot_be_declared_optional: {
+            code: 1112,
+            category: 1,
+            key: "A class member cannot be declared optional."
+        },
+        A_default_clause_cannot_appear_more_than_once_in_a_switch_statement: {
+            code: 1113,
+            category: 1,
+            key: "A 'default' clause cannot appear more than once in a 'switch' statement."
+        },
+        Duplicate_label_0: {
+            code: 1114,
+            category: 1,
+            key: "Duplicate label '{0}'"
+        },
+        A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement: {
+            code: 1115,
+            category: 1,
+            key: "A 'continue' statement can only jump to a label of an enclosing iteration statement."
+        },
+        A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement: {
+            code: 1116,
+            category: 1,
+            key: "A 'break' statement can only jump to a label of an enclosing statement."
+        },
+        An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode: {
+            code: 1117,
+            category: 1,
+            key: "An object literal cannot have multiple properties with the same name in strict mode."
+        },
+        An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name: {
+            code: 1118,
+            category: 1,
+            key: "An object literal cannot have multiple get/set accessors with the same name."
+        },
+        An_object_literal_cannot_have_property_and_accessor_with_the_same_name: {
+            code: 1119,
+            category: 1,
+            key: "An object literal cannot have property and accessor with the same name."
+        },
+        An_export_assignment_cannot_have_modifiers: {
+            code: 1120,
+            category: 1,
+            key: "An export assignment cannot have modifiers."
+        },
+        Octal_literals_are_not_allowed_in_strict_mode: {
+            code: 1121,
+            category: 1,
+            key: "Octal literals are not allowed in strict mode."
+        },
+        A_tuple_type_element_list_cannot_be_empty: {
+            code: 1122,
+            category: 1,
+            key: "A tuple type element list cannot be empty."
+        },
+        Variable_declaration_list_cannot_be_empty: {
+            code: 1123,
+            category: 1,
+            key: "Variable declaration list cannot be empty."
+        },
+        Digit_expected: {
+            code: 1124,
+            category: 1,
+            key: "Digit expected."
+        },
+        Hexadecimal_digit_expected: {
+            code: 1125,
+            category: 1,
+            key: "Hexadecimal digit expected."
+        },
+        Unexpected_end_of_text: {
+            code: 1126,
+            category: 1,
+            key: "Unexpected end of text."
+        },
+        Invalid_character: {
+            code: 1127,
+            category: 1,
+            key: "Invalid character."
+        },
+        Declaration_or_statement_expected: {
+            code: 1128,
+            category: 1,
+            key: "Declaration or statement expected."
+        },
+        Statement_expected: {
+            code: 1129,
+            category: 1,
+            key: "Statement expected."
+        },
+        case_or_default_expected: {
+            code: 1130,
+            category: 1,
+            key: "'case' or 'default' expected."
+        },
+        Property_or_signature_expected: {
+            code: 1131,
+            category: 1,
+            key: "Property or signature expected."
+        },
+        Enum_member_expected: {
+            code: 1132,
+            category: 1,
+            key: "Enum member expected."
+        },
+        Type_reference_expected: {
+            code: 1133,
+            category: 1,
+            key: "Type reference expected."
+        },
+        Variable_declaration_expected: {
+            code: 1134,
+            category: 1,
+            key: "Variable declaration expected."
+        },
+        Argument_expression_expected: {
+            code: 1135,
+            category: 1,
+            key: "Argument expression expected."
+        },
+        Property_assignment_expected: {
+            code: 1136,
+            category: 1,
+            key: "Property assignment expected."
+        },
+        Expression_or_comma_expected: {
+            code: 1137,
+            category: 1,
+            key: "Expression or comma expected."
+        },
+        Parameter_declaration_expected: {
+            code: 1138,
+            category: 1,
+            key: "Parameter declaration expected."
+        },
+        Type_parameter_declaration_expected: {
+            code: 1139,
+            category: 1,
+            key: "Type parameter declaration expected."
+        },
+        Type_argument_expected: {
+            code: 1140,
+            category: 1,
+            key: "Type argument expected."
+        },
+        String_literal_expected: {
+            code: 1141,
+            category: 1,
+            key: "String literal expected."
+        },
+        Line_break_not_permitted_here: {
+            code: 1142,
+            category: 1,
+            key: "Line break not permitted here."
+        },
+        or_expected: {
+            code: 1144,
+            category: 1,
+            key: "'{' or ';' expected."
+        },
+        Modifiers_not_permitted_on_index_signature_members: {
+            code: 1145,
+            category: 1,
+            key: "Modifiers not permitted on index signature members."
+        },
+        Declaration_expected: {
+            code: 1146,
+            category: 1,
+            key: "Declaration expected."
+        },
+        Import_declarations_in_an_internal_module_cannot_reference_an_external_module: {
+            code: 1147,
+            category: 1,
+            key: "Import declarations in an internal module cannot reference an external module."
+        },
+        Cannot_compile_external_modules_unless_the_module_flag_is_provided: {
+            code: 1148,
+            category: 1,
+            key: "Cannot compile external modules unless the '--module' flag is provided."
+        },
+        File_name_0_differs_from_already_included_file_name_1_only_in_casing: {
+            code: 1149,
+            category: 1,
+            key: "File name '{0}' differs from already included file name '{1}' only in casing"
+        },
+        new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead: {
+            code: 1150,
+            category: 1,
+            key: "'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead."
+        },
+        var_let_or_const_expected: {
+            code: 1152,
+            category: 1,
+            key: "'var', 'let' or 'const' expected."
+        },
+        let_declarations_are_only_available_when_targeting_ECMAScript_6_and_higher: {
+            code: 1153,
+            category: 1,
+            key: "'let' declarations are only available when targeting ECMAScript 6 and higher."
+        },
+        const_declarations_are_only_available_when_targeting_ECMAScript_6_and_higher: {
+            code: 1154,
+            category: 1,
+            key: "'const' declarations are only available when targeting ECMAScript 6 and higher."
+        },
+        const_declarations_must_be_initialized: {
+            code: 1155,
+            category: 1,
+            key: "'const' declarations must be initialized"
+        },
+        const_declarations_can_only_be_declared_inside_a_block: {
+            code: 1156,
+            category: 1,
+            key: "'const' declarations can only be declared inside a block."
+        },
+        let_declarations_can_only_be_declared_inside_a_block: {
+            code: 1157,
+            category: 1,
+            key: "'let' declarations can only be declared inside a block."
+        },
+        Unterminated_template_literal: {
+            code: 1160,
+            category: 1,
+            key: "Unterminated template literal."
+        },
+        Unterminated_regular_expression_literal: {
+            code: 1161,
+            category: 1,
+            key: "Unterminated regular expression literal."
+        },
+        An_object_member_cannot_be_declared_optional: {
+            code: 1162,
+            category: 1,
+            key: "An object member cannot be declared optional."
+        },
+        yield_expression_must_be_contained_within_a_generator_declaration: {
+            code: 1163,
+            category: 1,
+            key: "'yield' expression must be contained_within a generator declaration."
+        },
+        Computed_property_names_are_not_allowed_in_enums: {
+            code: 1164,
+            category: 1,
+            key: "Computed property names are not allowed in enums."
+        },
+        A_computed_property_name_in_an_ambient_context_must_directly_refer_to_a_built_in_symbol: {
+            code: 1165,
+            category: 1,
+            key: "A computed property name in an ambient context must directly refer to a built-in symbol."
+        },
+        A_computed_property_name_in_a_class_property_declaration_must_directly_refer_to_a_built_in_symbol: {
+            code: 1166,
+            category: 1,
+            key: "A computed property name in a class property declaration must directly refer to a built-in symbol."
+        },
+        Computed_property_names_are_only_available_when_targeting_ECMAScript_6_and_higher: {
+            code: 1167,
+            category: 1,
+            key: "Computed property names are only available when targeting ECMAScript 6 and higher."
+        },
+        A_computed_property_name_in_a_method_overload_must_directly_refer_to_a_built_in_symbol: {
+            code: 1168,
+            category: 1,
+            key: "A computed property name in a method overload must directly refer to a built-in symbol."
+        },
+        A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol: {
+            code: 1169,
+            category: 1,
+            key: "A computed property name in an interface must directly refer to a built-in symbol."
+        },
+        A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol: {
+            code: 1170,
+            category: 1,
+            key: "A computed property name in a type literal must directly refer to a built-in symbol."
+        },
+        A_comma_expression_is_not_allowed_in_a_computed_property_name: {
+            code: 1171,
+            category: 1,
+            key: "A comma expression is not allowed in a computed property name."
+        },
+        extends_clause_already_seen: {
+            code: 1172,
+            category: 1,
+            key: "'extends' clause already seen."
+        },
+        extends_clause_must_precede_implements_clause: {
+            code: 1173,
+            category: 1,
+            key: "'extends' clause must precede 'implements' clause."
+        },
+        Classes_can_only_extend_a_single_class: {
+            code: 1174,
+            category: 1,
+            key: "Classes can only extend a single class."
+        },
+        implements_clause_already_seen: {
+            code: 1175,
+            category: 1,
+            key: "'implements' clause already seen."
+        },
+        Interface_declaration_cannot_have_implements_clause: {
+            code: 1176,
+            category: 1,
+            key: "Interface declaration cannot have 'implements' clause."
+        },
+        Binary_digit_expected: {
+            code: 1177,
+            category: 1,
+            key: "Binary digit expected."
+        },
+        Octal_digit_expected: {
+            code: 1178,
+            category: 1,
+            key: "Octal digit expected."
+        },
+        Unexpected_token_expected: {
+            code: 1179,
+            category: 1,
+            key: "Unexpected token. '{' expected."
+        },
+        Property_destructuring_pattern_expected: {
+            code: 1180,
+            category: 1,
+            key: "Property destructuring pattern expected."
+        },
+        Array_element_destructuring_pattern_expected: {
+            code: 1181,
+            category: 1,
+            key: "Array element destructuring pattern expected."
+        },
+        A_destructuring_declaration_must_have_an_initializer: {
+            code: 1182,
+            category: 1,
+            key: "A destructuring declaration must have an initializer."
+        },
+        Destructuring_declarations_are_not_allowed_in_ambient_contexts: {
+            code: 1183,
+            category: 1,
+            key: "Destructuring declarations are not allowed in ambient contexts."
+        },
+        An_implementation_cannot_be_declared_in_ambient_contexts: {
+            code: 1184,
+            category: 1,
+            key: "An implementation cannot be declared in ambient contexts."
+        },
+        Modifiers_cannot_appear_here: {
+            code: 1184,
+            category: 1,
+            key: "Modifiers cannot appear here."
+        },
+        Merge_conflict_marker_encountered: {
+            code: 1185,
+            category: 1,
+            key: "Merge conflict marker encountered."
+        },
+        A_rest_element_cannot_have_an_initializer: {
+            code: 1186,
+            category: 1,
+            key: "A rest element cannot have an initializer."
+        },
+        A_parameter_property_may_not_be_a_binding_pattern: {
+            code: 1187,
+            category: 1,
+            key: "A parameter property may not be a binding pattern."
+        },
+        Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement: {
+            code: 1188,
+            category: 1,
+            key: "Only a single variable declaration is allowed in a 'for...of' statement."
+        },
+        The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer: {
+            code: 1189,
+            category: 1,
+            key: "The variable declaration of a 'for...in' statement cannot have an initializer."
+        },
+        The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer: {
+            code: 1190,
+            category: 1,
+            key: "The variable declaration of a 'for...of' statement cannot have an initializer."
+        },
+        An_import_declaration_cannot_have_modifiers: {
+            code: 1191,
+            category: 1,
+            key: "An import declaration cannot have modifiers."
+        },
+        External_module_0_has_no_default_export_or_export_assignment: {
+            code: 1192,
+            category: 1,
+            key: "External module '{0}' has no default export or export assignment."
+        },
+        An_export_declaration_cannot_have_modifiers: {
+            code: 1193,
+            category: 1,
+            key: "An export declaration cannot have modifiers."
+        },
+        Export_declarations_are_not_permitted_in_an_internal_module: {
+            code: 1194,
+            category: 1,
+            key: "Export declarations are not permitted in an internal module."
+        },
+        Catch_clause_variable_name_must_be_an_identifier: {
+            code: 1195,
+            category: 1,
+            key: "Catch clause variable name must be an identifier."
+        },
+        Catch_clause_variable_cannot_have_a_type_annotation: {
+            code: 1196,
+            category: 1,
+            key: "Catch clause variable cannot have a type annotation."
+        },
+        Catch_clause_variable_cannot_have_an_initializer: {
+            code: 1197,
+            category: 1,
+            key: "Catch clause variable cannot have an initializer."
+        },
+        An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: {
+            code: 1198,
+            category: 1,
+            key: "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive."
+        },
+        Unterminated_Unicode_escape_sequence: {
+            code: 1199,
+            category: 1,
+            key: "Unterminated Unicode escape sequence."
+        },
+        Duplicate_identifier_0: {
+            code: 2300,
+            category: 1,
+            key: "Duplicate identifier '{0}'."
+        },
+        Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: {
+            code: 2301,
+            category: 1,
+            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: 1,
+            key: "Static members cannot reference class type parameters."
+        },
+        Circular_definition_of_import_alias_0: {
+            code: 2303,
+            category: 1,
+            key: "Circular definition of import alias '{0}'."
+        },
+        Cannot_find_name_0: {
+            code: 2304,
+            category: 1,
+            key: "Cannot find name '{0}'."
+        },
+        Module_0_has_no_exported_member_1: {
+            code: 2305,
+            category: 1,
+            key: "Module '{0}' has no exported member '{1}'."
+        },
+        File_0_is_not_an_external_module: {
+            code: 2306,
+            category: 1,
+            key: "File '{0}' is not an external module."
+        },
+        Cannot_find_external_module_0: {
+            code: 2307,
+            category: 1,
+            key: "Cannot find external module '{0}'."
+        },
+        A_module_cannot_have_more_than_one_export_assignment: {
+            code: 2308,
+            category: 1,
+            key: "A module cannot have more than one export assignment."
+        },
+        An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements: {
+            code: 2309,
+            category: 1,
+            key: "An export assignment cannot be used in a module with other exported elements."
+        },
+        Type_0_recursively_references_itself_as_a_base_type: {
+            code: 2310,
+            category: 1,
+            key: "Type '{0}' recursively references itself as a base type."
+        },
+        A_class_may_only_extend_another_class: {
+            code: 2311,
+            category: 1,
+            key: "A class may only extend another class."
+        },
+        An_interface_may_only_extend_a_class_or_another_interface: {
+            code: 2312,
+            category: 1,
+            key: "An interface may only extend a class or another interface."
+        },
+        Constraint_of_a_type_parameter_cannot_reference_any_type_parameter_from_the_same_type_parameter_list: {
+            code: 2313,
+            category: 1,
+            key: "Constraint of a type parameter cannot reference any type parameter from the same type parameter list."
+        },
+        Generic_type_0_requires_1_type_argument_s: {
+            code: 2314,
+            category: 1,
+            key: "Generic type '{0}' requires {1} type argument(s)."
+        },
+        Type_0_is_not_generic: {
+            code: 2315,
+            category: 1,
+            key: "Type '{0}' is not generic."
+        },
+        Global_type_0_must_be_a_class_or_interface_type: {
+            code: 2316,
+            category: 1,
+            key: "Global type '{0}' must be a class or interface type."
+        },
+        Global_type_0_must_have_1_type_parameter_s: {
+            code: 2317,
+            category: 1,
+            key: "Global type '{0}' must have {1} type parameter(s)."
+        },
+        Cannot_find_global_type_0: {
+            code: 2318,
+            category: 1,
+            key: "Cannot find global type '{0}'."
+        },
+        Named_property_0_of_types_1_and_2_are_not_identical: {
+            code: 2319,
+            category: 1,
+            key: "Named property '{0}' of types '{1}' and '{2}' are not identical."
+        },
+        Interface_0_cannot_simultaneously_extend_types_1_and_2: {
+            code: 2320,
+            category: 1,
+            key: "Interface '{0}' cannot simultaneously extend types '{1}' and '{2}'."
+        },
+        Excessive_stack_depth_comparing_types_0_and_1: {
+            code: 2321,
+            category: 1,
+            key: "Excessive stack depth comparing types '{0}' and '{1}'."
+        },
+        Type_0_is_not_assignable_to_type_1: {
+            code: 2322,
+            category: 1,
+            key: "Type '{0}' is not assignable to type '{1}'."
+        },
+        Property_0_is_missing_in_type_1: {
+            code: 2324,
+            category: 1,
+            key: "Property '{0}' is missing in type '{1}'."
+        },
+        Property_0_is_private_in_type_1_but_not_in_type_2: {
+            code: 2325,
+            category: 1,
+            key: "Property '{0}' is private in type '{1}' but not in type '{2}'."
+        },
+        Types_of_property_0_are_incompatible: {
+            code: 2326,
+            category: 1,
+            key: "Types of property '{0}' are incompatible."
+        },
+        Property_0_is_optional_in_type_1_but_required_in_type_2: {
+            code: 2327,
+            category: 1,
+            key: "Property '{0}' is optional in type '{1}' but required in type '{2}'."
+        },
+        Types_of_parameters_0_and_1_are_incompatible: {
+            code: 2328,
+            category: 1,
+            key: "Types of parameters '{0}' and '{1}' are incompatible."
+        },
+        Index_signature_is_missing_in_type_0: {
+            code: 2329,
+            category: 1,
+            key: "Index signature is missing in type '{0}'."
+        },
+        Index_signatures_are_incompatible: {
+            code: 2330,
+            category: 1,
+            key: "Index signatures are incompatible."
+        },
+        this_cannot_be_referenced_in_a_module_body: {
+            code: 2331,
+            category: 1,
+            key: "'this' cannot be referenced in a module body."
+        },
+        this_cannot_be_referenced_in_current_location: {
+            code: 2332,
+            category: 1,
+            key: "'this' cannot be referenced in current location."
+        },
+        this_cannot_be_referenced_in_constructor_arguments: {
+            code: 2333,
+            category: 1,
+            key: "'this' cannot be referenced in constructor arguments."
+        },
+        this_cannot_be_referenced_in_a_static_property_initializer: {
+            code: 2334,
+            category: 1,
+            key: "'this' cannot be referenced in a static property initializer."
+        },
+        super_can_only_be_referenced_in_a_derived_class: {
+            code: 2335,
+            category: 1,
+            key: "'super' can only be referenced in a derived class."
+        },
+        super_cannot_be_referenced_in_constructor_arguments: {
+            code: 2336,
+            category: 1,
+            key: "'super' cannot be referenced in constructor arguments."
+        },
+        Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors: {
+            code: 2337,
+            category: 1,
+            key: "Super calls are not permitted outside constructors or in nested functions inside constructors"
+        },
+        super_property_access_is_permitted_only_in_a_constructor_member_function_or_member_accessor_of_a_derived_class: {
+            code: 2338,
+            category: 1,
+            key: "'super' property access is permitted only in a constructor, member function, or member accessor of a derived class"
+        },
+        Property_0_does_not_exist_on_type_1: {
+            code: 2339,
+            category: 1,
+            key: "Property '{0}' does not exist on type '{1}'."
+        },
+        Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword: {
+            code: 2340,
+            category: 1,
+            key: "Only public and protected methods of the base class are accessible via the 'super' keyword"
+        },
+        Property_0_is_private_and_only_accessible_within_class_1: {
+            code: 2341,
+            category: 1,
+            key: "Property '{0}' is private and only accessible within class '{1}'."
+        },
+        An_index_expression_argument_must_be_of_type_string_number_symbol_or_any: {
+            code: 2342,
+            category: 1,
+            key: "An index expression argument must be of type 'string', 'number', 'symbol, or 'any'."
+        },
+        Type_0_does_not_satisfy_the_constraint_1: {
+            code: 2344,
+            category: 1,
+            key: "Type '{0}' does not satisfy the constraint '{1}'."
+        },
+        Argument_of_type_0_is_not_assignable_to_parameter_of_type_1: {
+            code: 2345,
+            category: 1,
+            key: "Argument of type '{0}' is not assignable to parameter of type '{1}'."
+        },
+        Supplied_parameters_do_not_match_any_signature_of_call_target: {
+            code: 2346,
+            category: 1,
+            key: "Supplied parameters do not match any signature of call target."
+        },
+        Untyped_function_calls_may_not_accept_type_arguments: {
+            code: 2347,
+            category: 1,
+            key: "Untyped function calls may not accept type arguments."
+        },
+        Value_of_type_0_is_not_callable_Did_you_mean_to_include_new: {
+            code: 2348,
+            category: 1,
+            key: "Value of type '{0}' is not callable. Did you mean to include 'new'?"
+        },
+        Cannot_invoke_an_expression_whose_type_lacks_a_call_signature: {
+            code: 2349,
+            category: 1,
+            key: "Cannot invoke an expression whose type lacks a call signature."
+        },
+        Only_a_void_function_can_be_called_with_the_new_keyword: {
+            code: 2350,
+            category: 1,
+            key: "Only a void function can be called with the 'new' keyword."
+        },
+        Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature: {
+            code: 2351,
+            category: 1,
+            key: "Cannot use 'new' with an expression whose type lacks a call or construct signature."
+        },
+        Neither_type_0_nor_type_1_is_assignable_to_the_other: {
+            code: 2352,
+            category: 1,
+            key: "Neither type '{0}' nor type '{1}' is assignable to the other."
+        },
+        No_best_common_type_exists_among_return_expressions: {
+            code: 2354,
+            category: 1,
+            key: "No best common type exists among return expressions."
+        },
+        A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_or_consist_of_a_single_throw_statement: {
+            code: 2355,
+            category: 1,
+            key: "A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement."
+        },
+        An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type: {
+            code: 2356,
+            category: 1,
+            key: "An arithmetic operand must be of type 'any', 'number' or an enum type."
+        },
+        The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer: {
+            code: 2357,
+            category: 1,
+            key: "The operand of an increment or decrement operator must be a variable, property or indexer."
+        },
+        The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: {
+            code: 2358,
+            category: 1,
+            key: "The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter."
+        },
+        The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_Function_interface_type: {
+            code: 2359,
+            category: 1,
+            key: "The right-hand side of an 'instanceof' expression must be of type 'any' or of a type assignable to the 'Function' interface type."
+        },
+        The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol: {
+            code: 2360,
+            category: 1,
+            key: "The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'."
+        },
+        The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: {
+            code: 2361,
+            category: 1,
+            key: "The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter"
+        },
+        The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: {
+            code: 2362,
+            category: 1,
+            key: "The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type."
+        },
+        The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: {
+            code: 2363,
+            category: 1,
+            key: "The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type."
+        },
+        Invalid_left_hand_side_of_assignment_expression: {
+            code: 2364,
+            category: 1,
+            key: "Invalid left-hand side of assignment expression."
+        },
+        Operator_0_cannot_be_applied_to_types_1_and_2: {
+            code: 2365,
+            category: 1,
+            key: "Operator '{0}' cannot be applied to types '{1}' and '{2}'."
+        },
+        Type_parameter_name_cannot_be_0: {
+            code: 2368,
+            category: 1,
+            key: "Type parameter name cannot be '{0}'"
+        },
+        A_parameter_property_is_only_allowed_in_a_constructor_implementation: {
+            code: 2369,
+            category: 1,
+            key: "A parameter property is only allowed in a constructor implementation."
+        },
+        A_rest_parameter_must_be_of_an_array_type: {
+            code: 2370,
+            category: 1,
+            key: "A rest parameter must be of an array type."
+        },
+        A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation: {
+            code: 2371,
+            category: 1,
+            key: "A parameter initializer is only allowed in a function or constructor implementation."
+        },
+        Parameter_0_cannot_be_referenced_in_its_initializer: {
+            code: 2372,
+            category: 1,
+            key: "Parameter '{0}' cannot be referenced in its initializer."
+        },
+        Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it: {
+            code: 2373,
+            category: 1,
+            key: "Initializer of parameter '{0}' cannot reference identifier '{1}' declared after it."
+        },
+        Duplicate_string_index_signature: {
+            code: 2374,
+            category: 1,
+            key: "Duplicate string index signature."
+        },
+        Duplicate_number_index_signature: {
+            code: 2375,
+            category: 1,
+            key: "Duplicate number index signature."
+        },
+        A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_or_has_parameter_properties: {
+            code: 2376,
+            category: 1,
+            key: "A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties."
+        },
+        Constructors_for_derived_classes_must_contain_a_super_call: {
+            code: 2377,
+            category: 1,
+            key: "Constructors for derived classes must contain a 'super' call."
+        },
+        A_get_accessor_must_return_a_value_or_consist_of_a_single_throw_statement: {
+            code: 2378,
+            category: 1,
+            key: "A 'get' accessor must return a value or consist of a single 'throw' statement."
+        },
+        Getter_and_setter_accessors_do_not_agree_in_visibility: {
+            code: 2379,
+            category: 1,
+            key: "Getter and setter accessors do not agree in visibility."
+        },
+        get_and_set_accessor_must_have_the_same_type: {
+            code: 2380,
+            category: 1,
+            key: "'get' and 'set' accessor must have the same type."
+        },
+        A_signature_with_an_implementation_cannot_use_a_string_literal_type: {
+            code: 2381,
+            category: 1,
+            key: "A signature with an implementation cannot use a string literal type."
+        },
+        Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature: {
+            code: 2382,
+            category: 1,
+            key: "Specialized overload signature is not assignable to any non-specialized signature."
+        },
+        Overload_signatures_must_all_be_exported_or_not_exported: {
+            code: 2383,
+            category: 1,
+            key: "Overload signatures must all be exported or not exported."
+        },
+        Overload_signatures_must_all_be_ambient_or_non_ambient: {
+            code: 2384,
+            category: 1,
+            key: "Overload signatures must all be ambient or non-ambient."
+        },
+        Overload_signatures_must_all_be_public_private_or_protected: {
+            code: 2385,
+            category: 1,
+            key: "Overload signatures must all be public, private or protected."
+        },
+        Overload_signatures_must_all_be_optional_or_required: {
+            code: 2386,
+            category: 1,
+            key: "Overload signatures must all be optional or required."
+        },
+        Function_overload_must_be_static: {
+            code: 2387,
+            category: 1,
+            key: "Function overload must be static."
+        },
+        Function_overload_must_not_be_static: {
+            code: 2388,
+            category: 1,
+            key: "Function overload must not be static."
+        },
+        Function_implementation_name_must_be_0: {
+            code: 2389,
+            category: 1,
+            key: "Function implementation name must be '{0}'."
+        },
+        Constructor_implementation_is_missing: {
+            code: 2390,
+            category: 1,
+            key: "Constructor implementation is missing."
+        },
+        Function_implementation_is_missing_or_not_immediately_following_the_declaration: {
+            code: 2391,
+            category: 1,
+            key: "Function implementation is missing or not immediately following the declaration."
+        },
+        Multiple_constructor_implementations_are_not_allowed: {
+            code: 2392,
+            category: 1,
+            key: "Multiple constructor implementations are not allowed."
+        },
+        Duplicate_function_implementation: {
+            code: 2393,
+            category: 1,
+            key: "Duplicate function implementation."
+        },
+        Overload_signature_is_not_compatible_with_function_implementation: {
+            code: 2394,
+            category: 1,
+            key: "Overload signature is not compatible with function implementation."
+        },
+        Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local: {
+            code: 2395,
+            category: 1,
+            key: "Individual declarations in merged declaration {0} must be all exported or all local."
+        },
+        Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters: {
+            code: 2396,
+            category: 1,
+            key: "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters."
+        },
+        Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference: {
+            code: 2399,
+            category: 1,
+            key: "Duplicate identifier '_this'. Compiler uses variable declaration '_this' to capture 'this' reference."
+        },
+        Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference: {
+            code: 2400,
+            category: 1,
+            key: "Expression resolves to variable declaration '_this' that compiler uses to capture 'this' reference."
+        },
+        Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference: {
+            code: 2401,
+            category: 1,
+            key: "Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference."
+        },
+        Expression_resolves_to_super_that_compiler_uses_to_capture_base_class_reference: {
+            code: 2402,
+            category: 1,
+            key: "Expression resolves to '_super' that compiler uses to capture base class reference."
+        },
+        Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2: {
+            code: 2403,
+            category: 1,
+            key: "Subsequent variable declarations must have the same type.  Variable '{0}' must be of type '{1}', but here has type '{2}'."
+        },
+        The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation: {
+            code: 2404,
+            category: 1,
+            key: "The left-hand side of a 'for...in' statement cannot use a type annotation."
+        },
+        The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any: {
+            code: 2405,
+            category: 1,
+            key: "The left-hand side of a 'for...in' statement must be of type 'string' or 'any'."
+        },
+        Invalid_left_hand_side_in_for_in_statement: {
+            code: 2406,
+            category: 1,
+            key: "Invalid left-hand side in 'for...in' statement."
+        },
+        The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter: {
+            code: 2407,
+            category: 1,
+            key: "The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter."
+        },
+        Setters_cannot_return_a_value: {
+            code: 2408,
+            category: 1,
+            key: "Setters cannot return a value."
+        },
+        Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class: {
+            code: 2409,
+            category: 1,
+            key: "Return type of constructor signature must be assignable to the instance type of the class"
+        },
+        All_symbols_within_a_with_block_will_be_resolved_to_any: {
+            code: 2410,
+            category: 1,
+            key: "All symbols within a 'with' block will be resolved to 'any'."
+        },
+        Property_0_of_type_1_is_not_assignable_to_string_index_type_2: {
+            code: 2411,
+            category: 1,
+            key: "Property '{0}' of type '{1}' is not assignable to string index type '{2}'."
+        },
+        Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2: {
+            code: 2412,
+            category: 1,
+            key: "Property '{0}' of type '{1}' is not assignable to numeric index type '{2}'."
+        },
+        Numeric_index_type_0_is_not_assignable_to_string_index_type_1: {
+            code: 2413,
+            category: 1,
+            key: "Numeric index type '{0}' is not assignable to string index type '{1}'."
+        },
+        Class_name_cannot_be_0: {
+            code: 2414,
+            category: 1,
+            key: "Class name cannot be '{0}'"
+        },
+        Class_0_incorrectly_extends_base_class_1: {
+            code: 2415,
+            category: 1,
+            key: "Class '{0}' incorrectly extends base class '{1}'."
+        },
+        Class_static_side_0_incorrectly_extends_base_class_static_side_1: {
+            code: 2417,
+            category: 1,
+            key: "Class static side '{0}' incorrectly extends base class static side '{1}'."
+        },
+        Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0: {
+            code: 2419,
+            category: 1,
+            key: "Type name '{0}' in extends clause does not reference constructor function for '{0}'."
+        },
+        Class_0_incorrectly_implements_interface_1: {
+            code: 2420,
+            category: 1,
+            key: "Class '{0}' incorrectly implements interface '{1}'."
+        },
+        A_class_may_only_implement_another_class_or_interface: {
+            code: 2422,
+            category: 1,
+            key: "A class may only implement another class or interface."
+        },
+        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_accessor: {
+            code: 2423,
+            category: 1,
+            key: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member accessor."
+        },
+        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_property: {
+            code: 2424,
+            category: 1,
+            key: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member property."
+        },
+        Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_function: {
+            code: 2425,
+            category: 1,
+            key: "Class '{0}' defines instance member property '{1}', but extended class '{2}' defines it as instance member function."
+        },
+        Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_function: {
+            code: 2426,
+            category: 1,
+            key: "Class '{0}' defines instance member accessor '{1}', but extended class '{2}' defines it as instance member function."
+        },
+        Interface_name_cannot_be_0: {
+            code: 2427,
+            category: 1,
+            key: "Interface name cannot be '{0}'"
+        },
+        All_declarations_of_an_interface_must_have_identical_type_parameters: {
+            code: 2428,
+            category: 1,
+            key: "All declarations of an interface must have identical type parameters."
+        },
+        Interface_0_incorrectly_extends_interface_1: {
+            code: 2430,
+            category: 1,
+            key: "Interface '{0}' incorrectly extends interface '{1}'."
+        },
+        Enum_name_cannot_be_0: {
+            code: 2431,
+            category: 1,
+            key: "Enum name cannot be '{0}'"
+        },
+        In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enum_element: {
+            code: 2432,
+            category: 1,
+            key: "In an enum with multiple declarations, only one declaration can omit an initializer for its first enum element."
+        },
+        A_module_declaration_cannot_be_in_a_different_file_from_a_class_or_function_with_which_it_is_merged: {
+            code: 2433,
+            category: 1,
+            key: "A module declaration cannot be in a different file from a class or function with which it is merged"
+        },
+        A_module_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged: {
+            code: 2434,
+            category: 1,
+            key: "A module declaration cannot be located prior to a class or function with which it is merged"
+        },
+        Ambient_external_modules_cannot_be_nested_in_other_modules: {
+            code: 2435,
+            category: 1,
+            key: "Ambient external modules cannot be nested in other modules."
+        },
+        Ambient_external_module_declaration_cannot_specify_relative_module_name: {
+            code: 2436,
+            category: 1,
+            key: "Ambient external module declaration cannot specify relative module name."
+        },
+        Module_0_is_hidden_by_a_local_declaration_with_the_same_name: {
+            code: 2437,
+            category: 1,
+            key: "Module '{0}' is hidden by a local declaration with the same name"
+        },
+        Import_name_cannot_be_0: {
+            code: 2438,
+            category: 1,
+            key: "Import name cannot be '{0}'"
+        },
+        Import_or_export_declaration_in_an_ambient_external_module_declaration_cannot_reference_external_module_through_relative_external_module_name: {
+            code: 2439,
+            category: 1,
+            key: "Import or export declaration in an ambient external module declaration cannot reference external module through relative external module name."
+        },
+        Import_declaration_conflicts_with_local_declaration_of_0: {
+            code: 2440,
+            category: 1,
+            key: "Import declaration conflicts with local declaration of '{0}'"
+        },
+        Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_an_external_module: {
+            code: 2441,
+            category: 1,
+            key: "Duplicate identifier '{0}'. Compiler reserves name '{1}' in top level scope of an external module."
+        },
+        Types_have_separate_declarations_of_a_private_property_0: {
+            code: 2442,
+            category: 1,
+            key: "Types have separate declarations of a private property '{0}'."
+        },
+        Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2: {
+            code: 2443,
+            category: 1,
+            key: "Property '{0}' is protected but type '{1}' is not a class derived from '{2}'."
+        },
+        Property_0_is_protected_in_type_1_but_public_in_type_2: {
+            code: 2444,
+            category: 1,
+            key: "Property '{0}' is protected in type '{1}' but public in type '{2}'."
+        },
+        Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses: {
+            code: 2445,
+            category: 1,
+            key: "Property '{0}' is protected and only accessible within class '{1}' and its subclasses."
+        },
+        Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1: {
+            code: 2446,
+            category: 1,
+            key: "Property '{0}' is protected and only accessible through an instance of class '{1}'."
+        },
+        The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead: {
+            code: 2447,
+            category: 1,
+            key: "The '{0}' operator is not allowed for boolean types. Consider using '{1}' instead."
+        },
+        Block_scoped_variable_0_used_before_its_declaration: {
+            code: 2448,
+            category: 1,
+            key: "Block-scoped variable '{0}' used before its declaration."
+        },
+        The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant: {
+            code: 2449,
+            category: 1,
+            key: "The operand of an increment or decrement operator cannot be a constant."
+        },
+        Left_hand_side_of_assignment_expression_cannot_be_a_constant: {
+            code: 2450,
+            category: 1,
+            key: "Left-hand side of assignment expression cannot be a constant."
+        },
+        Cannot_redeclare_block_scoped_variable_0: {
+            code: 2451,
+            category: 1,
+            key: "Cannot redeclare block-scoped variable '{0}'."
+        },
+        An_enum_member_cannot_have_a_numeric_name: {
+            code: 2452,
+            category: 1,
+            key: "An enum member cannot have a numeric name."
+        },
+        The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_type_arguments_explicitly: {
+            code: 2453,
+            category: 1,
+            key: "The type argument for type parameter '{0}' cannot be inferred from the usage. Consider specifying the type arguments explicitly."
+        },
+        Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0: {
+            code: 2455,
+            category: 1,
+            key: "Type argument candidate '{1}' is not a valid type argument because it is not a supertype of candidate '{0}'."
+        },
+        Type_alias_0_circularly_references_itself: {
+            code: 2456,
+            category: 1,
+            key: "Type alias '{0}' circularly references itself."
+        },
+        Type_alias_name_cannot_be_0: {
+            code: 2457,
+            category: 1,
+            key: "Type alias name cannot be '{0}'"
+        },
+        An_AMD_module_cannot_have_multiple_name_assignments: {
+            code: 2458,
+            category: 1,
+            key: "An AMD module cannot have multiple name assignments."
+        },
+        Type_0_has_no_property_1_and_no_string_index_signature: {
+            code: 2459,
+            category: 1,
+            key: "Type '{0}' has no property '{1}' and no string index signature."
+        },
+        Type_0_has_no_property_1: {
+            code: 2460,
+            category: 1,
+            key: "Type '{0}' has no property '{1}'."
+        },
+        Type_0_is_not_an_array_type: {
+            code: 2461,
+            category: 1,
+            key: "Type '{0}' is not an array type."
+        },
+        A_rest_element_must_be_last_in_an_array_destructuring_pattern: {
+            code: 2462,
+            category: 1,
+            key: "A rest element must be last in an array destructuring pattern"
+        },
+        A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature: {
+            code: 2463,
+            category: 1,
+            key: "A binding pattern parameter cannot be optional in an implementation signature."
+        },
+        A_computed_property_name_must_be_of_type_string_number_symbol_or_any: {
+            code: 2464,
+            category: 1,
+            key: "A computed property name must be of type 'string', 'number', 'symbol', or 'any'."
+        },
+        this_cannot_be_referenced_in_a_computed_property_name: {
+            code: 2465,
+            category: 1,
+            key: "'this' cannot be referenced in a computed property name."
+        },
+        super_cannot_be_referenced_in_a_computed_property_name: {
+            code: 2466,
+            category: 1,
+            key: "'super' cannot be referenced in a computed property name."
+        },
+        A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type: {
+            code: 2467,
+            category: 1,
+            key: "A computed property name cannot reference a type parameter from its containing type."
+        },
+        Cannot_find_global_value_0: {
+            code: 2468,
+            category: 1,
+            key: "Cannot find global value '{0}'."
+        },
+        The_0_operator_cannot_be_applied_to_type_symbol: {
+            code: 2469,
+            category: 1,
+            key: "The '{0}' operator cannot be applied to type 'symbol'."
+        },
+        Symbol_reference_does_not_refer_to_the_global_Symbol_constructor_object: {
+            code: 2470,
+            category: 1,
+            key: "'Symbol' reference does not refer to the global Symbol constructor object."
+        },
+        A_computed_property_name_of_the_form_0_must_be_of_type_symbol: {
+            code: 2471,
+            category: 1,
+            key: "A computed property name of the form '{0}' must be of type 'symbol'."
+        },
+        Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_6_and_higher: {
+            code: 2472,
+            category: 1,
+            key: "Spread operator in 'new' expressions is only available when targeting ECMAScript 6 and higher."
+        },
+        Enum_declarations_must_all_be_const_or_non_const: {
+            code: 2473,
+            category: 1,
+            key: "Enum declarations must all be const or non-const."
+        },
+        In_const_enum_declarations_member_initializer_must_be_constant_expression: {
+            code: 2474,
+            category: 1,
+            key: "In 'const' enum declarations member initializer must be constant expression."
+        },
+        const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment: {
+            code: 2475,
+            category: 1,
+            key: "'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment."
+        },
+        A_const_enum_member_can_only_be_accessed_using_a_string_literal: {
+            code: 2476,
+            category: 1,
+            key: "A const enum member can only be accessed using a string literal."
+        },
+        const_enum_member_initializer_was_evaluated_to_a_non_finite_value: {
+            code: 2477,
+            category: 1,
+            key: "'const' enum member initializer was evaluated to a non-finite value."
+        },
+        const_enum_member_initializer_was_evaluated_to_disallowed_value_NaN: {
+            code: 2478,
+            category: 1,
+            key: "'const' enum member initializer was evaluated to disallowed value 'NaN'."
+        },
+        Property_0_does_not_exist_on_const_enum_1: {
+            code: 2479,
+            category: 1,
+            key: "Property '{0}' does not exist on 'const' enum '{1}'."
+        },
+        let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations: {
+            code: 2480,
+            category: 1,
+            key: "'let' is not allowed to be used as a name in 'let' or 'const' declarations."
+        },
+        Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1: {
+            code: 2481,
+            category: 1,
+            key: "Cannot initialize outer scoped variable '{0}' in the same scope as block scoped declaration '{1}'."
+        },
+        The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: {
+            code: 2483,
+            category: 1,
+            key: "The left-hand side of a 'for...of' statement cannot use a type annotation."
+        },
+        Export_declaration_conflicts_with_exported_declaration_of_0: {
+            code: 2484,
+            category: 1,
+            key: "Export declaration conflicts with exported declaration of '{0}'"
+        },
+        The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant: {
+            code: 2485,
+            category: 1,
+            key: "The left-hand side of a 'for...of' statement cannot be a previously defined constant."
+        },
+        The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant: {
+            code: 2486,
+            category: 1,
+            key: "The left-hand side of a 'for...in' statement cannot be a previously defined constant."
+        },
+        Invalid_left_hand_side_in_for_of_statement: {
+            code: 2487,
+            category: 1,
+            key: "Invalid left-hand side in 'for...of' statement."
+        },
+        The_right_hand_side_of_a_for_of_statement_must_have_a_Symbol_iterator_method_that_returns_an_iterator: {
+            code: 2488,
+            category: 1,
+            key: "The right-hand side of a 'for...of' statement must have a '[Symbol.iterator]()' method that returns an iterator."
+        },
+        The_iterator_returned_by_the_right_hand_side_of_a_for_of_statement_must_have_a_next_method: {
+            code: 2489,
+            category: 1,
+            key: "The iterator returned by the right-hand side of a 'for...of' statement must have a 'next()' method."
+        },
+        The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: {
+            code: 2490,
+            category: 1,
+            key: "The type returned by the 'next()' method of an iterator must have a 'value' property."
+        },
+        The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern: {
+            code: 2491,
+            category: 1,
+            key: "The left-hand side of a 'for...in' statement cannot be a destructuring pattern."
+        },
+        Cannot_redeclare_identifier_0_in_catch_clause: {
+            code: 2492,
+            category: 1,
+            key: "Cannot redeclare identifier '{0}' in catch clause"
+        },
+        Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2: {
+            code: 2493,
+            category: 1,
+            key: "Tuple type '{0}' with length '{1}' cannot be assigned to tuple with length '{2}'."
+        },
+        Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher: {
+            code: 2494,
+            category: 1,
+            key: "Using a string in a 'for...of' statement is only supported in ECMAScript 5 and higher."
+        },
+        Type_0_is_not_an_array_type_or_a_string_type: {
+            code: 2461,
+            category: 1,
+            key: "Type '{0}' is not an array type or a string type."
+        },
+        Import_declaration_0_is_using_private_name_1: {
+            code: 4000,
+            category: 1,
+            key: "Import declaration '{0}' is using private name '{1}'."
+        },
+        Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: {
+            code: 4002,
+            category: 1,
+            key: "Type parameter '{0}' of exported class has or is using private name '{1}'."
+        },
+        Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: {
+            code: 4004,
+            category: 1,
+            key: "Type parameter '{0}' of exported interface has or is using private name '{1}'."
+        },
+        Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: {
+            code: 4006,
+            category: 1,
+            key: "Type parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'."
+        },
+        Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: {
+            code: 4008,
+            category: 1,
+            key: "Type parameter '{0}' of call signature from exported interface has or is using private name '{1}'."
+        },
+        Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: {
+            code: 4010,
+            category: 1,
+            key: "Type parameter '{0}' of public static method from exported class has or is using private name '{1}'."
+        },
+        Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: {
+            code: 4012,
+            category: 1,
+            key: "Type parameter '{0}' of public method from exported class has or is using private name '{1}'."
+        },
+        Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: {
+            code: 4014,
+            category: 1,
+            key: "Type parameter '{0}' of method from exported interface has or is using private name '{1}'."
+        },
+        Type_parameter_0_of_exported_function_has_or_is_using_private_name_1: {
+            code: 4016,
+            category: 1,
+            key: "Type parameter '{0}' of exported function has or is using private name '{1}'."
+        },
+        Implements_clause_of_exported_class_0_has_or_is_using_private_name_1: {
+            code: 4019,
+            category: 1,
+            key: "Implements clause of exported class '{0}' has or is using private name '{1}'."
+        },
+        Extends_clause_of_exported_class_0_has_or_is_using_private_name_1: {
+            code: 4020,
+            category: 1,
+            key: "Extends clause of exported class '{0}' has or is using private name '{1}'."
+        },
+        Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1: {
+            code: 4022,
+            category: 1,
+            key: "Extends clause of exported interface '{0}' has or is using private name '{1}'."
+        },
+        Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: {
+            code: 4023,
+            category: 1,
+            key: "Exported variable '{0}' has or is using name '{1}' from external module {2} but cannot be named."
+        },
+        Exported_variable_0_has_or_is_using_name_1_from_private_module_2: {
+            code: 4024,
+            category: 1,
+            key: "Exported variable '{0}' has or is using name '{1}' from private module '{2}'."
+        },
+        Exported_variable_0_has_or_is_using_private_name_1: {
+            code: 4025,
+            category: 1,
+            key: "Exported variable '{0}' has or is using private name '{1}'."
+        },
+        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: {
+            code: 4026,
+            category: 1,
+            key: "Public static property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named."
+        },
+        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: {
+            code: 4027,
+            category: 1,
+            key: "Public static property '{0}' of exported class has or is using name '{1}' from private module '{2}'."
+        },
+        Public_static_property_0_of_exported_class_has_or_is_using_private_name_1: {
+            code: 4028,
+            category: 1,
+            key: "Public static property '{0}' of exported class has or is using private name '{1}'."
+        },
+        Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: {
+            code: 4029,
+            category: 1,
+            key: "Public property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named."
+        },
+        Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: {
+            code: 4030,
+            category: 1,
+            key: "Public property '{0}' of exported class has or is using name '{1}' from private module '{2}'."
+        },
+        Public_property_0_of_exported_class_has_or_is_using_private_name_1: {
+            code: 4031,
+            category: 1,
+            key: "Public property '{0}' of exported class has or is using private name '{1}'."
+        },
+        Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2: {
+            code: 4032,
+            category: 1,
+            key: "Property '{0}' of exported interface has or is using name '{1}' from private module '{2}'."
+        },
+        Property_0_of_exported_interface_has_or_is_using_private_name_1: {
+            code: 4033,
+            category: 1,
+            key: "Property '{0}' of exported interface has or is using private name '{1}'."
+        },
+        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: {
+            code: 4034,
+            category: 1,
+            key: "Parameter '{0}' of public static property setter from exported class has or is using name '{1}' from private module '{2}'."
+        },
+        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1: {
+            code: 4035,
+            category: 1,
+            key: "Parameter '{0}' of public static property setter from exported class has or is using private name '{1}'."
+        },
+        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: {
+            code: 4036,
+            category: 1,
+            key: "Parameter '{0}' of public property setter from exported class has or is using name '{1}' from private module '{2}'."
+        },
+        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1: {
+            code: 4037,
+            category: 1,
+            key: "Parameter '{0}' of public property setter from exported class has or is using private name '{1}'."
+        },
+        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: {
+            code: 4038,
+            category: 1,
+            key: "Return type of public static property getter from exported class has or is using name '{0}' from external module {1} but cannot be named."
+        },
+        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: {
+            code: 4039,
+            category: 1,
+            key: "Return type of public static property getter from exported class has or is using name '{0}' from private module '{1}'."
+        },
+        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0: {
+            code: 4040,
+            category: 1,
+            key: "Return type of public static property getter from exported class has or is using private name '{0}'."
+        },
+        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: {
+            code: 4041,
+            category: 1,
+            key: "Return type of public property getter from exported class has or is using name '{0}' from external module {1} but cannot be named."
+        },
+        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: {
+            code: 4042,
+            category: 1,
+            key: "Return type of public property getter from exported class has or is using name '{0}' from private module '{1}'."
+        },
+        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0: {
+            code: 4043,
+            category: 1,
+            key: "Return type of public property getter from exported class has or is using private name '{0}'."
+        },
+        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: {
+            code: 4044,
+            category: 1,
+            key: "Return type of constructor signature from exported interface has or is using name '{0}' from private module '{1}'."
+        },
+        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0: {
+            code: 4045,
+            category: 1,
+            key: "Return type of constructor signature from exported interface has or is using private name '{0}'."
+        },
+        Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: {
+            code: 4046,
+            category: 1,
+            key: "Return type of call signature from exported interface has or is using name '{0}' from private module '{1}'."
+        },
+        Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0: {
+            code: 4047,
+            category: 1,
+            key: "Return type of call signature from exported interface has or is using private name '{0}'."
+        },
+        Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: {
+            code: 4048,
+            category: 1,
+            key: "Return type of index signature from exported interface has or is using name '{0}' from private module '{1}'."
+        },
+        Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0: {
+            code: 4049,
+            category: 1,
+            key: "Return type of index signature from exported interface has or is using private name '{0}'."
+        },
+        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: {
+            code: 4050,
+            category: 1,
+            key: "Return type of public static method from exported class has or is using name '{0}' from external module {1} but cannot be named."
+        },
+        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: {
+            code: 4051,
+            category: 1,
+            key: "Return type of public static method from exported class has or is using name '{0}' from private module '{1}'."
+        },
+        Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0: {
+            code: 4052,
+            category: 1,
+            key: "Return type of public static method from exported class has or is using private name '{0}'."
+        },
+        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: {
+            code: 4053,
+            category: 1,
+            key: "Return type of public method from exported class has or is using name '{0}' from external module {1} but cannot be named."
+        },
+        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: {
+            code: 4054,
+            category: 1,
+            key: "Return type of public method from exported class has or is using name '{0}' from private module '{1}'."
+        },
+        Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0: {
+            code: 4055,
+            category: 1,
+            key: "Return type of public method from exported class has or is using private name '{0}'."
+        },
+        Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1: {
+            code: 4056,
+            category: 1,
+            key: "Return type of method from exported interface has or is using name '{0}' from private module '{1}'."
+        },
+        Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0: {
+            code: 4057,
+            category: 1,
+            key: "Return type of method from exported interface has or is using private name '{0}'."
+        },
+        Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: {
+            code: 4058,
+            category: 1,
+            key: "Return type of exported function has or is using name '{0}' from external module {1} but cannot be named."
+        },
+        Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1: {
+            code: 4059,
+            category: 1,
+            key: "Return type of exported function has or is using name '{0}' from private module '{1}'."
+        },
+        Return_type_of_exported_function_has_or_is_using_private_name_0: {
+            code: 4060,
+            category: 1,
+            key: "Return type of exported function has or is using private name '{0}'."
+        },
+        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: {
+            code: 4061,
+            category: 1,
+            key: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from external module {2} but cannot be named."
+        },
+        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2: {
+            code: 4062,
+            category: 1,
+            key: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from private module '{2}'."
+        },
+        Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1: {
+            code: 4063,
+            category: 1,
+            key: "Parameter '{0}' of constructor from exported class has or is using private name '{1}'."
+        },
+        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: {
+            code: 4064,
+            category: 1,
+            key: "Parameter '{0}' of constructor signature from exported interface has or is using name '{1}' from private module '{2}'."
+        },
+        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: {
+            code: 4065,
+            category: 1,
+            key: "Parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'."
+        },
+        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: {
+            code: 4066,
+            category: 1,
+            key: "Parameter '{0}' of call signature from exported interface has or is using name '{1}' from private module '{2}'."
+        },
+        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: {
+            code: 4067,
+            category: 1,
+            key: "Parameter '{0}' of call signature from exported interface has or is using private name '{1}'."
+        },
+        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: {
+            code: 4068,
+            category: 1,
+            key: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from external module {2} but cannot be named."
+        },
+        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: {
+            code: 4069,
+            category: 1,
+            key: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from private module '{2}'."
+        },
+        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: {
+            code: 4070,
+            category: 1,
+            key: "Parameter '{0}' of public static method from exported class has or is using private name '{1}'."
+        },
+        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: {
+            code: 4071,
+            category: 1,
+            key: "Parameter '{0}' of public method from exported class has or is using name '{1}' from external module {2} but cannot be named."
+        },
+        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: {
+            code: 4072,
+            category: 1,
+            key: "Parameter '{0}' of public method from exported class has or is using name '{1}' from private module '{2}'."
+        },
+        Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: {
+            code: 4073,
+            category: 1,
+            key: "Parameter '{0}' of public method from exported class has or is using private name '{1}'."
+        },
+        Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2: {
+            code: 4074,
+            category: 1,
+            key: "Parameter '{0}' of method from exported interface has or is using name '{1}' from private module '{2}'."
+        },
+        Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: {
+            code: 4075,
+            category: 1,
+            key: "Parameter '{0}' of method from exported interface has or is using private name '{1}'."
+        },
+        Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: {
+            code: 4076,
+            category: 1,
+            key: "Parameter '{0}' of exported function has or is using name '{1}' from external module {2} but cannot be named."
+        },
+        Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2: {
+            code: 4077,
+            category: 1,
+            key: "Parameter '{0}' of exported function has or is using name '{1}' from private module '{2}'."
+        },
+        Parameter_0_of_exported_function_has_or_is_using_private_name_1: {
+            code: 4078,
+            category: 1,
+            key: "Parameter '{0}' of exported function has or is using private name '{1}'."
+        },
+        Exported_type_alias_0_has_or_is_using_private_name_1: {
+            code: 4081,
+            category: 1,
+            key: "Exported type alias '{0}' has or is using private name '{1}'."
+        },
+        Loop_contains_block_scoped_variable_0_referenced_by_a_function_in_the_loop_This_is_only_supported_in_ECMAScript_6_or_higher: {
+            code: 4091,
+            category: 1,
+            key: "Loop contains block-scoped variable '{0}' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher."
+        },
+        The_current_host_does_not_support_the_0_option: {
+            code: 5001,
+            category: 1,
+            key: "The current host does not support the '{0}' option."
+        },
+        Cannot_find_the_common_subdirectory_path_for_the_input_files: {
+            code: 5009,
+            category: 1,
+            key: "Cannot find the common subdirectory path for the input files."
+        },
+        Cannot_read_file_0_Colon_1: {
+            code: 5012,
+            category: 1,
+            key: "Cannot read file '{0}': {1}"
+        },
+        Unsupported_file_encoding: {
+            code: 5013,
+            category: 1,
+            key: "Unsupported file encoding."
+        },
+        Unknown_compiler_option_0: {
+            code: 5023,
+            category: 1,
+            key: "Unknown compiler option '{0}'."
+        },
+        Compiler_option_0_requires_a_value_of_type_1: {
+            code: 5024,
+            category: 1,
+            key: "Compiler option '{0}' requires a value of type {1}."
+        },
+        Could_not_write_file_0_Colon_1: {
+            code: 5033,
+            category: 1,
+            key: "Could not write file '{0}': {1}"
+        },
+        Option_mapRoot_cannot_be_specified_without_specifying_sourcemap_option: {
+            code: 5038,
+            category: 1,
+            key: "Option 'mapRoot' cannot be specified without specifying 'sourcemap' option."
+        },
+        Option_sourceRoot_cannot_be_specified_without_specifying_sourcemap_option: {
+            code: 5039,
+            category: 1,
+            key: "Option 'sourceRoot' cannot be specified without specifying 'sourcemap' option."
+        },
+        Option_noEmit_cannot_be_specified_with_option_out_or_outDir: {
+            code: 5040,
+            category: 1,
+            key: "Option 'noEmit' cannot be specified with option 'out' or 'outDir'."
+        },
+        Option_noEmit_cannot_be_specified_with_option_declaration: {
+            code: 5041,
+            category: 1,
+            key: "Option 'noEmit' cannot be specified with option 'declaration'."
+        },
+        Option_project_cannot_be_mixed_with_source_files_on_a_command_line: {
+            code: 5042,
+            category: 1,
+            key: "Option 'project' cannot be mixed with source files on a command line."
+        },
+        Concatenate_and_emit_output_to_single_file: {
+            code: 6001,
+            category: 2,
+            key: "Concatenate and emit output to single file."
+        },
+        Generates_corresponding_d_ts_file: {
+            code: 6002,
+            category: 2,
+            key: "Generates corresponding '.d.ts' file."
+        },
+        Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: {
+            code: 6003,
+            category: 2,
+            key: "Specifies the location where debugger should locate map files instead of generated locations."
+        },
+        Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations: {
+            code: 6004,
+            category: 2,
+            key: "Specifies the location where debugger should locate TypeScript files instead of source locations."
+        },
+        Watch_input_files: {
+            code: 6005,
+            category: 2,
+            key: "Watch input files."
+        },
+        Redirect_output_structure_to_the_directory: {
+            code: 6006,
+            category: 2,
+            key: "Redirect output structure to the directory."
+        },
+        Do_not_erase_const_enum_declarations_in_generated_code: {
+            code: 6007,
+            category: 2,
+            key: "Do not erase const enum declarations in generated code."
+        },
+        Do_not_emit_outputs_if_any_type_checking_errors_were_reported: {
+            code: 6008,
+            category: 2,
+            key: "Do not emit outputs if any type checking errors were reported."
+        },
+        Do_not_emit_comments_to_output: {
+            code: 6009,
+            category: 2,
+            key: "Do not emit comments to output."
+        },
+        Do_not_emit_outputs: {
+            code: 6010,
+            category: 2,
+            key: "Do not emit outputs."
+        },
+        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES6_experimental: {
+            code: 6015,
+            category: 2,
+            key: "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES6' (experimental)"
+        },
+        Specify_module_code_generation_Colon_commonjs_or_amd: {
+            code: 6016,
+            category: 2,
+            key: "Specify module code generation: 'commonjs' or 'amd'"
+        },
+        Print_this_message: {
+            code: 6017,
+            category: 2,
+            key: "Print this message."
+        },
+        Print_the_compiler_s_version: {
+            code: 6019,
+            category: 2,
+            key: "Print the compiler's version."
+        },
+        Compile_the_project_in_the_given_directory: {
+            code: 6020,
+            category: 2,
+            key: "Compile the project in the given directory."
+        },
+        Syntax_Colon_0: {
+            code: 6023,
+            category: 2,
+            key: "Syntax: {0}"
+        },
+        options: {
+            code: 6024,
+            category: 2,
+            key: "options"
+        },
+        file: {
+            code: 6025,
+            category: 2,
+            key: "file"
+        },
+        Examples_Colon_0: {
+            code: 6026,
+            category: 2,
+            key: "Examples: {0}"
+        },
+        Options_Colon: {
+            code: 6027,
+            category: 2,
+            key: "Options:"
+        },
+        Version_0: {
+            code: 6029,
+            category: 2,
+            key: "Version {0}"
+        },
+        Insert_command_line_options_and_files_from_a_file: {
+            code: 6030,
+            category: 2,
+            key: "Insert command line options and files from a file."
+        },
+        File_change_detected_Starting_incremental_compilation: {
+            code: 6032,
+            category: 2,
+            key: "File change detected. Starting incremental compilation..."
+        },
+        KIND: {
+            code: 6034,
+            category: 2,
+            key: "KIND"
+        },
+        FILE: {
+            code: 6035,
+            category: 2,
+            key: "FILE"
+        },
+        VERSION: {
+            code: 6036,
+            category: 2,
+            key: "VERSION"
+        },
+        LOCATION: {
+            code: 6037,
+            category: 2,
+            key: "LOCATION"
+        },
+        DIRECTORY: {
+            code: 6038,
+            category: 2,
+            key: "DIRECTORY"
+        },
+        Compilation_complete_Watching_for_file_changes: {
+            code: 6042,
+            category: 2,
+            key: "Compilation complete. Watching for file changes."
+        },
+        Generates_corresponding_map_file: {
+            code: 6043,
+            category: 2,
+            key: "Generates corresponding '.map' file."
+        },
+        Compiler_option_0_expects_an_argument: {
+            code: 6044,
+            category: 1,
+            key: "Compiler option '{0}' expects an argument."
+        },
+        Unterminated_quoted_string_in_response_file_0: {
+            code: 6045,
+            category: 1,
+            key: "Unterminated quoted string in response file '{0}'."
+        },
+        Argument_for_module_option_must_be_commonjs_or_amd: {
+            code: 6046,
+            category: 1,
+            key: "Argument for '--module' option must be 'commonjs' or 'amd'."
+        },
+        Argument_for_target_option_must_be_es3_es5_or_es6: {
+            code: 6047,
+            category: 1,
+            key: "Argument for '--target' option must be 'es3', 'es5', or 'es6'."
+        },
+        Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1: {
+            code: 6048,
+            category: 1,
+            key: "Locale must be of the form <language> or <language>-<territory>. For example '{0}' or '{1}'."
+        },
+        Unsupported_locale_0: {
+            code: 6049,
+            category: 1,
+            key: "Unsupported locale '{0}'."
+        },
+        Unable_to_open_file_0: {
+            code: 6050,
+            category: 1,
+            key: "Unable to open file '{0}'."
+        },
+        Corrupted_locale_file_0: {
+            code: 6051,
+            category: 1,
+            key: "Corrupted locale file {0}."
+        },
+        Raise_error_on_expressions_and_declarations_with_an_implied_any_type: {
+            code: 6052,
+            category: 2,
+            key: "Raise error on expressions and declarations with an implied 'any' type."
+        },
+        File_0_not_found: {
+            code: 6053,
+            category: 1,
+            key: "File '{0}' not found."
+        },
+        File_0_must_have_extension_ts_or_d_ts: {
+            code: 6054,
+            category: 1,
+            key: "File '{0}' must have extension '.ts' or '.d.ts'."
+        },
+        Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures: {
+            code: 6055,
+            category: 2,
+            key: "Suppress noImplicitAny errors for indexing objects lacking index signatures."
+        },
+        Do_not_emit_declarations_for_code_that_has_an_internal_annotation: {
+            code: 6056,
+            category: 2,
+            key: "Do not emit declarations for code that has an '@internal' annotation."
+        },
+        Preserve_new_lines_when_emitting_code: {
+            code: 6057,
+            category: 2,
+            key: "Preserve new-lines when emitting code."
+        },
+        Variable_0_implicitly_has_an_1_type: {
+            code: 7005,
+            category: 1,
+            key: "Variable '{0}' implicitly has an '{1}' type."
+        },
+        Parameter_0_implicitly_has_an_1_type: {
+            code: 7006,
+            category: 1,
+            key: "Parameter '{0}' implicitly has an '{1}' type."
+        },
+        Member_0_implicitly_has_an_1_type: {
+            code: 7008,
+            category: 1,
+            key: "Member '{0}' implicitly has an '{1}' type."
+        },
+        new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type: {
+            code: 7009,
+            category: 1,
+            key: "'new' expression, whose target lacks a construct signature, implicitly has an 'any' type."
+        },
+        _0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type: {
+            code: 7010,
+            category: 1,
+            key: "'{0}', which lacks return-type annotation, implicitly has an '{1}' return type."
+        },
+        Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type: {
+            code: 7011,
+            category: 1,
+            key: "Function expression, which lacks return-type annotation, implicitly has an '{0}' return type."
+        },
+        Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: {
+            code: 7013,
+            category: 1,
+            key: "Construct signature, which lacks return-type annotation, implicitly has an 'any' return type."
+        },
+        Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_type_annotation: {
+            code: 7016,
+            category: 1,
+            key: "Property '{0}' implicitly has type 'any', because its 'set' accessor lacks a type annotation."
+        },
+        Index_signature_of_object_type_implicitly_has_an_any_type: {
+            code: 7017,
+            category: 1,
+            key: "Index signature of object type implicitly has an 'any' type."
+        },
+        Object_literal_s_property_0_implicitly_has_an_1_type: {
+            code: 7018,
+            category: 1,
+            key: "Object literal's property '{0}' implicitly has an '{1}' type."
+        },
+        Rest_parameter_0_implicitly_has_an_any_type: {
+            code: 7019,
+            category: 1,
+            key: "Rest parameter '{0}' implicitly has an 'any[]' type."
+        },
+        Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: {
+            code: 7020,
+            category: 1,
+            key: "Call signature, which lacks return-type annotation, implicitly has an 'any' return type."
+        },
+        _0_implicitly_has_type_any_because_it_is_referenced_directly_or_indirectly_in_its_own_type_annotation: {
+            code: 7021,
+            category: 1,
+            key: "'{0}' implicitly has type 'any' because it is referenced directly or indirectly in its own type annotation."
+        },
+        _0_implicitly_has_type_any_because_it_is_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer: {
+            code: 7022,
+            category: 1,
+            key: "'{0}' implicitly has type 'any' because it is does not have a type annotation and is referenced directly or indirectly in its own initializer."
+        },
+        _0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: {
+            code: 7023,
+            category: 1,
+            key: "'{0}' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions."
+        },
+        Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: {
+            code: 7024,
+            category: 1,
+            key: "Function implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions."
+        },
+        You_cannot_rename_this_element: {
+            code: 8000,
+            category: 1,
+            key: "You cannot rename this element."
+        },
+        You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: {
+            code: 8001,
+            category: 1,
+            key: "You cannot rename elements that are defined in the standard TypeScript library."
+        },
+        yield_expressions_are_not_currently_supported: {
+            code: 9000,
+            category: 1,
+            key: "'yield' expressions are not currently supported."
+        },
+        Generators_are_not_currently_supported: {
+            code: 9001,
+            category: 1,
+            key: "Generators are not currently supported."
+        },
+        The_arguments_object_cannot_be_referenced_in_an_arrow_function_Consider_using_a_standard_function_expression: {
+            code: 9002,
+            category: 1,
+            key: "The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression."
+        }
     };
 })(ts || (ts = {}));
 var ts;
@@ -1461,10 +3425,2806 @@ var ts;
         "|=": 62,
         "^=": 63
     };
-    var unicodeES3IdentifierStart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 543, 546, 563, 592, 685, 688, 696, 699, 705, 720, 721, 736, 740, 750, 750, 890, 890, 902, 902, 904, 906, 908, 908, 910, 929, 931, 974, 976, 983, 986, 1011, 1024, 1153, 1164, 1220, 1223, 1224, 1227, 1228, 1232, 1269, 1272, 1273, 1329, 1366, 1369, 1369, 1377, 1415, 1488, 1514, 1520, 1522, 1569, 1594, 1600, 1610, 1649, 1747, 1749, 1749, 1765, 1766, 1786, 1788, 1808, 1808, 1810, 1836, 1920, 1957, 2309, 2361, 2365, 2365, 2384, 2384, 2392, 2401, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2524, 2525, 2527, 2529, 2544, 2545, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2649, 2652, 2654, 2654, 2674, 2676, 2693, 2699, 2701, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2749, 2749, 2768, 2768, 2784, 2784, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2870, 2873, 2877, 2877, 2908, 2909, 2911, 2913, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 2997, 2999, 3001, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3168, 3169, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3294, 3294, 3296, 3297, 3333, 3340, 3342, 3344, 3346, 3368, 3370, 3385, 3424, 3425, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3585, 3632, 3634, 3635, 3648, 3654, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3760, 3762, 3763, 3773, 3773, 3776, 3780, 3782, 3782, 3804, 3805, 3840, 3840, 3904, 3911, 3913, 3946, 3976, 3979, 4096, 4129, 4131, 4135, 4137, 4138, 4176, 4181, 4256, 4293, 4304, 4342, 4352, 4441, 4447, 4514, 4520, 4601, 4608, 4614, 4616, 4678, 4680, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4742, 4744, 4744, 4746, 4749, 4752, 4782, 4784, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4814, 4816, 4822, 4824, 4846, 4848, 4878, 4880, 4880, 4882, 4885, 4888, 4894, 4896, 4934, 4936, 4954, 5024, 5108, 5121, 5740, 5743, 5750, 5761, 5786, 5792, 5866, 6016, 6067, 6176, 6263, 6272, 6312, 7680, 7835, 7840, 7929, 7936, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8319, 8319, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8497, 8499, 8505, 8544, 8579, 12293, 12295, 12321, 12329, 12337, 12341, 12344, 12346, 12353, 12436, 12445, 12446, 12449, 12538, 12540, 12542, 12549, 12588, 12593, 12686, 12704, 12727, 13312, 19893, 19968, 40869, 40960, 42124, 44032, 55203, 63744, 64045, 64256, 64262, 64275, 64279, 64285, 64285, 64287, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65136, 65138, 65140, 65140, 65142, 65276, 65313, 65338, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500,];
-    var unicodeES3IdentifierPart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 543, 546, 563, 592, 685, 688, 696, 699, 705, 720, 721, 736, 740, 750, 750, 768, 846, 864, 866, 890, 890, 902, 902, 904, 906, 908, 908, 910, 929, 931, 974, 976, 983, 986, 1011, 1024, 1153, 1155, 1158, 1164, 1220, 1223, 1224, 1227, 1228, 1232, 1269, 1272, 1273, 1329, 1366, 1369, 1369, 1377, 1415, 1425, 1441, 1443, 1465, 1467, 1469, 1471, 1471, 1473, 1474, 1476, 1476, 1488, 1514, 1520, 1522, 1569, 1594, 1600, 1621, 1632, 1641, 1648, 1747, 1749, 1756, 1759, 1768, 1770, 1773, 1776, 1788, 1808, 1836, 1840, 1866, 1920, 1968, 2305, 2307, 2309, 2361, 2364, 2381, 2384, 2388, 2392, 2403, 2406, 2415, 2433, 2435, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2492, 2492, 2494, 2500, 2503, 2504, 2507, 2509, 2519, 2519, 2524, 2525, 2527, 2531, 2534, 2545, 2562, 2562, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2620, 2620, 2622, 2626, 2631, 2632, 2635, 2637, 2649, 2652, 2654, 2654, 2662, 2676, 2689, 2691, 2693, 2699, 2701, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2748, 2757, 2759, 2761, 2763, 2765, 2768, 2768, 2784, 2784, 2790, 2799, 2817, 2819, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2870, 2873, 2876, 2883, 2887, 2888, 2891, 2893, 2902, 2903, 2908, 2909, 2911, 2913, 2918, 2927, 2946, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 2997, 2999, 3001, 3006, 3010, 3014, 3016, 3018, 3021, 3031, 3031, 3047, 3055, 3073, 3075, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3134, 3140, 3142, 3144, 3146, 3149, 3157, 3158, 3168, 3169, 3174, 3183, 3202, 3203, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3262, 3268, 3270, 3272, 3274, 3277, 3285, 3286, 3294, 3294, 3296, 3297, 3302, 3311, 3330, 3331, 3333, 3340, 3342, 3344, 3346, 3368, 3370, 3385, 3390, 3395, 3398, 3400, 3402, 3405, 3415, 3415, 3424, 3425, 3430, 3439, 3458, 3459, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3530, 3530, 3535, 3540, 3542, 3542, 3544, 3551, 3570, 3571, 3585, 3642, 3648, 3662, 3664, 3673, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3769, 3771, 3773, 3776, 3780, 3782, 3782, 3784, 3789, 3792, 3801, 3804, 3805, 3840, 3840, 3864, 3865, 3872, 3881, 3893, 3893, 3895, 3895, 3897, 3897, 3902, 3911, 3913, 3946, 3953, 3972, 3974, 3979, 3984, 3991, 3993, 4028, 4038, 4038, 4096, 4129, 4131, 4135, 4137, 4138, 4140, 4146, 4150, 4153, 4160, 4169, 4176, 4185, 4256, 4293, 4304, 4342, 4352, 4441, 4447, 4514, 4520, 4601, 4608, 4614, 4616, 4678, 4680, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4742, 4744, 4744, 4746, 4749, 4752, 4782, 4784, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4814, 4816, 4822, 4824, 4846, 4848, 4878, 4880, 4880, 4882, 4885, 4888, 4894, 4896, 4934, 4936, 4954, 4969, 4977, 5024, 5108, 5121, 5740, 5743, 5750, 5761, 5786, 5792, 5866, 6016, 6099, 6112, 6121, 6160, 6169, 6176, 6263, 6272, 6313, 7680, 7835, 7840, 7929, 7936, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8255, 8256, 8319, 8319, 8400, 8412, 8417, 8417, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8497, 8499, 8505, 8544, 8579, 12293, 12295, 12321, 12335, 12337, 12341, 12344, 12346, 12353, 12436, 12441, 12442, 12445, 12446, 12449, 12542, 12549, 12588, 12593, 12686, 12704, 12727, 13312, 19893, 19968, 40869, 40960, 42124, 44032, 55203, 63744, 64045, 64256, 64262, 64275, 64279, 64285, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65056, 65059, 65075, 65076, 65101, 65103, 65136, 65138, 65140, 65140, 65142, 65276, 65296, 65305, 65313, 65338, 65343, 65343, 65345, 65370, 65381, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500,];
-    var unicodeES5IdentifierStart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 705, 710, 721, 736, 740, 748, 748, 750, 750, 880, 884, 886, 887, 890, 893, 902, 902, 904, 906, 908, 908, 910, 929, 931, 1013, 1015, 1153, 1162, 1319, 1329, 1366, 1369, 1369, 1377, 1415, 1488, 1514, 1520, 1522, 1568, 1610, 1646, 1647, 1649, 1747, 1749, 1749, 1765, 1766, 1774, 1775, 1786, 1788, 1791, 1791, 1808, 1808, 1810, 1839, 1869, 1957, 1969, 1969, 1994, 2026, 2036, 2037, 2042, 2042, 2048, 2069, 2074, 2074, 2084, 2084, 2088, 2088, 2112, 2136, 2208, 2208, 2210, 2220, 2308, 2361, 2365, 2365, 2384, 2384, 2392, 2401, 2417, 2423, 2425, 2431, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2493, 2493, 2510, 2510, 2524, 2525, 2527, 2529, 2544, 2545, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2649, 2652, 2654, 2654, 2674, 2676, 2693, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2749, 2749, 2768, 2768, 2784, 2785, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2869, 2873, 2877, 2877, 2908, 2909, 2911, 2913, 2929, 2929, 2947, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 3001, 3024, 3024, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3133, 3133, 3160, 3161, 3168, 3169, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3261, 3261, 3294, 3294, 3296, 3297, 3313, 3314, 3333, 3340, 3342, 3344, 3346, 3386, 3389, 3389, 3406, 3406, 3424, 3425, 3450, 3455, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3585, 3632, 3634, 3635, 3648, 3654, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3760, 3762, 3763, 3773, 3773, 3776, 3780, 3782, 3782, 3804, 3807, 3840, 3840, 3904, 3911, 3913, 3948, 3976, 3980, 4096, 4138, 4159, 4159, 4176, 4181, 4186, 4189, 4193, 4193, 4197, 4198, 4206, 4208, 4213, 4225, 4238, 4238, 4256, 4293, 4295, 4295, 4301, 4301, 4304, 4346, 4348, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4744, 4746, 4749, 4752, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4822, 4824, 4880, 4882, 4885, 4888, 4954, 4992, 5007, 5024, 5108, 5121, 5740, 5743, 5759, 5761, 5786, 5792, 5866, 5870, 5872, 5888, 5900, 5902, 5905, 5920, 5937, 5952, 5969, 5984, 5996, 5998, 6000, 6016, 6067, 6103, 6103, 6108, 6108, 6176, 6263, 6272, 6312, 6314, 6314, 6320, 6389, 6400, 6428, 6480, 6509, 6512, 6516, 6528, 6571, 6593, 6599, 6656, 6678, 6688, 6740, 6823, 6823, 6917, 6963, 6981, 6987, 7043, 7072, 7086, 7087, 7098, 7141, 7168, 7203, 7245, 7247, 7258, 7293, 7401, 7404, 7406, 7409, 7413, 7414, 7424, 7615, 7680, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8305, 8305, 8319, 8319, 8336, 8348, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8505, 8508, 8511, 8517, 8521, 8526, 8526, 8544, 8584, 11264, 11310, 11312, 11358, 11360, 11492, 11499, 11502, 11506, 11507, 11520, 11557, 11559, 11559, 11565, 11565, 11568, 11623, 11631, 11631, 11648, 11670, 11680, 11686, 11688, 11694, 11696, 11702, 11704, 11710, 11712, 11718, 11720, 11726, 11728, 11734, 11736, 11742, 11823, 11823, 12293, 12295, 12321, 12329, 12337, 12341, 12344, 12348, 12353, 12438, 12445, 12447, 12449, 12538, 12540, 12543, 12549, 12589, 12593, 12686, 12704, 12730, 12784, 12799, 13312, 19893, 19968, 40908, 40960, 42124, 42192, 42237, 42240, 42508, 42512, 42527, 42538, 42539, 42560, 42606, 42623, 42647, 42656, 42735, 42775, 42783, 42786, 42888, 42891, 42894, 42896, 42899, 42912, 42922, 43000, 43009, 43011, 43013, 43015, 43018, 43020, 43042, 43072, 43123, 43138, 43187, 43250, 43255, 43259, 43259, 43274, 43301, 43312, 43334, 43360, 43388, 43396, 43442, 43471, 43471, 43520, 43560, 43584, 43586, 43588, 43595, 43616, 43638, 43642, 43642, 43648, 43695, 43697, 43697, 43701, 43702, 43705, 43709, 43712, 43712, 43714, 43714, 43739, 43741, 43744, 43754, 43762, 43764, 43777, 43782, 43785, 43790, 43793, 43798, 43808, 43814, 43816, 43822, 43968, 44002, 44032, 55203, 55216, 55238, 55243, 55291, 63744, 64109, 64112, 64217, 64256, 64262, 64275, 64279, 64285, 64285, 64287, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65136, 65140, 65142, 65276, 65313, 65338, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500,];
-    var unicodeES5IdentifierPart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 705, 710, 721, 736, 740, 748, 748, 750, 750, 768, 884, 886, 887, 890, 893, 902, 902, 904, 906, 908, 908, 910, 929, 931, 1013, 1015, 1153, 1155, 1159, 1162, 1319, 1329, 1366, 1369, 1369, 1377, 1415, 1425, 1469, 1471, 1471, 1473, 1474, 1476, 1477, 1479, 1479, 1488, 1514, 1520, 1522, 1552, 1562, 1568, 1641, 1646, 1747, 1749, 1756, 1759, 1768, 1770, 1788, 1791, 1791, 1808, 1866, 1869, 1969, 1984, 2037, 2042, 2042, 2048, 2093, 2112, 2139, 2208, 2208, 2210, 2220, 2276, 2302, 2304, 2403, 2406, 2415, 2417, 2423, 2425, 2431, 2433, 2435, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2492, 2500, 2503, 2504, 2507, 2510, 2519, 2519, 2524, 2525, 2527, 2531, 2534, 2545, 2561, 2563, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2620, 2620, 2622, 2626, 2631, 2632, 2635, 2637, 2641, 2641, 2649, 2652, 2654, 2654, 2662, 2677, 2689, 2691, 2693, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2748, 2757, 2759, 2761, 2763, 2765, 2768, 2768, 2784, 2787, 2790, 2799, 2817, 2819, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2869, 2873, 2876, 2884, 2887, 2888, 2891, 2893, 2902, 2903, 2908, 2909, 2911, 2915, 2918, 2927, 2929, 2929, 2946, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 3001, 3006, 3010, 3014, 3016, 3018, 3021, 3024, 3024, 3031, 3031, 3046, 3055, 3073, 3075, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3133, 3140, 3142, 3144, 3146, 3149, 3157, 3158, 3160, 3161, 3168, 3171, 3174, 3183, 3202, 3203, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3260, 3268, 3270, 3272, 3274, 3277, 3285, 3286, 3294, 3294, 3296, 3299, 3302, 3311, 3313, 3314, 3330, 3331, 3333, 3340, 3342, 3344, 3346, 3386, 3389, 3396, 3398, 3400, 3402, 3406, 3415, 3415, 3424, 3427, 3430, 3439, 3450, 3455, 3458, 3459, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3530, 3530, 3535, 3540, 3542, 3542, 3544, 3551, 3570, 3571, 3585, 3642, 3648, 3662, 3664, 3673, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3769, 3771, 3773, 3776, 3780, 3782, 3782, 3784, 3789, 3792, 3801, 3804, 3807, 3840, 3840, 3864, 3865, 3872, 3881, 3893, 3893, 3895, 3895, 3897, 3897, 3902, 3911, 3913, 3948, 3953, 3972, 3974, 3991, 3993, 4028, 4038, 4038, 4096, 4169, 4176, 4253, 4256, 4293, 4295, 4295, 4301, 4301, 4304, 4346, 4348, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4744, 4746, 4749, 4752, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4822, 4824, 4880, 4882, 4885, 4888, 4954, 4957, 4959, 4992, 5007, 5024, 5108, 5121, 5740, 5743, 5759, 5761, 5786, 5792, 5866, 5870, 5872, 5888, 5900, 5902, 5908, 5920, 5940, 5952, 5971, 5984, 5996, 5998, 6000, 6002, 6003, 6016, 6099, 6103, 6103, 6108, 6109, 6112, 6121, 6155, 6157, 6160, 6169, 6176, 6263, 6272, 6314, 6320, 6389, 6400, 6428, 6432, 6443, 6448, 6459, 6470, 6509, 6512, 6516, 6528, 6571, 6576, 6601, 6608, 6617, 6656, 6683, 6688, 6750, 6752, 6780, 6783, 6793, 6800, 6809, 6823, 6823, 6912, 6987, 6992, 7001, 7019, 7027, 7040, 7155, 7168, 7223, 7232, 7241, 7245, 7293, 7376, 7378, 7380, 7414, 7424, 7654, 7676, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8204, 8205, 8255, 8256, 8276, 8276, 8305, 8305, 8319, 8319, 8336, 8348, 8400, 8412, 8417, 8417, 8421, 8432, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8505, 8508, 8511, 8517, 8521, 8526, 8526, 8544, 8584, 11264, 11310, 11312, 11358, 11360, 11492, 11499, 11507, 11520, 11557, 11559, 11559, 11565, 11565, 11568, 11623, 11631, 11631, 11647, 11670, 11680, 11686, 11688, 11694, 11696, 11702, 11704, 11710, 11712, 11718, 11720, 11726, 11728, 11734, 11736, 11742, 11744, 11775, 11823, 11823, 12293, 12295, 12321, 12335, 12337, 12341, 12344, 12348, 12353, 12438, 12441, 12442, 12445, 12447, 12449, 12538, 12540, 12543, 12549, 12589, 12593, 12686, 12704, 12730, 12784, 12799, 13312, 19893, 19968, 40908, 40960, 42124, 42192, 42237, 42240, 42508, 42512, 42539, 42560, 42607, 42612, 42621, 42623, 42647, 42655, 42737, 42775, 42783, 42786, 42888, 42891, 42894, 42896, 42899, 42912, 42922, 43000, 43047, 43072, 43123, 43136, 43204, 43216, 43225, 43232, 43255, 43259, 43259, 43264, 43309, 43312, 43347, 43360, 43388, 43392, 43456, 43471, 43481, 43520, 43574, 43584, 43597, 43600, 43609, 43616, 43638, 43642, 43643, 43648, 43714, 43739, 43741, 43744, 43759, 43762, 43766, 43777, 43782, 43785, 43790, 43793, 43798, 43808, 43814, 43816, 43822, 43968, 44010, 44012, 44013, 44016, 44025, 44032, 55203, 55216, 55238, 55243, 55291, 63744, 64109, 64112, 64217, 64256, 64262, 64275, 64279, 64285, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65024, 65039, 65056, 65062, 65075, 65076, 65101, 65103, 65136, 65140, 65142, 65276, 65296, 65305, 65313, 65338, 65343, 65343, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500,];
+    var unicodeES3IdentifierStart = [
+        170,
+        170,
+        181,
+        181,
+        186,
+        186,
+        192,
+        214,
+        216,
+        246,
+        248,
+        543,
+        546,
+        563,
+        592,
+        685,
+        688,
+        696,
+        699,
+        705,
+        720,
+        721,
+        736,
+        740,
+        750,
+        750,
+        890,
+        890,
+        902,
+        902,
+        904,
+        906,
+        908,
+        908,
+        910,
+        929,
+        931,
+        974,
+        976,
+        983,
+        986,
+        1011,
+        1024,
+        1153,
+        1164,
+        1220,
+        1223,
+        1224,
+        1227,
+        1228,
+        1232,
+        1269,
+        1272,
+        1273,
+        1329,
+        1366,
+        1369,
+        1369,
+        1377,
+        1415,
+        1488,
+        1514,
+        1520,
+        1522,
+        1569,
+        1594,
+        1600,
+        1610,
+        1649,
+        1747,
+        1749,
+        1749,
+        1765,
+        1766,
+        1786,
+        1788,
+        1808,
+        1808,
+        1810,
+        1836,
+        1920,
+        1957,
+        2309,
+        2361,
+        2365,
+        2365,
+        2384,
+        2384,
+        2392,
+        2401,
+        2437,
+        2444,
+        2447,
+        2448,
+        2451,
+        2472,
+        2474,
+        2480,
+        2482,
+        2482,
+        2486,
+        2489,
+        2524,
+        2525,
+        2527,
+        2529,
+        2544,
+        2545,
+        2565,
+        2570,
+        2575,
+        2576,
+        2579,
+        2600,
+        2602,
+        2608,
+        2610,
+        2611,
+        2613,
+        2614,
+        2616,
+        2617,
+        2649,
+        2652,
+        2654,
+        2654,
+        2674,
+        2676,
+        2693,
+        2699,
+        2701,
+        2701,
+        2703,
+        2705,
+        2707,
+        2728,
+        2730,
+        2736,
+        2738,
+        2739,
+        2741,
+        2745,
+        2749,
+        2749,
+        2768,
+        2768,
+        2784,
+        2784,
+        2821,
+        2828,
+        2831,
+        2832,
+        2835,
+        2856,
+        2858,
+        2864,
+        2866,
+        2867,
+        2870,
+        2873,
+        2877,
+        2877,
+        2908,
+        2909,
+        2911,
+        2913,
+        2949,
+        2954,
+        2958,
+        2960,
+        2962,
+        2965,
+        2969,
+        2970,
+        2972,
+        2972,
+        2974,
+        2975,
+        2979,
+        2980,
+        2984,
+        2986,
+        2990,
+        2997,
+        2999,
+        3001,
+        3077,
+        3084,
+        3086,
+        3088,
+        3090,
+        3112,
+        3114,
+        3123,
+        3125,
+        3129,
+        3168,
+        3169,
+        3205,
+        3212,
+        3214,
+        3216,
+        3218,
+        3240,
+        3242,
+        3251,
+        3253,
+        3257,
+        3294,
+        3294,
+        3296,
+        3297,
+        3333,
+        3340,
+        3342,
+        3344,
+        3346,
+        3368,
+        3370,
+        3385,
+        3424,
+        3425,
+        3461,
+        3478,
+        3482,
+        3505,
+        3507,
+        3515,
+        3517,
+        3517,
+        3520,
+        3526,
+        3585,
+        3632,
+        3634,
+        3635,
+        3648,
+        3654,
+        3713,
+        3714,
+        3716,
+        3716,
+        3719,
+        3720,
+        3722,
+        3722,
+        3725,
+        3725,
+        3732,
+        3735,
+        3737,
+        3743,
+        3745,
+        3747,
+        3749,
+        3749,
+        3751,
+        3751,
+        3754,
+        3755,
+        3757,
+        3760,
+        3762,
+        3763,
+        3773,
+        3773,
+        3776,
+        3780,
+        3782,
+        3782,
+        3804,
+        3805,
+        3840,
+        3840,
+        3904,
+        3911,
+        3913,
+        3946,
+        3976,
+        3979,
+        4096,
+        4129,
+        4131,
+        4135,
+        4137,
+        4138,
+        4176,
+        4181,
+        4256,
+        4293,
+        4304,
+        4342,
+        4352,
+        4441,
+        4447,
+        4514,
+        4520,
+        4601,
+        4608,
+        4614,
+        4616,
+        4678,
+        4680,
+        4680,
+        4682,
+        4685,
+        4688,
+        4694,
+        4696,
+        4696,
+        4698,
+        4701,
+        4704,
+        4742,
+        4744,
+        4744,
+        4746,
+        4749,
+        4752,
+        4782,
+        4784,
+        4784,
+        4786,
+        4789,
+        4792,
+        4798,
+        4800,
+        4800,
+        4802,
+        4805,
+        4808,
+        4814,
+        4816,
+        4822,
+        4824,
+        4846,
+        4848,
+        4878,
+        4880,
+        4880,
+        4882,
+        4885,
+        4888,
+        4894,
+        4896,
+        4934,
+        4936,
+        4954,
+        5024,
+        5108,
+        5121,
+        5740,
+        5743,
+        5750,
+        5761,
+        5786,
+        5792,
+        5866,
+        6016,
+        6067,
+        6176,
+        6263,
+        6272,
+        6312,
+        7680,
+        7835,
+        7840,
+        7929,
+        7936,
+        7957,
+        7960,
+        7965,
+        7968,
+        8005,
+        8008,
+        8013,
+        8016,
+        8023,
+        8025,
+        8025,
+        8027,
+        8027,
+        8029,
+        8029,
+        8031,
+        8061,
+        8064,
+        8116,
+        8118,
+        8124,
+        8126,
+        8126,
+        8130,
+        8132,
+        8134,
+        8140,
+        8144,
+        8147,
+        8150,
+        8155,
+        8160,
+        8172,
+        8178,
+        8180,
+        8182,
+        8188,
+        8319,
+        8319,
+        8450,
+        8450,
+        8455,
+        8455,
+        8458,
+        8467,
+        8469,
+        8469,
+        8473,
+        8477,
+        8484,
+        8484,
+        8486,
+        8486,
+        8488,
+        8488,
+        8490,
+        8493,
+        8495,
+        8497,
+        8499,
+        8505,
+        8544,
+        8579,
+        12293,
+        12295,
+        12321,
+        12329,
+        12337,
+        12341,
+        12344,
+        12346,
+        12353,
+        12436,
+        12445,
+        12446,
+        12449,
+        12538,
+        12540,
+        12542,
+        12549,
+        12588,
+        12593,
+        12686,
+        12704,
+        12727,
+        13312,
+        19893,
+        19968,
+        40869,
+        40960,
+        42124,
+        44032,
+        55203,
+        63744,
+        64045,
+        64256,
+        64262,
+        64275,
+        64279,
+        64285,
+        64285,
+        64287,
+        64296,
+        64298,
+        64310,
+        64312,
+        64316,
+        64318,
+        64318,
+        64320,
+        64321,
+        64323,
+        64324,
+        64326,
+        64433,
+        64467,
+        64829,
+        64848,
+        64911,
+        64914,
+        64967,
+        65008,
+        65019,
+        65136,
+        65138,
+        65140,
+        65140,
+        65142,
+        65276,
+        65313,
+        65338,
+        65345,
+        65370,
+        65382,
+        65470,
+        65474,
+        65479,
+        65482,
+        65487,
+        65490,
+        65495,
+        65498,
+        65500,
+    ];
+    var unicodeES3IdentifierPart = [
+        170,
+        170,
+        181,
+        181,
+        186,
+        186,
+        192,
+        214,
+        216,
+        246,
+        248,
+        543,
+        546,
+        563,
+        592,
+        685,
+        688,
+        696,
+        699,
+        705,
+        720,
+        721,
+        736,
+        740,
+        750,
+        750,
+        768,
+        846,
+        864,
+        866,
+        890,
+        890,
+        902,
+        902,
+        904,
+        906,
+        908,
+        908,
+        910,
+        929,
+        931,
+        974,
+        976,
+        983,
+        986,
+        1011,
+        1024,
+        1153,
+        1155,
+        1158,
+        1164,
+        1220,
+        1223,
+        1224,
+        1227,
+        1228,
+        1232,
+        1269,
+        1272,
+        1273,
+        1329,
+        1366,
+        1369,
+        1369,
+        1377,
+        1415,
+        1425,
+        1441,
+        1443,
+        1465,
+        1467,
+        1469,
+        1471,
+        1471,
+        1473,
+        1474,
+        1476,
+        1476,
+        1488,
+        1514,
+        1520,
+        1522,
+        1569,
+        1594,
+        1600,
+        1621,
+        1632,
+        1641,
+        1648,
+        1747,
+        1749,
+        1756,
+        1759,
+        1768,
+        1770,
+        1773,
+        1776,
+        1788,
+        1808,
+        1836,
+        1840,
+        1866,
+        1920,
+        1968,
+        2305,
+        2307,
+        2309,
+        2361,
+        2364,
+        2381,
+        2384,
+        2388,
+        2392,
+        2403,
+        2406,
+        2415,
+        2433,
+        2435,
+        2437,
+        2444,
+        2447,
+        2448,
+        2451,
+        2472,
+        2474,
+        2480,
+        2482,
+        2482,
+        2486,
+        2489,
+        2492,
+        2492,
+        2494,
+        2500,
+        2503,
+        2504,
+        2507,
+        2509,
+        2519,
+        2519,
+        2524,
+        2525,
+        2527,
+        2531,
+        2534,
+        2545,
+        2562,
+        2562,
+        2565,
+        2570,
+        2575,
+        2576,
+        2579,
+        2600,
+        2602,
+        2608,
+        2610,
+        2611,
+        2613,
+        2614,
+        2616,
+        2617,
+        2620,
+        2620,
+        2622,
+        2626,
+        2631,
+        2632,
+        2635,
+        2637,
+        2649,
+        2652,
+        2654,
+        2654,
+        2662,
+        2676,
+        2689,
+        2691,
+        2693,
+        2699,
+        2701,
+        2701,
+        2703,
+        2705,
+        2707,
+        2728,
+        2730,
+        2736,
+        2738,
+        2739,
+        2741,
+        2745,
+        2748,
+        2757,
+        2759,
+        2761,
+        2763,
+        2765,
+        2768,
+        2768,
+        2784,
+        2784,
+        2790,
+        2799,
+        2817,
+        2819,
+        2821,
+        2828,
+        2831,
+        2832,
+        2835,
+        2856,
+        2858,
+        2864,
+        2866,
+        2867,
+        2870,
+        2873,
+        2876,
+        2883,
+        2887,
+        2888,
+        2891,
+        2893,
+        2902,
+        2903,
+        2908,
+        2909,
+        2911,
+        2913,
+        2918,
+        2927,
+        2946,
+        2947,
+        2949,
+        2954,
+        2958,
+        2960,
+        2962,
+        2965,
+        2969,
+        2970,
+        2972,
+        2972,
+        2974,
+        2975,
+        2979,
+        2980,
+        2984,
+        2986,
+        2990,
+        2997,
+        2999,
+        3001,
+        3006,
+        3010,
+        3014,
+        3016,
+        3018,
+        3021,
+        3031,
+        3031,
+        3047,
+        3055,
+        3073,
+        3075,
+        3077,
+        3084,
+        3086,
+        3088,
+        3090,
+        3112,
+        3114,
+        3123,
+        3125,
+        3129,
+        3134,
+        3140,
+        3142,
+        3144,
+        3146,
+        3149,
+        3157,
+        3158,
+        3168,
+        3169,
+        3174,
+        3183,
+        3202,
+        3203,
+        3205,
+        3212,
+        3214,
+        3216,
+        3218,
+        3240,
+        3242,
+        3251,
+        3253,
+        3257,
+        3262,
+        3268,
+        3270,
+        3272,
+        3274,
+        3277,
+        3285,
+        3286,
+        3294,
+        3294,
+        3296,
+        3297,
+        3302,
+        3311,
+        3330,
+        3331,
+        3333,
+        3340,
+        3342,
+        3344,
+        3346,
+        3368,
+        3370,
+        3385,
+        3390,
+        3395,
+        3398,
+        3400,
+        3402,
+        3405,
+        3415,
+        3415,
+        3424,
+        3425,
+        3430,
+        3439,
+        3458,
+        3459,
+        3461,
+        3478,
+        3482,
+        3505,
+        3507,
+        3515,
+        3517,
+        3517,
+        3520,
+        3526,
+        3530,
+        3530,
+        3535,
+        3540,
+        3542,
+        3542,
+        3544,
+        3551,
+        3570,
+        3571,
+        3585,
+        3642,
+        3648,
+        3662,
+        3664,
+        3673,
+        3713,
+        3714,
+        3716,
+        3716,
+        3719,
+        3720,
+        3722,
+        3722,
+        3725,
+        3725,
+        3732,
+        3735,
+        3737,
+        3743,
+        3745,
+        3747,
+        3749,
+        3749,
+        3751,
+        3751,
+        3754,
+        3755,
+        3757,
+        3769,
+        3771,
+        3773,
+        3776,
+        3780,
+        3782,
+        3782,
+        3784,
+        3789,
+        3792,
+        3801,
+        3804,
+        3805,
+        3840,
+        3840,
+        3864,
+        3865,
+        3872,
+        3881,
+        3893,
+        3893,
+        3895,
+        3895,
+        3897,
+        3897,
+        3902,
+        3911,
+        3913,
+        3946,
+        3953,
+        3972,
+        3974,
+        3979,
+        3984,
+        3991,
+        3993,
+        4028,
+        4038,
+        4038,
+        4096,
+        4129,
+        4131,
+        4135,
+        4137,
+        4138,
+        4140,
+        4146,
+        4150,
+        4153,
+        4160,
+        4169,
+        4176,
+        4185,
+        4256,
+        4293,
+        4304,
+        4342,
+        4352,
+        4441,
+        4447,
+        4514,
+        4520,
+        4601,
+        4608,
+        4614,
+        4616,
+        4678,
+        4680,
+        4680,
+        4682,
+        4685,
+        4688,
+        4694,
+        4696,
+        4696,
+        4698,
+        4701,
+        4704,
+        4742,
+        4744,
+        4744,
+        4746,
+        4749,
+        4752,
+        4782,
+        4784,
+        4784,
+        4786,
+        4789,
+        4792,
+        4798,
+        4800,
+        4800,
+        4802,
+        4805,
+        4808,
+        4814,
+        4816,
+        4822,
+        4824,
+        4846,
+        4848,
+        4878,
+        4880,
+        4880,
+        4882,
+        4885,
+        4888,
+        4894,
+        4896,
+        4934,
+        4936,
+        4954,
+        4969,
+        4977,
+        5024,
+        5108,
+        5121,
+        5740,
+        5743,
+        5750,
+        5761,
+        5786,
+        5792,
+        5866,
+        6016,
+        6099,
+        6112,
+        6121,
+        6160,
+        6169,
+        6176,
+        6263,
+        6272,
+        6313,
+        7680,
+        7835,
+        7840,
+        7929,
+        7936,
+        7957,
+        7960,
+        7965,
+        7968,
+        8005,
+        8008,
+        8013,
+        8016,
+        8023,
+        8025,
+        8025,
+        8027,
+        8027,
+        8029,
+        8029,
+        8031,
+        8061,
+        8064,
+        8116,
+        8118,
+        8124,
+        8126,
+        8126,
+        8130,
+        8132,
+        8134,
+        8140,
+        8144,
+        8147,
+        8150,
+        8155,
+        8160,
+        8172,
+        8178,
+        8180,
+        8182,
+        8188,
+        8255,
+        8256,
+        8319,
+        8319,
+        8400,
+        8412,
+        8417,
+        8417,
+        8450,
+        8450,
+        8455,
+        8455,
+        8458,
+        8467,
+        8469,
+        8469,
+        8473,
+        8477,
+        8484,
+        8484,
+        8486,
+        8486,
+        8488,
+        8488,
+        8490,
+        8493,
+        8495,
+        8497,
+        8499,
+        8505,
+        8544,
+        8579,
+        12293,
+        12295,
+        12321,
+        12335,
+        12337,
+        12341,
+        12344,
+        12346,
+        12353,
+        12436,
+        12441,
+        12442,
+        12445,
+        12446,
+        12449,
+        12542,
+        12549,
+        12588,
+        12593,
+        12686,
+        12704,
+        12727,
+        13312,
+        19893,
+        19968,
+        40869,
+        40960,
+        42124,
+        44032,
+        55203,
+        63744,
+        64045,
+        64256,
+        64262,
+        64275,
+        64279,
+        64285,
+        64296,
+        64298,
+        64310,
+        64312,
+        64316,
+        64318,
+        64318,
+        64320,
+        64321,
+        64323,
+        64324,
+        64326,
+        64433,
+        64467,
+        64829,
+        64848,
+        64911,
+        64914,
+        64967,
+        65008,
+        65019,
+        65056,
+        65059,
+        65075,
+        65076,
+        65101,
+        65103,
+        65136,
+        65138,
+        65140,
+        65140,
+        65142,
+        65276,
+        65296,
+        65305,
+        65313,
+        65338,
+        65343,
+        65343,
+        65345,
+        65370,
+        65381,
+        65470,
+        65474,
+        65479,
+        65482,
+        65487,
+        65490,
+        65495,
+        65498,
+        65500,
+    ];
+    var unicodeES5IdentifierStart = [
+        170,
+        170,
+        181,
+        181,
+        186,
+        186,
+        192,
+        214,
+        216,
+        246,
+        248,
+        705,
+        710,
+        721,
+        736,
+        740,
+        748,
+        748,
+        750,
+        750,
+        880,
+        884,
+        886,
+        887,
+        890,
+        893,
+        902,
+        902,
+        904,
+        906,
+        908,
+        908,
+        910,
+        929,
+        931,
+        1013,
+        1015,
+        1153,
+        1162,
+        1319,
+        1329,
+        1366,
+        1369,
+        1369,
+        1377,
+        1415,
+        1488,
+        1514,
+        1520,
+        1522,
+        1568,
+        1610,
+        1646,
+        1647,
+        1649,
+        1747,
+        1749,
+        1749,
+        1765,
+        1766,
+        1774,
+        1775,
+        1786,
+        1788,
+        1791,
+        1791,
+        1808,
+        1808,
+        1810,
+        1839,
+        1869,
+        1957,
+        1969,
+        1969,
+        1994,
+        2026,
+        2036,
+        2037,
+        2042,
+        2042,
+        2048,
+        2069,
+        2074,
+        2074,
+        2084,
+        2084,
+        2088,
+        2088,
+        2112,
+        2136,
+        2208,
+        2208,
+        2210,
+        2220,
+        2308,
+        2361,
+        2365,
+        2365,
+        2384,
+        2384,
+        2392,
+        2401,
+        2417,
+        2423,
+        2425,
+        2431,
+        2437,
+        2444,
+        2447,
+        2448,
+        2451,
+        2472,
+        2474,
+        2480,
+        2482,
+        2482,
+        2486,
+        2489,
+        2493,
+        2493,
+        2510,
+        2510,
+        2524,
+        2525,
+        2527,
+        2529,
+        2544,
+        2545,
+        2565,
+        2570,
+        2575,
+        2576,
+        2579,
+        2600,
+        2602,
+        2608,
+        2610,
+        2611,
+        2613,
+        2614,
+        2616,
+        2617,
+        2649,
+        2652,
+        2654,
+        2654,
+        2674,
+        2676,
+        2693,
+        2701,
+        2703,
+        2705,
+        2707,
+        2728,
+        2730,
+        2736,
+        2738,
+        2739,
+        2741,
+        2745,
+        2749,
+        2749,
+        2768,
+        2768,
+        2784,
+        2785,
+        2821,
+        2828,
+        2831,
+        2832,
+        2835,
+        2856,
+        2858,
+        2864,
+        2866,
+        2867,
+        2869,
+        2873,
+        2877,
+        2877,
+        2908,
+        2909,
+        2911,
+        2913,
+        2929,
+        2929,
+        2947,
+        2947,
+        2949,
+        2954,
+        2958,
+        2960,
+        2962,
+        2965,
+        2969,
+        2970,
+        2972,
+        2972,
+        2974,
+        2975,
+        2979,
+        2980,
+        2984,
+        2986,
+        2990,
+        3001,
+        3024,
+        3024,
+        3077,
+        3084,
+        3086,
+        3088,
+        3090,
+        3112,
+        3114,
+        3123,
+        3125,
+        3129,
+        3133,
+        3133,
+        3160,
+        3161,
+        3168,
+        3169,
+        3205,
+        3212,
+        3214,
+        3216,
+        3218,
+        3240,
+        3242,
+        3251,
+        3253,
+        3257,
+        3261,
+        3261,
+        3294,
+        3294,
+        3296,
+        3297,
+        3313,
+        3314,
+        3333,
+        3340,
+        3342,
+        3344,
+        3346,
+        3386,
+        3389,
+        3389,
+        3406,
+        3406,
+        3424,
+        3425,
+        3450,
+        3455,
+        3461,
+        3478,
+        3482,
+        3505,
+        3507,
+        3515,
+        3517,
+        3517,
+        3520,
+        3526,
+        3585,
+        3632,
+        3634,
+        3635,
+        3648,
+        3654,
+        3713,
+        3714,
+        3716,
+        3716,
+        3719,
+        3720,
+        3722,
+        3722,
+        3725,
+        3725,
+        3732,
+        3735,
+        3737,
+        3743,
+        3745,
+        3747,
+        3749,
+        3749,
+        3751,
+        3751,
+        3754,
+        3755,
+        3757,
+        3760,
+        3762,
+        3763,
+        3773,
+        3773,
+        3776,
+        3780,
+        3782,
+        3782,
+        3804,
+        3807,
+        3840,
+        3840,
+        3904,
+        3911,
+        3913,
+        3948,
+        3976,
+        3980,
+        4096,
+        4138,
+        4159,
+        4159,
+        4176,
+        4181,
+        4186,
+        4189,
+        4193,
+        4193,
+        4197,
+        4198,
+        4206,
+        4208,
+        4213,
+        4225,
+        4238,
+        4238,
+        4256,
+        4293,
+        4295,
+        4295,
+        4301,
+        4301,
+        4304,
+        4346,
+        4348,
+        4680,
+        4682,
+        4685,
+        4688,
+        4694,
+        4696,
+        4696,
+        4698,
+        4701,
+        4704,
+        4744,
+        4746,
+        4749,
+        4752,
+        4784,
+        4786,
+        4789,
+        4792,
+        4798,
+        4800,
+        4800,
+        4802,
+        4805,
+        4808,
+        4822,
+        4824,
+        4880,
+        4882,
+        4885,
+        4888,
+        4954,
+        4992,
+        5007,
+        5024,
+        5108,
+        5121,
+        5740,
+        5743,
+        5759,
+        5761,
+        5786,
+        5792,
+        5866,
+        5870,
+        5872,
+        5888,
+        5900,
+        5902,
+        5905,
+        5920,
+        5937,
+        5952,
+        5969,
+        5984,
+        5996,
+        5998,
+        6000,
+        6016,
+        6067,
+        6103,
+        6103,
+        6108,
+        6108,
+        6176,
+        6263,
+        6272,
+        6312,
+        6314,
+        6314,
+        6320,
+        6389,
+        6400,
+        6428,
+        6480,
+        6509,
+        6512,
+        6516,
+        6528,
+        6571,
+        6593,
+        6599,
+        6656,
+        6678,
+        6688,
+        6740,
+        6823,
+        6823,
+        6917,
+        6963,
+        6981,
+        6987,
+        7043,
+        7072,
+        7086,
+        7087,
+        7098,
+        7141,
+        7168,
+        7203,
+        7245,
+        7247,
+        7258,
+        7293,
+        7401,
+        7404,
+        7406,
+        7409,
+        7413,
+        7414,
+        7424,
+        7615,
+        7680,
+        7957,
+        7960,
+        7965,
+        7968,
+        8005,
+        8008,
+        8013,
+        8016,
+        8023,
+        8025,
+        8025,
+        8027,
+        8027,
+        8029,
+        8029,
+        8031,
+        8061,
+        8064,
+        8116,
+        8118,
+        8124,
+        8126,
+        8126,
+        8130,
+        8132,
+        8134,
+        8140,
+        8144,
+        8147,
+        8150,
+        8155,
+        8160,
+        8172,
+        8178,
+        8180,
+        8182,
+        8188,
+        8305,
+        8305,
+        8319,
+        8319,
+        8336,
+        8348,
+        8450,
+        8450,
+        8455,
+        8455,
+        8458,
+        8467,
+        8469,
+        8469,
+        8473,
+        8477,
+        8484,
+        8484,
+        8486,
+        8486,
+        8488,
+        8488,
+        8490,
+        8493,
+        8495,
+        8505,
+        8508,
+        8511,
+        8517,
+        8521,
+        8526,
+        8526,
+        8544,
+        8584,
+        11264,
+        11310,
+        11312,
+        11358,
+        11360,
+        11492,
+        11499,
+        11502,
+        11506,
+        11507,
+        11520,
+        11557,
+        11559,
+        11559,
+        11565,
+        11565,
+        11568,
+        11623,
+        11631,
+        11631,
+        11648,
+        11670,
+        11680,
+        11686,
+        11688,
+        11694,
+        11696,
+        11702,
+        11704,
+        11710,
+        11712,
+        11718,
+        11720,
+        11726,
+        11728,
+        11734,
+        11736,
+        11742,
+        11823,
+        11823,
+        12293,
+        12295,
+        12321,
+        12329,
+        12337,
+        12341,
+        12344,
+        12348,
+        12353,
+        12438,
+        12445,
+        12447,
+        12449,
+        12538,
+        12540,
+        12543,
+        12549,
+        12589,
+        12593,
+        12686,
+        12704,
+        12730,
+        12784,
+        12799,
+        13312,
+        19893,
+        19968,
+        40908,
+        40960,
+        42124,
+        42192,
+        42237,
+        42240,
+        42508,
+        42512,
+        42527,
+        42538,
+        42539,
+        42560,
+        42606,
+        42623,
+        42647,
+        42656,
+        42735,
+        42775,
+        42783,
+        42786,
+        42888,
+        42891,
+        42894,
+        42896,
+        42899,
+        42912,
+        42922,
+        43000,
+        43009,
+        43011,
+        43013,
+        43015,
+        43018,
+        43020,
+        43042,
+        43072,
+        43123,
+        43138,
+        43187,
+        43250,
+        43255,
+        43259,
+        43259,
+        43274,
+        43301,
+        43312,
+        43334,
+        43360,
+        43388,
+        43396,
+        43442,
+        43471,
+        43471,
+        43520,
+        43560,
+        43584,
+        43586,
+        43588,
+        43595,
+        43616,
+        43638,
+        43642,
+        43642,
+        43648,
+        43695,
+        43697,
+        43697,
+        43701,
+        43702,
+        43705,
+        43709,
+        43712,
+        43712,
+        43714,
+        43714,
+        43739,
+        43741,
+        43744,
+        43754,
+        43762,
+        43764,
+        43777,
+        43782,
+        43785,
+        43790,
+        43793,
+        43798,
+        43808,
+        43814,
+        43816,
+        43822,
+        43968,
+        44002,
+        44032,
+        55203,
+        55216,
+        55238,
+        55243,
+        55291,
+        63744,
+        64109,
+        64112,
+        64217,
+        64256,
+        64262,
+        64275,
+        64279,
+        64285,
+        64285,
+        64287,
+        64296,
+        64298,
+        64310,
+        64312,
+        64316,
+        64318,
+        64318,
+        64320,
+        64321,
+        64323,
+        64324,
+        64326,
+        64433,
+        64467,
+        64829,
+        64848,
+        64911,
+        64914,
+        64967,
+        65008,
+        65019,
+        65136,
+        65140,
+        65142,
+        65276,
+        65313,
+        65338,
+        65345,
+        65370,
+        65382,
+        65470,
+        65474,
+        65479,
+        65482,
+        65487,
+        65490,
+        65495,
+        65498,
+        65500,
+    ];
+    var unicodeES5IdentifierPart = [
+        170,
+        170,
+        181,
+        181,
+        186,
+        186,
+        192,
+        214,
+        216,
+        246,
+        248,
+        705,
+        710,
+        721,
+        736,
+        740,
+        748,
+        748,
+        750,
+        750,
+        768,
+        884,
+        886,
+        887,
+        890,
+        893,
+        902,
+        902,
+        904,
+        906,
+        908,
+        908,
+        910,
+        929,
+        931,
+        1013,
+        1015,
+        1153,
+        1155,
+        1159,
+        1162,
+        1319,
+        1329,
+        1366,
+        1369,
+        1369,
+        1377,
+        1415,
+        1425,
+        1469,
+        1471,
+        1471,
+        1473,
+        1474,
+        1476,
+        1477,
+        1479,
+        1479,
+        1488,
+        1514,
+        1520,
+        1522,
+        1552,
+        1562,
+        1568,
+        1641,
+        1646,
+        1747,
+        1749,
+        1756,
+        1759,
+        1768,
+        1770,
+        1788,
+        1791,
+        1791,
+        1808,
+        1866,
+        1869,
+        1969,
+        1984,
+        2037,
+        2042,
+        2042,
+        2048,
+        2093,
+        2112,
+        2139,
+        2208,
+        2208,
+        2210,
+        2220,
+        2276,
+        2302,
+        2304,
+        2403,
+        2406,
+        2415,
+        2417,
+        2423,
+        2425,
+        2431,
+        2433,
+        2435,
+        2437,
+        2444,
+        2447,
+        2448,
+        2451,
+        2472,
+        2474,
+        2480,
+        2482,
+        2482,
+        2486,
+        2489,
+        2492,
+        2500,
+        2503,
+        2504,
+        2507,
+        2510,
+        2519,
+        2519,
+        2524,
+        2525,
+        2527,
+        2531,
+        2534,
+        2545,
+        2561,
+        2563,
+        2565,
+        2570,
+        2575,
+        2576,
+        2579,
+        2600,
+        2602,
+        2608,
+        2610,
+        2611,
+        2613,
+        2614,
+        2616,
+        2617,
+        2620,
+        2620,
+        2622,
+        2626,
+        2631,
+        2632,
+        2635,
+        2637,
+        2641,
+        2641,
+        2649,
+        2652,
+        2654,
+        2654,
+        2662,
+        2677,
+        2689,
+        2691,
+        2693,
+        2701,
+        2703,
+        2705,
+        2707,
+        2728,
+        2730,
+        2736,
+        2738,
+        2739,
+        2741,
+        2745,
+        2748,
+        2757,
+        2759,
+        2761,
+        2763,
+        2765,
+        2768,
+        2768,
+        2784,
+        2787,
+        2790,
+        2799,
+        2817,
+        2819,
+        2821,
+        2828,
+        2831,
+        2832,
+        2835,
+        2856,
+        2858,
+        2864,
+        2866,
+        2867,
+        2869,
+        2873,
+        2876,
+        2884,
+        2887,
+        2888,
+        2891,
+        2893,
+        2902,
+        2903,
+        2908,
+        2909,
+        2911,
+        2915,
+        2918,
+        2927,
+        2929,
+        2929,
+        2946,
+        2947,
+        2949,
+        2954,
+        2958,
+        2960,
+        2962,
+        2965,
+        2969,
+        2970,
+        2972,
+        2972,
+        2974,
+        2975,
+        2979,
+        2980,
+        2984,
+        2986,
+        2990,
+        3001,
+        3006,
+        3010,
+        3014,
+        3016,
+        3018,
+        3021,
+        3024,
+        3024,
+        3031,
+        3031,
+        3046,
+        3055,
+        3073,
+        3075,
+        3077,
+        3084,
+        3086,
+        3088,
+        3090,
+        3112,
+        3114,
+        3123,
+        3125,
+        3129,
+        3133,
+        3140,
+        3142,
+        3144,
+        3146,
+        3149,
+        3157,
+        3158,
+        3160,
+        3161,
+        3168,
+        3171,
+        3174,
+        3183,
+        3202,
+        3203,
+        3205,
+        3212,
+        3214,
+        3216,
+        3218,
+        3240,
+        3242,
+        3251,
+        3253,
+        3257,
+        3260,
+        3268,
+        3270,
+        3272,
+        3274,
+        3277,
+        3285,
+        3286,
+        3294,
+        3294,
+        3296,
+        3299,
+        3302,
+        3311,
+        3313,
+        3314,
+        3330,
+        3331,
+        3333,
+        3340,
+        3342,
+        3344,
+        3346,
+        3386,
+        3389,
+        3396,
+        3398,
+        3400,
+        3402,
+        3406,
+        3415,
+        3415,
+        3424,
+        3427,
+        3430,
+        3439,
+        3450,
+        3455,
+        3458,
+        3459,
+        3461,
+        3478,
+        3482,
+        3505,
+        3507,
+        3515,
+        3517,
+        3517,
+        3520,
+        3526,
+        3530,
+        3530,
+        3535,
+        3540,
+        3542,
+        3542,
+        3544,
+        3551,
+        3570,
+        3571,
+        3585,
+        3642,
+        3648,
+        3662,
+        3664,
+        3673,
+        3713,
+        3714,
+        3716,
+        3716,
+        3719,
+        3720,
+        3722,
+        3722,
+        3725,
+        3725,
+        3732,
+        3735,
+        3737,
+        3743,
+        3745,
+        3747,
+        3749,
+        3749,
+        3751,
+        3751,
+        3754,
+        3755,
+        3757,
+        3769,
+        3771,
+        3773,
+        3776,
+        3780,
+        3782,
+        3782,
+        3784,
+        3789,
+        3792,
+        3801,
+        3804,
+        3807,
+        3840,
+        3840,
+        3864,
+        3865,
+        3872,
+        3881,
+        3893,
+        3893,
+        3895,
+        3895,
+        3897,
+        3897,
+        3902,
+        3911,
+        3913,
+        3948,
+        3953,
+        3972,
+        3974,
+        3991,
+        3993,
+        4028,
+        4038,
+        4038,
+        4096,
+        4169,
+        4176,
+        4253,
+        4256,
+        4293,
+        4295,
+        4295,
+        4301,
+        4301,
+        4304,
+        4346,
+        4348,
+        4680,
+        4682,
+        4685,
+        4688,
+        4694,
+        4696,
+        4696,
+        4698,
+        4701,
+        4704,
+        4744,
+        4746,
+        4749,
+        4752,
+        4784,
+        4786,
+        4789,
+        4792,
+        4798,
+        4800,
+        4800,
+        4802,
+        4805,
+        4808,
+        4822,
+        4824,
+        4880,
+        4882,
+        4885,
+        4888,
+        4954,
+        4957,
+        4959,
+        4992,
+        5007,
+        5024,
+        5108,
+        5121,
+        5740,
+        5743,
+        5759,
+        5761,
+        5786,
+        5792,
+        5866,
+        5870,
+        5872,
+        5888,
+        5900,
+        5902,
+        5908,
+        5920,
+        5940,
+        5952,
+        5971,
+        5984,
+        5996,
+        5998,
+        6000,
+        6002,
+        6003,
+        6016,
+        6099,
+        6103,
+        6103,
+        6108,
+        6109,
+        6112,
+        6121,
+        6155,
+        6157,
+        6160,
+        6169,
+        6176,
+        6263,
+        6272,
+        6314,
+        6320,
+        6389,
+        6400,
+        6428,
+        6432,
+        6443,
+        6448,
+        6459,
+        6470,
+        6509,
+        6512,
+        6516,
+        6528,
+        6571,
+        6576,
+        6601,
+        6608,
+        6617,
+        6656,
+        6683,
+        6688,
+        6750,
+        6752,
+        6780,
+        6783,
+        6793,
+        6800,
+        6809,
+        6823,
+        6823,
+        6912,
+        6987,
+        6992,
+        7001,
+        7019,
+        7027,
+        7040,
+        7155,
+        7168,
+        7223,
+        7232,
+        7241,
+        7245,
+        7293,
+        7376,
+        7378,
+        7380,
+        7414,
+        7424,
+        7654,
+        7676,
+        7957,
+        7960,
+        7965,
+        7968,
+        8005,
+        8008,
+        8013,
+        8016,
+        8023,
+        8025,
+        8025,
+        8027,
+        8027,
+        8029,
+        8029,
+        8031,
+        8061,
+        8064,
+        8116,
+        8118,
+        8124,
+        8126,
+        8126,
+        8130,
+        8132,
+        8134,
+        8140,
+        8144,
+        8147,
+        8150,
+        8155,
+        8160,
+        8172,
+        8178,
+        8180,
+        8182,
+        8188,
+        8204,
+        8205,
+        8255,
+        8256,
+        8276,
+        8276,
+        8305,
+        8305,
+        8319,
+        8319,
+        8336,
+        8348,
+        8400,
+        8412,
+        8417,
+        8417,
+        8421,
+        8432,
+        8450,
+        8450,
+        8455,
+        8455,
+        8458,
+        8467,
+        8469,
+        8469,
+        8473,
+        8477,
+        8484,
+        8484,
+        8486,
+        8486,
+        8488,
+        8488,
+        8490,
+        8493,
+        8495,
+        8505,
+        8508,
+        8511,
+        8517,
+        8521,
+        8526,
+        8526,
+        8544,
+        8584,
+        11264,
+        11310,
+        11312,
+        11358,
+        11360,
+        11492,
+        11499,
+        11507,
+        11520,
+        11557,
+        11559,
+        11559,
+        11565,
+        11565,
+        11568,
+        11623,
+        11631,
+        11631,
+        11647,
+        11670,
+        11680,
+        11686,
+        11688,
+        11694,
+        11696,
+        11702,
+        11704,
+        11710,
+        11712,
+        11718,
+        11720,
+        11726,
+        11728,
+        11734,
+        11736,
+        11742,
+        11744,
+        11775,
+        11823,
+        11823,
+        12293,
+        12295,
+        12321,
+        12335,
+        12337,
+        12341,
+        12344,
+        12348,
+        12353,
+        12438,
+        12441,
+        12442,
+        12445,
+        12447,
+        12449,
+        12538,
+        12540,
+        12543,
+        12549,
+        12589,
+        12593,
+        12686,
+        12704,
+        12730,
+        12784,
+        12799,
+        13312,
+        19893,
+        19968,
+        40908,
+        40960,
+        42124,
+        42192,
+        42237,
+        42240,
+        42508,
+        42512,
+        42539,
+        42560,
+        42607,
+        42612,
+        42621,
+        42623,
+        42647,
+        42655,
+        42737,
+        42775,
+        42783,
+        42786,
+        42888,
+        42891,
+        42894,
+        42896,
+        42899,
+        42912,
+        42922,
+        43000,
+        43047,
+        43072,
+        43123,
+        43136,
+        43204,
+        43216,
+        43225,
+        43232,
+        43255,
+        43259,
+        43259,
+        43264,
+        43309,
+        43312,
+        43347,
+        43360,
+        43388,
+        43392,
+        43456,
+        43471,
+        43481,
+        43520,
+        43574,
+        43584,
+        43597,
+        43600,
+        43609,
+        43616,
+        43638,
+        43642,
+        43643,
+        43648,
+        43714,
+        43739,
+        43741,
+        43744,
+        43759,
+        43762,
+        43766,
+        43777,
+        43782,
+        43785,
+        43790,
+        43793,
+        43798,
+        43808,
+        43814,
+        43816,
+        43822,
+        43968,
+        44010,
+        44012,
+        44013,
+        44016,
+        44025,
+        44032,
+        55203,
+        55216,
+        55238,
+        55243,
+        55291,
+        63744,
+        64109,
+        64112,
+        64217,
+        64256,
+        64262,
+        64275,
+        64279,
+        64285,
+        64296,
+        64298,
+        64310,
+        64312,
+        64316,
+        64318,
+        64318,
+        64320,
+        64321,
+        64323,
+        64324,
+        64326,
+        64433,
+        64467,
+        64829,
+        64848,
+        64911,
+        64914,
+        64967,
+        65008,
+        65019,
+        65024,
+        65039,
+        65056,
+        65062,
+        65075,
+        65076,
+        65101,
+        65103,
+        65136,
+        65140,
+        65142,
+        65276,
+        65296,
+        65305,
+        65313,
+        65338,
+        65343,
+        65343,
+        65345,
+        65370,
+        65382,
+        65470,
+        65474,
+        65479,
+        65482,
+        65487,
+        65490,
+        65495,
+        65498,
+        65500,
+    ];
     function lookupInUnicodeMap(code, map) {
         if (code < map[0]) {
             return false;
@@ -1488,15 +6248,11 @@ var ts;
         return false;
     }
     function isUnicodeIdentifierStart(code, languageVersion) {
-        return languageVersion >= 1 ?
-            lookupInUnicodeMap(code, unicodeES5IdentifierStart) :
-            lookupInUnicodeMap(code, unicodeES3IdentifierStart);
+        return languageVersion >= 1 ? lookupInUnicodeMap(code, unicodeES5IdentifierStart) : lookupInUnicodeMap(code, unicodeES3IdentifierStart);
     }
     ts.isUnicodeIdentifierStart = isUnicodeIdentifierStart;
     function isUnicodeIdentifierPart(code, languageVersion) {
-        return languageVersion >= 1 ?
-            lookupInUnicodeMap(code, unicodeES5IdentifierPart) :
-            lookupInUnicodeMap(code, unicodeES3IdentifierPart);
+        return languageVersion >= 1 ? lookupInUnicodeMap(code, unicodeES5IdentifierPart) : lookupInUnicodeMap(code, unicodeES3IdentifierPart);
     }
     function makeReverseMap(source) {
         var result = [];
@@ -1569,9 +6325,7 @@ var ts;
     ts.getLineAndCharacterOfPosition = getLineAndCharacterOfPosition;
     var hasOwnProperty = Object.prototype.hasOwnProperty;
     function isWhiteSpace(ch) {
-        return ch === 32 || ch === 9 || ch === 11 || ch === 12 ||
-            ch === 160 || ch === 5760 || ch >= 8192 && ch <= 8203 ||
-            ch === 8239 || ch === 8287 || ch === 12288 || ch === 65279;
+        return ch === 32 || ch === 9 || ch === 11 || ch === 12 || ch === 160 || ch === 5760 || ch >= 8192 && ch <= 8203 || ch === 8239 || ch === 8287 || ch === 12288 || ch === 65279;
     }
     ts.isWhiteSpace = isWhiteSpace;
     function isLineBreak(ch) {
@@ -1658,8 +6412,7 @@ var ts;
                         return false;
                     }
                 }
-                return ch === 61 ||
-                    text.charCodeAt(pos + mergeConflictMarkerLength) === 32;
+                return ch === 61 || text.charCodeAt(pos + mergeConflictMarkerLength) === 32;
             }
         }
         return false;
@@ -1739,7 +6492,11 @@ var ts;
                         if (collecting) {
                             if (!result)
                                 result = [];
-                            result.push({ pos: startPos, end: pos, hasTrailingNewLine: hasTrailingNewLine });
+                            result.push({
+                                pos: startPos,
+                                end: pos,
+                                hasTrailingNewLine: hasTrailingNewLine
+                            });
                         }
                         continue;
                     }
@@ -1766,15 +6523,11 @@ var ts;
     }
     ts.getTrailingCommentRanges = getTrailingCommentRanges;
     function isIdentifierStart(ch, languageVersion) {
-        return ch >= 65 && ch <= 90 || ch >= 97 && ch <= 122 ||
-            ch === 36 || ch === 95 ||
-            ch > 127 && isUnicodeIdentifierStart(ch, languageVersion);
+        return ch >= 65 && ch <= 90 || ch >= 97 && ch <= 122 || ch === 36 || ch === 95 || ch > 127 && isUnicodeIdentifierStart(ch, languageVersion);
     }
     ts.isIdentifierStart = isIdentifierStart;
     function isIdentifierPart(ch, languageVersion) {
-        return ch >= 65 && ch <= 90 || ch >= 97 && ch <= 122 ||
-            ch >= 48 && ch <= 57 || ch === 36 || ch === 95 ||
-            ch > 127 && isUnicodeIdentifierPart(ch, languageVersion);
+        return ch >= 65 && ch <= 90 || ch >= 97 && ch <= 122 || ch >= 48 && ch <= 57 || ch === 36 || ch === 95 || ch > 127 && isUnicodeIdentifierPart(ch, languageVersion);
     }
     ts.isIdentifierPart = isIdentifierPart;
     function createScanner(languageVersion, skipTrivia, text, onError) {
@@ -1793,14 +6546,10 @@ var ts;
             }
         }
         function isIdentifierStart(ch) {
-            return ch >= 65 && ch <= 90 || ch >= 97 && ch <= 122 ||
-                ch === 36 || ch === 95 ||
-                ch > 127 && isUnicodeIdentifierStart(ch, languageVersion);
+            return ch >= 65 && ch <= 90 || ch >= 97 && ch <= 122 || ch === 36 || ch === 95 || ch > 127 && isUnicodeIdentifierStart(ch, languageVersion);
         }
         function isIdentifierPart(ch) {
-            return ch >= 65 && ch <= 90 || ch >= 97 && ch <= 122 ||
-                ch >= 48 && ch <= 57 || ch === 36 || ch === 95 ||
-                ch > 127 && isUnicodeIdentifierPart(ch, languageVersion);
+            return ch >= 65 && ch <= 90 || ch >= 97 && ch <= 122 || ch >= 48 && ch <= 57 || ch === 36 || ch === 95 || ch > 127 && isUnicodeIdentifierPart(ch, languageVersion);
         }
         function scanNumber() {
             var start = pos;
@@ -2523,17 +7272,39 @@ var ts;
         }
         setText(text);
         return {
-            getStartPos: function () { return startPos; },
-            getTextPos: function () { return pos; },
-            getToken: function () { return token; },
-            getTokenPos: function () { return tokenPos; },
-            getTokenText: function () { return text.substring(tokenPos, pos); },
-            getTokenValue: function () { return tokenValue; },
-            hasExtendedUnicodeEscape: function () { return hasExtendedUnicodeEscape; },
-            hasPrecedingLineBreak: function () { return precedingLineBreak; },
-            isIdentifier: function () { return token === 64 || token > 100; },
-            isReservedWord: function () { return token >= 65 && token <= 100; },
-            isUnterminated: function () { return tokenIsUnterminated; },
+            getStartPos: function () {
+                return startPos;
+            },
+            getTextPos: function () {
+                return pos;
+            },
+            getToken: function () {
+                return token;
+            },
+            getTokenPos: function () {
+                return tokenPos;
+            },
+            getTokenText: function () {
+                return text.substring(tokenPos, pos);
+            },
+            getTokenValue: function () {
+                return tokenValue;
+            },
+            hasExtendedUnicodeEscape: function () {
+                return hasExtendedUnicodeEscape;
+            },
+            hasPrecedingLineBreak: function () {
+                return precedingLineBreak;
+            },
+            isIdentifier: function () {
+                return token === 64 || token > 100;
+            },
+            isReservedWord: function () {
+                return token >= 65 && token <= 100;
+            },
+            isUnterminated: function () {
+                return tokenIsUnterminated;
+            },
             reScanGreaterToken: reScanGreaterToken,
             reScanSlashToken: reScanSlashToken,
             reScanTemplateToken: reScanTemplateToken,
@@ -2684,10 +7455,20 @@ var ts;
             description: ts.Diagnostics.Do_not_emit_declarations_for_code_that_has_an_internal_annotation,
             experimental: true
         },
+        {
+            name: "preserveNewLines",
+            type: "boolean",
+            description: ts.Diagnostics.Preserve_new_lines_when_emitting_code,
+            experimental: true
+        },
         {
             name: "target",
             shortName: "t",
-            type: { "es3": 0, "es5": 1, "es6": 2 },
+            type: {
+                "es3": 0,
+                "es5": 1,
+                "es6": 2
+            },
             description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES6_experimental,
             paramType: ts.Diagnostics.VERSION,
             error: ts.Diagnostics.Argument_for_target_option_must_be_es3_es5_or_es6
@@ -2867,7 +7648,9 @@ var ts;
             var files = [];
             if (ts.hasProperty(json, "files")) {
                 if (json["files"] instanceof Array) {
-                    var files = ts.map(json["files"], function (s) { return ts.combinePaths(basePath, s); });
+                    var files = ts.map(json["files"], function (s) {
+                        return ts.combinePaths(basePath, s);
+                    });
                 }
             }
             else {
@@ -2901,9 +7684,13 @@ var ts;
     function getSingleLineStringWriter() {
         if (stringWriters.length == 0) {
             var str = "";
-            var writeText = function (text) { return str += text; };
+            var writeText = function (text) {
+                return str += text;
+            };
             return {
-                string: function () { return str; },
+                string: function () {
+                    return str;
+                },
                 writeKeyword: writeText,
                 writeOperator: writeText,
                 writePunctuation: writeText,
@@ -2911,11 +7698,18 @@ var ts;
                 writeStringLiteral: writeText,
                 writeParameter: writeText,
                 writeSymbol: writeText,
-                writeLine: function () { return str += " "; },
-                increaseIndent: function () { },
-                decreaseIndent: function () { },
-                clear: function () { return str = ""; },
-                trackSymbol: function () { }
+                writeLine: function () {
+                    return str += " ";
+                },
+                increaseIndent: function () {
+                },
+                decreaseIndent: function () {
+                },
+                clear: function () {
+                    return str = "";
+                },
+                trackSymbol: function () {
+                }
             };
         }
         return stringWriters.pop();
@@ -2937,8 +7731,7 @@ var ts;
     ts.containsParseError = containsParseError;
     function aggregateChildData(node) {
         if (!(node.parserContextFlags & 64)) {
-            var thisNodeOrAnySubNodesHasError = ((node.parserContextFlags & 16) !== 0) ||
-                ts.forEachChild(node, containsParseError);
+            var thisNodeOrAnySubNodesHasError = ((node.parserContextFlags & 16) !== 0) || ts.forEachChild(node, containsParseError);
             if (thisNodeOrAnySubNodesHasError) {
                 node.parserContextFlags |= 32;
             }
@@ -2946,7 +7739,7 @@ var ts;
         }
     }
     function getSourceFileOfNode(node) {
-        while (node && node.kind !== 220) {
+        while (node && node.kind !== 221) {
             node = node.parent;
         }
         return node;
@@ -3017,15 +7810,35 @@ var ts;
     }
     ts.makeIdentifierFromModuleName = makeIdentifierFromModuleName;
     function isBlockOrCatchScoped(declaration) {
-        return (getCombinedNodeFlags(declaration) & 12288) !== 0 ||
-            isCatchClauseVariableDeclaration(declaration);
+        return (getCombinedNodeFlags(declaration) & 12288) !== 0 || isCatchClauseVariableDeclaration(declaration);
     }
     ts.isBlockOrCatchScoped = isBlockOrCatchScoped;
+    function getEnclosingBlockScopeContainer(node) {
+        var current = node;
+        while (current) {
+            if (isFunctionLike(current)) {
+                return current;
+            }
+            switch (current.kind) {
+                case 221:
+                case 202:
+                case 217:
+                case 200:
+                case 181:
+                case 182:
+                case 183:
+                    return current;
+                case 174:
+                    if (!isFunctionLike(current.parent)) {
+                        return current;
+                    }
+            }
+            current = current.parent;
+        }
+    }
+    ts.getEnclosingBlockScopeContainer = getEnclosingBlockScopeContainer;
     function isCatchClauseVariableDeclaration(declaration) {
-        return declaration &&
-            declaration.kind === 193 &&
-            declaration.parent &&
-            declaration.parent.kind === 216;
+        return declaration && declaration.kind === 193 && declaration.parent && declaration.parent.kind === 217;
     }
     ts.isCatchClauseVariableDeclaration = isCatchClauseVariableDeclaration;
     function declarationNameToString(name) {
@@ -3068,7 +7881,7 @@ var ts;
             case 197:
             case 200:
             case 199:
-            case 219:
+            case 220:
             case 195:
             case 160:
                 errorNode = node.name;
@@ -3077,9 +7890,7 @@ var ts;
         if (errorNode === undefined) {
             return getSpanOfTokenAtPosition(sourceFile, node.pos);
         }
-        var pos = nodeIsMissing(errorNode)
-            ? errorNode.pos
-            : ts.skipTrivia(sourceFile.text, errorNode.pos);
+        var pos = nodeIsMissing(errorNode) ? errorNode.pos : ts.skipTrivia(sourceFile.text, errorNode.pos);
         return createTextSpanFromBounds(pos, errorNode.end);
     }
     ts.getErrorSpanForNode = getErrorSpanForNode;
@@ -3142,9 +7953,7 @@ var ts;
     function getJsDocComments(node, sourceFileOfNode) {
         return ts.filter(getLeadingCommentRangesOfNode(node, sourceFileOfNode), isJsDocComment);
         function isJsDocComment(comment) {
-            return sourceFileOfNode.text.charCodeAt(comment.pos + 1) === 42 &&
-                sourceFileOfNode.text.charCodeAt(comment.pos + 2) === 42 &&
-                sourceFileOfNode.text.charCodeAt(comment.pos + 3) !== 47;
+            return sourceFileOfNode.text.charCodeAt(comment.pos + 1) === 42 && sourceFileOfNode.text.charCodeAt(comment.pos + 2) === 42 && sourceFileOfNode.text.charCodeAt(comment.pos + 3) !== 47;
         }
     }
     ts.getJsDocComments = getJsDocComments;
@@ -3155,6 +7964,7 @@ var ts;
             switch (node.kind) {
                 case 186:
                     return visitor(node);
+                case 202:
                 case 174:
                 case 178:
                 case 179:
@@ -3164,11 +7974,11 @@ var ts;
                 case 183:
                 case 187:
                 case 188:
-                case 213:
                 case 214:
+                case 215:
                 case 189:
                 case 191:
-                case 216:
+                case 217:
                     return ts.forEachChild(node, traverse);
             }
         }
@@ -3178,12 +7988,12 @@ var ts;
         if (node) {
             switch (node.kind) {
                 case 150:
-                case 219:
+                case 220:
                 case 128:
-                case 217:
+                case 218:
                 case 130:
                 case 129:
-                case 218:
+                case 219:
                 case 193:
                     return true;
             }
@@ -3261,7 +8071,7 @@ var ts;
                 case 134:
                 case 135:
                 case 199:
-                case 220:
+                case 221:
                     return node;
             }
         }
@@ -3352,8 +8162,8 @@ var ts;
                     case 128:
                     case 130:
                     case 129:
-                    case 219:
-                    case 217:
+                    case 220:
+                    case 218:
                     case 150:
                         return parent.initializer === node;
                     case 177:
@@ -3363,20 +8173,17 @@ var ts;
                     case 186:
                     case 187:
                     case 188:
-                    case 213:
+                    case 214:
                     case 190:
                     case 188:
                         return parent.expression === node;
                     case 181:
                         var forStatement = parent;
-                        return (forStatement.initializer === node && forStatement.initializer.kind !== 194) ||
-                            forStatement.condition === node ||
-                            forStatement.iterator === node;
+                        return (forStatement.initializer === node && forStatement.initializer.kind !== 194) || forStatement.condition === node || forStatement.iterator === node;
                     case 182:
                     case 183:
                         var forInStatement = parent;
-                        return (forInStatement.initializer === node && forInStatement.initializer.kind !== 194) ||
-                            forInStatement.expression === node;
+                        return (forInStatement.initializer === node && forInStatement.initializer.kind !== 194) || forInStatement.expression === node;
                     case 158:
                         return node === parent.expression;
                     case 173:
@@ -3394,12 +8201,11 @@ var ts;
     ts.isExpression = isExpression;
     function isInstantiatedModule(node, preserveConstEnums) {
         var moduleState = ts.getModuleInstanceState(node);
-        return moduleState === 1 ||
-            (preserveConstEnums && moduleState === 2);
+        return moduleState === 1 || (preserveConstEnums && moduleState === 2);
     }
     ts.isInstantiatedModule = isInstantiatedModule;
     function isExternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 202 && node.moduleReference.kind === 212;
+        return node.kind === 203 && node.moduleReference.kind === 213;
     }
     ts.isExternalModuleImportEqualsDeclaration = isExternalModuleImportEqualsDeclaration;
     function getExternalModuleImportEqualsDeclarationExpression(node) {
@@ -3408,20 +8214,20 @@ var ts;
     }
     ts.getExternalModuleImportEqualsDeclarationExpression = getExternalModuleImportEqualsDeclarationExpression;
     function isInternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 202 && node.moduleReference.kind !== 212;
+        return node.kind === 203 && node.moduleReference.kind !== 213;
     }
     ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration;
     function getExternalModuleName(node) {
-        if (node.kind === 203) {
+        if (node.kind === 204) {
             return node.moduleSpecifier;
         }
-        if (node.kind === 202) {
+        if (node.kind === 203) {
             var reference = node.moduleReference;
-            if (reference.kind === 212) {
+            if (reference.kind === 213) {
                 return reference.expression;
             }
         }
-        if (node.kind === 209) {
+        if (node.kind === 210) {
             return node.moduleSpecifier;
         }
     }
@@ -3438,8 +8244,8 @@ var ts;
                 case 132:
                 case 131:
                     return node.questionToken !== undefined;
+                case 219:
                 case 218:
-                case 217:
                 case 130:
                 case 129:
                     return node.questionToken !== undefined;
@@ -3485,25 +8291,25 @@ var ts;
             case 196:
             case 133:
             case 199:
-            case 219:
-            case 211:
+            case 220:
+            case 212:
             case 195:
             case 160:
             case 134:
-            case 204:
-            case 202:
-            case 207:
+            case 205:
+            case 203:
+            case 208:
             case 197:
             case 132:
             case 131:
             case 200:
-            case 205:
+            case 206:
             case 128:
-            case 217:
+            case 218:
             case 130:
             case 129:
             case 135:
-            case 218:
+            case 219:
             case 198:
             case 127:
             case 193:
@@ -3532,7 +8338,7 @@ var ts;
             case 175:
             case 180:
             case 187:
-            case 208:
+            case 209:
                 return true;
             default:
                 return false;
@@ -3544,7 +8350,7 @@ var ts;
             return false;
         }
         var parent = name.parent;
-        if (parent.kind === 207 || parent.kind === 211) {
+        if (parent.kind === 208 || parent.kind === 212) {
             if (parent.propertyName) {
                 return true;
             }
@@ -3642,9 +8448,7 @@ var ts;
     }
     ts.isTrivia = isTrivia;
     function hasDynamicName(declaration) {
-        return declaration.name &&
-            declaration.name.kind === 126 &&
-            !isWellKnownSymbolSyntactically(declaration.name.expression);
+        return declaration.name && declaration.name.kind === 126 && !isWellKnownSymbolSyntactically(declaration.name.expression);
     }
     ts.hasDynamicName = hasDynamicName;
     function isWellKnownSymbolSyntactically(node) {
@@ -3748,7 +8552,10 @@ var ts;
         if (length < 0) {
             throw new Error("length < 0");
         }
-        return { start: start, length: length };
+        return {
+            start: start,
+            length: length
+        };
     }
     ts.createTextSpan = createTextSpan;
     function createTextSpanFromBounds(start, end) {
@@ -3767,7 +8574,10 @@ var ts;
         if (newLength < 0) {
             throw new Error("newLength < 0");
         }
-        return { span: span, newLength: newLength };
+        return {
+            span: span,
+            newLength: newLength
+        };
     }
     ts.createTextChangeRange = createTextChangeRange;
     ts.unchangedTextChangeRange = createTextChangeRange(createTextSpan(0, 0), 0);
@@ -3798,11 +8608,11 @@ var ts;
     }
     ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions;
     function nodeStartsNewLexicalEnvironment(n) {
-        return isFunctionLike(n) || n.kind === 200 || n.kind === 220;
+        return isFunctionLike(n) || n.kind === 200 || n.kind === 221;
     }
     ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment;
     function nodeIsSynthesized(node) {
-        return node.pos === -1 && node.end === -1;
+        return node.pos === -1;
     }
     ts.nodeIsSynthesized = nodeIsSynthesized;
     function createSynthesizedNode(kind, startsOnNewLine) {
@@ -3928,15 +8738,15 @@ var ts;
     }
     var nonAsciiCharacters = /[^\u0000-\u007F]/g;
     function escapeNonAsciiCharacters(s) {
-        return nonAsciiCharacters.test(s) ?
-            s.replace(nonAsciiCharacters, function (c) { return get16BitUnicodeEscapeSequence(c.charCodeAt(0)); }) :
-            s;
+        return nonAsciiCharacters.test(s) ? s.replace(nonAsciiCharacters, function (c) {
+            return get16BitUnicodeEscapeSequence(c.charCodeAt(0));
+        }) : s;
     }
     ts.escapeNonAsciiCharacters = escapeNonAsciiCharacters;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    var nodeConstructors = new Array(222);
+    var nodeConstructors = new Array(223);
     ts.parseTime = 0;
     function getNodeConstructor(kind) {
         return nodeConstructors[kind] || (nodeConstructors[kind] = ts.objectAllocator.getNodeConstructor(kind));
@@ -3974,35 +8784,23 @@ var ts;
         var cbNodes = cbNodeArray || cbNode;
         switch (node.kind) {
             case 125:
-                return visitNode(cbNode, node.left) ||
-                    visitNode(cbNode, node.right);
+                return visitNode(cbNode, node.left) || visitNode(cbNode, node.right);
             case 127:
-                return visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.constraint) ||
-                    visitNode(cbNode, node.expression);
+                return visitNode(cbNode, node.name) || visitNode(cbNode, node.constraint) || visitNode(cbNode, node.expression);
             case 128:
             case 130:
             case 129:
-            case 217:
             case 218:
+            case 219:
             case 193:
             case 150:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.propertyName) ||
-                    visitNode(cbNode, node.dotDotDotToken) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.questionToken) ||
-                    visitNode(cbNode, node.type) ||
-                    visitNode(cbNode, node.initializer);
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.propertyName) || visitNode(cbNode, node.dotDotDotToken) || visitNode(cbNode, node.name) || visitNode(cbNode, node.questionToken) || visitNode(cbNode, node.type) || visitNode(cbNode, node.initializer);
             case 140:
             case 141:
             case 136:
             case 137:
             case 138:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNodes(cbNodes, node.typeParameters) ||
-                    visitNodes(cbNodes, node.parameters) ||
-                    visitNode(cbNode, node.type);
+                return visitNodes(cbNodes, node.modifiers) || visitNodes(cbNodes, node.typeParameters) || visitNodes(cbNodes, node.parameters) || visitNode(cbNode, node.type);
             case 132:
             case 131:
             case 133:
@@ -4011,17 +8809,9 @@ var ts;
             case 160:
             case 195:
             case 161:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.asteriskToken) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.questionToken) ||
-                    visitNodes(cbNodes, node.typeParameters) ||
-                    visitNodes(cbNodes, node.parameters) ||
-                    visitNode(cbNode, node.type) ||
-                    visitNode(cbNode, node.body);
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.asteriskToken) || visitNode(cbNode, node.name) || visitNode(cbNode, node.questionToken) || visitNodes(cbNodes, node.typeParameters) || visitNodes(cbNodes, node.parameters) || visitNode(cbNode, node.type) || visitNode(cbNode, node.body);
             case 139:
-                return visitNode(cbNode, node.typeName) ||
-                    visitNodes(cbNodes, node.typeArguments);
+                return visitNode(cbNode, node.typeName) || visitNodes(cbNodes, node.typeArguments);
             case 142:
                 return visitNode(cbNode, node.exprName);
             case 143:
@@ -4042,23 +8832,16 @@ var ts;
             case 152:
                 return visitNodes(cbNodes, node.properties);
             case 153:
-                return visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.dotToken) ||
-                    visitNode(cbNode, node.name);
+                return visitNode(cbNode, node.expression) || visitNode(cbNode, node.dotToken) || visitNode(cbNode, node.name);
             case 154:
-                return visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.argumentExpression);
+                return visitNode(cbNode, node.expression) || visitNode(cbNode, node.argumentExpression);
             case 155:
             case 156:
-                return visitNode(cbNode, node.expression) ||
-                    visitNodes(cbNodes, node.typeArguments) ||
-                    visitNodes(cbNodes, node.arguments);
+                return visitNode(cbNode, node.expression) || visitNodes(cbNodes, node.typeArguments) || visitNodes(cbNodes, node.arguments);
             case 157:
-                return visitNode(cbNode, node.tag) ||
-                    visitNode(cbNode, node.template);
+                return visitNode(cbNode, node.tag) || visitNode(cbNode, node.template);
             case 158:
-                return visitNode(cbNode, node.type) ||
-                    visitNode(cbNode, node.expression);
+                return visitNode(cbNode, node.type) || visitNode(cbNode, node.expression);
             case 159:
                 return visitNode(cbNode, node.expression);
             case 162:
@@ -4070,189 +8853,169 @@ var ts;
             case 165:
                 return visitNode(cbNode, node.operand);
             case 170:
-                return visitNode(cbNode, node.asteriskToken) ||
-                    visitNode(cbNode, node.expression);
+                return visitNode(cbNode, node.asteriskToken) || visitNode(cbNode, node.expression);
             case 166:
                 return visitNode(cbNode, node.operand);
             case 167:
-                return visitNode(cbNode, node.left) ||
-                    visitNode(cbNode, node.operatorToken) ||
-                    visitNode(cbNode, node.right);
+                return visitNode(cbNode, node.left) || visitNode(cbNode, node.operatorToken) || visitNode(cbNode, node.right);
             case 168:
-                return visitNode(cbNode, node.condition) ||
-                    visitNode(cbNode, node.questionToken) ||
-                    visitNode(cbNode, node.whenTrue) ||
-                    visitNode(cbNode, node.colonToken) ||
-                    visitNode(cbNode, node.whenFalse);
+                return visitNode(cbNode, node.condition) || visitNode(cbNode, node.questionToken) || visitNode(cbNode, node.whenTrue) || visitNode(cbNode, node.colonToken) || visitNode(cbNode, node.whenFalse);
             case 171:
                 return visitNode(cbNode, node.expression);
             case 174:
             case 201:
                 return visitNodes(cbNodes, node.statements);
-            case 220:
-                return visitNodes(cbNodes, node.statements) ||
-                    visitNode(cbNode, node.endOfFileToken);
+            case 221:
+                return visitNodes(cbNodes, node.statements) || visitNode(cbNode, node.endOfFileToken);
             case 175:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.declarationList);
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.declarationList);
             case 194:
                 return visitNodes(cbNodes, node.declarations);
             case 177:
                 return visitNode(cbNode, node.expression);
             case 178:
-                return visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.thenStatement) ||
-                    visitNode(cbNode, node.elseStatement);
+                return visitNode(cbNode, node.expression) || visitNode(cbNode, node.thenStatement) || visitNode(cbNode, node.elseStatement);
             case 179:
-                return visitNode(cbNode, node.statement) ||
-                    visitNode(cbNode, node.expression);
+                return visitNode(cbNode, node.statement) || visitNode(cbNode, node.expression);
             case 180:
-                return visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.statement);
+                return visitNode(cbNode, node.expression) || visitNode(cbNode, node.statement);
             case 181:
-                return visitNode(cbNode, node.initializer) ||
-                    visitNode(cbNode, node.condition) ||
-                    visitNode(cbNode, node.iterator) ||
-                    visitNode(cbNode, node.statement);
+                return visitNode(cbNode, node.initializer) || visitNode(cbNode, node.condition) || visitNode(cbNode, node.iterator) || visitNode(cbNode, node.statement);
             case 182:
-                return visitNode(cbNode, node.initializer) ||
-                    visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.statement);
+                return visitNode(cbNode, node.initializer) || visitNode(cbNode, node.expression) || visitNode(cbNode, node.statement);
             case 183:
-                return visitNode(cbNode, node.initializer) ||
-                    visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.statement);
+                return visitNode(cbNode, node.initializer) || visitNode(cbNode, node.expression) || visitNode(cbNode, node.statement);
             case 184:
             case 185:
                 return visitNode(cbNode, node.label);
             case 186:
                 return visitNode(cbNode, node.expression);
             case 187:
-                return visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.statement);
+                return visitNode(cbNode, node.expression) || visitNode(cbNode, node.statement);
             case 188:
-                return visitNode(cbNode, node.expression) ||
-                    visitNodes(cbNodes, node.clauses);
-            case 213:
-                return visitNode(cbNode, node.expression) ||
-                    visitNodes(cbNodes, node.statements);
+                return visitNode(cbNode, node.expression) || visitNode(cbNode, node.caseBlock);
+            case 202:
+                return visitNodes(cbNodes, node.clauses);
             case 214:
+                return visitNode(cbNode, node.expression) || visitNodes(cbNodes, node.statements);
+            case 215:
                 return visitNodes(cbNodes, node.statements);
             case 189:
-                return visitNode(cbNode, node.label) ||
-                    visitNode(cbNode, node.statement);
+                return visitNode(cbNode, node.label) || visitNode(cbNode, node.statement);
             case 190:
                 return visitNode(cbNode, node.expression);
             case 191:
-                return visitNode(cbNode, node.tryBlock) ||
-                    visitNode(cbNode, node.catchClause) ||
-                    visitNode(cbNode, node.finallyBlock);
-            case 216:
-                return visitNode(cbNode, node.variableDeclaration) ||
-                    visitNode(cbNode, node.block);
+                return visitNode(cbNode, node.tryBlock) || visitNode(cbNode, node.catchClause) || visitNode(cbNode, node.finallyBlock);
+            case 217:
+                return visitNode(cbNode, node.variableDeclaration) || visitNode(cbNode, node.block);
             case 196:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNodes(cbNodes, node.typeParameters) ||
-                    visitNodes(cbNodes, node.heritageClauses) ||
-                    visitNodes(cbNodes, node.members);
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.name) || visitNodes(cbNodes, node.typeParameters) || visitNodes(cbNodes, node.heritageClauses) || visitNodes(cbNodes, node.members);
             case 197:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNodes(cbNodes, node.typeParameters) ||
-                    visitNodes(cbNodes, node.heritageClauses) ||
-                    visitNodes(cbNodes, node.members);
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.name) || visitNodes(cbNodes, node.typeParameters) || visitNodes(cbNodes, node.heritageClauses) || visitNodes(cbNodes, node.members);
             case 198:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.type);
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.name) || visitNode(cbNode, node.type);
             case 199:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNodes(cbNodes, node.members);
-            case 219:
-                return visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.initializer);
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.name) || visitNodes(cbNodes, node.members);
+            case 220:
+                return visitNode(cbNode, node.name) || visitNode(cbNode, node.initializer);
             case 200:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.body);
-            case 202:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.moduleReference);
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.name) || visitNode(cbNode, node.body);
             case 203:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.importClause) ||
-                    visitNode(cbNode, node.moduleSpecifier);
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.name) || visitNode(cbNode, node.moduleReference);
             case 204:
-                return visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.namedBindings);
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.importClause) || visitNode(cbNode, node.moduleSpecifier);
             case 205:
-                return visitNode(cbNode, node.name);
+                return visitNode(cbNode, node.name) || visitNode(cbNode, node.namedBindings);
             case 206:
-            case 210:
-                return visitNodes(cbNodes, node.elements);
-            case 209:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.exportClause) ||
-                    visitNode(cbNode, node.moduleSpecifier);
+                return visitNode(cbNode, node.name);
             case 207:
             case 211:
-                return visitNode(cbNode, node.propertyName) ||
-                    visitNode(cbNode, node.name);
+                return visitNodes(cbNodes, node.elements);
+            case 210:
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.exportClause) || visitNode(cbNode, node.moduleSpecifier);
             case 208:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.expression);
+            case 212:
+                return visitNode(cbNode, node.propertyName) || visitNode(cbNode, node.name);
+            case 209:
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.expression);
             case 169:
                 return visitNode(cbNode, node.head) || visitNodes(cbNodes, node.templateSpans);
             case 173:
                 return visitNode(cbNode, node.expression) || visitNode(cbNode, node.literal);
             case 126:
                 return visitNode(cbNode, node.expression);
-            case 215:
+            case 216:
                 return visitNodes(cbNodes, node.types);
-            case 212:
+            case 213:
                 return visitNode(cbNode, node.expression);
         }
     }
     ts.forEachChild = forEachChild;
     function parsingContextErrors(context) {
         switch (context) {
-            case 0: return ts.Diagnostics.Declaration_or_statement_expected;
-            case 1: return ts.Diagnostics.Declaration_or_statement_expected;
-            case 2: return ts.Diagnostics.Statement_expected;
-            case 3: return ts.Diagnostics.case_or_default_expected;
-            case 4: return ts.Diagnostics.Statement_expected;
-            case 5: return ts.Diagnostics.Property_or_signature_expected;
-            case 6: return ts.Diagnostics.Unexpected_token_A_constructor_method_accessor_or_property_was_expected;
-            case 7: return ts.Diagnostics.Enum_member_expected;
-            case 8: return ts.Diagnostics.Type_reference_expected;
-            case 9: return ts.Diagnostics.Variable_declaration_expected;
-            case 10: return ts.Diagnostics.Property_destructuring_pattern_expected;
-            case 11: return ts.Diagnostics.Array_element_destructuring_pattern_expected;
-            case 12: return ts.Diagnostics.Argument_expression_expected;
-            case 13: return ts.Diagnostics.Property_assignment_expected;
-            case 14: return ts.Diagnostics.Expression_or_comma_expected;
-            case 15: return ts.Diagnostics.Parameter_declaration_expected;
-            case 16: return ts.Diagnostics.Type_parameter_declaration_expected;
-            case 17: return ts.Diagnostics.Type_argument_expected;
-            case 18: return ts.Diagnostics.Type_expected;
-            case 19: return ts.Diagnostics.Unexpected_token_expected;
-            case 20: return ts.Diagnostics.Identifier_expected;
+            case 0:
+                return ts.Diagnostics.Declaration_or_statement_expected;
+            case 1:
+                return ts.Diagnostics.Declaration_or_statement_expected;
+            case 2:
+                return ts.Diagnostics.Statement_expected;
+            case 3:
+                return ts.Diagnostics.case_or_default_expected;
+            case 4:
+                return ts.Diagnostics.Statement_expected;
+            case 5:
+                return ts.Diagnostics.Property_or_signature_expected;
+            case 6:
+                return ts.Diagnostics.Unexpected_token_A_constructor_method_accessor_or_property_was_expected;
+            case 7:
+                return ts.Diagnostics.Enum_member_expected;
+            case 8:
+                return ts.Diagnostics.Type_reference_expected;
+            case 9:
+                return ts.Diagnostics.Variable_declaration_expected;
+            case 10:
+                return ts.Diagnostics.Property_destructuring_pattern_expected;
+            case 11:
+                return ts.Diagnostics.Array_element_destructuring_pattern_expected;
+            case 12:
+                return ts.Diagnostics.Argument_expression_expected;
+            case 13:
+                return ts.Diagnostics.Property_assignment_expected;
+            case 14:
+                return ts.Diagnostics.Expression_or_comma_expected;
+            case 15:
+                return ts.Diagnostics.Parameter_declaration_expected;
+            case 16:
+                return ts.Diagnostics.Type_parameter_declaration_expected;
+            case 17:
+                return ts.Diagnostics.Type_argument_expected;
+            case 18:
+                return ts.Diagnostics.Type_expected;
+            case 19:
+                return ts.Diagnostics.Unexpected_token_expected;
+            case 20:
+                return ts.Diagnostics.Identifier_expected;
         }
     }
     ;
     function modifierToFlag(token) {
         switch (token) {
-            case 109: return 128;
-            case 108: return 16;
-            case 107: return 64;
-            case 106: return 32;
-            case 77: return 1;
-            case 114: return 2;
-            case 69: return 8192;
-            case 72: return 256;
+            case 109:
+                return 128;
+            case 108:
+                return 16;
+            case 107:
+                return 64;
+            case 106:
+                return 32;
+            case 77:
+                return 1;
+            case 114:
+                return 2;
+            case 69:
+                return 8192;
+            case 72:
+                return 256;
         }
         return 0;
     }
@@ -4483,8 +9246,7 @@ var ts;
     }
     ts.updateSourceFile = updateSourceFile;
     function isEvalOrArgumentsIdentifier(node) {
-        return node.kind === 64 &&
-            (node.text === "eval" || node.text === "arguments");
+        return node.kind === 64 && (node.text === "eval" || node.text === "arguments");
     }
     ts.isEvalOrArgumentsIdentifier = isEvalOrArgumentsIdentifier;
     function isUseStrictPrologueDirective(sourceFile, node) {
@@ -4566,7 +9328,7 @@ var ts;
         var identifierCount = 0;
         var nodeCount = 0;
         var token;
-        var sourceFile = createNode(220, 0);
+        var sourceFile = createNode(221, 0);
         sourceFile.pos = 0;
         sourceFile.end = sourceText.length;
         sourceFile.text = sourceText;
@@ -4702,9 +9464,7 @@ var ts;
             var saveParseDiagnosticsLength = sourceFile.parseDiagnostics.length;
             var saveParseErrorBeforeNextFinishedNode = parseErrorBeforeNextFinishedNode;
             var saveContextFlags = contextFlags;
-            var result = isLookAhead
-                ? scanner.lookAhead(callback)
-                : scanner.tryScan(callback);
+            var result = isLookAhead ? scanner.lookAhead(callback) : scanner.tryScan(callback);
             ts.Debug.assert(saveContextFlags === contextFlags);
             if (!result || isLookAhead) {
                 token = saveToken;
@@ -4755,8 +9515,7 @@ var ts;
             return undefined;
         }
         function parseExpectedToken(t, reportAtCurrentPosition, diagnosticMessage, arg0) {
-            return parseOptionalToken(t) ||
-                createMissingNode(t, reportAtCurrentPosition, diagnosticMessage, arg0);
+            return parseOptionalToken(t) || createMissingNode(t, reportAtCurrentPosition, diagnosticMessage, arg0);
         }
         function parseTokenNode() {
             var node = createNode(token);
@@ -4833,9 +9592,7 @@ var ts;
             return createIdentifier(isIdentifierOrKeyword());
         }
         function isLiteralPropertyName() {
-            return isIdentifierOrKeyword() ||
-                token === 8 ||
-                token === 7;
+            return isIdentifierOrKeyword() || token === 8 || token === 7;
         }
         function parsePropertyName() {
             if (token === 8 || token === 7) {
@@ -4888,10 +9645,7 @@ var ts;
             return canFollowModifier();
         }
         function canFollowModifier() {
-            return token === 18
-                || token === 14
-                || token === 35
-                || isLiteralPropertyName();
+            return token === 18 || token === 14 || token === 35 || isLiteralPropertyName();
         }
         function nextTokenIsClassOrFunction() {
             nextToken();
@@ -4949,8 +9703,7 @@ var ts;
             return isIdentifier();
         }
         function isNotHeritageClauseTypeName() {
-            if (token === 102 ||
-                token === 78) {
+            if (token === 102 || token === 78) {
                 return lookAhead(nextTokenIsIdentifier);
             }
             return false;
@@ -5116,10 +9869,10 @@ var ts;
         function isReusableModuleElement(node) {
             if (node) {
                 switch (node.kind) {
+                    case 204:
                     case 203:
-                    case 202:
+                    case 210:
                     case 209:
-                    case 208:
                     case 196:
                     case 197:
                     case 200:
@@ -5147,8 +9900,8 @@ var ts;
         function isReusableSwitchClause(node) {
             if (node) {
                 switch (node.kind) {
-                    case 213:
                     case 214:
+                    case 215:
                         return true;
                 }
             }
@@ -5183,7 +9936,7 @@ var ts;
             return false;
         }
         function isReusableEnumMember(node) {
-            return node.kind === 219;
+            return node.kind === 220;
         }
         function isReusableTypeMember(node) {
             if (node) {
@@ -5331,9 +10084,7 @@ var ts;
             var tokenPos = scanner.getTokenPos();
             nextToken();
             finishNode(node);
-            if (node.kind === 7
-                && sourceText.charCodeAt(tokenPos) === 48
-                && ts.isOctalDigit(sourceText.charCodeAt(tokenPos + 1))) {
+            if (node.kind === 7 && sourceText.charCodeAt(tokenPos) === 48 && ts.isOctalDigit(sourceText.charCodeAt(tokenPos + 1))) {
                 node.flags |= 16384;
             }
             return node;
@@ -5372,9 +10123,7 @@ var ts;
         }
         function parseParameterType() {
             if (parseOptional(51)) {
-                return token === 8
-                    ? parseLiteralNode(true)
-                    : parseType();
+                return token === 8 ? parseLiteralNode(true) : parseType();
             }
             return undefined;
         }
@@ -5532,11 +10281,7 @@ var ts;
         }
         function isTypeMemberWithLiteralPropertyName() {
             nextToken();
-            return token === 16 ||
-                token === 24 ||
-                token === 50 ||
-                token === 51 ||
-                canParseSemicolon();
+            return token === 16 || token === 24 || token === 50 || token === 51 || canParseSemicolon();
         }
         function parseTypeMember() {
             switch (token) {
@@ -5544,9 +10289,7 @@ var ts;
                 case 24:
                     return parseSignatureMember(136);
                 case 18:
-                    return isIndexSignature()
-                        ? parseIndexSignatureDeclaration(undefined)
-                        : parsePropertyOrMethodSignature();
+                    return isIndexSignature() ? parseIndexSignatureDeclaration(undefined) : parsePropertyOrMethodSignature();
                 case 87:
                     if (lookAhead(isStartOfConstructSignature)) {
                         return parseSignatureMember(137);
@@ -5568,9 +10311,7 @@ var ts;
         }
         function parseIndexSignatureWithModifiers() {
             var modifiers = parseModifiers();
-            return isIndexSignature()
-                ? parseIndexSignatureDeclaration(modifiers)
-                : undefined;
+            return isIndexSignature() ? parseIndexSignatureDeclaration(modifiers) : undefined;
         }
         function isStartOfConstructSignature() {
             nextToken();
@@ -5676,7 +10417,9 @@ var ts;
         function parseUnionTypeOrHigher() {
             var type = parseArrayTypeOrHigher();
             if (token === 44) {
-                var types = [type];
+                var types = [
+                    type
+                ];
                 types.pos = type.pos;
                 while (parseOptional(44)) {
                     types.push(parseArrayTypeOrHigher());
@@ -5701,9 +10444,7 @@ var ts;
             }
             if (isIdentifier() || ts.isModifier(token)) {
                 nextToken();
-                if (token === 51 || token === 23 ||
-                    token === 50 || token === 52 ||
-                    isIdentifier() || ts.isModifier(token)) {
+                if (token === 51 || token === 23 || token === 50 || token === 52 || isIdentifier() || ts.isModifier(token)) {
                     return true;
                 }
                 if (token === 17) {
@@ -5831,8 +10572,7 @@ var ts;
         function parseYieldExpression() {
             var node = createNode(170);
             nextToken();
-            if (!scanner.hasPrecedingLineBreak() &&
-                (token === 35 || isStartOfExpression())) {
+            if (!scanner.hasPrecedingLineBreak() && (token === 35 || isStartOfExpression())) {
                 node.asteriskToken = parseOptionalToken(35);
                 node.expression = parseAssignmentExpressionOrHigher();
                 return finishNode(node);
@@ -5847,7 +10587,9 @@ var ts;
             var parameter = createNode(128, identifier.pos);
             parameter.name = identifier;
             finishNode(parameter);
-            node.parameters = [parameter];
+            node.parameters = [
+                parameter
+            ];
             node.parameters.pos = parameter.pos;
             node.parameters.end = parameter.end;
             parseExpected(32);
@@ -5859,9 +10601,7 @@ var ts;
             if (triState === 0) {
                 return undefined;
             }
-            var arrowFunction = triState === 1
-                ? parseParenthesizedArrowFunctionExpressionHead(true)
-                : tryParse(parsePossibleParenthesizedArrowFunctionExpressionHead);
+            var arrowFunction = triState === 1 ? parseParenthesizedArrowFunctionExpressionHead(true) : tryParse(parsePossibleParenthesizedArrowFunctionExpressionHead);
             if (!arrowFunction) {
                 return undefined;
             }
@@ -6083,9 +10823,7 @@ var ts;
             return expression;
         }
         function parseLeftHandSideExpressionOrHigher() {
-            var expression = token === 90
-                ? parseSuperExpression()
-                : parseMemberExpressionOrHigher();
+            var expression = token === 90 ? parseSuperExpression() : parseMemberExpressionOrHigher();
             return parseCallExpressionRest(expression);
         }
         function parseMemberExpressionOrHigher() {
@@ -6139,9 +10877,7 @@ var ts;
                 if (token === 10 || token === 11) {
                     var tagExpression = createNode(157, expression.pos);
                     tagExpression.tag = expression;
-                    tagExpression.template = token === 10
-                        ? parseLiteralNode()
-                        : parseTemplateExpression();
+                    tagExpression.template = token === 10 ? parseLiteralNode() : parseTemplateExpression();
                     expression = finishNode(tagExpression);
                     continue;
                 }
@@ -6187,9 +10923,7 @@ var ts;
             if (!parseExpected(25)) {
                 return undefined;
             }
-            return typeArguments && canFollowTypeArgumentsInExpression()
-                ? typeArguments
-                : undefined;
+            return typeArguments && canFollowTypeArgumentsInExpression() ? typeArguments : undefined;
         }
         function canFollowTypeArgumentsInExpression() {
             switch (token) {
@@ -6264,9 +10998,7 @@ var ts;
             return finishNode(node);
         }
         function parseArgumentOrArrayLiteralElement() {
-            return token === 21 ? parseSpreadElement() :
-                token === 23 ? createNode(172) :
-                    parseAssignmentExpressionOrHigher();
+            return token === 21 ? parseSpreadElement() : token === 23 ? createNode(172) : parseAssignmentExpressionOrHigher();
         }
         function parseArgumentExpression() {
             return allowInAnd(parseArgumentOrArrayLiteralElement);
@@ -6305,13 +11037,13 @@ var ts;
                 return parseMethodDeclaration(fullStart, modifiers, asteriskToken, propertyName, questionToken);
             }
             if ((token === 23 || token === 15) && tokenIsIdentifier) {
-                var shorthandDeclaration = createNode(218, fullStart);
+                var shorthandDeclaration = createNode(219, fullStart);
                 shorthandDeclaration.name = propertyName;
                 shorthandDeclaration.questionToken = questionToken;
                 return finishNode(shorthandDeclaration);
             }
             else {
-                var propertyAssignment = createNode(217, fullStart);
+                var propertyAssignment = createNode(218, fullStart);
                 propertyAssignment.name = propertyName;
                 propertyAssignment.questionToken = questionToken;
                 parseExpected(51);
@@ -6477,7 +11209,7 @@ var ts;
             return finishNode(node);
         }
         function parseCaseClause() {
-            var node = createNode(213);
+            var node = createNode(214);
             parseExpected(66);
             node.expression = allowInAnd(parseExpression);
             parseExpected(51);
@@ -6485,7 +11217,7 @@ var ts;
             return finishNode(node);
         }
         function parseDefaultClause() {
-            var node = createNode(214);
+            var node = createNode(215);
             parseExpected(72);
             parseExpected(51);
             node.statements = parseList(4, false, parseStatement);
@@ -6500,9 +11232,11 @@ var ts;
             parseExpected(16);
             node.expression = allowInAnd(parseExpression);
             parseExpected(17);
+            var caseBlock = createNode(202, scanner.getStartPos());
             parseExpected(14);
-            node.clauses = parseList(3, false, parseCaseOrDefaultClause);
+            caseBlock.clauses = parseList(3, false, parseCaseOrDefaultClause);
             parseExpected(15);
+            node.caseBlock = finishNode(caseBlock);
             return finishNode(node);
         }
         function parseThrowStatement() {
@@ -6524,7 +11258,7 @@ var ts;
             return finishNode(node);
         }
         function parseCatchClause() {
-            var result = createNode(216);
+            var result = createNode(217);
             parseExpected(67);
             if (parseExpected(16)) {
                 result.variableDeclaration = parseVariableDeclaration();
@@ -6914,11 +11648,7 @@ var ts;
             if (isIndexSignature()) {
                 return parseIndexSignatureDeclaration(modifiers);
             }
-            if (isIdentifierOrKeyword() ||
-                token === 8 ||
-                token === 7 ||
-                token === 35 ||
-                token === 18) {
+            if (isIdentifierOrKeyword() || token === 8 || token === 7 || token === 35 || token === 18) {
                 return parsePropertyOrMethodDeclaration(fullStart, modifiers);
             }
             ts.Debug.fail("Should not have attempted to parse class member declaration.");
@@ -6931,9 +11661,7 @@ var ts;
             node.typeParameters = parseTypeParameters();
             node.heritageClauses = parseHeritageClauses(true);
             if (parseExpected(14)) {
-                node.members = inGeneratorParameterContext()
-                    ? doOutsideOfYieldContext(parseClassMembers)
-                    : parseClassMembers();
+                node.members = inGeneratorParameterContext() ? doOutsideOfYieldContext(parseClassMembers) : parseClassMembers();
                 parseExpected(15);
             }
             else {
@@ -6943,9 +11671,7 @@ var ts;
         }
         function parseHeritageClauses(isClassHeritageClause) {
             if (isHeritageClause()) {
-                return isClassHeritageClause && inGeneratorParameterContext()
-                    ? doOutsideOfYieldContext(parseHeritageClausesWorker)
-                    : parseHeritageClausesWorker();
+                return isClassHeritageClause && inGeneratorParameterContext() ? doOutsideOfYieldContext(parseHeritageClausesWorker) : parseHeritageClausesWorker();
             }
             return undefined;
         }
@@ -6954,7 +11680,7 @@ var ts;
         }
         function parseHeritageClause() {
             if (token === 78 || token === 102) {
-                var node = createNode(215);
+                var node = createNode(216);
                 node.token = token;
                 nextToken();
                 node.types = parseDelimitedList(8, parseTypeReference);
@@ -6989,7 +11715,7 @@ var ts;
             return finishNode(node);
         }
         function parseEnumMember() {
-            var node = createNode(219, scanner.getStartPos());
+            var node = createNode(220, scanner.getStartPos());
             node.name = parsePropertyName();
             node.initializer = allowInAnd(parseNonParameterInitializer);
             return finishNode(node);
@@ -7024,9 +11750,7 @@ var ts;
             setModifiers(node, modifiers);
             node.flags |= flags;
             node.name = parseIdentifier();
-            node.body = parseOptional(20)
-                ? parseInternalModuleTail(getNodePos(), undefined, 1)
-                : parseModuleBlock();
+            node.body = parseOptional(20) ? parseInternalModuleTail(getNodePos(), undefined, 1) : parseModuleBlock();
             return finishNode(node);
         }
         function parseAmbientExternalModuleDeclaration(fullStart, modifiers) {
@@ -7038,21 +11762,17 @@ var ts;
         }
         function parseModuleDeclaration(fullStart, modifiers) {
             parseExpected(116);
-            return token === 8
-                ? parseAmbientExternalModuleDeclaration(fullStart, modifiers)
-                : parseInternalModuleTail(fullStart, modifiers, modifiers ? modifiers.flags : 0);
+            return token === 8 ? parseAmbientExternalModuleDeclaration(fullStart, modifiers) : parseInternalModuleTail(fullStart, modifiers, modifiers ? modifiers.flags : 0);
         }
         function isExternalModuleReference() {
-            return token === 117 &&
-                lookAhead(nextTokenIsOpenParen);
+            return token === 117 && lookAhead(nextTokenIsOpenParen);
         }
         function nextTokenIsOpenParen() {
             return nextToken() === 16;
         }
         function nextTokenIsCommaOrFromKeyword() {
             nextToken();
-            return token === 23 ||
-                token === 123;
+            return token === 23 || token === 123;
         }
         function parseImportDeclarationOrImportEqualsDeclaration(fullStart, modifiers) {
             parseExpected(84);
@@ -7061,7 +11781,7 @@ var ts;
             if (isIdentifier()) {
                 identifier = parseIdentifier();
                 if (token !== 23 && token !== 123) {
-                    var importEqualsDeclaration = createNode(202, fullStart);
+                    var importEqualsDeclaration = createNode(203, fullStart);
                     setModifiers(importEqualsDeclaration, modifiers);
                     importEqualsDeclaration.name = identifier;
                     parseExpected(52);
@@ -7070,11 +11790,9 @@ var ts;
                     return finishNode(importEqualsDeclaration);
                 }
             }
-            var importDeclaration = createNode(203, fullStart);
+            var importDeclaration = createNode(204, fullStart);
             setModifiers(importDeclaration, modifiers);
-            if (identifier ||
-                token === 35 ||
-                token === 14) {
+            if (identifier || token === 35 || token === 14) {
                 importDeclaration.importClause = parseImportClause(identifier, afterImportPos);
                 parseExpected(123);
             }
@@ -7083,23 +11801,20 @@ var ts;
             return finishNode(importDeclaration);
         }
         function parseImportClause(identifier, fullStart) {
-            var importClause = createNode(204, fullStart);
+            var importClause = createNode(205, fullStart);
             if (identifier) {
                 importClause.name = identifier;
             }
-            if (!importClause.name ||
-                parseOptional(23)) {
-                importClause.namedBindings = token === 35 ? parseNamespaceImport() : parseNamedImportsOrExports(206);
+            if (!importClause.name || parseOptional(23)) {
+                importClause.namedBindings = token === 35 ? parseNamespaceImport() : parseNamedImportsOrExports(207);
             }
             return finishNode(importClause);
         }
         function parseModuleReference() {
-            return isExternalModuleReference()
-                ? parseExternalModuleReference()
-                : parseEntityName(false);
+            return isExternalModuleReference() ? parseExternalModuleReference() : parseEntityName(false);
         }
         function parseExternalModuleReference() {
-            var node = createNode(212);
+            var node = createNode(213);
             parseExpected(117);
             parseExpected(16);
             node.expression = parseModuleSpecifier();
@@ -7114,7 +11829,7 @@ var ts;
             return result;
         }
         function parseNamespaceImport() {
-            var namespaceImport = createNode(205);
+            var namespaceImport = createNode(206);
             parseExpected(35);
             parseExpected(101);
             namespaceImport.name = parseIdentifier();
@@ -7122,14 +11837,14 @@ var ts;
         }
         function parseNamedImportsOrExports(kind) {
             var node = createNode(kind);
-            node.elements = parseBracketedList(20, kind === 206 ? parseImportSpecifier : parseExportSpecifier, 14, 15);
+            node.elements = parseBracketedList(20, kind === 207 ? parseImportSpecifier : parseExportSpecifier, 14, 15);
             return finishNode(node);
         }
         function parseExportSpecifier() {
-            return parseImportOrExportSpecifier(211);
+            return parseImportOrExportSpecifier(212);
         }
         function parseImportSpecifier() {
-            return parseImportOrExportSpecifier(207);
+            return parseImportOrExportSpecifier(208);
         }
         function parseImportOrExportSpecifier(kind) {
             var node = createNode(kind);
@@ -7155,14 +11870,14 @@ var ts;
             return finishNode(node);
         }
         function parseExportDeclaration(fullStart, modifiers) {
-            var node = createNode(209, fullStart);
+            var node = createNode(210, fullStart);
             setModifiers(node, modifiers);
             if (parseOptional(35)) {
                 parseExpected(123);
                 node.moduleSpecifier = parseModuleSpecifier();
             }
             else {
-                node.exportClause = parseNamedImportsOrExports(210);
+                node.exportClause = parseNamedImportsOrExports(211);
                 if (parseOptional(123)) {
                     node.moduleSpecifier = parseModuleSpecifier();
                 }
@@ -7171,7 +11886,7 @@ var ts;
             return finishNode(node);
         }
         function parseExportAssignment(fullStart, modifiers) {
-            var node = createNode(208, fullStart);
+            var node = createNode(209, fullStart);
             setModifiers(node, modifiers);
             if (parseOptional(52)) {
                 node.isExportEquals = true;
@@ -7226,13 +11941,11 @@ var ts;
         }
         function nextTokenCanFollowImportKeyword() {
             nextToken();
-            return isIdentifierOrKeyword() || token === 8 ||
-                token === 35 || token === 14;
+            return isIdentifierOrKeyword() || token === 8 || token === 35 || token === 14;
         }
         function nextTokenCanFollowExportKeyword() {
             nextToken();
-            return token === 52 || token === 35 ||
-                token === 14 || token === 72 || isDeclarationStart();
+            return token === 52 || token === 35 || token === 14 || token === 72 || isDeclarationStart();
         }
         function nextTokenIsDeclarationStart() {
             nextToken();
@@ -7286,9 +11999,7 @@ var ts;
             return parseSourceElementOrModuleElement();
         }
         function parseSourceElementOrModuleElement() {
-            return isDeclarationStart()
-                ? parseDeclaration()
-                : parseStatement();
+            return isDeclarationStart() ? parseDeclaration() : parseStatement();
         }
         function processReferenceComments(sourceFile) {
             var triviaScanner = ts.createScanner(sourceFile.languageVersion, false, sourceText);
@@ -7303,7 +12014,10 @@ var ts;
                 if (kind !== 2) {
                     break;
                 }
-                var range = { pos: triviaScanner.getTokenPos(), end: triviaScanner.getTextPos() };
+                var range = {
+                    pos: triviaScanner.getTokenPos(),
+                    end: triviaScanner.getTextPos()
+                };
                 var comment = sourceText.substring(range.pos, range.end);
                 var referencePathMatchResult = ts.getFileReferenceFromReferencePath(comment, range);
                 if (referencePathMatchResult) {
@@ -7334,7 +12048,10 @@ var ts;
                         var pathMatchResult = pathRegex.exec(comment);
                         var nameMatchResult = nameRegex.exec(comment);
                         if (pathMatchResult) {
-                            var amdDependency = { path: pathMatchResult[2], name: nameMatchResult ? nameMatchResult[2] : undefined };
+                            var amdDependency = {
+                                path: pathMatchResult[2],
+                                name: nameMatchResult ? nameMatchResult[2] : undefined
+                            };
                             amdDependencies.push(amdDependency);
                         }
                     }
@@ -7346,13 +12063,7 @@ var ts;
         }
         function setExternalModuleIndicator(sourceFile) {
             sourceFile.externalModuleIndicator = ts.forEach(sourceFile.statements, function (node) {
-                return node.flags & 1
-                    || node.kind === 202 && node.moduleReference.kind === 212
-                    || node.kind === 203
-                    || node.kind === 208
-                    || node.kind === 209
-                    ? node
-                    : undefined;
+                return node.flags & 1 || node.kind === 203 && node.moduleReference.kind === 213 || node.kind === 204 || node.kind === 209 || node.kind === 210 ? node : undefined;
             });
         }
     }
@@ -7400,7 +12111,7 @@ var ts;
         else if (ts.isConstEnumDeclaration(node)) {
             return 2;
         }
-        else if ((node.kind === 203 || node.kind === 202) && !(node.flags & 1)) {
+        else if ((node.kind === 204 || node.kind === 203) && !(node.flags & 1)) {
             return 0;
         }
         else if (node.kind === 201) {
@@ -7493,9 +12204,9 @@ var ts;
                     return "__new";
                 case 138:
                     return "__index";
-                case 209:
+                case 210:
                     return "__export";
-                case 208:
+                case 209:
                     return "default";
                 case 195:
                 case 196:
@@ -7514,9 +12225,7 @@ var ts;
                     if (node.name) {
                         node.name.parent = node;
                     }
-                    var message = symbol.flags & 2
-                        ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0
-                        : ts.Diagnostics.Duplicate_identifier_0;
+                    var message = symbol.flags & 2 ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 : ts.Diagnostics.Duplicate_identifier_0;
                     ts.forEach(symbol.declarations, function (declaration) {
                         file.bindDiagnostics.push(ts.createDiagnosticForNode(declaration.name || declaration, message, getDisplayName(declaration)));
                     });
@@ -7553,7 +12262,7 @@ var ts;
         function declareModuleMember(node, symbolKind, symbolExcludes) {
             var hasExportModifier = ts.getCombinedNodeFlags(node) & 1;
             if (symbolKind & 8388608) {
-                if (node.kind === 211 || (node.kind === 202 && hasExportModifier)) {
+                if (node.kind === 212 || (node.kind === 203 && hasExportModifier)) {
                     declareSymbol(container.symbol.exports, container.symbol, node, symbolKind, symbolExcludes);
                 }
                 else {
@@ -7562,9 +12271,7 @@ var ts;
             }
             else {
                 if (hasExportModifier || isAmbientContext(container)) {
-                    var exportKind = (symbolKind & 107455 ? 1048576 : 0) |
-                        (symbolKind & 793056 ? 2097152 : 0) |
-                        (symbolKind & 1536 ? 4194304 : 0);
+                    var exportKind = (symbolKind & 107455 ? 1048576 : 0) | (symbolKind & 793056 ? 2097152 : 0) | (symbolKind & 1536 ? 4194304 : 0);
                     var local = declareSymbol(container.locals, undefined, node, exportKind, symbolExcludes);
                     local.exportSymbol = declareSymbol(container.symbol.exports, container.symbol, node, symbolKind, symbolExcludes);
                     node.localSymbol = local;
@@ -7590,7 +12297,7 @@ var ts;
                 lastContainer = container;
             }
             if (isBlockScopeContainer) {
-                setBlockScopeContainer(node, (symbolKind & 255504) === 0 && node.kind !== 220);
+                setBlockScopeContainer(node, (symbolKind & 255504) === 0 && node.kind !== 221);
             }
             ts.forEachChild(node, bind);
             container = saveContainer;
@@ -7602,7 +12309,7 @@ var ts;
                 case 200:
                     declareModuleMember(node, symbolKind, symbolExcludes);
                     break;
-                case 220:
+                case 221:
                     if (ts.isExternalModule(container)) {
                         declareModuleMember(node, symbolKind, symbolExcludes);
                         break;
@@ -7680,7 +12387,7 @@ var ts;
                 case 200:
                     declareModuleMember(node, 2, 107455);
                     break;
-                case 220:
+                case 221:
                     if (ts.isExternalModule(container)) {
                         declareModuleMember(node, 2, 107455);
                         break;
@@ -7721,11 +12428,11 @@ var ts;
                 case 129:
                     bindPropertyOrMethodOrAccessor(node, 4 | (node.questionToken ? 536870912 : 0), 107455, false);
                     break;
-                case 217:
                 case 218:
+                case 219:
                     bindPropertyOrMethodOrAccessor(node, 4, 107455, false);
                     break;
-                case 219:
+                case 220:
                     bindPropertyOrMethodOrAccessor(node, 8, 107455, false);
                     break;
                 case 136:
@@ -7763,7 +12470,7 @@ var ts;
                 case 161:
                     bindAnonymousDeclaration(node, 16, "__function", true);
                     break;
-                case 216:
+                case 217:
                     bindCatchVariableDeclaration(node);
                     break;
                 case 196:
@@ -7786,13 +12493,13 @@ var ts;
                 case 200:
                     bindModuleDeclaration(node);
                     break;
-                case 202:
-                case 205:
-                case 207:
-                case 211:
+                case 203:
+                case 206:
+                case 208:
+                case 212:
                     bindDeclaration(node, 8388608, 8388608, false);
                     break;
-                case 204:
+                case 205:
                     if (node.name) {
                         bindDeclaration(node, 8388608, 8388608, false);
                     }
@@ -7800,13 +12507,13 @@ var ts;
                         bindChildren(node, 0, false);
                     }
                     break;
-                case 209:
+                case 210:
                     if (!node.exportClause) {
                         declareSymbol(container.symbol.exports, container.symbol, node, 1073741824, 0);
                     }
                     bindChildren(node, 0, false);
                     break;
-                case 208:
+                case 209:
                     if (node.expression.kind === 64) {
                         declareSymbol(container.symbol.exports, container.symbol, node, 8388608, 8388608);
                     }
@@ -7815,7 +12522,7 @@ var ts;
                     }
                     bindChildren(node, 0, false);
                     break;
-                case 220:
+                case 221:
                     if (ts.isExternalModule(node)) {
                         bindAnonymousDeclaration(node, 512, '"' + ts.removeFileExtension(node.fileName) + '"', true);
                         break;
@@ -7823,11 +12530,11 @@ var ts;
                 case 174:
                     bindChildren(node, 0, !ts.isFunctionLike(node.parent));
                     break;
-                case 216:
+                case 217:
                 case 181:
                 case 182:
                 case 183:
-                case 188:
+                case 202:
                     bindChildren(node, 0, true);
                     break;
                 default:
@@ -7844,9 +12551,7 @@ var ts;
             else {
                 bindDeclaration(node, 1, 107455, false);
             }
-            if (node.flags & 112 &&
-                node.parent.kind === 133 &&
-                node.parent.parent.kind === 196) {
+            if (node.flags & 112 && node.parent.kind === 133 && node.parent.parent.kind === 196) {
                 var classDeclaration = node.parent.parent;
                 declareSymbol(classDeclaration.symbol.members, classDeclaration.symbol, node, 4, 107455);
             }
@@ -7878,12 +12583,24 @@ var ts;
         var languageVersion = compilerOptions.target || 0;
         var emitResolver = createResolver();
         var checker = {
-            getNodeCount: function () { return ts.sum(host.getSourceFiles(), "nodeCount"); },
-            getIdentifierCount: function () { return ts.sum(host.getSourceFiles(), "identifierCount"); },
-            getSymbolCount: function () { return ts.sum(host.getSourceFiles(), "symbolCount"); },
-            getTypeCount: function () { return typeCount; },
-            isUndefinedSymbol: function (symbol) { return symbol === undefinedSymbol; },
-            isArgumentsSymbol: function (symbol) { return symbol === argumentsSymbol; },
+            getNodeCount: function () {
+                return ts.sum(host.getSourceFiles(), "nodeCount");
+            },
+            getIdentifierCount: function () {
+                return ts.sum(host.getSourceFiles(), "identifierCount");
+            },
+            getSymbolCount: function () {
+                return ts.sum(host.getSourceFiles(), "symbolCount");
+            },
+            getTypeCount: function () {
+                return typeCount;
+            },
+            isUndefinedSymbol: function (symbol) {
+                return symbol === undefinedSymbol;
+            },
+            isArgumentsSymbol: function (symbol) {
+                return symbol === argumentsSymbol;
+            },
             getDiagnostics: getDiagnostics,
             getGlobalDiagnostics: getGlobalDiagnostics,
             getTypeOfSymbolAtLocation: getTypeOfSymbolAtLocation,
@@ -7979,9 +12696,7 @@ var ts;
             return emitResolver;
         }
         function error(location, message, arg0, arg1, arg2) {
-            var diagnostic = location
-                ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2)
-                : ts.createCompilerDiagnostic(message, arg0, arg1, arg2);
+            var diagnostic = location ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2) : ts.createCompilerDiagnostic(message, arg0, arg1, arg2);
             diagnostics.add(diagnostic);
         }
         function createSymbol(flags, name) {
@@ -8067,8 +12782,7 @@ var ts;
                 recordMergedSymbol(target, source);
             }
             else {
-                var message = target.flags & 2 || source.flags & 2
-                    ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 : ts.Diagnostics.Duplicate_identifier_0;
+                var message = target.flags & 2 || source.flags & 2 ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 : ts.Diagnostics.Duplicate_identifier_0;
                 ts.forEach(source.declarations, function (node) {
                     error(node.name ? node.name : node, message, symbolToString(source));
                 });
@@ -8115,10 +12829,10 @@ var ts;
             return nodeLinks[node.id] || (nodeLinks[node.id] = {});
         }
         function getSourceFile(node) {
-            return ts.getAncestor(node, 220);
+            return ts.getAncestor(node, 221);
         }
         function isGlobalSourceFile(node) {
-            return node.kind === 220 && !ts.isExternalModule(node);
+            return node.kind === 221 && !ts.isExternalModule(node);
         }
         function getSymbol(symbols, name, meaning) {
             if (meaning && ts.hasProperty(symbols, name)) {
@@ -8159,12 +12873,12 @@ var ts;
                     }
                 }
                 switch (location.kind) {
-                    case 220:
+                    case 221:
                         if (!ts.isExternalModule(location))
                             break;
                     case 200:
                         if (result = getSymbol(getSymbolOfNode(location).exports, name, meaning & 8914931)) {
-                            if (!(result.flags & 8388608 && getDeclarationOfAliasSymbol(result).kind === 211)) {
+                            if (!(result.flags & 8388608 && getDeclarationOfAliasSymbol(result).kind === 212)) {
                                 break loop;
                             }
                             result = undefined;
@@ -8248,28 +12962,54 @@ var ts;
                     return undefined;
                 }
                 if (result.flags & 2) {
-                    var declaration = ts.forEach(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) ? d : undefined; });
-                    ts.Debug.assert(declaration !== undefined, "Block-scoped variable declaration is undefined");
-                    if (!isDefinedBefore(declaration, errorLocation)) {
-                        error(errorLocation, ts.Diagnostics.Block_scoped_variable_0_used_before_its_declaration, ts.declarationNameToString(declaration.name));
-                    }
+                    checkResolvedBlockScopedVariable(result, errorLocation);
                 }
             }
             return result;
         }
+        function checkResolvedBlockScopedVariable(result, errorLocation) {
+            ts.Debug.assert((result.flags & 2) !== 0);
+            var declaration = ts.forEach(result.declarations, function (d) {
+                return ts.isBlockOrCatchScoped(d) ? d : undefined;
+            });
+            ts.Debug.assert(declaration !== undefined, "Block-scoped variable declaration is undefined");
+            var isUsedBeforeDeclaration = !isDefinedBefore(declaration, errorLocation);
+            if (!isUsedBeforeDeclaration) {
+                var variableDeclaration = ts.getAncestor(declaration, 193);
+                var container = ts.getEnclosingBlockScopeContainer(variableDeclaration);
+                if (variableDeclaration.parent.parent.kind === 175 || variableDeclaration.parent.parent.kind === 181) {
+                    isUsedBeforeDeclaration = isSameScopeDescendentOf(errorLocation, variableDeclaration, container);
+                }
+                else if (variableDeclaration.parent.parent.kind === 183 || variableDeclaration.parent.parent.kind === 182) {
+                    var expression = variableDeclaration.parent.parent.expression;
+                    isUsedBeforeDeclaration = isSameScopeDescendentOf(errorLocation, expression, container);
+                }
+            }
+            if (isUsedBeforeDeclaration) {
+                error(errorLocation, ts.Diagnostics.Block_scoped_variable_0_used_before_its_declaration, ts.declarationNameToString(declaration.name));
+            }
+        }
+        function isSameScopeDescendentOf(initial, parent, stopAt) {
+            if (!parent) {
+                return false;
+            }
+            for (var current = initial; current && current !== stopAt && !ts.isFunctionLike(current); current = current.parent) {
+                if (current === parent) {
+                    return true;
+                }
+            }
+            return false;
+        }
         function isAliasSymbolDeclaration(node) {
-            return node.kind === 202 ||
-                node.kind === 204 && !!node.name ||
-                node.kind === 205 ||
-                node.kind === 207 ||
-                node.kind === 211 ||
-                node.kind === 208;
+            return node.kind === 203 || node.kind === 205 && !!node.name || node.kind === 206 || node.kind === 208 || node.kind === 212 || node.kind === 209;
         }
         function getDeclarationOfAliasSymbol(symbol) {
-            return ts.forEach(symbol.declarations, function (d) { return isAliasSymbolDeclaration(d) ? d : undefined; });
+            return ts.forEach(symbol.declarations, function (d) {
+                return isAliasSymbolDeclaration(d) ? d : undefined;
+            });
         }
         function getTargetOfImportEqualsDeclaration(node) {
-            if (node.moduleReference.kind === 212) {
+            if (node.moduleReference.kind === 213) {
                 var moduleSymbol = resolveExternalModuleName(node, ts.getExternalModuleImportEqualsDeclarationExpression(node));
                 var exportAssignmentSymbol = moduleSymbol && getResolvedExportAssignmentSymbol(moduleSymbol);
                 return exportAssignmentSymbol || moduleSymbol;
@@ -8307,26 +13047,24 @@ var ts;
             return getExternalModuleMember(node.parent.parent.parent, node);
         }
         function getTargetOfExportSpecifier(node) {
-            return node.parent.parent.moduleSpecifier ?
-                getExternalModuleMember(node.parent.parent, node) :
-                resolveEntityName(node.propertyName || node.name, 107455 | 793056 | 1536);
+            return node.parent.parent.moduleSpecifier ? getExternalModuleMember(node.parent.parent, node) : resolveEntityName(node.propertyName || node.name, 107455 | 793056 | 1536);
         }
         function getTargetOfExportAssignment(node) {
             return resolveEntityName(node.expression, 107455 | 793056 | 1536);
         }
         function getTargetOfImportDeclaration(node) {
             switch (node.kind) {
-                case 202:
+                case 203:
                     return getTargetOfImportEqualsDeclaration(node);
-                case 204:
-                    return getTargetOfImportClause(node);
                 case 205:
+                    return getTargetOfImportClause(node);
+                case 206:
                     return getTargetOfNamespaceImport(node);
-                case 207:
-                    return getTargetOfImportSpecifier(node);
-                case 211:
-                    return getTargetOfExportSpecifier(node);
                 case 208:
+                    return getTargetOfImportSpecifier(node);
+                case 212:
+                    return getTargetOfExportSpecifier(node);
+                case 209:
                     return getTargetOfExportAssignment(node);
             }
         }
@@ -8361,10 +13099,10 @@ var ts;
             if (!links.referenced) {
                 links.referenced = true;
                 var node = getDeclarationOfAliasSymbol(symbol);
-                if (node.kind === 208) {
+                if (node.kind === 209) {
                     checkExpressionCached(node.expression);
                 }
-                else if (node.kind === 211) {
+                else if (node.kind === 212) {
                     checkExpressionCached(node.propertyName || node.name);
                 }
                 else if (ts.isInternalModuleImportEqualsDeclaration(node)) {
@@ -8374,7 +13112,7 @@ var ts;
         }
         function getSymbolOfPartOfRightHandSideOfImportEquals(entityName, importDeclaration) {
             if (!importDeclaration) {
-                importDeclaration = ts.getAncestor(entityName, 202);
+                importDeclaration = ts.getAncestor(entityName, 203);
                 ts.Debug.assert(importDeclaration !== undefined);
             }
             if (entityName.kind === 64 && isRightSideOfQualifiedNameOrPropertyAccess(entityName)) {
@@ -8384,7 +13122,7 @@ var ts;
                 return resolveEntityName(entityName, 1536);
             }
             else {
-                ts.Debug.assert(entityName.parent.kind === 202);
+                ts.Debug.assert(entityName.parent.kind === 203);
                 return resolveEntityName(entityName, 107455 | 793056 | 1536);
             }
         }
@@ -8524,9 +13262,7 @@ var ts;
             return getMergedSymbol(symbol.parent);
         }
         function getExportSymbolOfValueSymbolIfExported(symbol) {
-            return symbol && (symbol.flags & 1048576) !== 0
-                ? getMergedSymbol(symbol.exportSymbol)
-                : symbol;
+            return symbol && (symbol.flags & 1048576) !== 0 ? getMergedSymbol(symbol.exportSymbol) : symbol;
         }
         function symbolIsValue(symbol) {
             if (symbol.flags & 16777216) {
@@ -8565,10 +13301,7 @@ var ts;
             return type;
         }
         function isReservedMemberName(name) {
-            return name.charCodeAt(0) === 95 &&
-                name.charCodeAt(1) === 95 &&
-                name.charCodeAt(2) !== 95 &&
-                name.charCodeAt(2) !== 64;
+            return name.charCodeAt(0) === 95 && name.charCodeAt(1) === 95 && name.charCodeAt(2) !== 95 && name.charCodeAt(2) !== 64;
         }
         function getNamedMembers(members) {
             var result;
@@ -8609,7 +13342,7 @@ var ts;
                     }
                 }
                 switch (location.kind) {
-                    case 220:
+                    case 221:
                         if (!ts.isExternalModule(location)) {
                             break;
                         }
@@ -8642,24 +13375,28 @@ var ts;
                 }
                 function isAccessible(symbolFromSymbolTable, resolvedAliasSymbol) {
                     if (symbol === (resolvedAliasSymbol || symbolFromSymbolTable)) {
-                        return !ts.forEach(symbolFromSymbolTable.declarations, hasExternalModuleSymbol) &&
-                            canQualifySymbol(symbolFromSymbolTable, meaning);
+                        return !ts.forEach(symbolFromSymbolTable.declarations, hasExternalModuleSymbol) && canQualifySymbol(symbolFromSymbolTable, meaning);
                     }
                 }
                 if (isAccessible(ts.lookUp(symbols, symbol.name))) {
-                    return [symbol];
+                    return [
+                        symbol
+                    ];
                 }
                 return ts.forEachValue(symbols, function (symbolFromSymbolTable) {
                     if (symbolFromSymbolTable.flags & 8388608) {
-                        if (!useOnlyExternalAliasing ||
-                            ts.forEach(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration)) {
+                        if (!useOnlyExternalAliasing || ts.forEach(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration)) {
                             var resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable);
                             if (isAccessible(symbolFromSymbolTable, resolveAlias(symbolFromSymbolTable))) {
-                                return [symbolFromSymbolTable];
+                                return [
+                                    symbolFromSymbolTable
+                                ];
                             }
                             var accessibleSymbolsFromExports = resolvedImportedSymbol.exports ? getAccessibleSymbolChainFromSymbolTable(resolvedImportedSymbol.exports) : undefined;
                             if (accessibleSymbolsFromExports && canQualifySymbol(symbolFromSymbolTable, getQualifiedLeftMeaning(meaning))) {
-                                return [symbolFromSymbolTable].concat(accessibleSymbolsFromExports);
+                                return [
+                                    symbolFromSymbolTable
+                                ].concat(accessibleSymbolsFromExports);
                             }
                         }
                     }
@@ -8724,7 +13461,9 @@ var ts;
                     errorSymbolName: symbolToString(initialSymbol, enclosingDeclaration, meaning)
                 };
             }
-            return { accessibility: 0 };
+            return {
+                accessibility: 0
+            };
             function getExternalModuleContainer(declaration) {
                 for (; declaration; declaration = declaration.parent) {
                     if (hasExternalModuleSymbol(declaration)) {
@@ -8734,20 +13473,22 @@ var ts;
             }
         }
         function hasExternalModuleSymbol(declaration) {
-            return (declaration.kind === 200 && declaration.name.kind === 8) ||
-                (declaration.kind === 220 && ts.isExternalModule(declaration));
+            return (declaration.kind === 200 && declaration.name.kind === 8) || (declaration.kind === 221 && ts.isExternalModule(declaration));
         }
         function hasVisibleDeclarations(symbol) {
             var aliasesToMakeVisible;
-            if (ts.forEach(symbol.declarations, function (declaration) { return !getIsDeclarationVisible(declaration); })) {
+            if (ts.forEach(symbol.declarations, function (declaration) {
+                return !getIsDeclarationVisible(declaration);
+            })) {
                 return undefined;
             }
-            return { accessibility: 0, aliasesToMakeVisible: aliasesToMakeVisible };
+            return {
+                accessibility: 0,
+                aliasesToMakeVisible: aliasesToMakeVisible
+            };
             function getIsDeclarationVisible(declaration) {
                 if (!isDeclarationVisible(declaration)) {
-                    if (declaration.kind === 202 &&
-                        !(declaration.flags & 1) &&
-                        isDeclarationVisible(declaration.parent)) {
+                    if (declaration.kind === 203 && !(declaration.flags & 1) && isDeclarationVisible(declaration.parent)) {
                         getNodeLinks(declaration).isVisible = true;
                         if (aliasesToMakeVisible) {
                             if (!ts.contains(aliasesToMakeVisible, declaration)) {
@@ -8755,7 +13496,9 @@ var ts;
                             }
                         }
                         else {
-                            aliasesToMakeVisible = [declaration];
+                            aliasesToMakeVisible = [
+                                declaration
+                            ];
                         }
                         return true;
                     }
@@ -8769,8 +13512,7 @@ var ts;
             if (entityName.parent.kind === 142) {
                 meaning = 107455 | 1048576;
             }
-            else if (entityName.kind === 125 ||
-                entityName.parent.kind === 202) {
+            else if (entityName.kind === 125 || entityName.parent.kind === 203) {
                 meaning = 1536;
             }
             else {
@@ -8856,8 +13598,7 @@ var ts;
                 function walkSymbol(symbol, meaning) {
                     if (symbol) {
                         var accessibleSymbolChain = getAccessibleSymbolChain(symbol, enclosingDeclaration, meaning, !!(flags & 2));
-                        if (!accessibleSymbolChain ||
-                            needsQualification(accessibleSymbolChain[0], enclosingDeclaration, accessibleSymbolChain.length === 1 ? meaning : getQualifiedLeftMeaning(meaning))) {
+                        if (!accessibleSymbolChain || needsQualification(accessibleSymbolChain[0], enclosingDeclaration, accessibleSymbolChain.length === 1 ? meaning : getQualifiedLeftMeaning(meaning))) {
                             walkSymbol(getParentOfSymbol(accessibleSymbolChain ? accessibleSymbolChain[0] : symbol), getQualifiedLeftMeaning(meaning));
                         }
                         if (accessibleSymbolChain) {
@@ -8889,8 +13630,7 @@ var ts;
                 return writeType(type, globalFlags);
                 function writeType(type, flags) {
                     if (type.flags & 1048703) {
-                        writer.writeKeyword(!(globalFlags & 16) &&
-                            (type.flags & 1) ? "any" : type.intrinsicName);
+                        writer.writeKeyword(!(globalFlags & 16) && (type.flags & 1) ? "any" : type.intrinsicName);
                     }
                     else if (type.flags & 4096) {
                         writeTypeReference(type, flags);
@@ -8983,16 +13723,14 @@ var ts;
                     }
                     function shouldWriteTypeOfFunctionSymbol() {
                         if (type.symbol) {
-                            var isStaticMethodSymbol = !!(type.symbol.flags & 8192 &&
-                                ts.forEach(type.symbol.declarations, function (declaration) { return declaration.flags & 128; }));
-                            var isNonLocalFunctionSymbol = !!(type.symbol.flags & 16) &&
-                                (type.symbol.parent ||
-                                    ts.forEach(type.symbol.declarations, function (declaration) {
-                                        return declaration.parent.kind === 220 || declaration.parent.kind === 201;
-                                    }));
+                            var isStaticMethodSymbol = !!(type.symbol.flags & 8192 && ts.forEach(type.symbol.declarations, function (declaration) {
+                                return declaration.flags & 128;
+                            }));
+                            var isNonLocalFunctionSymbol = !!(type.symbol.flags & 16) && (type.symbol.parent || ts.forEach(type.symbol.declarations, function (declaration) {
+                                return declaration.parent.kind === 221 || declaration.parent.kind === 201;
+                            }));
                             if (isStaticMethodSymbol || isNonLocalFunctionSymbol) {
-                                return !!(flags & 2) ||
-                                    (typeStack && ts.contains(typeStack, type));
+                                return !!(flags & 2) || (typeStack && ts.contains(typeStack, type));
                             }
                         }
                     }
@@ -9222,7 +13960,7 @@ var ts;
                             return node;
                         }
                     }
-                    else if (node.kind === 220) {
+                    else if (node.kind === 221) {
                         return ts.isExternalModule(node) ? node : undefined;
                     }
                 }
@@ -9272,10 +14010,9 @@ var ts;
                     case 198:
                     case 195:
                     case 199:
-                    case 202:
+                    case 203:
                         var parent = getDeclarationContainer(node);
-                        if (!(ts.getCombinedNodeFlags(node) & 1) &&
-                            !(node.kind !== 202 && parent.kind !== 220 && ts.isInAmbientContext(parent))) {
+                        if (!(ts.getCombinedNodeFlags(node) & 1) && !(node.kind !== 203 && parent.kind !== 221 && ts.isInAmbientContext(parent))) {
                             return isGlobalSourceFile(parent) || isUsedInExportAssignment(node);
                         }
                         return isDeclarationVisible(parent);
@@ -9304,7 +14041,7 @@ var ts;
                     case 147:
                         return isDeclarationVisible(node.parent);
                     case 127:
-                    case 220:
+                    case 221:
                         return true;
                     default:
                         ts.Debug.fail("isDeclarationVisible unknown: SyntaxKind: " + node.kind);
@@ -9330,7 +14067,9 @@ var ts;
         }
         function getTypeOfPrototypeProperty(prototype) {
             var classType = getDeclaredTypeOfSymbol(prototype.parent);
-            return classType.typeParameters ? createTypeReference(classType, ts.map(classType.typeParameters, function (_) { return anyType; })) : classType;
+            return classType.typeParameters ? createTypeReference(classType, ts.map(classType.typeParameters, function (_) {
+                return anyType;
+            })) : classType;
         }
         function getTypeOfPropertyOfType(type, name) {
             var prop = getPropertyOfType(type, name);
@@ -9350,9 +14089,7 @@ var ts;
             }
             if (pattern.kind === 148) {
                 var name = declaration.propertyName || declaration.name;
-                var type = getTypeOfPropertyOfType(parentType, name.text) ||
-                    isNumericLiteralName(name.text) && getIndexTypeOfType(parentType, 1) ||
-                    getIndexTypeOfType(parentType, 0);
+                var type = getTypeOfPropertyOfType(parentType, name.text) || isNumericLiteralName(name.text) && getIndexTypeOfType(parentType, 1) || getIndexTypeOfType(parentType, 0);
                 if (!type) {
                     error(name, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(parentType), ts.declarationNameToString(name));
                     return unknownType;
@@ -9367,7 +14104,12 @@ var ts;
                     var propName = "" + ts.indexOf(pattern.elements, declaration);
                     var type = isTupleLikeType(parentType) ? getTypeOfPropertyOfType(parentType, propName) : getIndexTypeOfType(parentType, 1);
                     if (!type) {
-                        error(declaration, ts.Diagnostics.Type_0_has_no_property_1, typeToString(parentType), propName);
+                        if (isTupleType(parentType)) {
+                            error(declaration, ts.Diagnostics.Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2, typeToString(parentType), parentType.elementTypes.length, pattern.elements.length);
+                        }
+                        else {
+                            error(declaration, ts.Diagnostics.Type_0_has_no_property_1, typeToString(parentType), propName);
+                        }
                         return unknownType;
                     }
                 }
@@ -9382,7 +14124,7 @@ var ts;
                 return anyType;
             }
             if (declaration.parent.parent.kind === 183) {
-                return getTypeForVariableDeclarationInForOfStatement(declaration.parent.parent);
+                return checkRightHandSideOfForOf(declaration.parent.parent.expression) || anyType;
             }
             if (ts.isBindingPattern(declaration.parent)) {
                 return getTypeForBindingElement(declaration);
@@ -9406,7 +14148,7 @@ var ts;
             if (declaration.initializer) {
                 return checkExpressionCached(declaration.initializer);
             }
-            if (declaration.kind === 218) {
+            if (declaration.kind === 219) {
                 return checkIdentifier(declaration.name);
             }
             return undefined;
@@ -9443,9 +14185,7 @@ var ts;
             return !elementTypes.length ? anyArrayType : hasSpreadElement ? createArrayType(getUnionType(elementTypes)) : createTupleType(elementTypes);
         }
         function getTypeFromBindingPattern(pattern) {
-            return pattern.kind === 148
-                ? getTypeFromObjectBindingPattern(pattern)
-                : getTypeFromArrayBindingPattern(pattern);
+            return pattern.kind === 148 ? getTypeFromObjectBindingPattern(pattern) : getTypeFromArrayBindingPattern(pattern);
         }
         function getWidenedTypeForVariableLikeDeclaration(declaration, reportErrors) {
             var type = getTypeForVariableLikeDeclaration(declaration);
@@ -9453,7 +14193,7 @@ var ts;
                 if (reportErrors) {
                     reportErrorsFromWidening(declaration, type);
                 }
-                return declaration.kind !== 217 ? getWidenedType(type) : type;
+                return declaration.kind !== 218 ? getWidenedType(type) : type;
             }
             if (ts.isBindingPattern(declaration.name)) {
                 return getTypeFromBindingPattern(declaration.name);
@@ -9474,10 +14214,10 @@ var ts;
                     return links.type = getTypeOfPrototypeProperty(symbol);
                 }
                 var declaration = symbol.valueDeclaration;
-                if (declaration.parent.kind === 216) {
+                if (declaration.parent.kind === 217) {
                     return links.type = anyType;
                 }
-                if (declaration.kind === 208) {
+                if (declaration.kind === 209) {
                     return links.type = checkExpression(declaration.expression);
                 }
                 links.type = resolvingType;
@@ -9489,9 +14229,7 @@ var ts;
             else if (links.type === resolvingType) {
                 links.type = anyType;
                 if (compilerOptions.noImplicitAny) {
-                    var diagnostic = symbol.valueDeclaration.type ?
-                        ts.Diagnostics._0_implicitly_has_type_any_because_it_is_referenced_directly_or_indirectly_in_its_own_type_annotation :
-                        ts.Diagnostics._0_implicitly_has_type_any_because_it_is_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer;
+                    var diagnostic = symbol.valueDeclaration.type ? ts.Diagnostics._0_implicitly_has_type_any_because_it_is_referenced_directly_or_indirectly_in_its_own_type_annotation : ts.Diagnostics._0_implicitly_has_type_any_because_it_is_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer;
                     error(symbol.valueDeclaration, diagnostic, symbolToString(symbol));
                 }
             }
@@ -9625,7 +14363,9 @@ var ts;
                         ts.forEach(declaration.typeParameters, function (node) {
                             var tp = getDeclaredTypeOfTypeParameter(getSymbolOfNode(node));
                             if (!result) {
-                                result = [tp];
+                                result = [
+                                    tp
+                                ];
                             }
                             else if (!ts.contains(result, tp)) {
                                 result.push(tp);
@@ -9871,14 +14611,15 @@ var ts;
                 var baseType = classType.baseTypes[0];
                 var baseSignatures = getSignaturesOfType(getTypeOfSymbol(baseType.symbol), 1);
                 return ts.map(baseSignatures, function (baseSignature) {
-                    var signature = baseType.flags & 4096 ?
-                        getSignatureInstantiation(baseSignature, baseType.typeArguments) : cloneSignature(baseSignature);
+                    var signature = baseType.flags & 4096 ? getSignatureInstantiation(baseSignature, baseType.typeArguments) : cloneSignature(baseSignature);
                     signature.typeParameters = classType.typeParameters;
                     signature.resolvedReturnType = classType;
                     return signature;
                 });
             }
-            return [createSignature(undefined, classType.typeParameters, emptyArray, classType, 0, false, false)];
+            return [
+                createSignature(undefined, classType.typeParameters, emptyArray, classType, 0, false, false)
+            ];
         }
         function createTupleTypeMemberSymbols(memberTypes) {
             var members = {};
@@ -9907,7 +14648,9 @@ var ts;
             return true;
         }
         function getUnionSignatures(types, kind) {
-            var signatureLists = ts.map(types, function (t) { return getSignaturesOfType(t, kind); });
+            var signatureLists = ts.map(types, function (t) {
+                return getSignaturesOfType(t, kind);
+            });
             var signatures = signatureLists[0];
             for (var i = 0; i < signatures.length; i++) {
                 if (signatures[i].typeParameters) {
@@ -9923,7 +14666,9 @@ var ts;
             for (var i = 0; i < result.length; i++) {
                 var s = result[i];
                 s.resolvedReturnType = undefined;
-                s.unionSignatures = ts.map(signatureLists, function (signatures) { return signatures[i]; });
+                s.unionSignatures = ts.map(signatureLists, function (signatures) {
+                    return signatures[i];
+                });
             }
             return result;
         }
@@ -10067,7 +14812,9 @@ var ts;
                         return undefined;
                     }
                     if (!props) {
-                        props = [prop];
+                        props = [
+                            prop
+                        ];
                     }
                     else {
                         props.push(prop);
@@ -10167,8 +14914,7 @@ var ts;
             var links = getNodeLinks(declaration);
             if (!links.resolvedSignature) {
                 var classType = declaration.kind === 133 ? getDeclaredTypeOfClass(declaration.parent.symbol) : undefined;
-                var typeParameters = classType ? classType.typeParameters :
-                    declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) : undefined;
+                var typeParameters = classType ? classType.typeParameters : declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) : undefined;
                 var parameters = [];
                 var hasStringLiterals = false;
                 var minArgumentCount = -1;
@@ -10299,8 +15045,12 @@ var ts;
                 var type = createObjectType(32768 | 65536);
                 type.members = emptySymbols;
                 type.properties = emptyArray;
-                type.callSignatures = !isConstructor ? [signature] : emptyArray;
-                type.constructSignatures = isConstructor ? [signature] : emptyArray;
+                type.callSignatures = !isConstructor ? [
+                    signature
+                ] : emptyArray;
+                type.constructSignatures = isConstructor ? [
+                    signature
+                ] : emptyArray;
                 signature.isolatedSignatureType = type;
             }
             return signature.isolatedSignatureType;
@@ -10327,9 +15077,7 @@ var ts;
         }
         function getIndexTypeOfSymbol(symbol, kind) {
             var declaration = getIndexDeclarationOfSymbol(symbol, kind);
-            return declaration
-                ? declaration.type ? getTypeFromTypeNode(declaration.type) : anyType
-                : undefined;
+            return declaration ? declaration.type ? getTypeFromTypeNode(declaration.type) : anyType : undefined;
         }
         function getConstraintOfTypeParameter(type) {
             if (!type.constraint) {
@@ -10383,7 +15131,9 @@ var ts;
                 return links.isIllegalTypeReferenceInConstraint;
             }
             var currentNode = typeReferenceNode;
-            while (!ts.forEach(typeParameterSymbol.declarations, function (d) { return d.parent === currentNode.parent; })) {
+            while (!ts.forEach(typeParameterSymbol.declarations, function (d) {
+                return d.parent === currentNode.parent;
+            })) {
                 currentNode = currentNode.parent;
             }
             links.isIllegalTypeReferenceInConstraint = currentNode.kind === 127;
@@ -10397,7 +15147,9 @@ var ts;
                     if (links.isIllegalTypeReferenceInConstraint === undefined) {
                         var symbol = resolveName(typeParameter, n.typeName.text, 793056, undefined, undefined);
                         if (symbol && (symbol.flags & 262144)) {
-                            links.isIllegalTypeReferenceInConstraint = ts.forEach(symbol.declarations, function (d) { return d.parent == typeParameter.parent; });
+                            links.isIllegalTypeReferenceInConstraint = ts.forEach(symbol.declarations, function (d) {
+                                return d.parent == typeParameter.parent;
+                            });
                         }
                     }
                     if (links.isIllegalTypeReferenceInConstraint) {
@@ -10496,7 +15248,9 @@ var ts;
         }
         function createArrayType(elementType) {
             var arrayType = globalArrayType || getDeclaredTypeOfSymbol(globalArraySymbol);
-            return arrayType !== emptyObjectType ? createTypeReference(arrayType, [elementType]) : emptyObjectType;
+            return arrayType !== emptyObjectType ? createTypeReference(arrayType, [
+                elementType
+            ]) : emptyObjectType;
         }
         function getTypeFromArrayTypeNode(node) {
             var links = getNodeLinks(node);
@@ -10682,15 +15436,21 @@ var ts;
             return items;
         }
         function createUnaryTypeMapper(source, target) {
-            return function (t) { return t === source ? target : t; };
+            return function (t) {
+                return t === source ? target : t;
+            };
         }
         function createBinaryTypeMapper(source1, target1, source2, target2) {
-            return function (t) { return t === source1 ? target1 : t === source2 ? target2 : t; };
+            return function (t) {
+                return t === source1 ? target1 : t === source2 ? target2 : t;
+            };
         }
         function createTypeMapper(sources, targets) {
             switch (sources.length) {
-                case 1: return createUnaryTypeMapper(sources[0], targets[0]);
-                case 2: return createBinaryTypeMapper(sources[0], targets[0], sources[1], targets[1]);
+                case 1:
+                    return createUnaryTypeMapper(sources[0], targets[0]);
+                case 2:
+                    return createBinaryTypeMapper(sources[0], targets[0], sources[1], targets[1]);
             }
             return function (t) {
                 for (var i = 0; i < sources.length; i++) {
@@ -10701,15 +15461,21 @@ var ts;
             };
         }
         function createUnaryTypeEraser(source) {
-            return function (t) { return t === source ? anyType : t; };
+            return function (t) {
+                return t === source ? anyType : t;
+            };
         }
         function createBinaryTypeEraser(source1, source2) {
-            return function (t) { return t === source1 || t === source2 ? anyType : t; };
+            return function (t) {
+                return t === source1 || t === source2 ? anyType : t;
+            };
         }
         function createTypeEraser(sources) {
             switch (sources.length) {
-                case 1: return createUnaryTypeEraser(sources[0]);
-                case 2: return createBinaryTypeEraser(sources[0], sources[1]);
+                case 1:
+                    return createUnaryTypeEraser(sources[0]);
+                case 2:
+                    return createBinaryTypeEraser(sources[0], sources[1]);
             }
             return function (t) {
                 for (var i = 0; i < sources.length; i++) {
@@ -10733,7 +15499,9 @@ var ts;
             return type;
         }
         function combineTypeMappers(mapper1, mapper2) {
-            return function (t) { return mapper2(mapper1(t)); };
+            return function (t) {
+                return mapper2(mapper1(t));
+            };
         }
         function instantiateTypeParameter(typeParameter, mapper) {
             var result = createType(512);
@@ -10793,8 +15561,7 @@ var ts;
                     return mapper(type);
                 }
                 if (type.flags & 32768) {
-                    return type.symbol && type.symbol.flags & (16 | 8192 | 2048 | 4096) ?
-                        instantiateAnonymousType(type, mapper) : type;
+                    return type.symbol && type.symbol.flags & (16 | 8192 | 2048 | 4096) ? instantiateAnonymousType(type, mapper) : type;
                 }
                 if (type.flags & 4096) {
                     return createTypeReference(type.target, instantiateList(type.typeArguments, mapper, instantiateType));
@@ -10819,12 +15586,10 @@ var ts;
                 case 151:
                     return ts.forEach(node.elements, isContextSensitive);
                 case 168:
-                    return isContextSensitive(node.whenTrue) ||
-                        isContextSensitive(node.whenFalse);
+                    return isContextSensitive(node.whenTrue) || isContextSensitive(node.whenFalse);
                 case 167:
-                    return node.operatorToken.kind === 49 &&
-                        (isContextSensitive(node.left) || isContextSensitive(node.right));
-                case 217:
+                    return node.operatorToken.kind === 49 && (isContextSensitive(node.left) || isContextSensitive(node.right));
+                case 218:
                     return isContextSensitive(node.initializer);
                 case 132:
                 case 131:
@@ -10835,7 +15600,9 @@ var ts;
             return false;
         }
         function isContextSensitiveFunctionLikeDeclaration(node) {
-            return !node.typeParameters && node.parameters.length && !ts.forEach(node.parameters, function (p) { return p.type; });
+            return !node.typeParameters && node.parameters.length && !ts.forEach(node.parameters, function (p) {
+                return p.type;
+            });
         }
         function getTypeWithoutConstructors(type) {
             if (type.flags & 48128) {
@@ -10974,8 +15741,7 @@ var ts;
                     }
                     var reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo;
                     var sourceOrApparentType = relation === identityRelation ? source : getApparentType(source);
-                    if (sourceOrApparentType.flags & 48128 && target.flags & 48128 &&
-                        (result = objectTypeRelatedTo(sourceOrApparentType, target, reportStructuralErrors, elaborateErrors))) {
+                    if (sourceOrApparentType.flags & 48128 && target.flags & 48128 && (result = objectTypeRelatedTo(sourceOrApparentType, target, reportStructuralErrors, elaborateErrors))) {
                         errorInfo = saveErrorInfo;
                         return result;
                     }
@@ -11432,9 +16198,7 @@ var ts;
             if (source === target) {
                 return -1;
             }
-            if (source.parameters.length !== target.parameters.length ||
-                source.minArgumentCount !== target.minArgumentCount ||
-                source.hasRestParameter !== target.hasRestParameter) {
+            if (source.parameters.length !== target.parameters.length || source.minArgumentCount !== target.minArgumentCount || source.hasRestParameter !== target.hasRestParameter) {
                 return 0;
             }
             var result = -1;
@@ -11477,7 +16241,9 @@ var ts;
             return true;
         }
         function getCommonSupertype(types) {
-            return ts.forEach(types, function (t) { return isSupertypeOfEach(t, types) ? t : undefined; });
+            return ts.forEach(types, function (t) {
+                return isSupertypeOfEach(t, types) ? t : undefined;
+            });
         }
         function reportNoCommonSupertypeError(types, errorLocation, errorMessageChainHead) {
             var bestSupertype;
@@ -11514,6 +16280,9 @@ var ts;
         function isTupleLikeType(type) {
             return !!getPropertyOfType(type, "0");
         }
+        function isTupleType(type) {
+            return (type.flags & 8192) && !!type.elementTypes;
+        }
         function getWidenedTypeOfObjectLiteral(type) {
             var properties = getPropertiesOfObjectType(type);
             var members = {};
@@ -11593,9 +16362,7 @@ var ts;
                     var diagnostic = ts.Diagnostics.Member_0_implicitly_has_an_1_type;
                     break;
                 case 128:
-                    var diagnostic = declaration.dotDotDotToken ?
-                        ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type :
-                        ts.Diagnostics.Parameter_0_implicitly_has_an_1_type;
+                    var diagnostic = declaration.dotDotDotToken ? ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type : ts.Diagnostics.Parameter_0_implicitly_has_an_1_type;
                     break;
                 case 195:
                 case 132:
@@ -11651,7 +16418,10 @@ var ts;
         function createInferenceContext(typeParameters, inferUnionTypes) {
             var inferences = [];
             for (var i = 0; i < typeParameters.length; i++) {
-                inferences.push({ primary: undefined, secondary: undefined });
+                inferences.push({
+                    primary: undefined,
+                    secondary: undefined
+                });
             }
             return {
                 typeParameters: typeParameters,
@@ -11696,9 +16466,7 @@ var ts;
                     for (var i = 0; i < typeParameters.length; i++) {
                         if (target === typeParameters[i]) {
                             var inferences = context.inferences[i];
-                            var candidates = inferiority ?
-                                inferences.secondary || (inferences.secondary = []) :
-                                inferences.primary || (inferences.primary = []);
+                            var candidates = inferiority ? inferences.secondary || (inferences.secondary = []) : inferences.primary || (inferences.primary = []);
                             if (!ts.contains(candidates, source))
                                 candidates.push(source);
                             break;
@@ -11738,8 +16506,7 @@ var ts;
                         inferFromTypes(sourceTypes[i], target);
                     }
                 }
-                else if (source.flags & 48128 && (target.flags & (4096 | 8192) ||
-                    (target.flags & 32768) && target.symbol && target.symbol.flags & (8192 | 2048))) {
+                else if (source.flags & 48128 && (target.flags & (4096 | 8192) || (target.flags & 32768) && target.symbol && target.symbol.flags & (8192 | 2048))) {
                     if (!isInProcess(source, target) && isWithinDepthLimit(source, sourceStack) && isWithinDepthLimit(target, targetStack)) {
                         if (depth === 0) {
                             sourceStack = [];
@@ -11846,16 +16613,23 @@ var ts;
             }
             ts.Debug.fail("should not get here");
         }
-        function removeTypesFromUnionType(type, typeKind, isOfTypeKind) {
+        function removeTypesFromUnionType(type, typeKind, isOfTypeKind, allowEmptyUnionResult) {
             if (type.flags & 16384) {
                 var types = type.types;
-                if (ts.forEach(types, function (t) { return !!(t.flags & typeKind) === isOfTypeKind; })) {
-                    var narrowedType = getUnionType(ts.filter(types, function (t) { return !(t.flags & typeKind) === isOfTypeKind; }));
-                    if (narrowedType !== emptyObjectType) {
+                if (ts.forEach(types, function (t) {
+                    return !!(t.flags & typeKind) === isOfTypeKind;
+                })) {
+                    var narrowedType = getUnionType(ts.filter(types, function (t) {
+                        return !(t.flags & typeKind) === isOfTypeKind;
+                    }));
+                    if (allowEmptyUnionResult || narrowedType !== emptyObjectType) {
                         return narrowedType;
                     }
                 }
             }
+            else if (allowEmptyUnionResult && !!(type.flags & typeKind) === isOfTypeKind) {
+                return getUnionType(emptyArray);
+            }
             return type;
         }
         function hasInitializer(node) {
@@ -11927,12 +16701,12 @@ var ts;
                     case 186:
                     case 187:
                     case 188:
-                    case 213:
                     case 214:
+                    case 215:
                     case 189:
                     case 190:
                     case 191:
-                    case 216:
+                    case 217:
                         return ts.forEachChild(node, isAssignedIn);
                 }
                 return false;
@@ -11941,12 +16715,13 @@ var ts;
         function resolveLocation(node) {
             var containerNodes = [];
             for (var parent = node.parent; parent; parent = parent.parent) {
-                if ((ts.isExpression(parent) || ts.isObjectLiteralMethod(node)) &&
-                    isContextSensitive(parent)) {
+                if ((ts.isExpression(parent) || ts.isObjectLiteralMethod(node)) && isContextSensitive(parent)) {
                     containerNodes.unshift(parent);
                 }
             }
-            ts.forEach(containerNodes, function (node) { getTypeOfNode(node); });
+            ts.forEach(containerNodes, function (node) {
+                getTypeOfNode(node);
+            });
         }
         function getSymbolAtLocation(node) {
             resolveLocation(node);
@@ -11988,7 +16763,7 @@ var ts;
                                 }
                             }
                             break;
-                        case 220:
+                        case 221:
                         case 200:
                         case 195:
                         case 132:
@@ -12022,16 +16797,16 @@ var ts;
                 }
                 if (assumeTrue) {
                     if (!typeInfo) {
-                        return removeTypesFromUnionType(type, 258 | 132 | 8 | 1048576, true);
+                        return removeTypesFromUnionType(type, 258 | 132 | 8 | 1048576, true, false);
                     }
                     if (isTypeSubtypeOf(typeInfo.type, type)) {
                         return typeInfo.type;
                     }
-                    return removeTypesFromUnionType(type, typeInfo.flags, false);
+                    return removeTypesFromUnionType(type, typeInfo.flags, false, false);
                 }
                 else {
                     if (typeInfo) {
-                        return removeTypesFromUnionType(type, typeInfo.flags, true);
+                        return removeTypesFromUnionType(type, typeInfo.flags, true, false);
                     }
                     return type;
                 }
@@ -12075,7 +16850,9 @@ var ts;
                     return targetType;
                 }
                 if (type.flags & 16384) {
-                    return getUnionType(ts.filter(type.types, function (t) { return isTypeSubtypeOf(t, targetType); }));
+                    return getUnionType(ts.filter(type.types, function (t) {
+                        return isTypeSubtypeOf(t, targetType);
+                    }));
                 }
                 return type;
             }
@@ -12131,9 +16908,7 @@ var ts;
             return false;
         }
         function checkBlockScopedBindingCapturedInLoop(node, symbol) {
-            if (languageVersion >= 2 ||
-                (symbol.flags & 2) === 0 ||
-                symbol.valueDeclaration.parent.kind === 216) {
+            if (languageVersion >= 2 || (symbol.flags & 2) === 0 || symbol.valueDeclaration.parent.kind === 217) {
                 return;
             }
             var container = symbol.valueDeclaration;
@@ -12240,21 +17015,10 @@ var ts;
                     }
                     if (container && container.parent && container.parent.kind === 196) {
                         if (container.flags & 128) {
-                            canUseSuperExpression =
-                                container.kind === 132 ||
-                                    container.kind === 131 ||
-                                    container.kind === 134 ||
-                                    container.kind === 135;
+                            canUseSuperExpression = container.kind === 132 || container.kind === 131 || container.kind === 134 || container.kind === 135;
                         }
                         else {
-                            canUseSuperExpression =
-                                container.kind === 132 ||
-                                    container.kind === 131 ||
-                                    container.kind === 134 ||
-                                    container.kind === 135 ||
-                                    container.kind === 130 ||
-                                    container.kind === 129 ||
-                                    container.kind === 133;
+                            canUseSuperExpression = container.kind === 132 || container.kind === 131 || container.kind === 134 || container.kind === 135 || container.kind === 130 || container.kind === 129 || container.kind === 133;
                         }
                     }
                 }
@@ -12301,8 +17065,7 @@ var ts;
                         if (indexOfParameter < len) {
                             return getTypeAtPosition(contextualSignature, indexOfParameter);
                         }
-                        if (indexOfParameter === (func.parameters.length - 1) &&
-                            funcHasRestParameters && contextualSignature.hasRestParameter && func.parameters.length >= contextualSignature.parameters.length) {
+                        if (indexOfParameter === (func.parameters.length - 1) && funcHasRestParameters && contextualSignature.hasRestParameter && func.parameters.length >= contextualSignature.parameters.length) {
                             return getTypeOfSymbol(contextualSignature.parameters[contextualSignature.parameters.length - 1]);
                         }
                     }
@@ -12387,7 +17150,10 @@ var ts;
                         mappedType = t;
                     }
                     else if (!mappedTypes) {
-                        mappedTypes = [mappedType, t];
+                        mappedTypes = [
+                            mappedType,
+                            t
+                        ];
                     }
                     else {
                         mappedTypes.push(t);
@@ -12403,13 +17169,17 @@ var ts;
             });
         }
         function getIndexTypeOfContextualType(type, kind) {
-            return applyToContextualType(type, function (t) { return getIndexTypeOfObjectOrUnionType(t, kind); });
+            return applyToContextualType(type, function (t) {
+                return getIndexTypeOfObjectOrUnionType(t, kind);
+            });
         }
         function contextualTypeIsTupleLikeType(type) {
             return !!(type.flags & 16384 ? ts.forEach(type.types, isTupleLikeType) : isTupleLikeType(type));
         }
         function contextualTypeHasIndexSignature(type, kind) {
-            return !!(type.flags & 16384 ? ts.forEach(type.types, function (t) { return getIndexTypeOfObjectOrUnionType(t, kind); }) : getIndexTypeOfObjectOrUnionType(type, kind));
+            return !!(type.flags & 16384 ? ts.forEach(type.types, function (t) {
+                return getIndexTypeOfObjectOrUnionType(t, kind);
+            }) : getIndexTypeOfObjectOrUnionType(type, kind));
         }
         function getContextualTypeForObjectLiteralMethod(node) {
             ts.Debug.assert(ts.isObjectLiteralMethod(node));
@@ -12429,8 +17199,7 @@ var ts;
                         return propertyType;
                     }
                 }
-                return isNumericName(element.name) && getIndexTypeOfContextualType(type, 1) ||
-                    getIndexTypeOfContextualType(type, 0);
+                return isNumericName(element.name) && getIndexTypeOfContextualType(type, 1) || getIndexTypeOfContextualType(type, 0);
             }
             return undefined;
         }
@@ -12439,9 +17208,7 @@ var ts;
             var type = getContextualType(arrayLiteral);
             if (type) {
                 var index = ts.indexOf(arrayLiteral.elements, node);
-                return getTypeOfPropertyOfContextualType(type, "" + index)
-                    || getIndexTypeOfContextualType(type, 1)
-                    || (languageVersion >= 2 ? checkIteratedType(type, undefined) : undefined);
+                return getTypeOfPropertyOfContextualType(type, "" + index) || getIndexTypeOfContextualType(type, 1) || (languageVersion >= 2 ? checkIteratedType(type, undefined) : undefined);
             }
             return undefined;
         }
@@ -12474,7 +17241,7 @@ var ts;
                     return getTypeFromTypeNode(parent.type);
                 case 167:
                     return getContextualTypeForBinaryOperand(node);
-                case 217:
+                case 218:
                     return getContextualTypeForObjectLiteralElement(parent);
                 case 151:
                     return getContextualTypeForElementExpression(node);
@@ -12505,9 +17272,7 @@ var ts;
         }
         function getContextualSignature(node) {
             ts.Debug.assert(node.kind !== 132 || ts.isObjectLiteralMethod(node));
-            var type = ts.isObjectLiteralMethod(node)
-                ? getContextualTypeForObjectLiteralMethod(node)
-                : getContextualType(node);
+            var type = ts.isObjectLiteralMethod(node) ? getContextualTypeForObjectLiteralMethod(node) : getContextualType(node);
             if (!type) {
                 return undefined;
             }
@@ -12517,14 +17282,15 @@ var ts;
             var signatureList;
             var types = type.types;
             for (var i = 0; i < types.length; i++) {
-                if (signatureList &&
-                    getSignaturesOfObjectOrUnionType(types[i], 0).length > 1) {
+                if (signatureList && getSignaturesOfObjectOrUnionType(types[i], 0).length > 1) {
                     return undefined;
                 }
                 var signature = getNonGenericSignature(types[i]);
                 if (signature) {
                     if (!signatureList) {
-                        signatureList = [signature];
+                        signatureList = [
+                            signature
+                        ];
                     }
                     else if (!compareSignatures(signatureList[0], signature, false, compareTypes)) {
                         return undefined;
@@ -12550,7 +17316,7 @@ var ts;
             if (parent.kind === 167 && parent.operatorToken.kind === 52 && parent.left === node) {
                 return true;
             }
-            if (parent.kind === 217) {
+            if (parent.kind === 218) {
                 return isAssignmentTarget(parent.parent);
             }
             if (parent.kind === 151) {
@@ -12622,20 +17388,16 @@ var ts;
             for (var i = 0; i < node.properties.length; i++) {
                 var memberDecl = node.properties[i];
                 var member = memberDecl.symbol;
-                if (memberDecl.kind === 217 ||
-                    memberDecl.kind === 218 ||
-                    ts.isObjectLiteralMethod(memberDecl)) {
-                    if (memberDecl.kind === 217) {
+                if (memberDecl.kind === 218 || memberDecl.kind === 219 || ts.isObjectLiteralMethod(memberDecl)) {
+                    if (memberDecl.kind === 218) {
                         var type = checkPropertyAssignment(memberDecl, contextualMapper);
                     }
                     else if (memberDecl.kind === 132) {
                         var type = checkObjectLiteralMethod(memberDecl, contextualMapper);
                     }
                     else {
-                        ts.Debug.assert(memberDecl.kind === 218);
-                        var type = memberDecl.name.kind === 126
-                            ? unknownType
-                            : checkExpression(memberDecl.name, contextualMapper);
+                        ts.Debug.assert(memberDecl.kind === 219);
+                        var type = memberDecl.name.kind === 126 ? unknownType : checkExpression(memberDecl.name, contextualMapper);
                     }
                     typeFlags |= type.flags;
                     var prop = createSymbol(4 | 67108864 | member.flags, member.name);
@@ -12751,9 +17513,7 @@ var ts;
             return anyType;
         }
         function isValidPropertyAccess(node, propertyName) {
-            var left = node.kind === 153
-                ? node.expression
-                : node.left;
+            var left = node.kind === 153 ? node.expression : node.left;
             var type = checkExpressionOrQualifiedName(left);
             if (type !== unknownType && type !== anyType) {
                 var prop = getPropertyOfType(getWidenedType(type), propertyName);
@@ -12790,8 +17550,7 @@ var ts;
                 return unknownType;
             }
             var isConstEnum = isConstEnumObjectType(objectType);
-            if (isConstEnum &&
-                (!node.argumentExpression || node.argumentExpression.kind !== 8)) {
+            if (isConstEnum && (!node.argumentExpression || node.argumentExpression.kind !== 8)) {
                 error(node.argumentExpression, ts.Diagnostics.A_const_enum_member_can_only_be_accessed_using_a_string_literal);
                 return unknownType;
             }
@@ -12958,8 +17717,7 @@ var ts;
                 callIsIncomplete = callExpression.arguments.end === callExpression.end;
                 typeArguments = callExpression.typeArguments;
             }
-            var hasRightNumberOfTypeArgs = !typeArguments ||
-                (signature.typeParameters && typeArguments.length === signature.typeParameters.length);
+            var hasRightNumberOfTypeArgs = !typeArguments || (signature.typeParameters && typeArguments.length === signature.typeParameters.length);
             if (!hasRightNumberOfTypeArgs) {
                 return false;
             }
@@ -12976,8 +17734,7 @@ var ts;
         function getSingleCallSignature(type) {
             if (type.flags & 48128) {
                 var resolved = resolveObjectOrUnionTypeMembers(type);
-                if (resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0 &&
-                    resolved.properties.length === 0 && !resolved.stringIndexType && !resolved.numberIndexType) {
+                if (resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0 && resolved.properties.length === 0 && !resolved.stringIndexType && !resolved.numberIndexType) {
                     return resolved.callSignatures[0];
                 }
             }
@@ -13047,9 +17804,7 @@ var ts;
                 var arg = args[i];
                 if (arg.kind !== 172) {
                     var paramType = getTypeAtPosition(signature, arg.kind === 171 ? -1 : i);
-                    var argType = i === 0 && node.kind === 157 ? globalTemplateStringsArrayType :
-                        arg.kind === 8 && !reportErrors ? getStringLiteralType(arg) :
-                            checkExpressionWithContextualType(arg, paramType, excludeArgument && excludeArgument[i] ? identityMapper : undefined);
+                    var argType = i === 0 && node.kind === 157 ? globalTemplateStringsArrayType : arg.kind === 8 && !reportErrors ? getStringLiteralType(arg) : checkExpressionWithContextualType(arg, paramType, excludeArgument && excludeArgument[i] ? identityMapper : undefined);
                     if (!checkTypeRelatedTo(argType, paramType, relation, reportErrors ? arg : undefined, ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1)) {
                         return false;
                     }
@@ -13061,7 +17816,9 @@ var ts;
             var args;
             if (node.kind === 157) {
                 var template = node.template;
-                args = [template];
+                args = [
+                    template
+                ];
                 if (template.kind === 169) {
                     ts.forEach(template.templateSpans, function (span) {
                         args.push(span.expression);
@@ -13313,10 +18070,7 @@ var ts;
             }
             if (node.kind === 156) {
                 var declaration = signature.declaration;
-                if (declaration &&
-                    declaration.kind !== 133 &&
-                    declaration.kind !== 137 &&
-                    declaration.kind !== 141) {
+                if (declaration && declaration.kind !== 133 && declaration.kind !== 137 && declaration.kind !== 141) {
                     if (compilerOptions.noImplicitAny) {
                         error(node, ts.Diagnostics.new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type);
                     }
@@ -13341,13 +18095,9 @@ var ts;
         }
         function getTypeAtPosition(signature, pos) {
             if (pos >= 0) {
-                return signature.hasRestParameter ?
-                    pos < signature.parameters.length - 1 ? getTypeOfSymbol(signature.parameters[pos]) : getRestTypeOfSignature(signature) :
-                    pos < signature.parameters.length ? getTypeOfSymbol(signature.parameters[pos]) : anyType;
+                return signature.hasRestParameter ? pos < signature.parameters.length - 1 ? getTypeOfSymbol(signature.parameters[pos]) : getRestTypeOfSignature(signature) : pos < signature.parameters.length ? getTypeOfSymbol(signature.parameters[pos]) : anyType;
             }
-            return signature.hasRestParameter ?
-                getTypeOfSymbol(signature.parameters[signature.parameters.length - 1]) :
-                anyArrayType;
+            return signature.hasRestParameter ? getTypeOfSymbol(signature.parameters[signature.parameters.length - 1]) : anyArrayType;
         }
         function assignContextualParameterTypes(signature, context, mapper) {
             var len = signature.parameters.length - (signature.hasRestParameter ? 1 : 0);
@@ -13647,12 +18397,9 @@ var ts;
             var properties = node.properties;
             for (var i = 0; i < properties.length; i++) {
                 var p = properties[i];
-                if (p.kind === 217 || p.kind === 218) {
+                if (p.kind === 218 || p.kind === 219) {
                     var name = p.name;
-                    var type = sourceType.flags & 1 ? sourceType :
-                        getTypeOfPropertyOfType(sourceType, name.text) ||
-                            isNumericLiteralName(name.text) && getIndexTypeOfType(sourceType, 1) ||
-                            getIndexTypeOfType(sourceType, 0);
+                    var type = sourceType.flags & 1 ? sourceType : getTypeOfPropertyOfType(sourceType, name.text) || isNumericLiteralName(name.text) && getIndexTypeOfType(sourceType, 1) || getIndexTypeOfType(sourceType, 0);
                     if (type) {
                         checkDestructuringAssignment(p.initializer || name, type);
                     }
@@ -13677,14 +18424,17 @@ var ts;
                 if (e.kind !== 172) {
                     if (e.kind !== 171) {
                         var propName = "" + i;
-                        var type = sourceType.flags & 1 ? sourceType :
-                            isTupleLikeType(sourceType) ? getTypeOfPropertyOfType(sourceType, propName) :
-                                getIndexTypeOfType(sourceType, 1);
+                        var type = sourceType.flags & 1 ? sourceType : isTupleLikeType(sourceType) ? getTypeOfPropertyOfType(sourceType, propName) : getIndexTypeOfType(sourceType, 1);
                         if (type) {
                             checkDestructuringAssignment(e, type, contextualMapper);
                         }
                         else {
-                            error(e, ts.Diagnostics.Type_0_has_no_property_1, typeToString(sourceType), propName);
+                            if (isTupleType(sourceType)) {
+                                error(e, ts.Diagnostics.Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2, typeToString(sourceType), sourceType.elementTypes.length, elements.length);
+                            }
+                            else {
+                                error(e, ts.Diagnostics.Type_0_has_no_property_1, typeToString(sourceType), propName);
+                            }
                         }
                     }
                     else {
@@ -13755,9 +18505,7 @@ var ts;
                     if (rightType.flags & (32 | 64))
                         rightType = leftType;
                     var suggestedOperator;
-                    if ((leftType.flags & 8) &&
-                        (rightType.flags & 8) &&
-                        (suggestedOperator = getSuggestedBooleanOperator(node.operatorToken.kind)) !== undefined) {
+                    if ((leftType.flags & 8) && (rightType.flags & 8) && (suggestedOperator = getSuggestedBooleanOperator(node.operatorToken.kind)) !== undefined) {
                         error(node, ts.Diagnostics.The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead, ts.tokenToString(node.operatorToken.kind), ts.tokenToString(suggestedOperator));
                     }
                     else {
@@ -13819,7 +18567,10 @@ var ts;
                 case 48:
                     return rightType;
                 case 49:
-                    return getUnionType([leftType, rightType]);
+                    return getUnionType([
+                        leftType,
+                        rightType
+                    ]);
                 case 52:
                     checkAssignmentOperator(rightType);
                     return rightType;
@@ -13827,9 +18578,7 @@ var ts;
                     return rightType;
             }
             function checkForDisallowedESSymbolOperand(operator) {
-                var offendingSymbolOperand = someConstituentTypeHasKind(leftType, 1048576) ? node.left :
-                    someConstituentTypeHasKind(rightType, 1048576) ? node.right :
-                        undefined;
+                var offendingSymbolOperand = someConstituentTypeHasKind(leftType, 1048576) ? node.left : someConstituentTypeHasKind(rightType, 1048576) ? node.right : undefined;
                 if (offendingSymbolOperand) {
                     error(offendingSymbolOperand, ts.Diagnostics.The_0_operator_cannot_be_applied_to_type_symbol, ts.tokenToString(operator));
                     return false;
@@ -13875,7 +18624,10 @@ var ts;
             checkExpression(node.condition);
             var type1 = checkExpression(node.whenTrue, contextualMapper);
             var type2 = checkExpression(node.whenFalse, contextualMapper);
-            return getUnionType([type1, type2]);
+            return getUnionType([
+                type1,
+                type2
+            ]);
         }
         function checkTemplateExpression(node) {
             ts.forEach(node.templateSpans, function (templateSpan) {
@@ -13939,9 +18691,7 @@ var ts;
                 type = instantiateTypeWithSingleGenericCallSignature(node, uninstantiatedType, contextualMapper);
             }
             if (isConstEnumObjectType(type)) {
-                var ok = (node.parent.kind === 153 && node.parent.expression === node) ||
-                    (node.parent.kind === 154 && node.parent.expression === node) ||
-                    ((node.kind === 64 || node.kind === 125) && isInRightSideOfImportOrExportAssignment(node));
+                var ok = (node.parent.kind === 153 && node.parent.expression === node) || (node.parent.kind === 154 && node.parent.expression === node) || ((node.kind === 64 || node.kind === 125) && isInRightSideOfImportOrExportAssignment(node));
                 if (!ok) {
                     error(node, ts.Diagnostics.const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment);
                 }
@@ -14051,9 +18801,7 @@ var ts;
             if (node.kind === 138) {
                 checkGrammarIndexSignature(node);
             }
-            else if (node.kind === 140 || node.kind === 195 || node.kind === 141 ||
-                node.kind === 136 || node.kind === 133 ||
-                node.kind === 137) {
+            else if (node.kind === 140 || node.kind === 195 || node.kind === 141 || node.kind === 136 || node.kind === 133 || node.kind === 137) {
                 checkGrammarFunctionLikeDeclaration(node);
             }
             checkTypeParameters(node.typeParameters);
@@ -14146,8 +18894,10 @@ var ts;
                     case 160:
                     case 195:
                     case 161:
-                    case 152: return false;
-                    default: return ts.forEachChild(n, containsSuperCall);
+                    case 152:
+                        return false;
+                    default:
+                        return ts.forEachChild(n, containsSuperCall);
                 }
             }
             function markThisReferencesAsErrors(n) {
@@ -14159,14 +18909,13 @@ var ts;
                 }
             }
             function isInstancePropertyWithInitializer(n) {
-                return n.kind === 130 &&
-                    !(n.flags & 128) &&
-                    !!n.initializer;
+                return n.kind === 130 && !(n.flags & 128) && !!n.initializer;
             }
             if (ts.getClassBaseTypeNode(node.parent)) {
                 if (containsSuperCall(node.body)) {
-                    var superCallShouldBeFirst = ts.forEach(node.parent.members, isInstancePropertyWithInitializer) ||
-                        ts.forEach(node.parameters, function (p) { return p.flags & (16 | 32 | 64); });
+                    var superCallShouldBeFirst = ts.forEach(node.parent.members, isInstancePropertyWithInitializer) || ts.forEach(node.parameters, function (p) {
+                        return p.flags & (16 | 32 | 64);
+                    });
                     if (superCallShouldBeFirst) {
                         var statements = node.body.statements;
                         if (!statements.length || statements[0].kind !== 177 || !isSuperCallExpression(statements[0].expression)) {
@@ -14488,16 +19237,16 @@ var ts;
                     case 197:
                         return 2097152;
                     case 200:
-                        return d.name.kind === 8 || ts.getModuleInstanceState(d) !== 0
-                            ? 4194304 | 1048576
-                            : 4194304;
+                        return d.name.kind === 8 || ts.getModuleInstanceState(d) !== 0 ? 4194304 | 1048576 : 4194304;
                     case 196:
                     case 199:
                         return 2097152 | 1048576;
-                    case 202:
+                    case 203:
                         var result = 0;
                         var target = resolveAlias(getSymbolOfNode(d));
-                        ts.forEach(target.declarations, function (d) { result |= getDeclarationSpaces(d); });
+                        ts.forEach(target.declarations, function (d) {
+                            result |= getDeclarationSpaces(d);
+                        });
                         return result;
                     default:
                         return 1048576;
@@ -14506,10 +19255,7 @@ var ts;
         }
         function checkFunctionDeclaration(node) {
             if (produceDiagnostics) {
-                checkFunctionLikeDeclaration(node) ||
-                    checkGrammarDisallowedModifiersInBlockOrObjectLiteralExpression(node) ||
-                    checkGrammarFunctionName(node.name) ||
-                    checkGrammarForGenerator(node);
+                checkFunctionLikeDeclaration(node) || checkGrammarDisallowedModifiersInBlockOrObjectLiteralExpression(node) || checkGrammarFunctionName(node.name) || checkGrammarForGenerator(node);
                 checkCollisionWithCapturedSuperVariable(node, node.name);
                 checkCollisionWithCapturedThisVariable(node, node.name);
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
@@ -14564,12 +19310,7 @@ var ts;
             if (!(identifier && identifier.text === name)) {
                 return false;
             }
-            if (node.kind === 130 ||
-                node.kind === 129 ||
-                node.kind === 132 ||
-                node.kind === 131 ||
-                node.kind === 134 ||
-                node.kind === 135) {
+            if (node.kind === 130 || node.kind === 129 || node.kind === 132 || node.kind === 131 || node.kind === 134 || node.kind === 135) {
                 return false;
             }
             if (ts.isInAmbientContext(node)) {
@@ -14628,7 +19369,7 @@ var ts;
                 return;
             }
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 220 && ts.isExternalModule(parent)) {
+            if (parent.kind === 221 && ts.isExternalModule(parent)) {
                 error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_an_external_module, ts.declarationNameToString(name), ts.declarationNameToString(name));
             }
         }
@@ -14637,17 +19378,11 @@ var ts;
                 var symbol = getSymbolOfNode(node);
                 if (symbol.flags & 1) {
                     var localDeclarationSymbol = resolveName(node, node.name.text, 3, undefined, undefined);
-                    if (localDeclarationSymbol &&
-                        localDeclarationSymbol !== symbol &&
-                        localDeclarationSymbol.flags & 2) {
+                    if (localDeclarationSymbol && localDeclarationSymbol !== symbol && localDeclarationSymbol.flags & 2) {
                         if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & 12288) {
                             var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 194);
-                            var container = varDeclList.parent.kind === 175 &&
-                                varDeclList.parent.parent;
-                            var namesShareScope = container &&
-                                (container.kind === 174 && ts.isFunctionLike(container.parent) ||
-                                    (container.kind === 201 && container.kind === 200) ||
-                                    container.kind === 220);
+                            var container = varDeclList.parent.kind === 175 && varDeclList.parent.parent;
+                            var namesShareScope = container && (container.kind === 174 && ts.isFunctionLike(container.parent) || (container.kind === 201 && container.kind === 200) || container.kind === 221);
                             if (!namesShareScope) {
                                 var name = symbolToString(localDeclarationSymbol);
                                 error(node, ts.Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name, name);
@@ -14806,18 +19541,13 @@ var ts;
             checkSourceElement(node.statement);
         }
         function checkForOfStatement(node) {
-            if (languageVersion < 2) {
-                grammarErrorOnFirstToken(node, ts.Diagnostics.for_of_statements_are_only_available_when_targeting_ECMAScript_6_or_higher);
-                return;
-            }
             checkGrammarForInOrForOfStatement(node);
             if (node.initializer.kind === 194) {
                 checkForInOrForOfVariableDeclaration(node);
             }
             else {
                 var varExpr = node.initializer;
-                var rightType = checkExpression(node.expression);
-                var iteratedType = checkIteratedType(rightType, node.expression);
+                var iteratedType = checkRightHandSideOfForOf(node.expression);
                 if (varExpr.kind === 151 || varExpr.kind === 152) {
                     checkDestructuringAssignment(varExpr, iteratedType || unknownType);
                 }
@@ -14866,20 +19596,17 @@ var ts;
                 checkVariableDeclaration(decl);
             }
         }
-        function getTypeForVariableDeclarationInForOfStatement(forOfStatement) {
-            if (languageVersion < 2) {
-                return anyType;
-            }
-            var expressionType = getTypeOfExpression(forOfStatement.expression);
-            return checkIteratedType(expressionType, forOfStatement.expression) || anyType;
+        function checkRightHandSideOfForOf(rhsExpression) {
+            var expressionType = getTypeOfExpression(rhsExpression);
+            return languageVersion >= 2 ? checkIteratedType(expressionType, rhsExpression) : checkElementTypeOfArrayOrString(expressionType, rhsExpression);
         }
         function checkIteratedType(iterable, expressionForError) {
             ts.Debug.assert(languageVersion >= 2);
             var iteratedType = getIteratedType(iterable, expressionForError);
             if (expressionForError && iteratedType) {
-                var completeIterableType = globalIterableType !== emptyObjectType
-                    ? createTypeReference(globalIterableType, [iteratedType])
-                    : emptyObjectType;
+                var completeIterableType = globalIterableType !== emptyObjectType ? createTypeReference(globalIterableType, [
+                    iteratedType
+                ]) : emptyObjectType;
                 checkTypeAssignableTo(iterable, completeIterableType, expressionForError);
             }
             return iteratedType;
@@ -14927,6 +19654,39 @@ var ts;
                 return iteratorNextValue;
             }
         }
+        function checkElementTypeOfArrayOrString(arrayOrStringType, expressionForError) {
+            ts.Debug.assert(languageVersion < 2);
+            var arrayType = removeTypesFromUnionType(arrayOrStringType, 258, true, true);
+            var hasStringConstituent = arrayOrStringType !== arrayType;
+            var reportedError = false;
+            if (hasStringConstituent) {
+                if (languageVersion < 1) {
+                    error(expressionForError, ts.Diagnostics.Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher);
+                    reportedError = true;
+                }
+                if (arrayType === emptyObjectType) {
+                    return stringType;
+                }
+            }
+            if (!isArrayLikeType(arrayType)) {
+                if (!reportedError) {
+                    var diagnostic = hasStringConstituent ? ts.Diagnostics.Type_0_is_not_an_array_type : ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type;
+                    error(expressionForError, diagnostic, typeToString(arrayType));
+                }
+                return hasStringConstituent ? stringType : unknownType;
+            }
+            var arrayElementType = getIndexTypeOfType(arrayType, 1) || unknownType;
+            if (hasStringConstituent) {
+                if (arrayElementType.flags & 258) {
+                    return stringType;
+                }
+                return getUnionType([
+                    arrayElementType,
+                    stringType
+                ]);
+            }
+            return arrayElementType;
+        }
         function checkBreakOrContinueStatement(node) {
             checkGrammarStatementInAmbientContext(node) || checkGrammarBreakOrContinueStatement(node);
         }
@@ -14975,8 +19735,8 @@ var ts;
             var firstDefaultClause;
             var hasDuplicateDefaultClause = false;
             var expressionType = checkExpression(node.expression);
-            ts.forEach(node.clauses, function (clause) {
-                if (clause.kind === 214 && !hasDuplicateDefaultClause) {
+            ts.forEach(node.caseBlock.clauses, function (clause) {
+                if (clause.kind === 215 && !hasDuplicateDefaultClause) {
                     if (firstDefaultClause === undefined) {
                         firstDefaultClause = clause;
                     }
@@ -14988,7 +19748,7 @@ var ts;
                         hasDuplicateDefaultClause = true;
                     }
                 }
-                if (produceDiagnostics && clause.kind === 213) {
+                if (produceDiagnostics && clause.kind === 214) {
                     var caseClause = clause;
                     var caseType = checkExpression(caseClause.expression);
                     if (!isTypeAssignableTo(expressionType, caseType)) {
@@ -15085,7 +19845,9 @@ var ts;
             if (stringIndexType && numberIndexType) {
                 errorNode = declaredNumberIndexer || declaredStringIndexer;
                 if (!errorNode && (type.flags & 2048)) {
-                    var someBaseTypeHasBothIndexers = ts.forEach(type.baseTypes, function (base) { return getIndexTypeOfType(base, 0) && getIndexTypeOfType(base, 1); });
+                    var someBaseTypeHasBothIndexers = ts.forEach(type.baseTypes, function (base) {
+                        return getIndexTypeOfType(base, 0) && getIndexTypeOfType(base, 1);
+                    });
                     errorNode = someBaseTypeHasBothIndexers ? undefined : type.symbol.declarations[0];
                 }
             }
@@ -15107,13 +19869,13 @@ var ts;
                     errorNode = indexDeclaration;
                 }
                 else if (containingType.flags & 2048) {
-                    var someBaseClassHasBothPropertyAndIndexer = ts.forEach(containingType.baseTypes, function (base) { return getPropertyOfObjectType(base, prop.name) && getIndexTypeOfType(base, indexKind); });
+                    var someBaseClassHasBothPropertyAndIndexer = ts.forEach(containingType.baseTypes, function (base) {
+                        return getPropertyOfObjectType(base, prop.name) && getIndexTypeOfType(base, indexKind);
+                    });
                     errorNode = someBaseClassHasBothPropertyAndIndexer ? undefined : containingType.symbol.declarations[0];
                 }
                 if (errorNode && !isTypeAssignableTo(propertyType, indexType)) {
-                    var errorMessage = indexKind === 0
-                        ? ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_string_index_type_2
-                        : ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2;
+                    var errorMessage = indexKind === 0 ? ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_string_index_type_2 : ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2;
                     error(errorNode, errorMessage, symbolToString(prop), typeToString(propertyType), typeToString(indexType));
                 }
             }
@@ -15277,7 +20039,12 @@ var ts;
                 return true;
             }
             var seen = {};
-            ts.forEach(type.declaredProperties, function (p) { seen[p.name] = { prop: p, containingType: type }; });
+            ts.forEach(type.declaredProperties, function (p) {
+                seen[p.name] = {
+                    prop: p,
+                    containingType: type
+                };
+            });
             var ok = true;
             for (var i = 0, len = type.baseTypes.length; i < len; ++i) {
                 var base = type.baseTypes[i];
@@ -15285,7 +20052,10 @@ var ts;
                 for (var j = 0, proplen = properties.length; j < proplen; ++j) {
                     var prop = properties[j];
                     if (!ts.hasProperty(seen, prop.name)) {
-                        seen[prop.name] = { prop: prop, containingType: base };
+                        seen[prop.name] = {
+                            prop: prop,
+                            containingType: base
+                        };
                     }
                     else {
                         var existing = seen[prop.name];
@@ -15388,9 +20158,12 @@ var ts;
                                 return undefined;
                             }
                             switch (e.operator) {
-                                case 33: return value;
-                                case 34: return -value;
-                                case 47: return enumIsConst ? ~value : undefined;
+                                case 33:
+                                    return value;
+                                case 34:
+                                    return -value;
+                                case 47:
+                                    return enumIsConst ? ~value : undefined;
                             }
                             return undefined;
                         case 167:
@@ -15406,17 +20179,28 @@ var ts;
                                 return undefined;
                             }
                             switch (e.operatorToken.kind) {
-                                case 44: return left | right;
-                                case 43: return left & right;
-                                case 41: return left >> right;
-                                case 42: return left >>> right;
-                                case 40: return left << right;
-                                case 45: return left ^ right;
-                                case 35: return left * right;
-                                case 36: return left / right;
-                                case 33: return left + right;
-                                case 34: return left - right;
-                                case 37: return left % right;
+                                case 44:
+                                    return left | right;
+                                case 43:
+                                    return left & right;
+                                case 41:
+                                    return left >> right;
+                                case 42:
+                                    return left >>> right;
+                                case 40:
+                                    return left << right;
+                                case 45:
+                                    return left ^ right;
+                                case 35:
+                                    return left * right;
+                                case 36:
+                                    return left / right;
+                                case 33:
+                                    return left + right;
+                                case 34:
+                                    return left - right;
+                                case 37:
+                                    return left % right;
                             }
                             return undefined;
                         case 7:
@@ -15439,8 +20223,7 @@ var ts;
                             }
                             else {
                                 if (e.kind === 154) {
-                                    if (e.argumentExpression === undefined ||
-                                        e.argumentExpression.kind !== 8) {
+                                    if (e.argumentExpression === undefined || e.argumentExpression.kind !== 8) {
                                         return undefined;
                                     }
                                     var enumType = getTypeOfNode(e.expression);
@@ -15536,10 +20319,7 @@ var ts;
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
                 checkExportsOnMergedDeclarations(node);
                 var symbol = getSymbolOfNode(node);
-                if (symbol.flags & 512
-                    && symbol.declarations.length > 1
-                    && !ts.isInAmbientContext(node)
-                    && ts.isInstantiatedModule(node, compilerOptions.preserveConstEnums)) {
+                if (symbol.flags & 512 && symbol.declarations.length > 1 && !ts.isInAmbientContext(node) && ts.isInstantiatedModule(node, compilerOptions.preserveConstEnums)) {
                     var classOrFunc = getFirstNonAmbientClassOrFunctionDeclaration(symbol);
                     if (classOrFunc) {
                         if (ts.getSourceFileOfNode(node) !== ts.getSourceFileOfNode(classOrFunc)) {
@@ -15574,10 +20354,8 @@ var ts;
                 return false;
             }
             var inAmbientExternalModule = node.parent.kind === 201 && node.parent.parent.name.kind === 8;
-            if (node.parent.kind !== 220 && !inAmbientExternalModule) {
-                error(moduleName, node.kind === 209 ?
-                    ts.Diagnostics.Export_declarations_are_not_permitted_in_an_internal_module :
-                    ts.Diagnostics.Import_declarations_in_an_internal_module_cannot_reference_an_external_module);
+            if (node.parent.kind !== 221 && !inAmbientExternalModule) {
+                error(moduleName, node.kind === 210 ? ts.Diagnostics.Export_declarations_are_not_permitted_in_an_internal_module : ts.Diagnostics.Import_declarations_in_an_internal_module_cannot_reference_an_external_module);
                 return false;
             }
             if (inAmbientExternalModule && isExternalModuleNameRelative(moduleName.text)) {
@@ -15590,13 +20368,9 @@ var ts;
             var symbol = getSymbolOfNode(node);
             var target = resolveAlias(symbol);
             if (target !== unknownSymbol) {
-                var excludedMeanings = (symbol.flags & 107455 ? 107455 : 0) |
-                    (symbol.flags & 793056 ? 793056 : 0) |
-                    (symbol.flags & 1536 ? 1536 : 0);
+                var excludedMeanings = (symbol.flags & 107455 ? 107455 : 0) | (symbol.flags & 793056 ? 793056 : 0) | (symbol.flags & 1536 ? 1536 : 0);
                 if (target.flags & excludedMeanings) {
-                    var message = node.kind === 211 ?
-                        ts.Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 :
-                        ts.Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0;
+                    var message = node.kind === 212 ? ts.Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 : ts.Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0;
                     error(node, message, symbolToString(symbol));
                 }
             }
@@ -15617,7 +20391,7 @@ var ts;
                         checkImportBinding(importClause);
                     }
                     if (importClause.namedBindings) {
-                        if (importClause.namedBindings.kind === 205) {
+                        if (importClause.namedBindings.kind === 206) {
                             checkImportBinding(importClause.namedBindings);
                         }
                         else {
@@ -15667,7 +20441,7 @@ var ts;
             }
         }
         function checkExportAssignment(node) {
-            var container = node.parent.kind === 220 ? node.parent : node.parent.parent;
+            var container = node.parent.kind === 221 ? node.parent : node.parent.parent;
             if (container.kind === 200 && container.name.kind === 64) {
                 error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_an_internal_module);
                 return;
@@ -15684,7 +20458,7 @@ var ts;
             checkExternalModuleExports(container);
         }
         function getModuleStatements(node) {
-            if (node.kind === 220) {
+            if (node.kind === 221) {
                 return node.statements;
             }
             if (node.kind === 200 && node.body.kind === 201) {
@@ -15698,7 +20472,7 @@ var ts;
                 var statements = getModuleStatements(declarations[i]);
                 for (var j = 0; j < statements.length; j++) {
                     var node = statements[j];
-                    if (node.kind === 209) {
+                    if (node.kind === 210) {
                         var exportClause = node.exportClause;
                         if (!exportClause) {
                             return true;
@@ -15711,7 +20485,7 @@ var ts;
                             }
                         }
                     }
-                    else if (node.kind !== 208 && node.flags & 1 && !(node.flags & 256)) {
+                    else if (node.kind !== 209 && node.flags & 1 && !(node.flags & 256)) {
                         return true;
                     }
                 }
@@ -15821,13 +20595,13 @@ var ts;
                     return checkEnumDeclaration(node);
                 case 200:
                     return checkModuleDeclaration(node);
-                case 203:
+                case 204:
                     return checkImportDeclaration(node);
-                case 202:
+                case 203:
                     return checkImportEqualsDeclaration(node);
-                case 209:
+                case 210:
                     return checkExportDeclaration(node);
-                case 208:
+                case 209:
                     return checkExportAssignment(node);
                 case 176:
                     checkGrammarStatementInAmbientContext(node);
@@ -15868,7 +20642,7 @@ var ts;
                 case 150:
                 case 151:
                 case 152:
-                case 217:
+                case 218:
                 case 153:
                 case 154:
                 case 155:
@@ -15900,19 +20674,20 @@ var ts;
                 case 185:
                 case 186:
                 case 188:
-                case 213:
+                case 202:
                 case 214:
+                case 215:
                 case 189:
                 case 190:
                 case 191:
-                case 216:
+                case 217:
                 case 193:
                 case 194:
                 case 196:
                 case 199:
-                case 219:
-                case 208:
                 case 220:
+                case 209:
+                case 221:
                     ts.forEachChild(node, checkFunctionExpressionBodies);
                     break;
             }
@@ -16000,7 +20775,7 @@ var ts;
                     copySymbols(location.locals, meaning);
                 }
                 switch (location.kind) {
-                    case 220:
+                    case 221:
                         if (!ts.isExternalModule(location))
                             break;
                     case 200:
@@ -16028,9 +20803,7 @@ var ts;
             return ts.mapToArray(symbols);
         }
         function isTypeDeclarationName(name) {
-            return name.kind == 64 &&
-                isTypeDeclaration(name.parent) &&
-                name.parent.name === name;
+            return name.kind == 64 && isTypeDeclaration(name.parent) && name.parent.name === name;
         }
         function isTypeDeclaration(node) {
             switch (node.kind) {
@@ -16112,10 +20885,10 @@ var ts;
             while (nodeOnRightSide.parent.kind === 125) {
                 nodeOnRightSide = nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 202) {
+            if (nodeOnRightSide.parent.kind === 203) {
                 return nodeOnRightSide.parent.moduleReference === nodeOnRightSide && nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 208) {
+            if (nodeOnRightSide.parent.kind === 209) {
                 return nodeOnRightSide.parent.expression === nodeOnRightSide && nodeOnRightSide.parent;
             }
             return undefined;
@@ -16124,14 +20897,13 @@ var ts;
             return getLeftSideOfImportEqualsOrExportAssignment(node) !== undefined;
         }
         function isRightSideOfQualifiedNameOrPropertyAccess(node) {
-            return (node.parent.kind === 125 && node.parent.right === node) ||
-                (node.parent.kind === 153 && node.parent.name === node);
+            return (node.parent.kind === 125 && node.parent.right === node) || (node.parent.kind === 153 && node.parent.name === node);
         }
         function getSymbolOfEntityNameOrPropertyAccessExpression(entityName) {
             if (ts.isDeclarationName(entityName)) {
                 return getSymbolOfNode(entityName.parent);
             }
-            if (entityName.parent.kind === 208) {
+            if (entityName.parent.kind === 209) {
                 return resolveEntityName(entityName, 107455 | 793056 | 1536 | 8388608);
             }
             if (entityName.kind !== 153) {
@@ -16180,9 +20952,7 @@ var ts;
                 return getSymbolOfNode(node.parent);
             }
             if (node.kind === 64 && isInRightSideOfImportOrExportAssignment(node)) {
-                return node.parent.kind === 208
-                    ? getSymbolOfEntityNameOrPropertyAccessExpression(node)
-                    : getSymbolOfPartOfRightHandSideOfImportEquals(node);
+                return node.parent.kind === 209 ? getSymbolOfEntityNameOrPropertyAccessExpression(node) : getSymbolOfPartOfRightHandSideOfImportEquals(node);
             }
             switch (node.kind) {
                 case 64:
@@ -16201,10 +20971,7 @@ var ts;
                     return undefined;
                 case 8:
                     var moduleName;
-                    if ((ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) &&
-                        ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) ||
-                        ((node.parent.kind === 203 || node.parent.kind === 209) &&
-                            node.parent.moduleSpecifier === node)) {
+                    if ((ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) && ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) || ((node.parent.kind === 204 || node.parent.kind === 210) && node.parent.moduleSpecifier === node)) {
                         return resolveExternalModuleName(node, node);
                     }
                 case 7:
@@ -16222,7 +20989,7 @@ var ts;
             return undefined;
         }
         function getShorthandAssignmentValueSymbol(location) {
-            if (location && location.kind === 218) {
+            if (location && location.kind === 219) {
                 return resolveEntityName(location.name, 107455);
             }
             return undefined;
@@ -16290,13 +21057,17 @@ var ts;
             else if (symbol.flags & 67108864) {
                 var target = getSymbolLinks(symbol).target;
                 if (target) {
-                    return [target];
+                    return [
+                        target
+                    ];
                 }
             }
-            return [symbol];
+            return [
+                symbol
+            ];
         }
         function isExternalModuleSymbol(symbol) {
-            return symbol.flags & 512 && symbol.declarations.length === 1 && symbol.declarations[0].kind === 220;
+            return symbol.flags & 512 && symbol.declarations.length === 1 && symbol.declarations[0].kind === 221;
         }
         function isNodeDescendentOf(node, ancestor) {
             while (node) {
@@ -16337,16 +21108,16 @@ var ts;
                     case 199:
                         generateNameForModuleOrEnum(node);
                         break;
-                    case 203:
+                    case 204:
                         generateNameForImportDeclaration(node);
                         break;
-                    case 209:
+                    case 210:
                         generateNameForExportDeclaration(node);
                         break;
-                    case 208:
+                    case 209:
                         generateNameForExportAssignment(node);
                         break;
-                    case 220:
+                    case 221:
                     case 201:
                         ts.forEach(node.statements, generateNames);
                         break;
@@ -16375,12 +21146,11 @@ var ts;
             }
             function generateNameForImportOrExportDeclaration(node) {
                 var expr = ts.getExternalModuleName(node);
-                var baseName = expr.kind === 8 ?
-                    ts.escapeIdentifier(ts.makeIdentifierFromModuleName(expr.text)) : "module";
+                var baseName = expr.kind === 8 ? ts.escapeIdentifier(ts.makeIdentifierFromModuleName(expr.text)) : "module";
                 assignGeneratedName(node, makeUniqueName(baseName));
             }
             function generateNameForImportDeclaration(node) {
-                if (node.importClause && node.importClause.namedBindings && node.importClause.namedBindings.kind === 206) {
+                if (node.importClause && node.importClause.namedBindings && node.importClause.namedBindings.kind === 207) {
                     generateNameForImportOrExportDeclaration(node);
                 }
             }
@@ -16410,7 +21180,7 @@ var ts;
         }
         function getAliasNameSubstitution(symbol) {
             var declaration = getDeclarationOfAliasSymbol(symbol);
-            if (declaration && declaration.kind === 207) {
+            if (declaration && declaration.kind === 208) {
                 var moduleName = getGeneratedNameForNode(declaration.parent.parent.parent);
                 var propertyName = declaration.propertyName || declaration.name;
                 return moduleName + "." + ts.unescapeIdentifier(propertyName.text);
@@ -16449,7 +21219,7 @@ var ts;
             return symbol && symbol !== unknownSymbol && symbolIsValue(symbol) && !isConstEnumSymbol(symbol);
         }
         function isTopLevelValueImportEqualsWithEntityName(node) {
-            if (node.parent.kind !== 220 || !ts.isInternalModuleImportEqualsDeclaration(node)) {
+            if (node.parent.kind !== 221 || !ts.isInternalModuleImportEqualsDeclaration(node)) {
                 return false;
             }
             return isAliasResolvedToValue(getSymbolOfNode(node));
@@ -16474,8 +21244,7 @@ var ts;
             if (ts.nodeIsPresent(node.body)) {
                 var symbol = getSymbolOfNode(node);
                 var signaturesOfSymbol = getSignaturesOfSymbol(symbol);
-                return signaturesOfSymbol.length > 1 ||
-                    (signaturesOfSymbol.length === 1 && signaturesOfSymbol[0].declaration !== node);
+                return signaturesOfSymbol.length > 1 || (signaturesOfSymbol.length === 1 && signaturesOfSymbol[0].declaration !== node);
             }
             return false;
         }
@@ -16487,14 +21256,14 @@ var ts;
             return getNodeLinks(node).enumMemberValue;
         }
         function getConstantValue(node) {
-            if (node.kind === 219) {
+            if (node.kind === 220) {
                 return getEnumMemberValue(node);
             }
             var symbol = getNodeLinks(node).resolvedSymbol;
             if (symbol && (symbol.flags & 8)) {
                 var declaration = symbol.valueDeclaration;
                 var constantValue;
-                if (declaration.kind === 219) {
+                if (declaration.kind === 220) {
                     return getEnumMemberValue(declaration);
                 }
             }
@@ -16502,9 +21271,7 @@ var ts;
         }
         function writeTypeOfDeclaration(declaration, enclosingDeclaration, flags, writer) {
             var symbol = getSymbolOfNode(declaration);
-            var type = symbol && !(symbol.flags & (2048 | 131072))
-                ? getTypeOfSymbol(symbol)
-                : unknownType;
+            var type = symbol && !(symbol.flags & (2048 | 131072)) ? getTypeOfSymbol(symbol) : unknownType;
             getSymbolDisplayBuilder().buildTypeDisplay(type, writer, enclosingDeclaration, flags);
         }
         function writeReturnTypeOfSignatureDeclaration(signatureDeclaration, enclosingDeclaration, flags, writer) {
@@ -16512,29 +21279,20 @@ var ts;
             getSymbolDisplayBuilder().buildTypeDisplay(getReturnTypeOfSignature(signature), writer, enclosingDeclaration, flags);
         }
         function isUnknownIdentifier(location, name) {
-            return !resolveName(location, name, 107455, undefined, undefined) &&
-                !ts.hasProperty(getGeneratedNamesForSourceFile(getSourceFile(location)), name);
+            ts.Debug.assert(!ts.nodeIsSynthesized(location), "isUnknownIdentifier called with a synthesized location");
+            return !resolveName(location, name, 107455, undefined, undefined) && !ts.hasProperty(getGeneratedNamesForSourceFile(getSourceFile(location)), name);
         }
         function getBlockScopedVariableId(n) {
             ts.Debug.assert(!ts.nodeIsSynthesized(n));
-            if (n.parent.kind === 153 &&
-                n.parent.name === n) {
+            if (n.parent.kind === 153 && n.parent.name === n) {
                 return undefined;
             }
-            if (n.parent.kind === 150 &&
-                n.parent.propertyName === n) {
+            if (n.parent.kind === 150 && n.parent.propertyName === n) {
                 return undefined;
             }
-            var declarationSymbol = (n.parent.kind === 193 && n.parent.name === n) ||
-                n.parent.kind === 150
-                ? getSymbolOfNode(n.parent)
-                : undefined;
-            var symbol = declarationSymbol ||
-                getNodeLinks(n).resolvedSymbol ||
-                resolveName(n, n.text, 2 | 8388608, undefined, undefined);
-            var isLetOrConst = symbol &&
-                (symbol.flags & 2) &&
-                symbol.valueDeclaration.parent.kind !== 216;
+            var declarationSymbol = (n.parent.kind === 193 && n.parent.name === n) || n.parent.kind === 150 ? getSymbolOfNode(n.parent) : undefined;
+            var symbol = declarationSymbol || getNodeLinks(n).resolvedSymbol || resolveName(n, n.text, 2 | 8388608, undefined, undefined);
+            var isLetOrConst = symbol && (symbol.flags & 2) && symbol.valueDeclaration.parent.kind !== 217;
             if (isLetOrConst) {
                 getSymbolLinks(symbol);
                 return symbol.id;
@@ -16611,10 +21369,10 @@ var ts;
                 case 175:
                 case 195:
                 case 198:
+                case 204:
                 case 203:
-                case 202:
+                case 210:
                 case 209:
-                case 208:
                 case 128:
                     break;
                 default:
@@ -16649,7 +21407,7 @@ var ts;
                         else if (flags & 128) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "static");
                         }
-                        else if (node.parent.kind === 201 || node.parent.kind === 220) {
+                        else if (node.parent.kind === 201 || node.parent.kind === 221) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_element, text);
                         }
                         flags |= ts.modifierToFlag(modifier.kind);
@@ -16658,7 +21416,7 @@ var ts;
                         if (flags & 128) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "static");
                         }
-                        else if (node.parent.kind === 201 || node.parent.kind === 220) {
+                        else if (node.parent.kind === 201 || node.parent.kind === 221) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_element, "static");
                         }
                         else if (node.kind === 128) {
@@ -16711,7 +21469,7 @@ var ts;
                     return grammarErrorOnNode(lastPrivate, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "private");
                 }
             }
-            else if ((node.kind === 203 || node.kind === 202) && flags & 2) {
+            else if ((node.kind === 204 || node.kind === 203) && flags & 2) {
                 return grammarErrorOnNode(lastDeclare, ts.Diagnostics.A_declare_modifier_cannot_be_used_with_an_import_declaration, "declare");
             }
             else if (node.kind === 197 && flags & 2) {
@@ -16824,8 +21582,7 @@ var ts;
             }
         }
         function checkGrammarTypeArguments(node, typeArguments) {
-            return checkGrammarForDisallowedTrailingComma(typeArguments) ||
-                checkGrammarForAtLeastOneTypeArgument(node, typeArguments);
+            return checkGrammarForDisallowedTrailingComma(typeArguments) || checkGrammarForAtLeastOneTypeArgument(node, typeArguments);
         }
         function checkGrammarForOmittedArgument(node, arguments) {
             if (arguments) {
@@ -16839,8 +21596,7 @@ var ts;
             }
         }
         function checkGrammarArguments(node, arguments) {
-            return checkGrammarForDisallowedTrailingComma(arguments) ||
-                checkGrammarForOmittedArgument(node, arguments);
+            return checkGrammarForDisallowedTrailingComma(arguments) || checkGrammarForOmittedArgument(node, arguments);
         }
         function checkGrammarHeritageClause(node) {
             var types = node.types;
@@ -16936,13 +21692,12 @@ var ts;
             for (var i = 0, n = node.properties.length; i < n; i++) {
                 var prop = node.properties[i];
                 var name = prop.name;
-                if (prop.kind === 172 ||
-                    name.kind === 126) {
+                if (prop.kind === 172 || name.kind === 126) {
                     checkGrammarComputedPropertyName(name);
                     continue;
                 }
                 var currentKind;
-                if (prop.kind === 217 || prop.kind === 218) {
+                if (prop.kind === 218 || prop.kind === 219) {
                     checkGrammarForInvalidQuestionMark(prop, prop.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional);
                     if (name.kind === 7) {
                         checkGrammarNumbericLiteral(name);
@@ -16993,22 +21748,16 @@ var ts;
                 var variableList = forInOrOfStatement.initializer;
                 if (!checkGrammarVariableDeclarationList(variableList)) {
                     if (variableList.declarations.length > 1) {
-                        var diagnostic = forInOrOfStatement.kind === 182
-                            ? ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement
-                            : ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement;
+                        var diagnostic = forInOrOfStatement.kind === 182 ? ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement : ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement;
                         return grammarErrorOnFirstToken(variableList.declarations[1], diagnostic);
                     }
                     var firstDeclaration = variableList.declarations[0];
                     if (firstDeclaration.initializer) {
-                        var diagnostic = forInOrOfStatement.kind === 182
-                            ? ts.Diagnostics.The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer
-                            : ts.Diagnostics.The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer;
+                        var diagnostic = forInOrOfStatement.kind === 182 ? ts.Diagnostics.The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer : ts.Diagnostics.The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer;
                         return grammarErrorOnNode(firstDeclaration.name, diagnostic);
                     }
                     if (firstDeclaration.type) {
-                        var diagnostic = forInOrOfStatement.kind === 182
-                            ? ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation
-                            : ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation;
+                        var diagnostic = forInOrOfStatement.kind === 182 ? ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation : ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation;
                         return grammarErrorOnNode(firstDeclaration, diagnostic);
                     }
                 }
@@ -17062,9 +21811,7 @@ var ts;
             }
         }
         function checkGrammarMethod(node) {
-            if (checkGrammarDisallowedModifiersInBlockOrObjectLiteralExpression(node) ||
-                checkGrammarFunctionLikeDeclaration(node) ||
-                checkGrammarForGenerator(node)) {
+            if (checkGrammarDisallowedModifiersInBlockOrObjectLiteralExpression(node) || checkGrammarFunctionLikeDeclaration(node) || checkGrammarForGenerator(node)) {
                 return true;
             }
             if (node.parent.kind === 152) {
@@ -17115,8 +21862,7 @@ var ts;
                 switch (current.kind) {
                     case 189:
                         if (node.label && current.label.text === node.label.text) {
-                            var isMisplacedContinueLabel = node.kind === 184
-                                && !isIterationStatement(current.statement, true);
+                            var isMisplacedContinueLabel = node.kind === 184 && !isIterationStatement(current.statement, true);
                             if (isMisplacedContinueLabel) {
                                 return grammarErrorOnNode(node, ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement);
                             }
@@ -17137,15 +21883,11 @@ var ts;
                 current = current.parent;
             }
             if (node.label) {
-                var message = node.kind === 185
-                    ? ts.Diagnostics.A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement
-                    : ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement;
+                var message = node.kind === 185 ? ts.Diagnostics.A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement : ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement;
                 return grammarErrorOnNode(node, message);
             }
             else {
-                var message = node.kind === 185
-                    ? ts.Diagnostics.A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement
-                    : ts.Diagnostics.A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement;
+                var message = node.kind === 185 ? ts.Diagnostics.A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement : ts.Diagnostics.A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement;
                 return grammarErrorOnNode(node, message);
             }
         }
@@ -17182,8 +21924,7 @@ var ts;
                 }
             }
             var checkLetConstNames = languageVersion >= 2 && (ts.isLet(node) || ts.isConst(node));
-            return (checkLetConstNames && checkGrammarNameInLetOrConstDeclarations(node.name)) ||
-                checkGrammarEvalOrArgumentsInStrictMode(node, node.name);
+            return (checkLetConstNames && checkGrammarNameInLetOrConstDeclarations(node.name)) || checkGrammarEvalOrArgumentsInStrictMode(node, node.name);
         }
         function checkGrammarNameInLetOrConstDeclarations(name) {
             if (name.kind === 64) {
@@ -17315,8 +22056,7 @@ var ts;
         }
         function checkGrammarProperty(node) {
             if (node.parent.kind === 196) {
-                if (checkGrammarForInvalidQuestionMark(node, node.questionToken, ts.Diagnostics.A_class_member_cannot_be_declared_optional) ||
-                    checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_class_property_declaration_must_directly_refer_to_a_built_in_symbol)) {
+                if (checkGrammarForInvalidQuestionMark(node, node.questionToken, ts.Diagnostics.A_class_member_cannot_be_declared_optional) || checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_class_property_declaration_must_directly_refer_to_a_built_in_symbol)) {
                     return true;
                 }
             }
@@ -17335,12 +22075,7 @@ var ts;
             }
         }
         function checkGrammarTopLevelElementForRequiredDeclareModifier(node) {
-            if (node.kind === 197 ||
-                node.kind === 203 ||
-                node.kind === 202 ||
-                node.kind === 209 ||
-                node.kind === 208 ||
-                (node.flags & 2)) {
+            if (node.kind === 197 || node.kind === 204 || node.kind === 203 || node.kind === 210 || node.kind === 209 || (node.flags & 2)) {
                 return false;
             }
             return grammarErrorOnFirstToken(node, ts.Diagnostics.A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file);
@@ -17367,7 +22102,7 @@ var ts;
                 if (!links.hasReportedStatementInAmbientContext && ts.isFunctionLike(node.parent)) {
                     return getNodeLinks(node).hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.An_implementation_cannot_be_declared_in_ambient_contexts);
                 }
-                if (node.parent.kind === 174 || node.parent.kind === 201 || node.parent.kind === 220) {
+                if (node.parent.kind === 174 || node.parent.kind === 201 || node.parent.kind === 221) {
                     var links = getNodeLinks(node.parent);
                     if (!links.hasReportedStatementInAmbientContext) {
                         return links.hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.Statements_are_not_allowed_in_ambient_contexts);
@@ -17402,7 +22137,10 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    var indentStrings = ["", "    "];
+    var indentStrings = [
+        "",
+        "    "
+    ];
     function getIndentString(level) {
         if (indentStrings[level] === undefined) {
             indentStrings[level] = getIndentString(level - 1) + indentStrings[1];
@@ -17477,21 +22215,34 @@ var ts;
             writeTextOfNode: writeTextOfNode,
             writeLiteral: writeLiteral,
             writeLine: writeLine,
-            increaseIndent: function () { return indent++; },
-            decreaseIndent: function () { return indent--; },
-            getIndent: function () { return indent; },
-            getTextPos: function () { return output.length; },
-            getLine: function () { return lineCount + 1; },
-            getColumn: function () { return lineStart ? indent * getIndentSize() + 1 : output.length - linePos + 1; },
-            getText: function () { return output; }
+            increaseIndent: function () {
+                return indent++;
+            },
+            decreaseIndent: function () {
+                return indent--;
+            },
+            getIndent: function () {
+                return indent;
+            },
+            getTextPos: function () {
+                return output.length;
+            },
+            getLine: function () {
+                return lineCount + 1;
+            },
+            getColumn: function () {
+                return lineStart ? indent * getIndentSize() + 1 : output.length - linePos + 1;
+            },
+            getText: function () {
+                return output;
+            }
         };
     }
     function getLineOfLocalPosition(currentSourceFile, pos) {
         return ts.getLineAndCharacterOfPosition(currentSourceFile, pos).line;
     }
     function emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments) {
-        if (leadingComments && leadingComments.length && node.pos !== leadingComments[0].pos &&
-            getLineOfLocalPosition(currentSourceFile, node.pos) !== getLineOfLocalPosition(currentSourceFile, leadingComments[0].pos)) {
+        if (leadingComments && leadingComments.length && node.pos !== leadingComments[0].pos && getLineOfLocalPosition(currentSourceFile, node.pos) !== getLineOfLocalPosition(currentSourceFile, leadingComments[0].pos)) {
             writer.writeLine();
         }
     }
@@ -17520,9 +22271,7 @@ var ts;
             var lineCount = ts.getLineStarts(currentSourceFile).length;
             var firstCommentLineIndent;
             for (var pos = comment.pos, currentLine = firstCommentLineAndCharacter.line; pos < comment.end; currentLine++) {
-                var nextLineStart = (currentLine + 1) === lineCount
-                    ? currentSourceFile.text.length + 1
-                    : ts.getStartPositionOfLine(currentLine + 1, currentSourceFile);
+                var nextLineStart = (currentLine + 1) === lineCount ? currentSourceFile.text.length + 1 : ts.getStartPositionOfLine(currentLine + 1, currentSourceFile);
                 if (pos !== comment.pos) {
                     if (firstCommentLineIndent === undefined) {
                         firstCommentLineIndent = calculateIndent(ts.getStartPositionOfLine(firstCommentLineAndCharacter.line, currentSourceFile), comment.pos);
@@ -17600,8 +22349,7 @@ var ts;
         }
         else {
             ts.forEach(declarations, function (member) {
-                if ((member.kind === 134 || member.kind === 135)
-                    && (member.flags & 128) === (accessor.flags & 128)) {
+                if ((member.kind === 134 || member.kind === 135) && (member.flags & 128) === (accessor.flags & 128)) {
                     var memberName = ts.getPropertyNameForPropertyNameNode(member.name);
                     var accessorName = ts.getPropertyNameForPropertyNameNode(accessor.name);
                     if (memberName === accessorName) {
@@ -17657,7 +22405,8 @@ var ts;
         var enclosingDeclaration;
         var currentSourceFile;
         var reportedDeclarationError = false;
-        var emitJsDocComments = compilerOptions.removeComments ? function (declaration) { } : writeJsDocComments;
+        var emitJsDocComments = compilerOptions.removeComments ? function (declaration) {
+        } : writeJsDocComments;
         var emit = compilerOptions.stripInternal ? stripInternal : emitNode;
         var aliasDeclarationEmitInfo = [];
         var referencePathsOutput = "";
@@ -17666,9 +22415,7 @@ var ts;
                 var addedGlobalFileReference = false;
                 ts.forEach(root.referencedFiles, function (fileReference) {
                     var referencedFile = ts.tryResolveScriptReference(host, root, fileReference);
-                    if (referencedFile && ((referencedFile.flags & 2048) ||
-                        shouldEmitToOwnFile(referencedFile, compilerOptions) ||
-                        !addedGlobalFileReference)) {
+                    if (referencedFile && ((referencedFile.flags & 2048) || shouldEmitToOwnFile(referencedFile, compilerOptions) || !addedGlobalFileReference)) {
                         writeReferencePath(referencedFile);
                         if (!isExternalModuleOrDeclarationFile(referencedFile)) {
                             addedGlobalFileReference = true;
@@ -17685,8 +22432,7 @@ var ts;
                     if (!compilerOptions.noResolve) {
                         ts.forEach(sourceFile.referencedFiles, function (fileReference) {
                             var referencedFile = ts.tryResolveScriptReference(host, sourceFile, fileReference);
-                            if (referencedFile && (isExternalModuleOrDeclarationFile(referencedFile) &&
-                                !ts.contains(emittedReferencedFiles, referencedFile))) {
+                            if (referencedFile && (isExternalModuleOrDeclarationFile(referencedFile) && !ts.contains(emittedReferencedFiles, referencedFile))) {
                                 writeReferencePath(referencedFile);
                                 emittedReferencedFiles.push(referencedFile);
                             }
@@ -17740,7 +22486,9 @@ var ts;
         function writeAsychronousImportEqualsDeclarations(importEqualsDeclarations) {
             var oldWriter = writer;
             ts.forEach(importEqualsDeclarations, function (aliasToWrite) {
-                var aliasEmitInfo = ts.forEach(aliasDeclarationEmitInfo, function (declEmitInfo) { return declEmitInfo.declaration === aliasToWrite ? declEmitInfo : undefined; });
+                var aliasEmitInfo = ts.forEach(aliasDeclarationEmitInfo, function (declEmitInfo) {
+                    return declEmitInfo.declaration === aliasToWrite ? declEmitInfo : undefined;
+                });
                 if (aliasEmitInfo) {
                     createAndSetNewTextWriterWithSymbolWriter();
                     for (var declarationIndent = aliasEmitInfo.indent; declarationIndent; declarationIndent--) {
@@ -17858,7 +22606,7 @@ var ts;
                     ts.Debug.fail("Unknown type annotation: " + type.kind);
             }
             function emitEntityName(entityName) {
-                var visibilityResult = resolver.isEntityNameVisible(entityName, entityName.parent.kind === 202 ? entityName.parent : enclosingDeclaration);
+                var visibilityResult = resolver.isEntityNameVisible(entityName, entityName.parent.kind === 203 ? entityName.parent : enclosingDeclaration);
                 handleSymbolAccessibilityError(visibilityResult);
                 writeEntityName(entityName);
                 function writeEntityName(entityName) {
@@ -18065,15 +22813,8 @@ var ts;
                 writeTextOfNode(currentSourceFile, node.name);
                 if (node.constraint && !isPrivateMethodTypeParameter(node)) {
                     write(" extends ");
-                    if (node.parent.kind === 140 ||
-                        node.parent.kind === 141 ||
-                        (node.parent.parent && node.parent.parent.kind === 143)) {
-                        ts.Debug.assert(node.parent.kind === 132 ||
-                            node.parent.kind === 131 ||
-                            node.parent.kind === 140 ||
-                            node.parent.kind === 141 ||
-                            node.parent.kind === 136 ||
-                            node.parent.kind === 137);
+                    if (node.parent.kind === 140 || node.parent.kind === 141 || (node.parent.parent && node.parent.parent.kind === 143)) {
+                        ts.Debug.assert(node.parent.kind === 132 || node.parent.kind === 131 || node.parent.kind === 140 || node.parent.kind === 141 || node.parent.kind === 136 || node.parent.kind === 137);
                         emitType(node.constraint);
                     }
                     else {
@@ -18136,9 +22877,7 @@ var ts;
                 function getHeritageClauseVisibilityError(symbolAccesibilityResult) {
                     var diagnosticMessage;
                     if (node.parent.parent.kind === 196) {
-                        diagnosticMessage = isImplementsList ?
-                            ts.Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 :
-                            ts.Diagnostics.Extends_clause_of_exported_class_0_has_or_is_using_private_name_1;
+                        diagnosticMessage = isImplementsList ? ts.Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 : ts.Diagnostics.Extends_clause_of_exported_class_0_has_or_is_using_private_name_1;
                     }
                     else {
                         diagnosticMessage = ts.Diagnostics.Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1;
@@ -18171,7 +22910,9 @@ var ts;
                 emitTypeParameters(node.typeParameters);
                 var baseTypeNode = ts.getClassBaseTypeNode(node);
                 if (baseTypeNode) {
-                    emitHeritageClause([baseTypeNode], false);
+                    emitHeritageClause([
+                        baseTypeNode
+                    ], false);
                 }
                 emitHeritageClause(ts.getClassImplementedTypeNodes(node), true);
                 write(" {");
@@ -18231,31 +22972,17 @@ var ts;
             function getVariableDeclarationTypeVisibilityError(symbolAccesibilityResult) {
                 var diagnosticMessage;
                 if (node.kind === 193) {
-                    diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                        symbolAccesibilityResult.accessibility === 2 ?
-                            ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
-                            ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_private_module_2 :
-                        ts.Diagnostics.Exported_variable_0_has_or_is_using_private_name_1;
+                    diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Exported_variable_0_has_or_is_using_private_name_1;
                 }
                 else if (node.kind === 130 || node.kind === 129) {
                     if (node.flags & 128) {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
-                                ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
-                                ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1;
                     }
                     else if (node.parent.kind === 196) {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
-                                ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
-                                ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_private_name_1;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_private_name_1;
                     }
                     else {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_private_name_1;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_private_name_1;
                     }
                 }
                 return diagnosticMessage !== undefined ? {
@@ -18272,7 +22999,9 @@ var ts;
             }
         }
         function emitVariableStatement(node) {
-            var hasDeclarationWithEmit = ts.forEach(node.declarationList.declarations, function (varDeclaration) { return resolver.isDeclarationVisible(varDeclaration); });
+            var hasDeclarationWithEmit = ts.forEach(node.declarationList.declarations, function (varDeclaration) {
+                return resolver.isDeclarationVisible(varDeclaration);
+            });
             if (hasDeclarationWithEmit) {
                 emitJsDocComments(node);
                 emitModuleElementDeclarationFlags(node);
@@ -18317,25 +23046,17 @@ var ts;
             }
             function getTypeAnnotationFromAccessor(accessor) {
                 if (accessor) {
-                    return accessor.kind === 134
-                        ? accessor.type
-                        : accessor.parameters.length > 0
-                            ? accessor.parameters[0].type
-                            : undefined;
+                    return accessor.kind === 134 ? accessor.type : accessor.parameters.length > 0 ? accessor.parameters[0].type : undefined;
                 }
             }
             function getAccessorDeclarationTypeVisibilityError(symbolAccesibilityResult) {
                 var diagnosticMessage;
                 if (accessorWithTypeAnnotation.kind === 135) {
                     if (accessorWithTypeAnnotation.parent.flags & 128) {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1;
                     }
                     else {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1;
                     }
                     return {
                         diagnosticMessage: diagnosticMessage,
@@ -18345,18 +23066,10 @@ var ts;
                 }
                 else {
                     if (accessorWithTypeAnnotation.flags & 128) {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
-                                ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
-                                ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
-                            ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0;
                     }
                     else {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
-                                ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
-                                ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
-                            ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0;
                     }
                     return {
                         diagnosticMessage: diagnosticMessage,
@@ -18370,8 +23083,7 @@ var ts;
             if (ts.hasDynamicName(node)) {
                 return;
             }
-            if ((node.kind !== 195 || resolver.isDeclarationVisible(node)) &&
-                !resolver.isImplementationOfOverload(node)) {
+            if ((node.kind !== 195 || resolver.isDeclarationVisible(node)) && !resolver.isImplementationOfOverload(node)) {
                 emitJsDocComments(node);
                 if (node.kind === 195) {
                     emitModuleElementDeclarationFlags(node);
@@ -18438,48 +23150,28 @@ var ts;
                 var diagnosticMessage;
                 switch (node.kind) {
                     case 137:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
-                            ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0;
                         break;
                     case 136:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
-                            ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0;
                         break;
                     case 138:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
-                            ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0;
                         break;
                     case 132:
                     case 131:
                         if (node.flags & 128) {
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === 2 ?
-                                    ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
-                                    ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
-                                ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0;
+                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0;
                         }
                         else if (node.parent.kind === 196) {
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === 2 ?
-                                    ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
-                                    ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
-                                ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0;
+                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0;
                         }
                         else {
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                                ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
-                                ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0;
+                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0;
                         }
                         break;
                     case 195:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
-                                ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
-                                ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1 :
-                            ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_private_name_0;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_private_name_0;
                         break;
                     default:
                         ts.Debug.fail("This is unknown kind for signature: " + node.kind);
@@ -18506,9 +23198,7 @@ var ts;
                 write("?");
             }
             decreaseIndent();
-            if (node.parent.kind === 140 ||
-                node.parent.kind === 141 ||
-                node.parent.parent.kind === 143) {
+            if (node.parent.kind === 140 || node.parent.kind === 141 || node.parent.parent.kind === 143) {
                 emitTypeOfVariableDeclarationFromTypeLiteral(node);
             }
             else if (!(node.parent.flags & 32)) {
@@ -18518,50 +23208,28 @@ var ts;
                 var diagnosticMessage;
                 switch (node.parent.kind) {
                     case 133:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
-                                ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
-                                ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1;
                         break;
                     case 137:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
                         break;
                     case 136:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
                         break;
                     case 132:
                     case 131:
                         if (node.parent.flags & 128) {
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === 2 ?
-                                    ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
-                                    ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
-                                ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
+                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
                         }
                         else if (node.parent.parent.kind === 196) {
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === 2 ?
-                                    ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
-                                    ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
-                                ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1;
+                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1;
                         }
                         else {
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                                ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
-                                ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
+                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
                         }
                         break;
                     case 195:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
-                                ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
-                                ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_private_name_1;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_private_name_1;
                         break;
                     default:
                         ts.Debug.fail("This is unknown parent for parameter: " + node.parent.kind);
@@ -18598,26 +23266,22 @@ var ts;
                     return emitClassDeclaration(node);
                 case 198:
                     return emitTypeAliasDeclaration(node);
-                case 219:
+                case 220:
                     return emitEnumMemberDeclaration(node);
                 case 199:
                     return emitEnumDeclaration(node);
                 case 200:
                     return emitModuleDeclaration(node);
-                case 202:
+                case 203:
                     return emitImportEqualsDeclaration(node);
-                case 208:
+                case 209:
                     return emitExportAssignment(node);
-                case 220:
+                case 221:
                     return emitSourceFile(node);
             }
         }
         function writeReferencePath(referencedFile) {
-            var declFileName = referencedFile.flags & 2048
-                ? referencedFile.fileName
-                : shouldEmitToOwnFile(referencedFile, compilerOptions)
-                    ? getOwnEmitOutputFilePath(referencedFile, host, ".d.ts")
-                    : ts.removeFileExtension(compilerOptions.out) + ".d.ts";
+            var declFileName = referencedFile.flags & 2048 ? referencedFile.fileName : shouldEmitToOwnFile(referencedFile, compilerOptions) ? getOwnEmitOutputFilePath(referencedFile, host, ".d.ts") : ts.removeFileExtension(compilerOptions.out) + ".d.ts";
             declFileName = ts.getRelativePathToDirectoryOrUrl(ts.getDirectoryPath(ts.normalizeSlashes(jsFilePath)), declFileName, host.getCurrentDirectory(), host.getCanonicalFileName, false);
             referencePathsOutput += "/// <reference path=\"" + declFileName + "\" />" + newLine;
         }
@@ -18668,6 +23332,7 @@ var ts;
             var writeLine = writer.writeLine;
             var increaseIndent = writer.increaseIndent;
             var decreaseIndent = writer.decreaseIndent;
+            var preserveNewLines = compilerOptions.preserveNewLines || false;
             var currentSourceFile;
             var lastFrame;
             var currentScopeNames;
@@ -18680,41 +23345,57 @@ var ts;
             var exportSpecifiers;
             var exportDefault;
             var writeEmittedFiles = writeJavaScriptFile;
-            var emitLeadingComments = compilerOptions.removeComments ? function (node) { } : emitLeadingDeclarationComments;
-            var emitTrailingComments = compilerOptions.removeComments ? function (node) { } : emitTrailingDeclarationComments;
-            var emitLeadingCommentsOfPosition = compilerOptions.removeComments ? function (pos) { } : emitLeadingCommentsOfLocalPosition;
+            var emitLeadingComments = compilerOptions.removeComments ? function (node) {
+            } : emitLeadingDeclarationComments;
+            var emitTrailingComments = compilerOptions.removeComments ? function (node) {
+            } : emitTrailingDeclarationComments;
+            var emitLeadingCommentsOfPosition = compilerOptions.removeComments ? function (pos) {
+            } : emitLeadingCommentsOfLocalPosition;
             var detachedCommentsInfo;
-            var emitDetachedComments = compilerOptions.removeComments ? function (node) { } : emitDetachedCommentsAtPosition;
-            var emitPinnedOrTripleSlashComments = compilerOptions.removeComments ? function (node) { } : emitPinnedOrTripleSlashCommentsOfNode;
+            var emitDetachedComments = compilerOptions.removeComments ? function (node) {
+            } : emitDetachedCommentsAtPosition;
             var writeComment = writeCommentRange;
-            var emit = emitNode;
-            var emitStart = function (node) { };
-            var emitEnd = function (node) { };
+            var emitNodeWithoutSourceMap = compilerOptions.removeComments ? emitNodeWithoutSourceMapWithoutComments : emitNodeWithoutSourceMapWithComments;
+            var emit = emitNodeWithoutSourceMap;
+            var emitWithoutComments = emitNodeWithoutSourceMapWithoutComments;
+            var emitStart = function (node) {
+            };
+            var emitEnd = function (node) {
+            };
             var emitToken = emitTokenText;
-            var scopeEmitStart = function (scopeDeclaration, scopeName) { };
-            var scopeEmitEnd = function () { };
+            var scopeEmitStart = function (scopeDeclaration, scopeName) {
+            };
+            var scopeEmitEnd = function () {
+            };
             var sourceMapData;
             if (compilerOptions.sourceMap) {
                 initializeEmitterWithSourceMaps();
             }
             if (root) {
-                emit(root);
+                emitSourceFile(root);
             }
             else {
                 ts.forEach(host.getSourceFiles(), function (sourceFile) {
                     if (!isExternalModuleOrDeclarationFile(sourceFile)) {
-                        emit(sourceFile);
+                        emitSourceFile(sourceFile);
                     }
                 });
             }
             writeLine();
             writeEmittedFiles(writer.getText(), compilerOptions.emitBOM);
             return;
+            function emitSourceFile(sourceFile) {
+                currentSourceFile = sourceFile;
+                emit(sourceFile);
+            }
             function enterNameScope() {
                 var names = currentScopeNames;
                 currentScopeNames = undefined;
                 if (names) {
-                    lastFrame = { names: names, previous: lastFrame };
+                    lastFrame = {
+                        names: names,
+                        previous: lastFrame
+                    };
                     return true;
                 }
                 return false;
@@ -18734,8 +23415,13 @@ var ts;
                     name = baseName;
                 }
                 else {
-                    name = ts.generateUniqueName(baseName, function (n) { return isExistingName(location, n); });
+                    name = ts.generateUniqueName(baseName, function (n) {
+                        return isExistingName(location, n);
+                    });
                 }
+                return recordNameInCurrentScope(name);
+            }
+            function recordNameInCurrentScope(name) {
                 if (!currentScopeNames) {
                     currentScopeNames = {};
                 }
@@ -18831,12 +23517,7 @@ var ts;
                     sourceLinePos.character++;
                     var emittedLine = writer.getLine();
                     var emittedColumn = writer.getColumn();
-                    if (!lastRecordedSourceMapSpan ||
-                        lastRecordedSourceMapSpan.emittedLine != emittedLine ||
-                        lastRecordedSourceMapSpan.emittedColumn != emittedColumn ||
-                        (lastRecordedSourceMapSpan.sourceIndex === sourceMapSourceIndex &&
-                            (lastRecordedSourceMapSpan.sourceLine > sourceLinePos.line ||
-                                (lastRecordedSourceMapSpan.sourceLine === sourceLinePos.line && lastRecordedSourceMapSpan.sourceColumn > sourceLinePos.character)))) {
+                    if (!lastRecordedSourceMapSpan || lastRecordedSourceMapSpan.emittedLine != emittedLine || lastRecordedSourceMapSpan.emittedColumn != emittedColumn || (lastRecordedSourceMapSpan.sourceIndex === sourceMapSourceIndex && (lastRecordedSourceMapSpan.sourceLine > sourceLinePos.line || (lastRecordedSourceMapSpan.sourceLine === sourceLinePos.line && lastRecordedSourceMapSpan.sourceColumn > sourceLinePos.character)))) {
                         encodeLastRecordedSourceMapSpan();
                         lastRecordedSourceMapSpan = {
                             emittedLine: emittedLine,
@@ -18899,20 +23580,10 @@ var ts;
                     if (scopeName) {
                         recordScopeNameStart(scopeName);
                     }
-                    else if (node.kind === 195 ||
-                        node.kind === 160 ||
-                        node.kind === 132 ||
-                        node.kind === 131 ||
-                        node.kind === 134 ||
-                        node.kind === 135 ||
-                        node.kind === 200 ||
-                        node.kind === 196 ||
-                        node.kind === 199) {
+                    else if (node.kind === 195 || node.kind === 160 || node.kind === 132 || node.kind === 131 || node.kind === 134 || node.kind === 135 || node.kind === 200 || node.kind === 196 || node.kind === 199) {
                         if (node.name) {
                             var name = node.name;
-                            scopeName = name.kind === 126
-                                ? ts.getTextOfNode(name)
-                                : node.name.text;
+                            scopeName = name.kind === 126 ? ts.getTextOfNode(name) : node.name.text;
                         }
                         recordScopeNameStart(scopeName);
                     }
@@ -18990,21 +23661,32 @@ var ts;
                 else {
                     sourceMapDir = ts.getDirectoryPath(ts.normalizePath(jsFilePath));
                 }
-                function emitNodeWithMap(node) {
+                function emitNodeWithSourceMap(node) {
                     if (node) {
-                        if (node.kind != 220) {
+                        if (ts.nodeIsSynthesized(node)) {
+                            return emitNodeWithoutSourceMap(node);
+                        }
+                        if (node.kind != 221) {
                             recordEmitNodeStartSpan(node);
-                            emitNode(node);
+                            emitNodeWithoutSourceMap(node);
                             recordEmitNodeEndSpan(node);
                         }
                         else {
                             recordNewSourceFileStart(node);
-                            emitNode(node);
+                            emitNodeWithoutSourceMap(node);
                         }
                     }
                 }
+                function emitNodeWithSourceMapWithoutComments(node) {
+                    if (node) {
+                        recordEmitNodeStartSpan(node);
+                        emitNodeWithoutSourceMapWithoutComments(node);
+                        recordEmitNodeEndSpan(node);
+                    }
+                }
                 writeEmittedFiles = writeJavaScriptAndSourceMapFile;
-                emit = emitNodeWithMap;
+                emit = emitNodeWithSourceMap;
+                emitWithoutComments = emitNodeWithSourceMapWithoutComments;
                 emitStart = recordEmitNodeStartSpan;
                 emitEnd = recordEmitNodeEndSpan;
                 emitToken = writeTextWithSpanRecord;
@@ -19024,6 +23706,7 @@ var ts;
                     name = "_" + (tempCount < 25 ? String.fromCharCode(tempCount + (tempCount < 8 ? 0 : 1) + 97) : tempCount - 25);
                     tempCount++;
                 }
+                recordNameInCurrentScope(name);
                 var result = ts.createSynthesizedNode(64);
                 result.text = name;
                 return result;
@@ -19085,7 +23768,7 @@ var ts;
             function emitLinePreservingList(parent, nodes, allowTrailingComma, spacesBetweenBraces) {
                 ts.Debug.assert(nodes.length > 0);
                 increaseIndent();
-                if (nodeStartPositionsAreOnSameLine(parent, nodes[0])) {
+                if (preserveNewLines && nodeStartPositionsAreOnSameLine(parent, nodes[0])) {
                     if (spacesBetweenBraces) {
                         write(" ");
                     }
@@ -19095,7 +23778,7 @@ var ts;
                 }
                 for (var i = 0, n = nodes.length; i < n; i++) {
                     if (i) {
-                        if (nodeEndIsOnSameLineAsNodeStart(nodes[i - 1], nodes[i])) {
+                        if (preserveNewLines && nodeEndIsOnSameLineAsNodeStart(nodes[i - 1], nodes[i])) {
                             write(", ");
                         }
                         else {
@@ -19105,12 +23788,11 @@ var ts;
                     }
                     emit(nodes[i]);
                 }
-                var closeTokenIsOnSameLineAsLastElement = nodeEndPositionsAreOnSameLine(parent, ts.lastOrUndefined(nodes));
                 if (nodes.hasTrailingComma && allowTrailingComma) {
                     write(",");
                 }
                 decreaseIndent();
-                if (closeTokenIsOnSameLineAsLastElement) {
+                if (preserveNewLines && nodeEndPositionsAreOnSameLine(parent, ts.lastOrUndefined(nodes))) {
                     if (spacesBetweenBraces) {
                         write(" ");
                     }
@@ -19244,8 +23926,7 @@ var ts;
                 if (node.template.kind === 169) {
                     ts.forEach(node.template.templateSpans, function (templateSpan) {
                         write(", ");
-                        var needsParens = templateSpan.expression.kind === 167
-                            && templateSpan.expression.operatorToken.kind === 23;
+                        var needsParens = templateSpan.expression.kind === 167 && templateSpan.expression.operatorToken.kind === 23;
                         emitParenthesizedIf(templateSpan.expression, needsParens);
                     });
                 }
@@ -19256,8 +23937,7 @@ var ts;
                     ts.forEachChild(node, emit);
                     return;
                 }
-                var emitOuterParens = ts.isExpression(node.parent)
-                    && templateNeedsParens(node, node.parent);
+                var emitOuterParens = ts.isExpression(node.parent) && templateNeedsParens(node, node.parent);
                 if (emitOuterParens) {
                     write("(");
                 }
@@ -19268,8 +23948,7 @@ var ts;
                 }
                 for (var i = 0; i < node.templateSpans.length; i++) {
                     var templateSpan = node.templateSpans[i];
-                    var needsParens = templateSpan.expression.kind !== 159
-                        && comparePrecedenceToBinaryPlus(templateSpan.expression) !== 1;
+                    var needsParens = templateSpan.expression.kind !== 159 && comparePrecedenceToBinaryPlus(templateSpan.expression) !== 1;
                     if (i > 0 || headEmitted) {
                         write(" + ");
                     }
@@ -19350,9 +24029,9 @@ var ts;
                     case 150:
                     case 130:
                     case 129:
-                    case 217:
                     case 218:
                     case 219:
+                    case 220:
                     case 132:
                     case 131:
                     case 195:
@@ -19363,11 +24042,11 @@ var ts;
                     case 197:
                     case 199:
                     case 200:
-                    case 202:
+                    case 203:
                         return parent.name === node;
                     case 185:
                     case 184:
-                    case 208:
+                    case 209:
                         return false;
                     case 189:
                         return node.parent.label === node;
@@ -19555,9 +24234,9 @@ var ts;
             }
             function tryGetRightHandSideOfPatchingPropertyAssignment(objectLiteral, property) {
                 switch (property.kind) {
-                    case 217:
-                        return property.initializer;
                     case 218:
+                        return property.initializer;
+                    case 219:
                         return createIdentifier(resolver.getExpressionNameSubstitution(property.name));
                     case 132:
                         return createFunctionExpression(property.parameters, property.body);
@@ -19611,6 +24290,11 @@ var ts;
                 result.right = right;
                 return result;
             }
+            function createExpressionStatement(expression) {
+                var result = ts.createSynthesizedNode(177);
+                result.expression = expression;
+                return result;
+            }
             function createMemberAccessForPropertyName(expression, memberName) {
                 if (memberName.kind === 64) {
                     return createPropertyAccessExpression(expression, memberName);
@@ -19626,7 +24310,7 @@ var ts;
                 }
             }
             function createPropertyAssignment(name, initializer) {
-                var result = ts.createSynthesizedNode(217);
+                var result = ts.createSynthesizedNode(218);
                 result.name = name;
                 result.initializer = initializer;
                 return result;
@@ -19721,29 +24405,31 @@ var ts;
                 }
                 return false;
             }
-            function indentIfOnDifferentLines(parent, node1, node2) {
-                var isSynthesized = ts.nodeIsSynthesized(parent);
-                var realNodesAreOnDifferentLines = !isSynthesized && !nodeEndIsOnSameLineAsNodeStart(node1, node2);
+            function indentIfOnDifferentLines(parent, node1, node2, valueToWriteWhenNotIndenting) {
+                var realNodesAreOnDifferentLines = preserveNewLines && !ts.nodeIsSynthesized(parent) && !nodeEndIsOnSameLineAsNodeStart(node1, node2);
                 var synthesizedNodeIsOnDifferentLine = synthesizedNodeStartsOnNewLine(node2);
                 if (realNodesAreOnDifferentLines || synthesizedNodeIsOnDifferentLine) {
                     increaseIndent();
                     writeLine();
                     return true;
                 }
-                return false;
+                else {
+                    if (valueToWriteWhenNotIndenting) {
+                        write(valueToWriteWhenNotIndenting);
+                    }
+                    return false;
+                }
             }
             function emitPropertyAccess(node) {
                 if (tryEmitConstantValue(node)) {
                     return;
                 }
                 emit(node.expression);
-                var indented = indentIfOnDifferentLines(node, node.expression, node.dotToken);
+                var indentedBeforeDot = indentIfOnDifferentLines(node, node.expression, node.dotToken);
                 write(".");
-                indented = indented || indentIfOnDifferentLines(node, node.dotToken, node.name);
+                var indentedAfterDot = indentIfOnDifferentLines(node, node.dotToken, node.name);
                 emit(node.name);
-                if (indented) {
-                    decreaseIndent();
-                }
+                decreaseIndentIf(indentedBeforeDot, indentedAfterDot);
             }
             function emitQualifiedName(node) {
                 emit(node.left);
@@ -19760,7 +24446,9 @@ var ts;
                 write("]");
             }
             function hasSpreadElement(elements) {
-                return ts.forEach(elements, function (e) { return e.kind === 171; });
+                return ts.forEach(elements, function (e) {
+                    return e.kind === 171;
+                });
             }
             function skipParentheses(node) {
                 while (node.kind === 159 || node.kind === 158) {
@@ -19873,14 +24561,7 @@ var ts;
                         while (operand.kind == 158) {
                             operand = operand.expression;
                         }
-                        if (operand.kind !== 165 &&
-                            operand.kind !== 164 &&
-                            operand.kind !== 163 &&
-                            operand.kind !== 162 &&
-                            operand.kind !== 166 &&
-                            operand.kind !== 156 &&
-                            !(operand.kind === 155 && node.parent.kind === 156) &&
-                            !(operand.kind === 160 && node.parent.kind === 155)) {
+                        if (operand.kind !== 165 && operand.kind !== 164 && operand.kind !== 163 && operand.kind !== 162 && operand.kind !== 166 && operand.kind !== 156 && !(operand.kind === 155 && node.parent.kind === 156) && !(operand.kind === 160 && node.parent.kind === 155)) {
                             emit(operand);
                             return;
                         }
@@ -19923,27 +24604,16 @@ var ts;
                 write(ts.tokenToString(node.operator));
             }
             function emitBinaryExpression(node) {
-                if (languageVersion < 2 && node.operatorToken.kind === 52 &&
-                    (node.left.kind === 152 || node.left.kind === 151)) {
-                    emitDestructuring(node);
+                if (languageVersion < 2 && node.operatorToken.kind === 52 && (node.left.kind === 152 || node.left.kind === 151)) {
+                    emitDestructuring(node, node.parent.kind === 177);
                 }
                 else {
                     emit(node.left);
-                    var indented1 = indentIfOnDifferentLines(node, node.left, node.operatorToken);
-                    if (!indented1 && node.operatorToken.kind !== 23) {
-                        write(" ");
-                    }
+                    var indentedBeforeOperator = indentIfOnDifferentLines(node, node.left, node.operatorToken, node.operatorToken.kind !== 23 ? " " : undefined);
                     write(ts.tokenToString(node.operatorToken.kind));
-                    if (!indented1) {
-                        var indented2 = indentIfOnDifferentLines(node, node.operatorToken, node.right);
-                    }
-                    if (!indented2) {
-                        write(" ");
-                    }
+                    var indentedAfterOperator = indentIfOnDifferentLines(node, node.operatorToken, node.right, " ");
                     emit(node.right);
-                    if (indented1 || indented2) {
-                        decreaseIndent();
-                    }
+                    decreaseIndentIf(indentedBeforeOperator, indentedAfterOperator);
                 }
             }
             function synthesizedNodeStartsOnNewLine(node) {
@@ -19951,34 +24621,22 @@ var ts;
             }
             function emitConditionalExpression(node) {
                 emit(node.condition);
-                var indent1 = indentIfOnDifferentLines(node, node.condition, node.questionToken);
-                if (!indent1) {
-                    write(" ");
-                }
+                var indentedBeforeQuestion = indentIfOnDifferentLines(node, node.condition, node.questionToken, " ");
                 write("?");
-                if (!indent1) {
-                    var indent2 = indentIfOnDifferentLines(node, node.questionToken, node.whenTrue);
-                }
-                if (!indent2) {
-                    write(" ");
-                }
+                var indentedAfterQuestion = indentIfOnDifferentLines(node, node.questionToken, node.whenTrue, " ");
                 emit(node.whenTrue);
-                if (indent1 || indent2) {
+                decreaseIndentIf(indentedBeforeQuestion, indentedAfterQuestion);
+                var indentedBeforeColon = indentIfOnDifferentLines(node, node.whenTrue, node.colonToken, " ");
+                write(":");
+                var indentedAfterColon = indentIfOnDifferentLines(node, node.colonToken, node.whenFalse, " ");
+                emit(node.whenFalse);
+                decreaseIndentIf(indentedBeforeColon, indentedAfterColon);
+            }
+            function decreaseIndentIf(value1, value2) {
+                if (value1) {
                     decreaseIndent();
                 }
-                var indent3 = indentIfOnDifferentLines(node, node.whenTrue, node.colonToken);
-                if (!indent3) {
-                    write(" ");
-                }
-                write(":");
-                if (!indent3) {
-                    var indent4 = indentIfOnDifferentLines(node, node.colonToken, node.whenFalse);
-                }
-                if (!indent4) {
-                    write(" ");
-                }
-                emit(node.whenFalse);
-                if (indent3 || indent4) {
+                if (value2) {
                     decreaseIndent();
                 }
             }
@@ -19989,7 +24647,7 @@ var ts;
                 }
             }
             function emitBlock(node) {
-                if (isSingleLineEmptyBlock(node)) {
+                if (preserveNewLines && isSingleLineEmptyBlock(node)) {
                     emitToken(14, node.pos);
                     write(" ");
                     emitToken(15, node.statements.end);
@@ -20111,6 +24769,9 @@ var ts;
                 emitEmbeddedStatement(node.statement);
             }
             function emitForInOrForOfStatement(node) {
+                if (languageVersion < 2 && node.kind === 183) {
+                    return emitDownLevelForOfStatement(node);
+                }
                 var endPos = emitToken(81, node.pos);
                 write(" ");
                 endPos = emitToken(16, endPos);
@@ -20136,6 +24797,86 @@ var ts;
                 emitToken(17, node.expression.end);
                 emitEmbeddedStatement(node.statement);
             }
+            function emitDownLevelForOfStatement(node) {
+                var endPos = emitToken(81, node.pos);
+                write(" ");
+                endPos = emitToken(16, endPos);
+                var rhsIsIdentifier = node.expression.kind === 64;
+                var counter = createTempVariable(node, true);
+                var rhsReference = rhsIsIdentifier ? node.expression : createTempVariable(node, false);
+                emitStart(node.expression);
+                write("var ");
+                emitNodeWithoutSourceMap(counter);
+                write(" = 0");
+                emitEnd(node.expression);
+                if (!rhsIsIdentifier) {
+                    write(", ");
+                    emitStart(node.expression);
+                    emitNodeWithoutSourceMap(rhsReference);
+                    write(" = ");
+                    emitNodeWithoutSourceMap(node.expression);
+                    emitEnd(node.expression);
+                }
+                write("; ");
+                emitStart(node.initializer);
+                emitNodeWithoutSourceMap(counter);
+                write(" < ");
+                emitNodeWithoutSourceMap(rhsReference);
+                write(".length");
+                emitEnd(node.initializer);
+                write("; ");
+                emitStart(node.initializer);
+                emitNodeWithoutSourceMap(counter);
+                write("++");
+                emitEnd(node.initializer);
+                emitToken(17, node.expression.end);
+                write(" {");
+                writeLine();
+                increaseIndent();
+                var rhsIterationValue = createElementAccessExpression(rhsReference, counter);
+                emitStart(node.initializer);
+                if (node.initializer.kind === 194) {
+                    write("var ");
+                    var variableDeclarationList = node.initializer;
+                    if (variableDeclarationList.declarations.length > 0) {
+                        var declaration = variableDeclarationList.declarations[0];
+                        if (ts.isBindingPattern(declaration.name)) {
+                            emitDestructuring(declaration, false, rhsIterationValue);
+                        }
+                        else {
+                            emitNodeWithoutSourceMap(declaration);
+                            write(" = ");
+                            emitNodeWithoutSourceMap(rhsIterationValue);
+                        }
+                    }
+                    else {
+                        emitNodeWithoutSourceMap(createTempVariable(node, false));
+                        write(" = ");
+                        emitNodeWithoutSourceMap(rhsIterationValue);
+                    }
+                }
+                else {
+                    var assignmentExpression = createBinaryExpression(node.initializer, 52, rhsIterationValue, false);
+                    if (node.initializer.kind === 151 || node.initializer.kind === 152) {
+                        emitDestructuring(assignmentExpression, true, undefined, node);
+                    }
+                    else {
+                        emitNodeWithoutSourceMap(assignmentExpression);
+                    }
+                }
+                emitEnd(node.initializer);
+                write(";");
+                if (node.statement.kind === 174) {
+                    emitLines(node.statement.statements);
+                }
+                else {
+                    writeLine();
+                    emit(node.statement);
+                }
+                writeLine();
+                decreaseIndent();
+                write("}");
+            }
             function emitBreakOrContinueStatement(node) {
                 emitToken(node.kind === 185 ? 65 : 70, node.pos);
                 emitOptional(" ", node.label);
@@ -20159,7 +24900,10 @@ var ts;
                 emit(node.expression);
                 endPos = emitToken(17, node.expression.end);
                 write(" ");
-                emitToken(14, endPos);
+                emitCaseBlock(node.caseBlock, endPos);
+            }
+            function emitCaseBlock(node, startPos) {
+                emitToken(14, startPos);
                 increaseIndent();
                 emitLines(node.clauses);
                 decreaseIndent();
@@ -20167,19 +24911,16 @@ var ts;
                 emitToken(15, node.clauses.end);
             }
             function nodeStartPositionsAreOnSameLine(node1, node2) {
-                return getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node1.pos)) ===
-                    getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node2.pos));
+                return getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node1.pos)) === getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node2.pos));
             }
             function nodeEndPositionsAreOnSameLine(node1, node2) {
-                return getLineOfLocalPosition(currentSourceFile, node1.end) ===
-                    getLineOfLocalPosition(currentSourceFile, node2.end);
+                return getLineOfLocalPosition(currentSourceFile, node1.end) === getLineOfLocalPosition(currentSourceFile, node2.end);
             }
             function nodeEndIsOnSameLineAsNodeStart(node1, node2) {
-                return getLineOfLocalPosition(currentSourceFile, node1.end) ===
-                    getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node2.pos));
+                return getLineOfLocalPosition(currentSourceFile, node1.end) === getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node2.pos));
             }
             function emitCaseOrDefaultClause(node) {
-                if (node.kind === 213) {
+                if (node.kind === 214) {
                     write("case ");
                     emit(node.expression);
                     write(":");
@@ -20187,7 +24928,7 @@ var ts;
                 else {
                     write("default:");
                 }
-                if (node.statements.length === 1 && nodeStartPositionsAreOnSameLine(node, node.statements[0])) {
+                if (preserveNewLines && node.statements.length === 1 && nodeStartPositionsAreOnSameLine(node, node.statements[0])) {
                     write(" ");
                     emit(node.statements[0]);
                 }
@@ -20247,7 +24988,7 @@ var ts;
                     emitContainingModuleName(node);
                     write(".");
                 }
-                emitNode(node.name);
+                emitNodeWithoutSourceMap(node.name);
                 emitEnd(node.name);
             }
             function createVoidZero() {
@@ -20264,21 +25005,22 @@ var ts;
                         emitStart(specifier.name);
                         emitContainingModuleName(specifier);
                         write(".");
-                        emitNode(specifier.name);
+                        emitNodeWithoutSourceMap(specifier.name);
                         emitEnd(specifier.name);
                         write(" = ");
-                        emitNode(name);
+                        emitNodeWithoutSourceMap(name);
                         write(";");
                     });
                 }
             }
-            function emitDestructuring(root, value) {
+            function emitDestructuring(root, isAssignmentExpressionStatement, value, lowestNonSynthesizedAncestor) {
                 var emitCount = 0;
                 var isDeclaration = (root.kind === 193 && !(ts.getCombinedNodeFlags(root) & 1)) || root.kind === 128;
                 if (root.kind === 167) {
                     emitAssignmentExpression(root);
                 }
                 else {
+                    ts.Debug.assert(!isAssignmentExpressionStatement);
                     emitBindingElement(root, value);
                 }
                 function emitAssignment(name, value) {
@@ -20297,7 +25039,7 @@ var ts;
                 }
                 function ensureIdentifier(expr) {
                     if (expr.kind !== 64) {
-                        var identifier = createTempVariable(root);
+                        var identifier = createTempVariable(lowestNonSynthesizedAncestor || root);
                         if (!isDeclaration) {
                             recordTempDeclaration(identifier);
                         }
@@ -20355,7 +25097,7 @@ var ts;
                     }
                     for (var i = 0; i < properties.length; i++) {
                         var p = properties[i];
-                        if (p.kind === 217 || p.kind === 218) {
+                        if (p.kind === 218 || p.kind === 219) {
                             var propName = (p.name);
                             emitDestructuringAssignment(p.initializer || propName, createPropertyAccess(value, propName));
                         }
@@ -20400,7 +25142,7 @@ var ts;
                 function emitAssignmentExpression(root) {
                     var target = root.left;
                     var value = root.right;
-                    if (root.parent.kind === 177) {
+                    if (isAssignmentExpressionStatement) {
                         emitDestructuringAssignment(target, value);
                     }
                     else {
@@ -20457,7 +25199,7 @@ var ts;
             function emitVariableDeclaration(node) {
                 if (ts.isBindingPattern(node.name)) {
                     if (languageVersion < 2) {
-                        emitDestructuring(node);
+                        emitDestructuring(node, false);
                     }
                     else {
                         emit(node.name);
@@ -20465,15 +25207,12 @@ var ts;
                     }
                 }
                 else {
-                    var isLet = renameNonTopLevelLetAndConst(node.name);
+                    renameNonTopLevelLetAndConst(node.name);
                     emitModuleMemberName(node);
                     var initializer = node.initializer;
                     if (!initializer && languageVersion < 2) {
-                        var isUninitializedLet = (resolver.getNodeCheckFlags(node) & 256) &&
-                            (getCombinedFlagsForIdentifier(node.name) & 4096);
-                        if (isUninitializedLet &&
-                            node.parent.parent.kind !== 182 &&
-                            node.parent.parent.kind !== 183) {
+                        var isUninitializedLet = (resolver.getNodeCheckFlags(node) & 256) && (getCombinedFlagsForIdentifier(node.name) & 4096);
+                        if (isUninitializedLet && node.parent.parent.kind !== 182 && node.parent.parent.kind !== 183) {
                             initializer = createVoidZero();
                         }
                     }
@@ -20489,29 +25228,6 @@ var ts;
                     ts.forEach(name.elements, emitExportVariableAssignments);
                 }
             }
-            function getEnclosingBlockScopeContainer(node) {
-                var current = node;
-                while (current) {
-                    if (ts.isFunctionLike(current)) {
-                        return current;
-                    }
-                    switch (current.kind) {
-                        case 220:
-                        case 91:
-                        case 216:
-                        case 200:
-                        case 181:
-                        case 182:
-                        case 183:
-                            return current;
-                        case 174:
-                            if (!ts.isFunctionLike(current.parent)) {
-                                return current;
-                            }
-                    }
-                    current = current.parent;
-                }
-            }
             function getCombinedFlagsForIdentifier(node) {
                 if (!node.parent || (node.parent.kind !== 193 && node.parent.kind !== 150)) {
                     return 0;
@@ -20519,10 +25235,7 @@ var ts;
                 return ts.getCombinedNodeFlags(node.parent);
             }
             function renameNonTopLevelLetAndConst(node) {
-                if (languageVersion >= 2 ||
-                    ts.nodeIsSynthesized(node) ||
-                    node.kind !== 64 ||
-                    (node.parent.kind !== 193 && node.parent.kind !== 150)) {
+                if (languageVersion >= 2 || ts.nodeIsSynthesized(node) || node.kind !== 64 || (node.parent.kind !== 193 && node.parent.kind !== 150)) {
                     return;
                 }
                 var combinedFlags = getCombinedFlagsForIdentifier(node);
@@ -20530,13 +25243,11 @@ var ts;
                     return;
                 }
                 var list = ts.getAncestor(node, 194);
-                if (list.parent.kind === 175 && list.parent.parent.kind === 220) {
+                if (list.parent.kind === 175 && list.parent.parent.kind === 221) {
                     return;
                 }
-                var blockScopeContainer = getEnclosingBlockScopeContainer(node);
-                var parent = blockScopeContainer.kind === 220
-                    ? blockScopeContainer
-                    : blockScopeContainer.parent;
+                var blockScopeContainer = ts.getEnclosingBlockScopeContainer(node);
+                var parent = blockScopeContainer.kind === 221 ? blockScopeContainer : blockScopeContainer.parent;
                 var generatedName = generateUniqueNameForLocation(parent, node.text);
                 var variableId = resolver.getBlockScopedVariableId(node);
                 if (!generatedBlockScopeNames) {
@@ -20583,7 +25294,7 @@ var ts;
                         if (ts.isBindingPattern(p.name)) {
                             writeLine();
                             write("var ");
-                            emitDestructuring(p, tempParameters[tempIndex]);
+                            emitDestructuring(p, false, tempParameters[tempIndex]);
                             write(";");
                             tempIndex++;
                         }
@@ -20591,14 +25302,14 @@ var ts;
                             writeLine();
                             emitStart(p);
                             write("if (");
-                            emitNode(p.name);
+                            emitNodeWithoutSourceMap(p.name);
                             write(" === void 0)");
                             emitEnd(p);
                             write(" { ");
                             emitStart(p);
-                            emitNode(p.name);
+                            emitNodeWithoutSourceMap(p.name);
                             write(" = ");
-                            emitNode(p.initializer);
+                            emitNodeWithoutSourceMap(p.initializer);
                             emitEnd(p);
                             write("; }");
                         }
@@ -20614,7 +25325,7 @@ var ts;
                     emitLeadingComments(restParam);
                     emitStart(restParam);
                     write("var ");
-                    emitNode(restParam.name);
+                    emitNodeWithoutSourceMap(restParam.name);
                     write(" = [];");
                     emitEnd(restParam);
                     emitTrailingComments(restParam);
@@ -20635,7 +25346,7 @@ var ts;
                     increaseIndent();
                     writeLine();
                     emitStart(restParam);
-                    emitNode(restParam.name);
+                    emitNodeWithoutSourceMap(restParam.name);
                     write("[" + tempName + " - " + restIndex + "] = arguments[" + tempName + "];");
                     emitEnd(restParam);
                     decreaseIndent();
@@ -20653,7 +25364,7 @@ var ts;
             }
             function emitDeclarationName(node) {
                 if (node.name) {
-                    emitNode(node.name);
+                    emitNodeWithoutSourceMap(node.name);
                 }
                 else {
                     write(resolver.getGeneratedNameForNode(node));
@@ -20770,11 +25481,11 @@ var ts;
                 emitFunctionBodyPreamble(node);
                 var preambleEmitted = writer.getTextPos() !== outPos;
                 decreaseIndent();
-                if (!preambleEmitted && nodeStartPositionsAreOnSameLine(node, body)) {
+                if (preserveNewLines && !preambleEmitted && nodeStartPositionsAreOnSameLine(node, body)) {
                     write(" ");
                     emitStart(body);
                     write("return ");
-                    emitNode(body, true);
+                    emitWithoutComments(body);
                     emitEnd(body);
                     write(";");
                     emitTempDeclarations(false);
@@ -20785,7 +25496,7 @@ var ts;
                     writeLine();
                     emitLeadingComments(node.body);
                     write("return ");
-                    emit(node.body, true);
+                    emitWithoutComments(node.body);
                     write(";");
                     emitTrailingComments(node.body);
                     emitTempDeclarations(true);
@@ -20807,7 +25518,7 @@ var ts;
                 emitFunctionBodyPreamble(node);
                 decreaseIndent();
                 var preambleEmitted = writer.getTextPos() !== initialTextPos;
-                if (!preambleEmitted && nodeEndIsOnSameLineAsNodeStart(body, body)) {
+                if (preserveNewLines && !preambleEmitted && nodeEndIsOnSameLineAsNodeStart(body, body)) {
                     for (var i = 0, n = body.statements.length; i < n; i++) {
                         write(" ");
                         emit(body.statements[i]);
@@ -20848,7 +25559,7 @@ var ts;
                         emitStart(param);
                         emitStart(param.name);
                         write("this.");
-                        emitNode(param.name);
+                        emitNodeWithoutSourceMap(param.name);
                         emitEnd(param.name);
                         write(" = ");
                         emit(param.name);
@@ -20860,7 +25571,7 @@ var ts;
             function emitMemberAccessForPropertyName(memberName) {
                 if (memberName.kind === 8 || memberName.kind === 7) {
                     write("[");
-                    emitNode(memberName);
+                    emitNodeWithoutSourceMap(memberName);
                     write("]");
                 }
                 else if (memberName.kind === 126) {
@@ -20868,7 +25579,7 @@ var ts;
                 }
                 else {
                     write(".");
-                    emitNode(memberName);
+                    emitNodeWithoutSourceMap(memberName);
                 }
             }
             function emitMemberAssignments(node, staticFlag) {
@@ -21297,8 +26008,7 @@ var ts;
                     emitImportDeclaration(node);
                     return;
                 }
-                if (resolver.isReferencedAliasDeclaration(node) ||
-                    (!ts.isExternalModule(currentSourceFile) && resolver.isTopLevelValueImportEqualsWithEntityName(node))) {
+                if (resolver.isReferencedAliasDeclaration(node) || (!ts.isExternalModule(currentSourceFile) && resolver.isTopLevelValueImportEqualsWithEntityName(node))) {
                     emitLeadingComments(node);
                     emitStart(node);
                     if (!(node.flags & 1))
@@ -21327,11 +26037,11 @@ var ts;
                             emitStart(specifier);
                             emitContainingModuleName(specifier);
                             write(".");
-                            emitNode(specifier.name);
+                            emitNodeWithoutSourceMap(specifier.name);
                             write(" = ");
                             write(generatedName);
                             write(".");
-                            emitNode(specifier.propertyName || specifier.name);
+                            emitNodeWithoutSourceMap(specifier.propertyName || specifier.name);
                             write(";");
                             emitEnd(specifier);
                         });
@@ -21349,15 +26059,15 @@ var ts;
                 }
             }
             function createExternalImportInfo(node) {
-                if (node.kind === 202) {
-                    if (node.moduleReference.kind === 212) {
+                if (node.kind === 203) {
+                    if (node.moduleReference.kind === 213) {
                         return {
                             rootNode: node,
                             declarationNode: node
                         };
                     }
                 }
-                else if (node.kind === 203) {
+                else if (node.kind === 204) {
                     var importClause = node.importClause;
                     if (importClause) {
                         if (importClause.name) {
@@ -21366,7 +26076,7 @@ var ts;
                                 declarationNode: importClause
                             };
                         }
-                        if (importClause.namedBindings.kind === 205) {
+                        if (importClause.namedBindings.kind === 206) {
                             return {
                                 rootNode: node,
                                 declarationNode: importClause.namedBindings
@@ -21382,7 +26092,7 @@ var ts;
                         rootNode: node
                     };
                 }
-                else if (node.kind === 209) {
+                else if (node.kind === 210) {
                     if (node.moduleSpecifier) {
                         return {
                             rootNode: node
@@ -21395,7 +26105,7 @@ var ts;
                 exportSpecifiers = {};
                 exportDefault = undefined;
                 ts.forEach(sourceFile.statements, function (node) {
-                    if (node.kind === 209 && !node.moduleSpecifier) {
+                    if (node.kind === 210 && !node.moduleSpecifier) {
                         ts.forEach(node.exportClause.elements, function (specifier) {
                             if (specifier.name.text === "default") {
                                 exportDefault = exportDefault || specifier;
@@ -21404,7 +26114,7 @@ var ts;
                             (exportSpecifiers[name] || (exportSpecifiers[name] = [])).push(specifier);
                         });
                     }
-                    else if (node.kind === 208) {
+                    else if (node.kind === 209) {
                         exportDefault = exportDefault || node;
                     }
                     else if (node.kind === 195 || node.kind === 196) {
@@ -21434,7 +26144,7 @@ var ts;
             }
             function getFirstExportAssignment(sourceFile) {
                 return ts.forEach(sourceFile.statements, function (node) {
-                    if (node.kind === 208) {
+                    if (node.kind === 209) {
                         return node;
                     }
                 });
@@ -21512,10 +26222,10 @@ var ts;
                     writeLine();
                     emitStart(exportDefault);
                     write(emitAsReturn ? "return " : "module.exports = ");
-                    if (exportDefault.kind === 208) {
+                    if (exportDefault.kind === 209) {
                         emit(exportDefault.expression);
                     }
-                    else if (exportDefault.kind === 211) {
+                    else if (exportDefault.kind === 212) {
                         emit(exportDefault.propertyName);
                     }
                     else {
@@ -21539,8 +26249,7 @@ var ts;
                 }
                 return statements.length;
             }
-            function emitSourceFile(node) {
-                currentSourceFile = node;
+            function emitSourceFileNode(node) {
                 writeLine();
                 emitDetachedComments(node);
                 var startIndex = emitDirectivePrologues(node.statements, false);
@@ -21580,14 +26289,14 @@ var ts;
                 }
                 emitLeadingComments(node.endOfFileToken);
             }
-            function emitNode(node, disableComments) {
+            function emitNodeWithoutSourceMapWithComments(node) {
                 if (!node) {
                     return;
                 }
                 if (node.flags & 2) {
                     return emitPinnedOrTripleSlashComments(node);
                 }
-                var emitComments = !disableComments && shouldEmitLeadingAndTrailingComments(node);
+                var emitComments = shouldEmitLeadingAndTrailingComments(node);
                 if (emitComments) {
                     emitLeadingComments(node);
                 }
@@ -21596,14 +26305,23 @@ var ts;
                     emitTrailingComments(node);
                 }
             }
+            function emitNodeWithoutSourceMapWithoutComments(node) {
+                if (!node) {
+                    return;
+                }
+                if (node.flags & 2) {
+                    return emitPinnedOrTripleSlashComments(node);
+                }
+                emitJavaScriptWorker(node);
+            }
             function shouldEmitLeadingAndTrailingComments(node) {
                 switch (node.kind) {
                     case 197:
                     case 195:
+                    case 204:
                     case 203:
-                    case 202:
                     case 198:
-                    case 208:
+                    case 209:
                         return false;
                     case 200:
                         return shouldEmitModuleDeclaration(node);
@@ -21658,9 +26376,9 @@ var ts;
                         return emitArrayLiteral(node);
                     case 152:
                         return emitObjectLiteral(node);
-                    case 217:
-                        return emitPropertyAssignment(node);
                     case 218:
+                        return emitPropertyAssignment(node);
+                    case 219:
                         return emitShorthandPropertyAssignment(node);
                     case 126:
                         return emitComputedPropertyName(node);
@@ -21729,8 +26447,8 @@ var ts;
                         return emitWithStatement(node);
                     case 188:
                         return emitSwitchStatement(node);
-                    case 213:
                     case 214:
+                    case 215:
                         return emitCaseOrDefaultClause(node);
                     case 189:
                         return emitLabelledStatement(node);
@@ -21738,7 +26456,7 @@ var ts;
                         return emitThrowStatement(node);
                     case 191:
                         return emitTryStatement(node);
-                    case 216:
+                    case 217:
                         return emitCatchClause(node);
                     case 192:
                         return emitDebuggerStatement(node);
@@ -21750,18 +26468,18 @@ var ts;
                         return emitInterfaceDeclaration(node);
                     case 199:
                         return emitEnumDeclaration(node);
-                    case 219:
+                    case 220:
                         return emitEnumMember(node);
                     case 200:
                         return emitModuleDeclaration(node);
-                    case 203:
+                    case 204:
                         return emitImportDeclaration(node);
-                    case 202:
+                    case 203:
                         return emitImportEqualsDeclaration(node);
-                    case 209:
+                    case 210:
                         return emitExportDeclaration(node);
-                    case 220:
-                        return emitSourceFile(node);
+                    case 221:
+                        return emitSourceFileNode(node);
                 }
             }
             function hasDetachedComments(pos) {
@@ -21779,7 +26497,7 @@ var ts;
             }
             function getLeadingCommentsToEmit(node) {
                 if (node.parent) {
-                    if (node.parent.kind === 220 || node.pos !== node.parent.pos) {
+                    if (node.parent.kind === 221 || node.pos !== node.parent.pos) {
                         var leadingComments;
                         if (hasDetachedComments(node.pos)) {
                             leadingComments = getLeadingCommentsWithoutDetachedComments();
@@ -21798,7 +26516,7 @@ var ts;
             }
             function emitTrailingDeclarationComments(node) {
                 if (node.parent) {
-                    if (node.parent.kind === 220 || node.end !== node.parent.end) {
+                    if (node.parent.kind === 221 || node.end !== node.parent.end) {
                         var trailingComments = ts.getTrailingCommentRanges(currentSourceFile.text, node.end);
                         emitComments(currentSourceFile, writer, trailingComments, false, newLine, writeComment);
                     }
@@ -21812,7 +26530,10 @@ var ts;
                 else {
                     leadingComments = ts.getLeadingCommentRanges(currentSourceFile.text, pos);
                 }
-                emitNewLineBeforeLeadingComments(currentSourceFile, writer, { pos: pos, end: pos }, leadingComments);
+                emitNewLineBeforeLeadingComments(currentSourceFile, writer, {
+                    pos: pos,
+                    end: pos
+                }, leadingComments);
                 emitComments(currentSourceFile, writer, leadingComments, true, newLine, writeComment);
             }
             function emitDetachedCommentsAtPosition(node) {
@@ -21837,27 +26558,29 @@ var ts;
                         if (nodeLine >= lastCommentLine + 2) {
                             emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments);
                             emitComments(currentSourceFile, writer, detachedComments, true, newLine, writeComment);
-                            var currentDetachedCommentInfo = { nodePos: node.pos, detachedCommentEndPos: detachedComments[detachedComments.length - 1].end };
+                            var currentDetachedCommentInfo = {
+                                nodePos: node.pos,
+                                detachedCommentEndPos: detachedComments[detachedComments.length - 1].end
+                            };
                             if (detachedCommentsInfo) {
                                 detachedCommentsInfo.push(currentDetachedCommentInfo);
                             }
                             else {
-                                detachedCommentsInfo = [currentDetachedCommentInfo];
+                                detachedCommentsInfo = [
+                                    currentDetachedCommentInfo
+                                ];
                             }
                         }
                     }
                 }
             }
-            function emitPinnedOrTripleSlashCommentsOfNode(node) {
+            function emitPinnedOrTripleSlashComments(node) {
                 var pinnedComments = ts.filter(getLeadingCommentsToEmit(node), isPinnedOrTripleSlashComment);
                 function isPinnedOrTripleSlashComment(comment) {
                     if (currentSourceFile.text.charCodeAt(comment.pos + 1) === 42) {
                         return currentSourceFile.text.charCodeAt(comment.pos + 2) === 33;
                     }
-                    else if (currentSourceFile.text.charCodeAt(comment.pos + 1) === 47 &&
-                        comment.pos + 2 < comment.end &&
-                        currentSourceFile.text.charCodeAt(comment.pos + 2) === 47 &&
-                        currentSourceFile.text.substring(comment.pos, comment.end).match(ts.fullTripleSlashReferencePathRegEx)) {
+                    else if (currentSourceFile.text.charCodeAt(comment.pos + 1) === 47 && comment.pos + 2 < comment.end && currentSourceFile.text.charCodeAt(comment.pos + 2) === 47 && currentSourceFile.text.substring(comment.pos, comment.end).match(ts.fullTripleSlashReferencePathRegEx)) {
                         return true;
                     }
                 }
@@ -21894,6 +26617,7 @@ var ts;
 (function (ts) {
     ts.emitTime = 0;
     ts.ioReadTime = 0;
+    ts.version = "1.5.0.0";
     function createCompilerHost(options) {
         var currentDirectory;
         var existingDirectories = {};
@@ -21909,9 +26633,7 @@ var ts;
             }
             catch (e) {
                 if (onError) {
-                    onError(e.number === unsupportedFileEncodingErrorCode
-                        ? ts.createCompilerDiagnostic(ts.Diagnostics.Unsupported_file_encoding).messageText
-                        : e.message);
+                    onError(e.number === unsupportedFileEncodingErrorCode ? ts.createCompilerDiagnostic(ts.Diagnostics.Unsupported_file_encoding).messageText : e.message);
                 }
                 text = "";
             }
@@ -21947,12 +26669,20 @@ var ts;
         }
         return {
             getSourceFile: getSourceFile,
-            getDefaultLibFileName: function (options) { return ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(ts.sys.getExecutingFilePath())), ts.getDefaultLibFileName(options)); },
+            getDefaultLibFileName: function (options) {
+                return ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(ts.sys.getExecutingFilePath())), ts.getDefaultLibFileName(options));
+            },
             writeFile: writeFile,
-            getCurrentDirectory: function () { return currentDirectory || (currentDirectory = ts.sys.getCurrentDirectory()); },
-            useCaseSensitiveFileNames: function () { return ts.sys.useCaseSensitiveFileNames; },
+            getCurrentDirectory: function () {
+                return currentDirectory || (currentDirectory = ts.sys.getCurrentDirectory());
+            },
+            useCaseSensitiveFileNames: function () {
+                return ts.sys.useCaseSensitiveFileNames;
+            },
             getCanonicalFileName: getCanonicalFileName,
-            getNewLine: function () { return ts.sys.newLine; }
+            getNewLine: function () {
+                return ts.sys.newLine;
+            }
         };
     }
     ts.createCompilerHost = createCompilerHost;
@@ -21992,7 +26722,9 @@ var ts;
         var seenNoDefaultLib = options.noLib;
         var commonSourceDirectory;
         host = host || createCompilerHost(options);
-        ts.forEach(rootNames, function (name) { return processRootFile(name, false); });
+        ts.forEach(rootNames, function (name) {
+            return processRootFile(name, false);
+        });
         if (!seenNoDefaultLib) {
             processRootFile(host.getDefaultLibFileName(options), true);
         }
@@ -22001,21 +26733,35 @@ var ts;
         var noDiagnosticsTypeChecker;
         program = {
             getSourceFile: getSourceFile,
-            getSourceFiles: function () { return files; },
-            getCompilerOptions: function () { return options; },
+            getSourceFiles: function () {
+                return files;
+            },
+            getCompilerOptions: function () {
+                return options;
+            },
             getSyntacticDiagnostics: getSyntacticDiagnostics,
             getGlobalDiagnostics: getGlobalDiagnostics,
             getSemanticDiagnostics: getSemanticDiagnostics,
             getDeclarationDiagnostics: getDeclarationDiagnostics,
             getTypeChecker: getTypeChecker,
             getDiagnosticsProducingTypeChecker: getDiagnosticsProducingTypeChecker,
-            getCommonSourceDirectory: function () { return commonSourceDirectory; },
+            getCommonSourceDirectory: function () {
+                return commonSourceDirectory;
+            },
             emit: emit,
             getCurrentDirectory: host.getCurrentDirectory,
-            getNodeCount: function () { return getDiagnosticsProducingTypeChecker().getNodeCount(); },
-            getIdentifierCount: function () { return getDiagnosticsProducingTypeChecker().getIdentifierCount(); },
-            getSymbolCount: function () { return getDiagnosticsProducingTypeChecker().getSymbolCount(); },
-            getTypeCount: function () { return getDiagnosticsProducingTypeChecker().getTypeCount(); }
+            getNodeCount: function () {
+                return getDiagnosticsProducingTypeChecker().getNodeCount();
+            },
+            getIdentifierCount: function () {
+                return getDiagnosticsProducingTypeChecker().getIdentifierCount();
+            },
+            getSymbolCount: function () {
+                return getDiagnosticsProducingTypeChecker().getSymbolCount();
+            },
+            getTypeCount: function () {
+                return getDiagnosticsProducingTypeChecker().getTypeCount();
+            }
         };
         return program;
         function getEmitHost(writeFileCallback) {
@@ -22042,7 +26788,11 @@ var ts;
         }
         function emit(sourceFile, writeFileCallback) {
             if (options.noEmitOnError && getPreEmitDiagnostics(this).length > 0) {
-                return { diagnostics: [], sourceMaps: undefined, emitSkipped: true };
+                return {
+                    diagnostics: [],
+                    sourceMaps: undefined,
+                    emitSkipped: true
+                };
             }
             var emitResolver = getDiagnosticsProducingTypeChecker().getEmitResolver(sourceFile);
             var start = new Date().getTime();
@@ -22184,7 +26934,7 @@ var ts;
         }
         function processImportedModules(file, basePath) {
             ts.forEach(file.statements, function (node) {
-                if (node.kind === 203 || node.kind === 202 || node.kind === 209) {
+                if (node.kind === 204 || node.kind === 203 || node.kind === 210) {
                     var moduleNameExpr = ts.getExternalModuleName(node);
                     if (moduleNameExpr && moduleNameExpr.kind === 8) {
                         var moduleNameText = moduleNameExpr.text;
@@ -22206,8 +26956,7 @@ var ts;
                 }
                 else if (node.kind === 200 && node.name.kind === 8 && (node.flags & 2 || ts.isDeclarationFile(file))) {
                     ts.forEachChild(node.body, function (node) {
-                        if (ts.isExternalModuleImportEqualsDeclaration(node) &&
-                            ts.getExternalModuleImportEqualsDeclarationExpression(node).kind === 8) {
+                        if (ts.isExternalModuleImportEqualsDeclaration(node) && ts.getExternalModuleImportEqualsDeclarationExpression(node).kind === 8) {
                             var nameLiteral = ts.getExternalModuleImportEqualsDeclarationExpression(node);
                             var moduleName = nameLiteral.text;
                             if (moduleName) {
@@ -22235,19 +26984,17 @@ var ts;
                 }
                 return;
             }
-            var firstExternalModuleSourceFile = ts.forEach(files, function (f) { return ts.isExternalModule(f) ? f : undefined; });
+            var firstExternalModuleSourceFile = ts.forEach(files, function (f) {
+                return ts.isExternalModule(f) ? f : undefined;
+            });
             if (firstExternalModuleSourceFile && !options.module) {
                 var span = ts.getErrorSpanForNode(firstExternalModuleSourceFile, firstExternalModuleSourceFile.externalModuleIndicator);
                 diagnostics.add(ts.createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_external_modules_unless_the_module_flag_is_provided));
             }
-            if (options.outDir ||
-                options.sourceRoot ||
-                (options.mapRoot &&
-                    (!options.out || firstExternalModuleSourceFile !== undefined))) {
+            if (options.outDir || options.sourceRoot || (options.mapRoot && (!options.out || firstExternalModuleSourceFile !== undefined))) {
                 var commonPathComponents;
                 ts.forEach(files, function (sourceFile) {
-                    if (!(sourceFile.flags & 2048)
-                        && !ts.fileExtensionIs(sourceFile.fileName, ".js")) {
+                    if (!(sourceFile.flags & 2048) && !ts.fileExtensionIs(sourceFile.fileName, ".js")) {
                         var sourcePathComponents = ts.getNormalizedPathComponents(sourceFile.fileName, host.getCurrentDirectory());
                         sourcePathComponents.pop();
                         if (commonPathComponents) {
@@ -22362,7 +27109,7 @@ var ts;
                             }
                         case 201:
                             return spanInBlock(node);
-                        case 216:
+                        case 217:
                             return spanInBlock(node.block);
                         case 177:
                             return textSpan(node.expression);
@@ -22388,20 +27135,20 @@ var ts;
                             return textSpan(node, ts.findNextToken(node.expression, node));
                         case 188:
                             return textSpan(node, ts.findNextToken(node.expression, node));
-                        case 213:
                         case 214:
+                        case 215:
                             return spanInNode(node.statements[0]);
                         case 191:
                             return spanInBlock(node.tryBlock);
                         case 190:
                             return textSpan(node, node.expression);
-                        case 208:
-                            return textSpan(node, node.expression);
-                        case 202:
-                            return textSpan(node, node.moduleReference);
-                        case 203:
-                            return textSpan(node, node.moduleSpecifier);
                         case 209:
+                            return textSpan(node, node.expression);
+                        case 203:
+                            return textSpan(node, node.moduleReference);
+                        case 204:
+                            return textSpan(node, node.moduleSpecifier);
+                        case 210:
                             return textSpan(node, node.moduleSpecifier);
                         case 200:
                             if (ts.getModuleInstanceState(node) !== 1) {
@@ -22409,7 +27156,7 @@ var ts;
                             }
                         case 196:
                         case 199:
-                        case 219:
+                        case 220:
                         case 155:
                         case 156:
                             return textSpan(node);
@@ -22443,7 +27190,7 @@ var ts;
                         case 80:
                             return spanInNextNode(node);
                         default:
-                            if (node.parent.kind === 217 && node.parent.name === node) {
+                            if (node.parent.kind === 218 && node.parent.name === node) {
                                 return spanInNode(node.parent.initializer);
                             }
                             if (node.parent.kind === 158 && node.parent.type === node) {
@@ -22456,17 +27203,12 @@ var ts;
                     }
                 }
                 function spanInVariableDeclaration(variableDeclaration) {
-                    if (variableDeclaration.parent.parent.kind === 182 ||
-                        variableDeclaration.parent.parent.kind === 183) {
+                    if (variableDeclaration.parent.parent.kind === 182 || variableDeclaration.parent.parent.kind === 183) {
                         return spanInNode(variableDeclaration.parent.parent);
                     }
                     var isParentVariableStatement = variableDeclaration.parent.parent.kind === 175;
                     var isDeclarationOfForStatement = variableDeclaration.parent.parent.kind === 181 && ts.contains(variableDeclaration.parent.parent.initializer.declarations, variableDeclaration);
-                    var declarations = isParentVariableStatement
-                        ? variableDeclaration.parent.parent.declarationList.declarations
-                        : isDeclarationOfForStatement
-                            ? variableDeclaration.parent.parent.initializer.declarations
-                            : undefined;
+                    var declarations = isParentVariableStatement ? variableDeclaration.parent.parent.declarationList.declarations : isDeclarationOfForStatement ? variableDeclaration.parent.parent.initializer.declarations : undefined;
                     if (variableDeclaration.initializer || (variableDeclaration.flags & 1)) {
                         if (declarations && declarations[0] === variableDeclaration) {
                             if (isParentVariableStatement) {
@@ -22487,8 +27229,7 @@ var ts;
                     }
                 }
                 function canHaveSpanInParameterDeclaration(parameter) {
-                    return !!parameter.initializer || parameter.dotDotDotToken !== undefined ||
-                        !!(parameter.flags & 16) || !!(parameter.flags & 32);
+                    return !!parameter.initializer || parameter.dotDotDotToken !== undefined || !!(parameter.flags & 16) || !!(parameter.flags & 32);
                 }
                 function spanInParameterDeclaration(parameter) {
                     if (canHaveSpanInParameterDeclaration(parameter)) {
@@ -22506,8 +27247,7 @@ var ts;
                     }
                 }
                 function canFunctionHaveSpanInWholeDeclaration(functionDeclaration) {
-                    return !!(functionDeclaration.flags & 1) ||
-                        (functionDeclaration.parent.kind === 196 && functionDeclaration.kind !== 133);
+                    return !!(functionDeclaration.flags & 1) || (functionDeclaration.parent.kind === 196 && functionDeclaration.kind !== 133);
                 }
                 function spanInFunctionDeclaration(functionDeclaration) {
                     if (!functionDeclaration.body) {
@@ -22568,8 +27308,8 @@ var ts;
                         case 196:
                             var classDeclaration = node.parent;
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), classDeclaration.members.length ? classDeclaration.members[0] : classDeclaration.getLastToken(sourceFile));
-                        case 188:
-                            return spanInNodeIfStartsOnSameLine(node.parent, node.parent.clauses[0]);
+                        case 202:
+                            return spanInNodeIfStartsOnSameLine(node.parent.parent, node.parent.clauses[0]);
                     }
                     return spanInNode(node.parent);
                 }
@@ -22586,12 +27326,12 @@ var ts;
                             if (ts.isFunctionBlock(node.parent)) {
                                 return textSpan(node);
                             }
-                        case 216:
+                        case 217:
                             return spanInNode(node.parent.statements[node.parent.statements.length - 1]);
                             ;
-                        case 188:
-                            var switchStatement = node.parent;
-                            var lastClause = switchStatement.clauses[switchStatement.clauses.length - 1];
+                        case 202:
+                            var caseBlock = node.parent;
+                            var lastClause = caseBlock.clauses[caseBlock.clauses.length - 1];
                             if (lastClause) {
                                 return spanInNode(lastClause.statements[lastClause.statements.length - 1]);
                             }
@@ -22626,7 +27366,7 @@ var ts;
                     return spanInNode(node.parent);
                 }
                 function spanInColonToken(node) {
-                    if (ts.isFunctionLike(node.parent) || node.parent.kind === 217) {
+                    if (ts.isFunctionLike(node.parent) || node.parent.kind === 218) {
                         return spanInPreviousNode(node);
                     }
                     return spanInNode(node.parent);
@@ -22681,14 +27421,7 @@ var ts;
                             var parent = n.parent;
                             var openBrace = ts.findChildOfKind(n, 14, sourceFile);
                             var closeBrace = ts.findChildOfKind(n, 15, sourceFile);
-                            if (parent.kind === 179 ||
-                                parent.kind === 182 ||
-                                parent.kind === 183 ||
-                                parent.kind === 181 ||
-                                parent.kind === 178 ||
-                                parent.kind === 180 ||
-                                parent.kind === 187 ||
-                                parent.kind === 216) {
+                            if (parent.kind === 179 || parent.kind === 182 || parent.kind === 183 || parent.kind === 181 || parent.kind === 178 || parent.kind === 180 || parent.kind === 187 || parent.kind === 217) {
                                 addOutliningSpan(parent, openBrace, closeBrace, autoCollapse(n));
                                 break;
                             }
@@ -22724,7 +27457,7 @@ var ts;
                     case 197:
                     case 199:
                     case 152:
-                    case 188:
+                    case 202:
                         var openBrace = ts.findChildOfKind(n, 14, sourceFile);
                         var closeBrace = ts.findChildOfKind(n, 15, sourceFile);
                         addOutliningSpan(n, openBrace, closeBrace, autoCollapse(n));
@@ -22775,7 +27508,13 @@ var ts;
                         }
                         var fileName = sourceFile.fileName;
                         var matchKind = bestMatchKind(matches);
-                        rawItems.push({ name: name, fileName: fileName, matchKind: matchKind, isCaseSensitive: allMatchesAreCaseSensitive(matches), declaration: declaration });
+                        rawItems.push({
+                            name: name,
+                            fileName: fileName,
+                            matchKind: matchKind,
+                            isCaseSensitive: allMatchesAreCaseSensitive(matches),
+                            declaration: declaration
+                        });
                     }
                 }
             });
@@ -22809,9 +27548,7 @@ var ts;
                 return undefined;
             }
             function getTextOfIdentifierOrLiteral(node) {
-                if (node.kind === 64 ||
-                    node.kind === 8 ||
-                    node.kind === 7) {
+                if (node.kind === 64 || node.kind === 8 || node.kind === 7) {
                     return node.text;
                 }
                 return undefined;
@@ -22875,11 +27612,11 @@ var ts;
                 }
                 return bestMatchKind;
             }
-            var baseSensitivity = { sensitivity: "base" };
+            var baseSensitivity = {
+                sensitivity: "base"
+            };
             function compareNavigateToItems(i1, i2) {
-                return i1.matchKind - i2.matchKind ||
-                    i1.name.localeCompare(i2.name, undefined, baseSensitivity) ||
-                    i1.name.localeCompare(i2.name);
+                return i1.matchKind - i2.matchKind || i1.name.localeCompare(i2.name, undefined, baseSensitivity) || i1.name.localeCompare(i2.name);
             }
             function createNavigateToItem(rawItem) {
                 var declaration = rawItem.declaration;
@@ -22937,19 +27674,19 @@ var ts;
                         case 149:
                             ts.forEach(node.elements, visit);
                             break;
-                        case 209:
+                        case 210:
                             if (node.exportClause) {
                                 ts.forEach(node.exportClause.elements, visit);
                             }
                             break;
-                        case 203:
+                        case 204:
                             var importClause = node.importClause;
                             if (importClause) {
                                 if (importClause.name) {
                                     childNodes.push(importClause);
                                 }
                                 if (importClause.namedBindings) {
-                                    if (importClause.namedBindings.kind === 205) {
+                                    if (importClause.namedBindings.kind === 206) {
                                         childNodes.push(importClause.namedBindings);
                                     }
                                     else {
@@ -22969,9 +27706,9 @@ var ts;
                         case 197:
                         case 200:
                         case 195:
-                        case 202:
-                        case 207:
-                        case 211:
+                        case 203:
+                        case 208:
+                        case 212:
                             childNodes.push(node);
                             break;
                     }
@@ -23029,7 +27766,9 @@ var ts;
             function isTopLevelFunctionDeclaration(functionDeclaration) {
                 if (functionDeclaration.kind === 195) {
                     if (functionDeclaration.body && functionDeclaration.body.kind === 174) {
-                        if (ts.forEach(functionDeclaration.body.statements, function (s) { return s.kind === 195 && !isEmpty(s.name.text); })) {
+                        if (ts.forEach(functionDeclaration.body.statements, function (s) {
+                            return s.kind === 195 && !isEmpty(s.name.text);
+                        })) {
                             return true;
                         }
                         if (!ts.isFunctionBlock(functionDeclaration.parent)) {
@@ -23099,7 +27838,7 @@ var ts;
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberSetAccessorElement);
                     case 138:
                         return createItem(node, "[]", ts.ScriptElementKind.indexSignatureElement);
-                    case 219:
+                    case 220:
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberVariableElement);
                     case 136:
                         return createItem(node, "()", ts.ScriptElementKind.callSignatureElement);
@@ -23138,16 +27877,18 @@ var ts;
                         }
                     case 133:
                         return createItem(node, "constructor", ts.ScriptElementKind.constructorImplementationElement);
-                    case 211:
-                    case 207:
-                    case 202:
-                    case 204:
+                    case 212:
+                    case 208:
+                    case 203:
                     case 205:
+                    case 206:
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.alias);
                 }
                 return undefined;
                 function createItem(node, name, scriptElementKind) {
-                    return getNavigationBarItem(name, scriptElementKind, ts.getNodeModifiers(node), [getNodeSpan(node)]);
+                    return getNavigationBarItem(name, scriptElementKind, ts.getNodeModifiers(node), [
+                        getNodeSpan(node)
+                    ]);
                 }
             }
             function isEmpty(text) {
@@ -23172,7 +27913,7 @@ var ts;
             }
             function createTopLevelItem(node) {
                 switch (node.kind) {
-                    case 220:
+                    case 221:
                         return createSourceFileItem(node);
                     case 196:
                         return createClassItem(node);
@@ -23201,12 +27942,16 @@ var ts;
                 function createModuleItem(node) {
                     var moduleName = getModuleName(node);
                     var childItems = getItemsWorker(getChildNodes(getInnermostModule(node).body.statements), createChildItem);
-                    return getNavigationBarItem(moduleName, ts.ScriptElementKind.moduleElement, ts.getNodeModifiers(node), [getNodeSpan(node)], childItems, getIndent(node));
+                    return getNavigationBarItem(moduleName, ts.ScriptElementKind.moduleElement, ts.getNodeModifiers(node), [
+                        getNodeSpan(node)
+                    ], childItems, getIndent(node));
                 }
                 function createFunctionItem(node) {
                     if (node.name && node.body && node.body.kind === 174) {
                         var childItems = getItemsWorker(sortNodes(node.body.statements), createChildItem);
-                        return getNavigationBarItem(node.name.text, ts.ScriptElementKind.functionElement, ts.getNodeModifiers(node), [getNodeSpan(node)], childItems, getIndent(node));
+                        return getNavigationBarItem(node.name.text, ts.ScriptElementKind.functionElement, ts.getNodeModifiers(node), [
+                            getNodeSpan(node)
+                        ], childItems, getIndent(node));
                     }
                     return undefined;
                 }
@@ -23216,10 +27961,10 @@ var ts;
                         return undefined;
                     }
                     hasGlobalNode = true;
-                    var rootName = ts.isExternalModule(node)
-                        ? "\"" + ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(node.fileName)))) + "\""
-                        : "<global>";
-                    return getNavigationBarItem(rootName, ts.ScriptElementKind.moduleElement, ts.ScriptElementKindModifier.none, [getNodeSpan(node)], childItems);
+                    var rootName = ts.isExternalModule(node) ? "\"" + ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(node.fileName)))) + "\"" : "<global>";
+                    return getNavigationBarItem(rootName, ts.ScriptElementKind.moduleElement, ts.ScriptElementKindModifier.none, [
+                        getNodeSpan(node)
+                    ], childItems);
                 }
                 function createClassItem(node) {
                     if (!node.name) {
@@ -23232,26 +27977,38 @@ var ts;
                         });
                         var nodes = removeDynamicallyNamedProperties(node);
                         if (constructor) {
-                            nodes.push.apply(nodes, ts.filter(constructor.parameters, function (p) { return !ts.isBindingPattern(p.name); }));
+                            nodes.push.apply(nodes, ts.filter(constructor.parameters, function (p) {
+                                return !ts.isBindingPattern(p.name);
+                            }));
                         }
                         var childItems = getItemsWorker(sortNodes(nodes), createChildItem);
                     }
-                    return getNavigationBarItem(node.name.text, ts.ScriptElementKind.classElement, ts.getNodeModifiers(node), [getNodeSpan(node)], childItems, getIndent(node));
+                    return getNavigationBarItem(node.name.text, ts.ScriptElementKind.classElement, ts.getNodeModifiers(node), [
+                        getNodeSpan(node)
+                    ], childItems, getIndent(node));
                 }
                 function createEnumItem(node) {
                     var childItems = getItemsWorker(sortNodes(removeComputedProperties(node)), createChildItem);
-                    return getNavigationBarItem(node.name.text, ts.ScriptElementKind.enumElement, ts.getNodeModifiers(node), [getNodeSpan(node)], childItems, getIndent(node));
+                    return getNavigationBarItem(node.name.text, ts.ScriptElementKind.enumElement, ts.getNodeModifiers(node), [
+                        getNodeSpan(node)
+                    ], childItems, getIndent(node));
                 }
                 function createIterfaceItem(node) {
                     var childItems = getItemsWorker(sortNodes(removeDynamicallyNamedProperties(node)), createChildItem);
-                    return getNavigationBarItem(node.name.text, ts.ScriptElementKind.interfaceElement, ts.getNodeModifiers(node), [getNodeSpan(node)], childItems, getIndent(node));
+                    return getNavigationBarItem(node.name.text, ts.ScriptElementKind.interfaceElement, ts.getNodeModifiers(node), [
+                        getNodeSpan(node)
+                    ], childItems, getIndent(node));
                 }
             }
             function removeComputedProperties(node) {
-                return ts.filter(node.members, function (member) { return member.name === undefined || member.name.kind !== 126; });
+                return ts.filter(node.members, function (member) {
+                    return member.name === undefined || member.name.kind !== 126;
+                });
             }
             function removeDynamicallyNamedProperties(node) {
-                return ts.filter(node.members, function (member) { return !ts.hasDynamicName(member); });
+                return ts.filter(node.members, function (member) {
+                    return !ts.hasDynamicName(member);
+                });
             }
             function getInnermostModule(node) {
                 while (node.body.kind === 200) {
@@ -23260,9 +28017,7 @@ var ts;
                 return node;
             }
             function getNodeSpan(node) {
-                return node.kind === 220
-                    ? ts.createTextSpanFromBounds(node.getFullStart(), node.getEnd())
-                    : ts.createTextSpanFromBounds(node.getStart(), node.getEnd());
+                return node.kind === 221 ? ts.createTextSpanFromBounds(node.getFullStart(), node.getEnd()) : ts.createTextSpanFromBounds(node.getStart(), node.getEnd());
             }
             function getTextOfNode(node) {
                 return ts.getTextOfNodeFromSourceText(sourceFile.text, node);
@@ -23292,7 +28047,9 @@ var ts;
         var stringToWordSpans = {};
         pattern = pattern.trim();
         var fullPatternSegment = createSegment(pattern);
-        var dotSeparatedSegments = pattern.split(".").map(function (p) { return createSegment(p.trim()); });
+        var dotSeparatedSegments = pattern.split(".").map(function (p) {
+            return createSegment(p.trim());
+        });
         var invalidPattern = dotSeparatedSegments.length === 0 || ts.forEach(dotSeparatedSegments, segmentIsInvalid);
         return {
             getMatches: getMatches,
@@ -23400,7 +28157,9 @@ var ts;
             if (!containsSpaceOrAsterisk(segment.totalTextChunk.text)) {
                 var match = matchTextChunk(candidate, segment.totalTextChunk, false);
                 if (match) {
-                    return [match];
+                    return [
+                        match
+                    ];
                 }
             }
             var subWordTextChunks = segment.subWordTextChunks;
@@ -23467,8 +28226,7 @@ var ts;
                 for (; currentChunkSpan < chunkCharacterSpans.length; currentChunkSpan++) {
                     var chunkCharacterSpan = chunkCharacterSpans[currentChunkSpan];
                     if (gotOneMatchThisCandidate) {
-                        if (!isUpperCaseLetter(chunk.text.charCodeAt(chunkCharacterSpans[currentChunkSpan - 1].start)) ||
-                            !isUpperCaseLetter(chunk.text.charCodeAt(chunkCharacterSpans[currentChunkSpan].start))) {
+                        if (!isUpperCaseLetter(chunk.text.charCodeAt(chunkCharacterSpans[currentChunkSpan - 1].start)) || !isUpperCaseLetter(chunk.text.charCodeAt(chunkCharacterSpans[currentChunkSpan].start))) {
                             break;
                         }
                     }
@@ -23489,10 +28247,7 @@ var ts;
     }
     ts.createPatternMatcher = createPatternMatcher;
     function patternMatchCompareTo(match1, match2) {
-        return compareType(match1, match2) ||
-            compareCamelCase(match1, match2) ||
-            compareCase(match1, match2) ||
-            comparePunctuation(match1, match2);
+        return compareType(match1, match2) || compareCamelCase(match1, match2) || compareCase(match1, match2) || comparePunctuation(match1, match2);
     }
     function comparePunctuation(result1, result2) {
         if (result1.punctuationStripped !== result2.punctuationStripped) {
@@ -23641,11 +28396,7 @@ var ts;
             var currentIsDigit = isDigit(identifier.charCodeAt(i));
             var hasTransitionFromLowerToUpper = transitionFromLowerToUpper(identifier, word, i);
             var hasTransitionFromUpperToLower = transitionFromUpperToLower(identifier, word, i, wordStart);
-            if (charIsPunctuation(identifier.charCodeAt(i - 1)) ||
-                charIsPunctuation(identifier.charCodeAt(i)) ||
-                lastIsDigit != currentIsDigit ||
-                hasTransitionFromLowerToUpper ||
-                hasTransitionFromUpperToLower) {
+            if (charIsPunctuation(identifier.charCodeAt(i - 1)) || charIsPunctuation(identifier.charCodeAt(i)) || lastIsDigit != currentIsDigit || hasTransitionFromLowerToUpper || hasTransitionFromUpperToLower) {
                 if (!isAllPunctuation(identifier, wordStart, i)) {
                     result.push(ts.createTextSpan(wordStart, i - wordStart));
                 }
@@ -23697,8 +28448,7 @@ var ts;
     }
     function transitionFromUpperToLower(identifier, word, index, wordStart) {
         if (word) {
-            if (index != wordStart &&
-                index + 1 < identifier.length) {
+            if (index != wordStart && index + 1 < identifier.length) {
                 var currentIsUpper = isUpperCaseLetter(identifier.charCodeAt(index));
                 var nextIsLower = isLowerCaseLetter(identifier.charCodeAt(index + 1));
                 if (currentIsUpper && nextIsLower) {
@@ -23716,9 +28466,7 @@ var ts;
     function transitionFromLowerToUpper(identifier, word, index) {
         var lastIsUpper = isUpperCaseLetter(identifier.charCodeAt(index - 1));
         var currentIsUpper = isUpperCaseLetter(identifier.charCodeAt(index));
-        var transition = word
-            ? (currentIsUpper && !lastIsUpper)
-            : currentIsUpper;
+        var transition = word ? (currentIsUpper && !lastIsUpper) : currentIsUpper;
         return transition;
     }
 })(ts || (ts = {}));
@@ -23748,8 +28496,7 @@ var ts;
             function getImmediatelyContainingArgumentInfo(node) {
                 if (node.parent.kind === 155 || node.parent.kind === 156) {
                     var callExpression = node.parent;
-                    if (node.kind === 24 ||
-                        node.kind === 16) {
+                    if (node.kind === 24 || node.kind === 16) {
                         var list = getChildListThatStartsWithOpenerToken(callExpression, node, sourceFile);
                         var isTypeArgList = callExpression.typeArguments && callExpression.typeArguments.pos === list.pos;
                         ts.Debug.assert(list !== undefined);
@@ -23758,15 +28505,15 @@ var ts;
                             invocation: callExpression,
                             argumentsSpan: getApplicableSpanForArguments(list),
                             argumentIndex: 0,
-                            argumentCount: getCommaBasedArgCount(list)
+                            argumentCount: getArgumentCount(list)
                         };
                     }
                     var listItemInfo = ts.findListItemInfo(node);
                     if (listItemInfo) {
                         var list = listItemInfo.list;
                         var isTypeArgList = callExpression.typeArguments && callExpression.typeArguments.pos === list.pos;
-                        var argumentIndex = (listItemInfo.listItemIndex + 1) >> 1;
-                        var argumentCount = getCommaBasedArgCount(list);
+                        var argumentIndex = getArgumentIndex(list, node);
+                        var argumentCount = getArgumentCount(list);
                         ts.Debug.assert(argumentIndex === 0 || argumentIndex < argumentCount, "argumentCount < argumentIndex, " + argumentCount + " < " + argumentIndex);
                         return {
                             kind: isTypeArgList ? 0 : 1,
@@ -23803,10 +28550,29 @@ var ts;
                 }
                 return undefined;
             }
-            function getCommaBasedArgCount(argumentsList) {
-                return argumentsList.getChildCount() === 0
-                    ? 0
-                    : 1 + ts.countWhere(argumentsList.getChildren(), function (arg) { return arg.kind === 23; });
+            function getArgumentIndex(argumentsList, node) {
+                var argumentIndex = 0;
+                var listChildren = argumentsList.getChildren();
+                for (var i = 0, n = listChildren.length; i < n; i++) {
+                    var child = listChildren[i];
+                    if (child === node) {
+                        break;
+                    }
+                    if (child.kind !== 23) {
+                        argumentIndex++;
+                    }
+                }
+                return argumentIndex;
+            }
+            function getArgumentCount(argumentsList) {
+                var listChildren = argumentsList.getChildren();
+                var argumentCount = ts.countWhere(listChildren, function (arg) {
+                    return arg.kind !== 23;
+                });
+                if (listChildren.length > 0 && ts.lastOrUndefined(listChildren).kind === 23) {
+                    argumentCount++;
+                }
+                return argumentCount;
             }
             function getArgumentIndexForTemplatePiece(spanIndex, node) {
                 ts.Debug.assert(position >= node.getStart(), "Assumed 'position' could not occur before node.");
@@ -23819,9 +28585,7 @@ var ts;
                 return spanIndex + 1;
             }
             function getArgumentListInfoForTemplate(tagExpression, argumentIndex) {
-                var argumentCount = tagExpression.template.kind === 10
-                    ? 1
-                    : tagExpression.template.templateSpans.length + 1;
+                var argumentCount = tagExpression.template.kind === 10 ? 1 : tagExpression.template.templateSpans.length + 1;
                 ts.Debug.assert(argumentIndex === 0 || argumentIndex < argumentCount, "argumentCount < argumentIndex, " + argumentCount + " < " + argumentIndex);
                 return {
                     kind: 2,
@@ -23849,7 +28613,7 @@ var ts;
                 return ts.createTextSpan(applicableSpanStart, applicableSpanEnd - applicableSpanStart);
             }
             function getContainingArgumentInfo(node) {
-                for (var n = node; n.kind !== 220; n = n.parent) {
+                for (var n = node; n.kind !== 221; n = n.parent) {
                     if (ts.isFunctionBlock(n)) {
                         return undefined;
                     }
@@ -23926,7 +28690,10 @@ var ts;
                         isVariadic: candidateSignature.hasRestParameter,
                         prefixDisplayParts: prefixDisplayParts,
                         suffixDisplayParts: suffixDisplayParts,
-                        separatorDisplayParts: [ts.punctuationPart(23), ts.spacePart()],
+                        separatorDisplayParts: [
+                            ts.punctuationPart(23),
+                            ts.spacePart()
+                        ],
                         parameters: signatureHelpParameters,
                         documentation: candidateSignature.getDocumentationComment()
                     };
@@ -24035,24 +28802,31 @@ var ts;
     }
     ts.findListItemInfo = findListItemInfo;
     function findChildOfKind(n, kind, sourceFile) {
-        return ts.forEach(n.getChildren(sourceFile), function (c) { return c.kind === kind && c; });
+        return ts.forEach(n.getChildren(sourceFile), function (c) {
+            return c.kind === kind && c;
+        });
     }
     ts.findChildOfKind = findChildOfKind;
     function findContainingList(node) {
         var syntaxList = ts.forEach(node.parent.getChildren(), function (c) {
-            if (c.kind === 221 && c.pos <= node.pos && c.end >= node.end) {
+            if (c.kind === 222 && c.pos <= node.pos && c.end >= node.end) {
                 return c;
             }
         });
+        ts.Debug.assert(!syntaxList || ts.contains(syntaxList.getChildren(), node));
         return syntaxList;
     }
     ts.findContainingList = findContainingList;
     function getTouchingWord(sourceFile, position) {
-        return getTouchingToken(sourceFile, position, function (n) { return isWord(n.kind); });
+        return getTouchingToken(sourceFile, position, function (n) {
+            return isWord(n.kind);
+        });
     }
     ts.getTouchingWord = getTouchingWord;
     function getTouchingPropertyName(sourceFile, position) {
-        return getTouchingToken(sourceFile, position, function (n) { return isPropertyName(n.kind); });
+        return getTouchingToken(sourceFile, position, function (n) {
+            return isPropertyName(n.kind);
+        });
     }
     ts.getTouchingPropertyName = getTouchingPropertyName;
     function getTouchingToken(sourceFile, position, includeItemAtEndPosition) {
@@ -24106,8 +28880,7 @@ var ts;
             var children = n.getChildren();
             for (var i = 0, len = children.length; i < len; ++i) {
                 var child = children[i];
-                var shouldDiveInChildNode = (child.pos <= previousToken.pos && child.end > previousToken.end) ||
-                    (child.pos === previousToken.end);
+                var shouldDiveInChildNode = (child.pos <= previousToken.pos && child.end > previousToken.end) || (child.pos === previousToken.end);
                 if (shouldDiveInChildNode && nodeHasTokens(child)) {
                     return find(child);
                 }
@@ -24145,7 +28918,7 @@ var ts;
                     }
                 }
             }
-            ts.Debug.assert(startNode !== undefined || n.kind === 220);
+            ts.Debug.assert(startNode !== undefined || n.kind === 221);
             if (children.length) {
                 var candidate = findRightmostChildNodeWithTokens(children, children.length);
                 return candidate && findRightmostToken(candidate);
@@ -24210,8 +28983,7 @@ var ts;
     }
     ts.isPunctuation = isPunctuation;
     function isInsideTemplateLiteral(node, position) {
-        return ts.isTemplateLiteralKind(node.kind)
-            && (node.getStart() < position && position < node.getEnd()) || (!!node.isUnterminated && position === node.getEnd());
+        return ts.isTemplateLiteralKind(node.kind) && (node.getStart() < position && position < node.getEnd()) || (!!node.isUnterminated && position === node.getEnd());
     }
     ts.isInsideTemplateLiteral = isInsideTemplateLiteral;
     function compareDataObjects(dst, src) {
@@ -24244,19 +29016,38 @@ var ts;
         var indent;
         resetWriter();
         return {
-            displayParts: function () { return displayParts; },
-            writeKeyword: function (text) { return writeKind(text, 5); },
-            writeOperator: function (text) { return writeKind(text, 12); },
-            writePunctuation: function (text) { return writeKind(text, 15); },
-            writeSpace: function (text) { return writeKind(text, 16); },
-            writeStringLiteral: function (text) { return writeKind(text, 8); },
-            writeParameter: function (text) { return writeKind(text, 13); },
+            displayParts: function () {
+                return displayParts;
+            },
+            writeKeyword: function (text) {
+                return writeKind(text, 5);
+            },
+            writeOperator: function (text) {
+                return writeKind(text, 12);
+            },
+            writePunctuation: function (text) {
+                return writeKind(text, 15);
+            },
+            writeSpace: function (text) {
+                return writeKind(text, 16);
+            },
+            writeStringLiteral: function (text) {
+                return writeKind(text, 8);
+            },
+            writeParameter: function (text) {
+                return writeKind(text, 13);
+            },
             writeSymbol: writeSymbol,
             writeLine: writeLine,
-            increaseIndent: function () { indent++; },
-            decreaseIndent: function () { indent--; },
+            increaseIndent: function () {
+                indent++;
+            },
+            decreaseIndent: function () {
+                indent--;
+            },
             clear: resetWriter,
-            trackSymbol: function () { }
+            trackSymbol: function () {
+            }
         };
         function writeIndent() {
             if (lineStart) {
@@ -24410,7 +29201,9 @@ var ts;
                 advance: advance,
                 readTokenInfo: readTokenInfo,
                 isOnToken: isOnToken,
-                lastTrailingTriviaWasNewLine: function () { return wasNewLine; },
+                lastTrailingTriviaWasNewLine: function () {
+                    return wasNewLine;
+                },
                 close: function () {
                     lastTokenInfo = undefined;
                     scanner.setText(undefined);
@@ -24471,8 +29264,7 @@ var ts;
                 return container.kind === 9;
             }
             function shouldRescanTemplateToken(container) {
-                return container.kind === 12 ||
-                    container.kind === 13;
+                return container.kind === 12 || container.kind === 13;
             }
             function startsWithSlashToken(t) {
                 return t === 36 || t === 56;
@@ -24485,13 +29277,7 @@ var ts;
                         token: undefined
                     };
                 }
-                var expectedScanAction = shouldRescanGreaterThanToken(n)
-                    ? 1
-                    : shouldRescanSlashToken(n)
-                        ? 2
-                        : shouldRescanTemplateToken(n)
-                            ? 3
-                            : 0;
+                var expectedScanAction = shouldRescanGreaterThanToken(n) ? 1 : shouldRescanSlashToken(n) ? 2 : shouldRescanTemplateToken(n) ? 3 : 0;
                 if (lastTokenInfo && expectedScanAction === lastScanAction) {
                     return fixTokenKind(lastTokenInfo, n);
                 }
@@ -24645,6 +29431,7 @@ var ts;
         formatting.FormattingContext = FormattingContext;
     })(formatting = ts.formatting || (ts.formatting = {}));
 })(ts || (ts = {}));
+/// <reference path="references.ts"/>
 var ts;
 (function (ts) {
     var formatting;
@@ -24657,15 +29444,14 @@ var ts;
                 this.Flag = Flag;
             }
             Rule.prototype.toString = function () {
-                return "[desc=" + this.Descriptor + "," +
-                    "operation=" + this.Operation + "," +
-                    "flag=" + this.Flag + "]";
+                return "[desc=" + this.Descriptor + "," + "operation=" + this.Operation + "," + "flag=" + this.Flag + "]";
             };
             return Rule;
         })();
         formatting.Rule = Rule;
     })(formatting = ts.formatting || (ts.formatting = {}));
 })(ts || (ts = {}));
+///<reference path='references.ts' />
 var ts;
 (function (ts) {
     var formatting;
@@ -24676,8 +29462,7 @@ var ts;
                 this.RightTokenRange = RightTokenRange;
             }
             RuleDescriptor.prototype.toString = function () {
-                return "[leftRange=" + this.LeftTokenRange + "," +
-                    "rightRange=" + this.RightTokenRange + "]";
+                return "[leftRange=" + this.LeftTokenRange + "," + "rightRange=" + this.RightTokenRange + "]";
             };
             RuleDescriptor.create1 = function (left, right) {
                 return RuleDescriptor.create4(formatting.Shared.TokenRange.FromToken(left), formatting.Shared.TokenRange.FromToken(right));
@@ -24696,6 +29481,7 @@ var ts;
         formatting.RuleDescriptor = RuleDescriptor;
     })(formatting = ts.formatting || (ts.formatting = {}));
 })(ts || (ts = {}));
+///<reference path='references.ts' />
 var ts;
 (function (ts) {
     var formatting;
@@ -24706,8 +29492,7 @@ var ts;
                 this.Action = null;
             }
             RuleOperation.prototype.toString = function () {
-                return "[context=" + this.Context + "," +
-                    "action=" + this.Action + "]";
+                return "[context=" + this.Context + "," + "action=" + this.Action + "]";
             };
             RuleOperation.create1 = function (action) {
                 return RuleOperation.create2(formatting.RuleOperationContext.Any, action);
@@ -24773,7 +29558,12 @@ var ts;
                 this.SpaceAfterCloseBrace = new formatting.Rule(formatting.RuleDescriptor.create3(15, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsAfterCodeBlockContext), 2));
                 this.SpaceBetweenCloseBraceAndElse = new formatting.Rule(formatting.RuleDescriptor.create1(15, 75), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
                 this.SpaceBetweenCloseBraceAndWhile = new formatting.Rule(formatting.RuleDescriptor.create1(15, 99), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
-                this.NoSpaceAfterCloseBrace = new formatting.Rule(formatting.RuleDescriptor.create3(15, formatting.Shared.TokenRange.FromTokens([17, 19, 23, 22])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
+                this.NoSpaceAfterCloseBrace = new formatting.Rule(formatting.RuleDescriptor.create3(15, formatting.Shared.TokenRange.FromTokens([
+                    17,
+                    19,
+                    23,
+                    22
+                ])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
                 this.NoSpaceBeforeDot = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 20), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
                 this.NoSpaceAfterDot = new formatting.Rule(formatting.RuleDescriptor.create3(20, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
                 this.NoSpaceBeforeOpenBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 18), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
@@ -24782,9 +29572,19 @@ var ts;
                 this.NoSpaceAfterCloseBracket = new formatting.Rule(formatting.RuleDescriptor.create3(19, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
                 this.FunctionOpenBraceLeftTokenRange = formatting.Shared.TokenRange.AnyIncludingMultilineComments;
                 this.SpaceBeforeOpenBraceInFunction = new formatting.Rule(formatting.RuleDescriptor.create2(this.FunctionOpenBraceLeftTokenRange, 14), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext, Rules.IsBeforeBlockContext, Rules.IsNotFormatOnEnter, Rules.IsSameLineTokenOrBeforeMultilineBlockContext), 2), 1);
-                this.TypeScriptOpenBraceLeftTokenRange = formatting.Shared.TokenRange.FromTokens([64, 3]);
+                this.TypeScriptOpenBraceLeftTokenRange = formatting.Shared.TokenRange.FromTokens([
+                    64,
+                    3
+                ]);
                 this.SpaceBeforeOpenBraceInTypeScriptDeclWithBlock = new formatting.Rule(formatting.RuleDescriptor.create2(this.TypeScriptOpenBraceLeftTokenRange, 14), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsTypeScriptDeclWithBlockContext, Rules.IsNotFormatOnEnter, Rules.IsSameLineTokenOrBeforeMultilineBlockContext), 2), 1);
-                this.ControlOpenBraceLeftTokenRange = formatting.Shared.TokenRange.FromTokens([17, 3, 74, 95, 80, 75]);
+                this.ControlOpenBraceLeftTokenRange = formatting.Shared.TokenRange.FromTokens([
+                    17,
+                    3,
+                    74,
+                    95,
+                    80,
+                    75
+                ]);
                 this.SpaceBeforeOpenBraceInControl = new formatting.Rule(formatting.RuleDescriptor.create2(this.ControlOpenBraceLeftTokenRange, 14), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsControlDeclContext, Rules.IsNotFormatOnEnter, Rules.IsSameLineTokenOrBeforeMultilineBlockContext), 2), 1);
                 this.SpaceAfterOpenBrace = new formatting.Rule(formatting.RuleDescriptor.create3(14, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSingleLineBlockContext), 2));
                 this.SpaceBeforeCloseBrace = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 15), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSingleLineBlockContext), 2));
@@ -24803,79 +29603,151 @@ var ts;
                 this.SpaceAfterSubtractWhenFollowedByUnaryMinus = new formatting.Rule(formatting.RuleDescriptor.create1(34, 34), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2));
                 this.SpaceAfterSubtractWhenFollowedByPredecrement = new formatting.Rule(formatting.RuleDescriptor.create1(34, 39), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2));
                 this.NoSpaceBeforeComma = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 23), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.SpaceAfterCertainKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([97, 93, 87, 73, 89, 96]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
-                this.SpaceAfterLetConstInVariableDeclaration = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([104, 69]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsStartOfVariableDeclarationList), 2));
+                this.SpaceAfterCertainKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([
+                    97,
+                    93,
+                    87,
+                    73,
+                    89,
+                    96
+                ]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
+                this.SpaceAfterLetConstInVariableDeclaration = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([
+                    104,
+                    69
+                ]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsStartOfVariableDeclarationList), 2));
                 this.NoSpaceBeforeOpenParenInFuncCall = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsFunctionCallOrNewContext, Rules.IsPreviousTokenNotComma), 8));
                 this.SpaceAfterFunctionInFuncDecl = new formatting.Rule(formatting.RuleDescriptor.create3(82, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2));
                 this.NoSpaceBeforeOpenParenInFuncDecl = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsFunctionDeclContext), 8));
                 this.SpaceAfterVoidOperator = new formatting.Rule(formatting.RuleDescriptor.create3(98, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsVoidOpContext), 2));
                 this.NoSpaceBetweenReturnAndSemicolon = new formatting.Rule(formatting.RuleDescriptor.create1(89, 22), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.SpaceBetweenStatements = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([17, 74, 75, 66]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotForContext), 2));
-                this.SpaceAfterTryFinally = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([95, 80]), 14), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
-                this.SpaceAfterGetSetInMember = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([115, 119]), 64), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2));
+                this.SpaceBetweenStatements = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([
+                    17,
+                    74,
+                    75,
+                    66
+                ]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotForContext), 2));
+                this.SpaceAfterTryFinally = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([
+                    95,
+                    80
+                ]), 14), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
+                this.SpaceAfterGetSetInMember = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([
+                    115,
+                    119
+                ]), 64), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2));
                 this.SpaceBeforeBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryKeywordOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2));
                 this.SpaceAfterBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.BinaryKeywordOperators, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2));
                 this.NoSpaceAfterConstructor = new formatting.Rule(formatting.RuleDescriptor.create1(113, 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.NoSpaceAfterModuleImport = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([116, 117]), 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.SpaceAfterCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([68, 114, 76, 77, 78, 115, 102, 84, 103, 116, 106, 108, 119, 109]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
-                this.SpaceBeforeCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([78, 102])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
+                this.NoSpaceAfterModuleImport = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([
+                    116,
+                    117
+                ]), 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
+                this.SpaceAfterCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([
+                    68,
+                    114,
+                    76,
+                    77,
+                    78,
+                    115,
+                    102,
+                    84,
+                    103,
+                    116,
+                    106,
+                    108,
+                    119,
+                    109
+                ]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
+                this.SpaceBeforeCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([
+                    78,
+                    102
+                ])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
                 this.SpaceAfterModuleName = new formatting.Rule(formatting.RuleDescriptor.create1(8, 14), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsModuleDeclContext), 2));
                 this.SpaceAfterArrow = new formatting.Rule(formatting.RuleDescriptor.create3(32, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
                 this.NoSpaceAfterEllipsis = new formatting.Rule(formatting.RuleDescriptor.create1(21, 64), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.NoSpaceAfterOptionalParameters = new formatting.Rule(formatting.RuleDescriptor.create3(50, formatting.Shared.TokenRange.FromTokens([17, 23])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBinaryOpContext), 8));
+                this.NoSpaceAfterOptionalParameters = new formatting.Rule(formatting.RuleDescriptor.create3(50, formatting.Shared.TokenRange.FromTokens([
+                    17,
+                    23
+                ])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBinaryOpContext), 8));
                 this.NoSpaceBeforeOpenAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.TypeNames, 24), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterContext), 8));
                 this.NoSpaceBetweenCloseParenAndAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create1(17, 24), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterContext), 8));
                 this.NoSpaceAfterOpenAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create3(24, formatting.Shared.TokenRange.TypeNames), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterContext), 8));
                 this.NoSpaceBeforeCloseAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 25), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterContext), 8));
-                this.NoSpaceAfterCloseAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create3(25, formatting.Shared.TokenRange.FromTokens([16, 18, 25, 23])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterContext), 8));
+                this.NoSpaceAfterCloseAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create3(25, formatting.Shared.TokenRange.FromTokens([
+                    16,
+                    18,
+                    25,
+                    23
+                ])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterContext), 8));
                 this.NoSpaceBetweenEmptyInterfaceBraceBrackets = new formatting.Rule(formatting.RuleDescriptor.create1(14, 15), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsObjectTypeContext), 8));
-                this.HighPriorityCommonRules =
-                    [
-                        this.IgnoreBeforeComment, this.IgnoreAfterLineComment,
-                        this.NoSpaceBeforeColon, this.SpaceAfterColon, this.NoSpaceBeforeQuestionMark, this.SpaceAfterQuestionMarkInConditionalOperator,
-                        this.NoSpaceAfterQuestionMark,
-                        this.NoSpaceBeforeDot, this.NoSpaceAfterDot,
-                        this.NoSpaceAfterUnaryPrefixOperator,
-                        this.NoSpaceAfterUnaryPreincrementOperator, this.NoSpaceAfterUnaryPredecrementOperator,
-                        this.NoSpaceBeforeUnaryPostincrementOperator, this.NoSpaceBeforeUnaryPostdecrementOperator,
-                        this.SpaceAfterPostincrementWhenFollowedByAdd,
-                        this.SpaceAfterAddWhenFollowedByUnaryPlus, this.SpaceAfterAddWhenFollowedByPreincrement,
-                        this.SpaceAfterPostdecrementWhenFollowedBySubtract,
-                        this.SpaceAfterSubtractWhenFollowedByUnaryMinus, this.SpaceAfterSubtractWhenFollowedByPredecrement,
-                        this.NoSpaceAfterCloseBrace,
-                        this.SpaceAfterOpenBrace, this.SpaceBeforeCloseBrace, this.NewLineBeforeCloseBraceInBlockContext,
-                        this.SpaceAfterCloseBrace, this.SpaceBetweenCloseBraceAndElse, this.SpaceBetweenCloseBraceAndWhile, this.NoSpaceBetweenEmptyBraceBrackets,
-                        this.SpaceAfterFunctionInFuncDecl, this.NewLineAfterOpenBraceInBlockContext, this.SpaceAfterGetSetInMember,
-                        this.NoSpaceBetweenReturnAndSemicolon,
-                        this.SpaceAfterCertainKeywords,
-                        this.SpaceAfterLetConstInVariableDeclaration,
-                        this.NoSpaceBeforeOpenParenInFuncCall,
-                        this.SpaceBeforeBinaryKeywordOperator, this.SpaceAfterBinaryKeywordOperator,
-                        this.SpaceAfterVoidOperator,
-                        this.NoSpaceAfterConstructor, this.NoSpaceAfterModuleImport,
-                        this.SpaceAfterCertainTypeScriptKeywords, this.SpaceBeforeCertainTypeScriptKeywords,
-                        this.SpaceAfterModuleName,
-                        this.SpaceAfterArrow,
-                        this.NoSpaceAfterEllipsis,
-                        this.NoSpaceAfterOptionalParameters,
-                        this.NoSpaceBetweenEmptyInterfaceBraceBrackets,
-                        this.NoSpaceBeforeOpenAngularBracket,
-                        this.NoSpaceBetweenCloseParenAndAngularBracket,
-                        this.NoSpaceAfterOpenAngularBracket,
-                        this.NoSpaceBeforeCloseAngularBracket,
-                        this.NoSpaceAfterCloseAngularBracket
-                    ];
-                this.LowPriorityCommonRules =
-                    [
-                        this.NoSpaceBeforeSemicolon,
-                        this.SpaceBeforeOpenBraceInControl, this.SpaceBeforeOpenBraceInFunction, this.SpaceBeforeOpenBraceInTypeScriptDeclWithBlock,
-                        this.NoSpaceBeforeComma,
-                        this.NoSpaceBeforeOpenBracket, this.NoSpaceAfterOpenBracket,
-                        this.NoSpaceBeforeCloseBracket, this.NoSpaceAfterCloseBracket,
-                        this.SpaceAfterSemicolon,
-                        this.NoSpaceBeforeOpenParenInFuncDecl,
-                        this.SpaceBetweenStatements, this.SpaceAfterTryFinally
-                    ];
+                this.HighPriorityCommonRules = [
+                    this.IgnoreBeforeComment,
+                    this.IgnoreAfterLineComment,
+                    this.NoSpaceBeforeColon,
+                    this.SpaceAfterColon,
+                    this.NoSpaceBeforeQuestionMark,
+                    this.SpaceAfterQuestionMarkInConditionalOperator,
+                    this.NoSpaceAfterQuestionMark,
+                    this.NoSpaceBeforeDot,
+                    this.NoSpaceAfterDot,
+                    this.NoSpaceAfterUnaryPrefixOperator,
+                    this.NoSpaceAfterUnaryPreincrementOperator,
+                    this.NoSpaceAfterUnaryPredecrementOperator,
+                    this.NoSpaceBeforeUnaryPostincrementOperator,
+                    this.NoSpaceBeforeUnaryPostdecrementOperator,
+                    this.SpaceAfterPostincrementWhenFollowedByAdd,
+                    this.SpaceAfterAddWhenFollowedByUnaryPlus,
+                    this.SpaceAfterAddWhenFollowedByPreincrement,
+                    this.SpaceAfterPostdecrementWhenFollowedBySubtract,
+                    this.SpaceAfterSubtractWhenFollowedByUnaryMinus,
+                    this.SpaceAfterSubtractWhenFollowedByPredecrement,
+                    this.NoSpaceAfterCloseBrace,
+                    this.SpaceAfterOpenBrace,
+                    this.SpaceBeforeCloseBrace,
+                    this.NewLineBeforeCloseBraceInBlockContext,
+                    this.SpaceAfterCloseBrace,
+                    this.SpaceBetweenCloseBraceAndElse,
+                    this.SpaceBetweenCloseBraceAndWhile,
+                    this.NoSpaceBetweenEmptyBraceBrackets,
+                    this.SpaceAfterFunctionInFuncDecl,
+                    this.NewLineAfterOpenBraceInBlockContext,
+                    this.SpaceAfterGetSetInMember,
+                    this.NoSpaceBetweenReturnAndSemicolon,
+                    this.SpaceAfterCertainKeywords,
+                    this.SpaceAfterLetConstInVariableDeclaration,
+                    this.NoSpaceBeforeOpenParenInFuncCall,
+                    this.SpaceBeforeBinaryKeywordOperator,
+                    this.SpaceAfterBinaryKeywordOperator,
+                    this.SpaceAfterVoidOperator,
+                    this.NoSpaceAfterConstructor,
+                    this.NoSpaceAfterModuleImport,
+                    this.SpaceAfterCertainTypeScriptKeywords,
+                    this.SpaceBeforeCertainTypeScriptKeywords,
+                    this.SpaceAfterModuleName,
+                    this.SpaceAfterArrow,
+                    this.NoSpaceAfterEllipsis,
+                    this.NoSpaceAfterOptionalParameters,
+                    this.NoSpaceBetweenEmptyInterfaceBraceBrackets,
+                    this.NoSpaceBeforeOpenAngularBracket,
+                    this.NoSpaceBetweenCloseParenAndAngularBracket,
+                    this.NoSpaceAfterOpenAngularBracket,
+                    this.NoSpaceBeforeCloseAngularBracket,
+                    this.NoSpaceAfterCloseAngularBracket
+                ];
+                this.LowPriorityCommonRules = [
+                    this.NoSpaceBeforeSemicolon,
+                    this.SpaceBeforeOpenBraceInControl,
+                    this.SpaceBeforeOpenBraceInFunction,
+                    this.SpaceBeforeOpenBraceInTypeScriptDeclWithBlock,
+                    this.NoSpaceBeforeComma,
+                    this.NoSpaceBeforeOpenBracket,
+                    this.NoSpaceAfterOpenBracket,
+                    this.NoSpaceBeforeCloseBracket,
+                    this.NoSpaceAfterCloseBracket,
+                    this.SpaceAfterSemicolon,
+                    this.NoSpaceBeforeOpenParenInFuncDecl,
+                    this.SpaceBetweenStatements,
+                    this.SpaceAfterTryFinally
+                ];
                 this.SpaceAfterComma = new formatting.Rule(formatting.RuleDescriptor.create3(23, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
                 this.NoSpaceAfterComma = new formatting.Rule(formatting.RuleDescriptor.create3(23, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
                 this.SpaceBeforeBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2));
@@ -24917,10 +29789,10 @@ var ts;
                     case 167:
                     case 168:
                         return true;
-                    case 202:
+                    case 203:
                     case 193:
                     case 128:
-                    case 219:
+                    case 220:
                     case 130:
                     case 129:
                         return context.currentTokenSpan.kind === 52 || context.nextTokenSpan.kind === 52;
@@ -24963,7 +29835,7 @@ var ts;
                 }
                 switch (node.kind) {
                     case 174:
-                    case 188:
+                    case 202:
                     case 152:
                     case 201:
                         return true;
@@ -25006,7 +29878,7 @@ var ts;
                     case 200:
                     case 199:
                     case 174:
-                    case 216:
+                    case 217:
                     case 201:
                     case 188:
                         return true;
@@ -25024,7 +29896,7 @@ var ts;
                     case 191:
                     case 179:
                     case 187:
-                    case 216:
+                    case 217:
                         return true;
                     default:
                         return false;
@@ -25049,8 +29921,7 @@ var ts;
                 return context.TokensAreOnSameLine();
             };
             Rules.IsStartOfVariableDeclarationList = function (context) {
-                return context.currentTokenParent.kind === 194 &&
-                    context.currentTokenParent.getStart(context.sourceFile) === context.currentTokenSpan.pos;
+                return context.currentTokenParent.kind === 194 && context.currentTokenParent.getStart(context.sourceFile) === context.currentTokenSpan.pos;
             };
             Rules.IsNotFormatOnEnter = function (context) {
                 return context.formattingRequestKind != 2;
@@ -25084,8 +29955,7 @@ var ts;
                 }
             };
             Rules.IsTypeArgumentOrParameterContext = function (context) {
-                return Rules.IsTypeArgumentOrParameter(context.currentTokenSpan, context.currentTokenParent) ||
-                    Rules.IsTypeArgumentOrParameter(context.nextTokenSpan, context.nextTokenParent);
+                return Rules.IsTypeArgumentOrParameter(context.currentTokenSpan, context.currentTokenParent) || Rules.IsTypeArgumentOrParameter(context.nextTokenSpan, context.nextTokenParent);
             };
             Rules.IsVoidOpContext = function (context) {
                 return context.currentTokenSpan.kind === 98 && context.currentTokenParent.kind === 164;
@@ -25128,8 +29998,7 @@ var ts;
             };
             RulesMap.prototype.FillRule = function (rule, rulesBucketConstructionStateList) {
                 var _this = this;
-                var specificRule = rule.Descriptor.LeftTokenRange != formatting.Shared.TokenRange.Any &&
-                    rule.Descriptor.RightTokenRange != formatting.Shared.TokenRange.Any;
+                var specificRule = rule.Descriptor.LeftTokenRange != formatting.Shared.TokenRange.Any && rule.Descriptor.RightTokenRange != formatting.Shared.TokenRange.Any;
                 rule.Descriptor.LeftTokenRange.GetTokens().forEach(function (left) {
                     rule.Descriptor.RightTokenRange.GetTokens().forEach(function (right) {
                         var rulesBucketIndex = _this.GetRuleBucketIndex(left, right);
@@ -25203,19 +30072,13 @@ var ts;
             RulesBucket.prototype.AddRule = function (rule, specificTokens, constructionState, rulesBucketIndex) {
                 var position;
                 if (rule.Operation.Action == 1) {
-                    position = specificTokens ?
-                        0 :
-                        RulesPosition.IgnoreRulesAny;
+                    position = specificTokens ? 0 : RulesPosition.IgnoreRulesAny;
                 }
                 else if (!rule.Operation.Context.IsAny()) {
-                    position = specificTokens ?
-                        RulesPosition.ContextRulesSpecific :
-                        RulesPosition.ContextRulesAny;
+                    position = specificTokens ? RulesPosition.ContextRulesSpecific : RulesPosition.ContextRulesAny;
                 }
                 else {
-                    position = specificTokens ?
-                        RulesPosition.NoContextRulesSpecific :
-                        RulesPosition.NoContextRulesAny;
+                    position = specificTokens ? RulesPosition.NoContextRulesSpecific : RulesPosition.NoContextRulesAny;
                 }
                 var state = constructionState[rulesBucketIndex];
                 if (state === undefined) {
@@ -25272,7 +30135,9 @@ var ts;
                     this.token = token;
                 }
                 TokenSingleValueAccess.prototype.GetTokens = function () {
-                    return [this.token];
+                    return [
+                        this.token
+                    ];
                 };
                 TokenSingleValueAccess.prototype.Contains = function (tokenValue) {
                     return tokenValue == this.token;
@@ -25326,18 +30191,68 @@ var ts;
                     return this.tokenAccess.toString();
                 };
                 TokenRange.Any = TokenRange.AllTokens();
-                TokenRange.AnyIncludingMultilineComments = TokenRange.FromTokens(TokenRange.Any.GetTokens().concat([3]));
+                TokenRange.AnyIncludingMultilineComments = TokenRange.FromTokens(TokenRange.Any.GetTokens().concat([
+                    3
+                ]));
                 TokenRange.Keywords = TokenRange.FromRange(65, 124);
                 TokenRange.BinaryOperators = TokenRange.FromRange(24, 63);
-                TokenRange.BinaryKeywordOperators = TokenRange.FromTokens([85, 86, 124]);
-                TokenRange.UnaryPrefixOperators = TokenRange.FromTokens([38, 39, 47, 46]);
-                TokenRange.UnaryPrefixExpressions = TokenRange.FromTokens([7, 64, 16, 18, 14, 92, 87]);
-                TokenRange.UnaryPreincrementExpressions = TokenRange.FromTokens([64, 16, 92, 87]);
-                TokenRange.UnaryPostincrementExpressions = TokenRange.FromTokens([64, 17, 19, 87]);
-                TokenRange.UnaryPredecrementExpressions = TokenRange.FromTokens([64, 16, 92, 87]);
-                TokenRange.UnaryPostdecrementExpressions = TokenRange.FromTokens([64, 17, 19, 87]);
-                TokenRange.Comments = TokenRange.FromTokens([2, 3]);
-                TokenRange.TypeNames = TokenRange.FromTokens([64, 118, 120, 112, 121, 98, 111]);
+                TokenRange.BinaryKeywordOperators = TokenRange.FromTokens([
+                    85,
+                    86,
+                    124
+                ]);
+                TokenRange.UnaryPrefixOperators = TokenRange.FromTokens([
+                    38,
+                    39,
+                    47,
+                    46
+                ]);
+                TokenRange.UnaryPrefixExpressions = TokenRange.FromTokens([
+                    7,
+                    64,
+                    16,
+                    18,
+                    14,
+                    92,
+                    87
+                ]);
+                TokenRange.UnaryPreincrementExpressions = TokenRange.FromTokens([
+                    64,
+                    16,
+                    92,
+                    87
+                ]);
+                TokenRange.UnaryPostincrementExpressions = TokenRange.FromTokens([
+                    64,
+                    17,
+                    19,
+                    87
+                ]);
+                TokenRange.UnaryPredecrementExpressions = TokenRange.FromTokens([
+                    64,
+                    16,
+                    92,
+                    87
+                ]);
+                TokenRange.UnaryPostdecrementExpressions = TokenRange.FromTokens([
+                    64,
+                    17,
+                    19,
+                    87
+                ]);
+                TokenRange.Comments = TokenRange.FromTokens([
+                    2,
+                    3
+                ]);
+                TokenRange.TypeNames = TokenRange.FromTokens([
+                    64,
+                    118,
+                    120,
+                    112,
+                    121,
+                    98,
+                    111
+                ]);
                 return TokenRange;
             })();
             Shared.TokenRange = TokenRange;
@@ -25482,16 +30397,11 @@ var ts;
         }
         function findOutermostParent(position, expectedTokenKind, sourceFile) {
             var precedingToken = ts.findPrecedingToken(position, sourceFile);
-            if (!precedingToken ||
-                precedingToken.kind !== expectedTokenKind ||
-                position !== precedingToken.getEnd()) {
+            if (!precedingToken || precedingToken.kind !== expectedTokenKind || position !== precedingToken.getEnd()) {
                 return undefined;
             }
             var current = precedingToken;
-            while (current &&
-                current.parent &&
-                current.parent.end === precedingToken.end &&
-                !isListElement(current.parent, current)) {
+            while (current && current.parent && current.parent.end === precedingToken.end && !isListElement(current.parent, current)) {
                 current = current.parent;
             }
             return current;
@@ -25504,11 +30414,11 @@ var ts;
                 case 200:
                     var body = parent.body;
                     return body && body.kind === 174 && ts.rangeContainsRange(body.statements, node);
-                case 220:
+                case 221:
                 case 174:
                 case 201:
                     return ts.rangeContainsRange(parent.statements, node);
-                case 216:
+                case 217:
                     return ts.rangeContainsRange(parent.block.statements, node);
             }
             return false;
@@ -25516,7 +30426,9 @@ var ts;
         function findEnclosingNode(range, sourceFile) {
             return find(sourceFile);
             function find(n) {
-                var candidate = ts.forEachChild(n, function (c) { return ts.startEndContainsRange(c.getStart(sourceFile), c.end, range) && c; });
+                var candidate = ts.forEachChild(n, function (c) {
+                    return ts.startEndContainsRange(c.getStart(sourceFile), c.end, range) && c;
+                });
                 if (candidate) {
                     var result = find(candidate);
                     if (result) {
@@ -25530,9 +30442,11 @@ var ts;
             if (!errors.length) {
                 return rangeHasNoErrors;
             }
-            var sorted = errors
-                .filter(function (d) { return ts.rangeOverlapsWithStartEnd(originalRange, d.start, d.start + d.length); })
-                .sort(function (e1, e2) { return e1.start - e2.start; });
+            var sorted = errors.filter(function (d) {
+                return ts.rangeOverlapsWithStartEnd(originalRange, d.start, d.start + d.length);
+            }).sort(function (e1, e2) {
+                return e1.start - e2.start;
+            });
             if (!sorted.length) {
                 return rangeHasNoErrors;
             }
@@ -25626,10 +30540,7 @@ var ts;
                 var indentation = inheritedIndentation;
                 if (indentation === -1) {
                     if (isSomeBlock(node.kind)) {
-                        if (isSomeBlock(parent.kind) ||
-                            parent.kind === 220 ||
-                            parent.kind === 213 ||
-                            parent.kind === 214) {
+                        if (isSomeBlock(parent.kind) || parent.kind === 221 || parent.kind === 214 || parent.kind === 215) {
                             indentation = parentDynamicIndentation.getIndentation() + parentDynamicIndentation.getDelta();
                         }
                         else {
@@ -25678,8 +30589,12 @@ var ts;
                                 return nodeStartLine !== line ? indentation + delta : indentation;
                         }
                     },
-                    getIndentation: function () { return indentation; },
-                    getDelta: function () { return delta; },
+                    getIndentation: function () {
+                        return indentation;
+                    },
+                    getDelta: function () {
+                        return delta;
+                    },
                     recomputeIndentation: function (lineAdded) {
                         if (node.parent && formatting.SmartIndenter.shouldIndentChildNode(node.parent.kind, node.kind)) {
                             if (lineAdded) {
@@ -25872,8 +30787,7 @@ var ts;
                         trimTrailingWhitespacesForLines(originalStart.line, rangeStart.line);
                     }
                     else {
-                        lineAdded =
-                            processPair(range, rangeStart.line, parent, previousRange, previousRangeStartLine, previousParent, contextNode, dynamicIndentation);
+                        lineAdded = processPair(range, rangeStart.line, parent, previousRange, previousRangeStartLine, previousParent, contextNode, dynamicIndentation);
                     }
                 }
                 previousRange = range;
@@ -25901,9 +30815,7 @@ var ts;
                             dynamicIndentation.recomputeIndentation(true);
                         }
                     }
-                    trimTrailingWhitespaces =
-                        (rule.Operation.Action & (4 | 2)) &&
-                            rule.Flag !== 1;
+                    trimTrailingWhitespaces = (rule.Operation.Action & (4 | 2)) && rule.Flag !== 1;
                 }
                 else {
                     trimTrailingWhitespaces = true;
@@ -25940,10 +30852,16 @@ var ts;
                     var startPos = commentRange.pos;
                     for (var line = startLine; line < endLine; ++line) {
                         var endOfLine = ts.getEndLinePosition(line, sourceFile);
-                        parts.push({ pos: startPos, end: endOfLine });
+                        parts.push({
+                            pos: startPos,
+                            end: endOfLine
+                        });
                         startPos = ts.getStartPositionOfLine(line + 1, sourceFile);
                     }
-                    parts.push({ pos: startPos, end: commentRange.end });
+                    parts.push({
+                        pos: startPos,
+                        end: commentRange.end
+                    });
                 }
                 var startLinePos = ts.getStartPositionOfLine(startLine, sourceFile);
                 var nonWhitespaceColumnInFirstPart = formatting.SmartIndenter.findFirstNonWhitespaceCharacterAndColumn(startLinePos, parts[0].pos, sourceFile, options);
@@ -25958,9 +30876,7 @@ var ts;
                 var delta = indentation - nonWhitespaceColumnInFirstPart.column;
                 for (var i = startIndex, len = parts.length; i < len; ++i, ++startLine) {
                     var startLinePos = ts.getStartPositionOfLine(startLine, sourceFile);
-                    var nonWhitespaceCharacterAndColumn = i === 0
-                        ? nonWhitespaceColumnInFirstPart
-                        : formatting.SmartIndenter.findFirstNonWhitespaceCharacterAndColumn(parts[i].pos, parts[i].end, sourceFile, options);
+                    var nonWhitespaceCharacterAndColumn = i === 0 ? nonWhitespaceColumnInFirstPart : formatting.SmartIndenter.findFirstNonWhitespaceCharacterAndColumn(parts[i].pos, parts[i].end, sourceFile, options);
                     var newIndentation = nonWhitespaceCharacterAndColumn.column + delta;
                     if (newIndentation > 0) {
                         var indentationString = getIndentationString(newIndentation, options);
@@ -25989,7 +30905,10 @@ var ts;
                 }
             }
             function newTextChange(start, len, newText) {
-                return { span: ts.createTextSpan(start, len), newText: newText };
+                return {
+                    span: ts.createTextSpan(start, len),
+                    newText: newText
+                };
             }
             function recordDelete(start, len) {
                 if (len) {
@@ -26139,12 +31058,7 @@ var ts;
                 if (!precedingToken) {
                     return 0;
                 }
-                var precedingTokenIsLiteral = precedingToken.kind === 8 ||
-                    precedingToken.kind === 9 ||
-                    precedingToken.kind === 10 ||
-                    precedingToken.kind === 11 ||
-                    precedingToken.kind === 12 ||
-                    precedingToken.kind === 13;
+                var precedingTokenIsLiteral = precedingToken.kind === 8 || precedingToken.kind === 9 || precedingToken.kind === 10 || precedingToken.kind === 11 || precedingToken.kind === 12 || precedingToken.kind === 13;
                 if (precedingTokenIsLiteral && precedingToken.getStart(sourceFile) <= position && precedingToken.end > position) {
                     return 0;
                 }
@@ -26204,8 +31118,7 @@ var ts;
                         }
                     }
                     parentStart = getParentStart(parent, current, sourceFile);
-                    var parentAndChildShareLine = parentStart.line === currentStart.line ||
-                        childStartsOnTheSameLineWithElseInIfStatement(parent, current, currentStart.line, sourceFile);
+                    var parentAndChildShareLine = parentStart.line === currentStart.line || childStartsOnTheSameLineWithElseInIfStatement(parent, current, currentStart.line, sourceFile);
                     if (useActualIndentation) {
                         var actualIndentation = getActualIndentationForNode(current, parent, currentStart, parentAndChildShareLine, sourceFile, options);
                         if (actualIndentation !== -1) {
@@ -26238,8 +31151,7 @@ var ts;
                 }
             }
             function getActualIndentationForNode(current, parent, currentLineAndChar, parentAndChildShareLine, sourceFile, options) {
-                var useActualIndentation = (ts.isDeclaration(current) || ts.isStatement(current)) &&
-                    (parent.kind === 220 || !parentAndChildShareLine);
+                var useActualIndentation = (ts.isDeclaration(current) || ts.isStatement(current)) && (parent.kind === 221 || !parentAndChildShareLine);
                 if (!useActualIndentation) {
                     return -1;
                 }
@@ -26279,8 +31191,7 @@ var ts;
                 if (node.parent) {
                     switch (node.parent.kind) {
                         case 139:
-                            if (node.parent.typeArguments &&
-                                ts.rangeContainsStartEnd(node.parent.typeArguments, node.getStart(sourceFile), node.getEnd())) {
+                            if (node.parent.typeArguments && ts.rangeContainsStartEnd(node.parent.typeArguments, node.getStart(sourceFile), node.getEnd())) {
                                 return node.parent.typeArguments;
                             }
                             break;
@@ -26296,8 +31207,7 @@ var ts;
                         case 136:
                         case 137:
                             var start = node.getStart(sourceFile);
-                            if (node.parent.typeParameters &&
-                                ts.rangeContainsStartEnd(node.parent.typeParameters, start, node.getEnd())) {
+                            if (node.parent.typeParameters && ts.rangeContainsStartEnd(node.parent.typeParameters, start, node.getEnd())) {
                                 return node.parent.typeParameters;
                             }
                             if (ts.rangeContainsStartEnd(node.parent.parameters, start, node.getEnd())) {
@@ -26307,12 +31217,10 @@ var ts;
                         case 156:
                         case 155:
                             var start = node.getStart(sourceFile);
-                            if (node.parent.typeArguments &&
-                                ts.rangeContainsStartEnd(node.parent.typeArguments, start, node.getEnd())) {
+                            if (node.parent.typeArguments && ts.rangeContainsStartEnd(node.parent.typeArguments, start, node.getEnd())) {
                                 return node.parent.typeArguments;
                             }
-                            if (node.parent.arguments &&
-                                ts.rangeContainsStartEnd(node.parent.arguments, start, node.getEnd())) {
+                            if (node.parent.arguments && ts.rangeContainsStartEnd(node.parent.arguments, start, node.getEnd())) {
                                 return node.parent.arguments;
                             }
                             break;
@@ -26364,7 +31272,10 @@ var ts;
                     }
                     character++;
                 }
-                return { column: column, character: character };
+                return {
+                    column: column,
+                    character: character
+                };
             }
             SmartIndenter.findFirstNonWhitespaceCharacterAndColumn = findFirstNonWhitespaceCharacterAndColumn;
             function findFirstNonWhitespaceColumn(startPos, endPos, sourceFile, options) {
@@ -26381,15 +31292,15 @@ var ts;
                     case 201:
                     case 152:
                     case 143:
-                    case 188:
+                    case 202:
+                    case 215:
                     case 214:
-                    case 213:
                     case 159:
                     case 155:
                     case 156:
                     case 175:
                     case 193:
-                    case 208:
+                    case 209:
                     case 186:
                     case 168:
                         return true;
@@ -26445,9 +31356,9 @@ var ts;
                     case 152:
                     case 174:
                     case 201:
-                    case 188:
+                    case 202:
                         return nodeEndsWith(n, 15, sourceFile);
-                    case 216:
+                    case 217:
                         return isCompletedNode(n.block, sourceFile);
                     case 159:
                     case 136:
@@ -26471,9 +31382,15 @@ var ts;
                         return isCompletedNode(n.expression, sourceFile);
                     case 151:
                         return nodeEndsWith(n, 19, sourceFile);
-                    case 213:
                     case 214:
+                    case 215:
                         return false;
+                    case 181:
+                        return isCompletedNode(n.statement, sourceFile);
+                    case 182:
+                        return isCompletedNode(n.statement, sourceFile);
+                    case 183:
+                        return isCompletedNode(n.statement, sourceFile);
                     case 180:
                         return isCompletedNode(n.statement, sourceFile);
                     case 179:
@@ -26572,7 +31489,7 @@ var ts;
             return pos;
         };
         NodeObject.prototype.createSyntaxList = function (nodes) {
-            var list = createNode(221, nodes.pos, nodes.end, 1024, this);
+            var list = createNode(222, nodes.pos, nodes.end, 1024, this);
             list._children = [];
             var pos = nodes.pos;
             for (var i = 0, len = nodes.length; i < len; i++) {
@@ -26741,10 +31658,7 @@ var ts;
                 return pos;
             }
             function isName(pos, end, sourceFile, name) {
-                return pos + name.length < end &&
-                    sourceFile.text.substr(pos, name.length) === name &&
-                    (ts.isWhiteSpace(sourceFile.text.charCodeAt(pos + name.length)) ||
-                        ts.isLineBreak(sourceFile.text.charCodeAt(pos + name.length)));
+                return pos + name.length < end && sourceFile.text.substr(pos, name.length) === name && (ts.isWhiteSpace(sourceFile.text.charCodeAt(pos + name.length)) || ts.isLineBreak(sourceFile.text.charCodeAt(pos + name.length)));
             }
             function isParamTag(pos, end, sourceFile) {
                 return isName(pos, end, sourceFile, paramTag);
@@ -26960,7 +31874,9 @@ var ts;
         };
         SignatureObject.prototype.getDocumentationComment = function () {
             if (this.documentationComment === undefined) {
-                this.documentationComment = this.declaration ? getJsDocCommentsFromDeclarations([this.declaration], undefined, false) : [];
+                this.documentationComment = this.declaration ? getJsDocCommentsFromDeclarations([
+                    this.declaration
+                ], undefined, false) : [];
             }
             return this.documentationComment;
         };
@@ -26994,9 +31910,7 @@ var ts;
                         case 131:
                             var functionDeclaration = node;
                             if (functionDeclaration.name && functionDeclaration.name.getFullWidth() > 0) {
-                                var lastDeclaration = namedDeclarations.length > 0 ?
-                                    namedDeclarations[namedDeclarations.length - 1] :
-                                    undefined;
+                                var lastDeclaration = namedDeclarations.length > 0 ? namedDeclarations[namedDeclarations.length - 1] : undefined;
                                 if (lastDeclaration && functionDeclaration.symbol === lastDeclaration.symbol) {
                                     if (functionDeclaration.body && !lastDeclaration.body) {
                                         namedDeclarations[namedDeclarations.length - 1] = functionDeclaration;
@@ -27013,12 +31927,12 @@ var ts;
                         case 198:
                         case 199:
                         case 200:
-                        case 202:
-                        case 211:
-                        case 207:
-                        case 202:
-                        case 204:
+                        case 203:
+                        case 212:
+                        case 208:
+                        case 203:
                         case 205:
+                        case 206:
                         case 134:
                         case 135:
                         case 143:
@@ -27048,24 +31962,24 @@ var ts;
                                 ts.forEachChild(node.name, visit);
                                 break;
                             }
-                        case 219:
+                        case 220:
                         case 130:
                         case 129:
                             namedDeclarations.push(node);
                             break;
-                        case 209:
+                        case 210:
                             if (node.exportClause) {
                                 ts.forEach(node.exportClause.elements, visit);
                             }
                             break;
-                        case 203:
+                        case 204:
                             var importClause = node.importClause;
                             if (importClause) {
                                 if (importClause.name) {
                                     namedDeclarations.push(importClause);
                                 }
                                 if (importClause.namedBindings) {
-                                    if (importClause.namedBindings.kind === 205) {
+                                    if (importClause.namedBindings.kind === 206) {
                                         namedDeclarations.push(importClause.namedBindings);
                                     }
                                     else {
@@ -27194,7 +32108,9 @@ var ts;
     ts.ClassificationTypeNames = ClassificationTypeNames;
     function displayPartsToString(displayParts) {
         if (displayParts) {
-            return ts.map(displayParts, function (displayPart) { return displayPart.text; }).join("");
+            return ts.map(displayParts, function (displayPart) {
+                return displayPart.text;
+            }).join("");
         }
         return "";
     }
@@ -27211,7 +32127,7 @@ var ts;
                 return false;
             }
             for (var parent = declaration.parent; !ts.isFunctionBlock(parent); parent = parent.parent) {
-                if (parent.kind === 220 || parent.kind === 201) {
+                if (parent.kind === 221 || parent.kind === 201) {
                     return false;
                 }
             }
@@ -27371,7 +32287,9 @@ var ts;
             return bucket;
         }
         function reportStats() {
-            var bucketInfoArray = Object.keys(buckets).filter(function (name) { return name && name.charAt(0) === '_'; }).map(function (name) {
+            var bucketInfoArray = Object.keys(buckets).filter(function (name) {
+                return name && name.charAt(0) === '_';
+            }).map(function (name) {
                 var entries = ts.lookUp(buckets, name);
                 var sourceFiles = [];
                 for (var i in entries) {
@@ -27382,7 +32300,9 @@ var ts;
                         references: entry.owners.slice(0)
                     });
                 }
-                sourceFiles.sort(function (x, y) { return y.refCount - x.refCount; });
+                sourceFiles.sort(function (x, y) {
+                    return y.refCount - x.refCount;
+                });
                 return {
                     bucket: name,
                     sourceFiles: sourceFiles
@@ -27571,7 +32491,11 @@ var ts;
             processImport();
         }
         processTripleSlashDirectives();
-        return { referencedFiles: referencedFiles, importedFiles: importedFiles, isLibFile: isNoDefaultLib };
+        return {
+            referencedFiles: referencedFiles,
+            importedFiles: importedFiles,
+            isLibFile: isNoDefaultLib
+        };
     }
     ts.preProcessFile = preProcessFile;
     function getTargetLabel(referenceNode, labelName) {
@@ -27584,14 +32508,10 @@ var ts;
         return undefined;
     }
     function isJumpStatementTarget(node) {
-        return node.kind === 64 &&
-            (node.parent.kind === 185 || node.parent.kind === 184) &&
-            node.parent.label === node;
+        return node.kind === 64 && (node.parent.kind === 185 || node.parent.kind === 184) && node.parent.label === node;
     }
     function isLabelOfLabeledStatement(node) {
-        return node.kind === 64 &&
-            node.parent.kind === 189 &&
-            node.parent.label === node;
+        return node.kind === 64 && node.parent.kind === 189 && node.parent.label === node;
     }
     function isLabeledBy(node, labelName) {
         for (var owner = node.parent; owner.kind === 189; owner = owner.parent) {
@@ -27626,20 +32546,18 @@ var ts;
         return node.parent.kind === 200 && node.parent.name === node;
     }
     function isNameOfFunctionDeclaration(node) {
-        return node.kind === 64 &&
-            ts.isFunctionLike(node.parent) && node.parent.name === node;
+        return node.kind === 64 && ts.isFunctionLike(node.parent) && node.parent.name === node;
     }
     function isNameOfPropertyAssignment(node) {
-        return (node.kind === 64 || node.kind === 8 || node.kind === 7) &&
-            (node.parent.kind === 217 || node.parent.kind === 218) && node.parent.name === node;
+        return (node.kind === 64 || node.kind === 8 || node.kind === 7) && (node.parent.kind === 218 || node.parent.kind === 219) && node.parent.name === node;
     }
     function isLiteralNameOfPropertyDeclarationOrIndexAccess(node) {
         if (node.kind === 8 || node.kind === 7) {
             switch (node.parent.kind) {
                 case 130:
                 case 129:
-                case 217:
-                case 219:
+                case 218:
+                case 220:
                 case 132:
                 case 131:
                 case 134:
@@ -27654,15 +32572,12 @@ var ts;
     }
     function isNameOfExternalModuleImportOrDeclaration(node) {
         if (node.kind === 8) {
-            return isNameOfModuleDeclaration(node) ||
-                (ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) && ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node);
+            return isNameOfModuleDeclaration(node) || (ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) && ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node);
         }
         return false;
     }
     function isInsideComment(sourceFile, token, position) {
-        return position <= token.getStart(sourceFile) &&
-            (isInsideCommentRange(ts.getTrailingCommentRanges(sourceFile.text, token.getFullStart())) ||
-                isInsideCommentRange(ts.getLeadingCommentRanges(sourceFile.text, token.getFullStart())));
+        return position <= token.getStart(sourceFile) && (isInsideCommentRange(ts.getTrailingCommentRanges(sourceFile.text, token.getFullStart())) || isInsideCommentRange(ts.getLeadingCommentRanges(sourceFile.text, token.getFullStart())));
         function isInsideCommentRange(comments) {
             return ts.forEach(comments, function (comment) {
                 if (comment.pos < position && position < comment.end) {
@@ -27675,8 +32590,7 @@ var ts;
                         return true;
                     }
                     else {
-                        return !(text.charCodeAt(comment.end - 1) === 47 &&
-                            text.charCodeAt(comment.end - 2) === 42);
+                        return !(text.charCodeAt(comment.end - 1) === 47 && text.charCodeAt(comment.end - 2) === 42);
                     }
                 }
                 return false;
@@ -27698,7 +32612,7 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                case 220:
+                case 221:
                 case 132:
                 case 131:
                 case 195:
@@ -27716,38 +32630,49 @@ var ts;
     ts.getContainerNode = getContainerNode;
     function getNodeKind(node) {
         switch (node.kind) {
-            case 200: return ScriptElementKind.moduleElement;
-            case 196: return ScriptElementKind.classElement;
-            case 197: return ScriptElementKind.interfaceElement;
-            case 198: return ScriptElementKind.typeElement;
-            case 199: return ScriptElementKind.enumElement;
+            case 200:
+                return ScriptElementKind.moduleElement;
+            case 196:
+                return ScriptElementKind.classElement;
+            case 197:
+                return ScriptElementKind.interfaceElement;
+            case 198:
+                return ScriptElementKind.typeElement;
+            case 199:
+                return ScriptElementKind.enumElement;
             case 193:
-                return ts.isConst(node)
-                    ? ScriptElementKind.constElement
-                    : ts.isLet(node)
-                        ? ScriptElementKind.letElement
-                        : ScriptElementKind.variableElement;
-            case 195: return ScriptElementKind.functionElement;
-            case 134: return ScriptElementKind.memberGetAccessorElement;
-            case 135: return ScriptElementKind.memberSetAccessorElement;
+                return ts.isConst(node) ? ScriptElementKind.constElement : ts.isLet(node) ? ScriptElementKind.letElement : ScriptElementKind.variableElement;
+            case 195:
+                return ScriptElementKind.functionElement;
+            case 134:
+                return ScriptElementKind.memberGetAccessorElement;
+            case 135:
+                return ScriptElementKind.memberSetAccessorElement;
             case 132:
             case 131:
                 return ScriptElementKind.memberFunctionElement;
             case 130:
             case 129:
                 return ScriptElementKind.memberVariableElement;
-            case 138: return ScriptElementKind.indexSignatureElement;
-            case 137: return ScriptElementKind.constructSignatureElement;
-            case 136: return ScriptElementKind.callSignatureElement;
-            case 133: return ScriptElementKind.constructorImplementationElement;
-            case 127: return ScriptElementKind.typeParameterElement;
-            case 219: return ScriptElementKind.variableElement;
-            case 128: return (node.flags & 112) ? ScriptElementKind.memberVariableElement : ScriptElementKind.parameterElement;
-            case 202:
-            case 207:
-            case 204:
-            case 211:
+            case 138:
+                return ScriptElementKind.indexSignatureElement;
+            case 137:
+                return ScriptElementKind.constructSignatureElement;
+            case 136:
+                return ScriptElementKind.callSignatureElement;
+            case 133:
+                return ScriptElementKind.constructorImplementationElement;
+            case 127:
+                return ScriptElementKind.typeParameterElement;
+            case 220:
+                return ScriptElementKind.variableElement;
+            case 128:
+                return (node.flags & 112) ? ScriptElementKind.memberVariableElement : ScriptElementKind.parameterElement;
+            case 203:
+            case 208:
             case 205:
+            case 212:
+            case 206:
                 return ScriptElementKind.alias;
         }
         return ScriptElementKind.unknown;
@@ -27798,13 +32723,26 @@ var ts;
             var changesInCompilationSettingsAffectSyntax = oldSettings && oldSettings.target !== newSettings.target;
             var newProgram = ts.createProgram(hostCache.getRootFileNames(), newSettings, {
                 getSourceFile: getOrCreateSourceFile,
-                getCancellationToken: function () { return cancellationToken; },
-                getCanonicalFileName: function (fileName) { return useCaseSensitivefileNames ? fileName : fileName.toLowerCase(); },
-                useCaseSensitiveFileNames: function () { return useCaseSensitivefileNames; },
-                getNewLine: function () { return host.getNewLine ? host.getNewLine() : "\r\n"; },
-                getDefaultLibFileName: function (options) { return host.getDefaultLibFileName(options); },
-                writeFile: function (fileName, data, writeByteOrderMark) { },
-                getCurrentDirectory: function () { return host.getCurrentDirectory(); }
+                getCancellationToken: function () {
+                    return cancellationToken;
+                },
+                getCanonicalFileName: function (fileName) {
+                    return useCaseSensitivefileNames ? fileName : fileName.toLowerCase();
+                },
+                useCaseSensitiveFileNames: function () {
+                    return useCaseSensitivefileNames;
+                },
+                getNewLine: function () {
+                    return host.getNewLine ? host.getNewLine() : "\r\n";
+                },
+                getDefaultLibFileName: function (options) {
+                    return host.getDefaultLibFileName(options);
+                },
+                writeFile: function (fileName, data, writeByteOrderMark) {
+                },
+                getCurrentDirectory: function () {
+                    return host.getCurrentDirectory();
+                }
             });
             if (program) {
                 var oldSourceFiles = program.getSourceFiles();
@@ -27891,8 +32829,7 @@ var ts;
                 if ((symbol.flags & 1536) && (firstCharCode === 39 || firstCharCode === 34)) {
                     return undefined;
                 }
-                if (displayName && displayName.length >= 2 && firstCharCode === displayName.charCodeAt(displayName.length - 1) &&
-                    (firstCharCode === 39 || firstCharCode === 34)) {
+                if (displayName && displayName.length >= 2 && firstCharCode === displayName.charCodeAt(displayName.length - 1) && (firstCharCode === 39 || firstCharCode === 34)) {
                     displayName = displayName.substring(1, displayName.length - 1);
                 }
                 var isValid = ts.isIdentifierStart(displayName.charCodeAt(0), target);
@@ -28008,11 +32945,11 @@ var ts;
                         getCompletionEntriesFromSymbols(filteredMembers, activeCompletionSession);
                     }
                 }
-                else if (ts.getAncestor(previousToken, 204)) {
+                else if (ts.getAncestor(previousToken, 205)) {
                     isMemberCompletion = true;
                     isNewIdentifierLocation = true;
                     if (showCompletionsInImportsClause(previousToken)) {
-                        var importDeclaration = ts.getAncestor(previousToken, 203);
+                        var importDeclaration = ts.getAncestor(previousToken, 204);
                         ts.Debug.assert(importDeclaration !== undefined);
                         var exports = typeInfoResolver.getExportsOfExternalModule(importDeclaration);
                         var filteredExports = filterModuleExports(exports, importDeclaration);
@@ -28053,16 +32990,14 @@ var ts;
             }
             function isCompletionListBlocker(previousToken) {
                 var start = new Date().getTime();
-                var result = isInStringOrRegularExpressionOrTemplateLiteral(previousToken) ||
-                    isIdentifierDefinitionLocation(previousToken) ||
-                    isRightOfIllegalDot(previousToken);
+                var result = isInStringOrRegularExpressionOrTemplateLiteral(previousToken) || isIdentifierDefinitionLocation(previousToken) || isRightOfIllegalDot(previousToken);
                 log("getCompletionsAtPosition: isCompletionListBlocker: " + (new Date().getTime() - start));
                 return result;
             }
             function showCompletionsInImportsClause(node) {
                 if (node) {
                     if (node.kind === 14 || node.kind === 23) {
-                        return node.parent.kind === 206;
+                        return node.parent.kind === 207;
                     }
                 }
                 return false;
@@ -28072,16 +33007,9 @@ var ts;
                     var containingNodeKind = previousToken.parent.kind;
                     switch (previousToken.kind) {
                         case 23:
-                            return containingNodeKind === 155
-                                || containingNodeKind === 133
-                                || containingNodeKind === 156
-                                || containingNodeKind === 151
-                                || containingNodeKind === 167;
+                            return containingNodeKind === 155 || containingNodeKind === 133 || containingNodeKind === 156 || containingNodeKind === 151 || containingNodeKind === 167;
                         case 16:
-                            return containingNodeKind === 155
-                                || containingNodeKind === 133
-                                || containingNodeKind === 156
-                                || containingNodeKind === 159;
+                            return containingNodeKind === 155 || containingNodeKind === 133 || containingNodeKind === 156 || containingNodeKind === 159;
                         case 18:
                             return containingNodeKind === 151;
                         case 116:
@@ -28091,8 +33019,7 @@ var ts;
                         case 14:
                             return containingNodeKind === 196;
                         case 52:
-                            return containingNodeKind === 193
-                                || containingNodeKind === 167;
+                            return containingNodeKind === 193 || containingNodeKind === 167;
                         case 11:
                             return containingNodeKind === 169;
                         case 12:
@@ -28112,9 +33039,7 @@ var ts;
                 return false;
             }
             function isInStringOrRegularExpressionOrTemplateLiteral(previousToken) {
-                if (previousToken.kind === 8
-                    || previousToken.kind === 9
-                    || ts.isTemplateLiteralKind(previousToken.kind)) {
+                if (previousToken.kind === 8 || previousToken.kind === 9 || ts.isTemplateLiteralKind(previousToken.kind)) {
                     var start = previousToken.getStart();
                     var end = previousToken.getEnd();
                     if (start < position && position < end) {
@@ -28161,43 +33086,23 @@ var ts;
                     var containingNodeKind = previousToken.parent.kind;
                     switch (previousToken.kind) {
                         case 23:
-                            return containingNodeKind === 193 ||
-                                containingNodeKind === 194 ||
-                                containingNodeKind === 175 ||
-                                containingNodeKind === 199 ||
-                                isFunction(containingNodeKind) ||
-                                containingNodeKind === 196 ||
-                                containingNodeKind === 195 ||
-                                containingNodeKind === 197 ||
-                                containingNodeKind === 149 ||
-                                containingNodeKind === 148;
+                            return containingNodeKind === 193 || containingNodeKind === 194 || containingNodeKind === 175 || containingNodeKind === 199 || isFunction(containingNodeKind) || containingNodeKind === 196 || containingNodeKind === 195 || containingNodeKind === 197 || containingNodeKind === 149 || containingNodeKind === 148;
                         case 20:
                             return containingNodeKind === 149;
                         case 18:
                             return containingNodeKind === 149;
                         case 16:
-                            return containingNodeKind === 216 ||
-                                isFunction(containingNodeKind);
+                            return containingNodeKind === 217 || isFunction(containingNodeKind);
                         case 14:
-                            return containingNodeKind === 199 ||
-                                containingNodeKind === 197 ||
-                                containingNodeKind === 143 ||
-                                containingNodeKind === 148;
+                            return containingNodeKind === 199 || containingNodeKind === 197 || containingNodeKind === 143 || containingNodeKind === 148;
                         case 22:
-                            return containingNodeKind === 129 &&
-                                (previousToken.parent.parent.kind === 197 ||
-                                    previousToken.parent.parent.kind === 143);
+                            return containingNodeKind === 129 && (previousToken.parent.parent.kind === 197 || previousToken.parent.parent.kind === 143);
                         case 24:
-                            return containingNodeKind === 196 ||
-                                containingNodeKind === 195 ||
-                                containingNodeKind === 197 ||
-                                isFunction(containingNodeKind);
+                            return containingNodeKind === 196 || containingNodeKind === 195 || containingNodeKind === 197 || isFunction(containingNodeKind);
                         case 109:
                             return containingNodeKind === 130;
                         case 21:
-                            return containingNodeKind === 128 ||
-                                containingNodeKind === 133 ||
-                                (previousToken.parent.parent.kind === 149);
+                            return containingNodeKind === 128 || containingNodeKind === 133 || (previousToken.parent.parent.kind === 149);
                         case 108:
                         case 106:
                         case 107:
@@ -28242,8 +33147,7 @@ var ts;
                 if (!importDeclaration.importClause) {
                     return exports;
                 }
-                if (importDeclaration.importClause.namedBindings &&
-                    importDeclaration.importClause.namedBindings.kind === 206) {
+                if (importDeclaration.importClause.namedBindings && importDeclaration.importClause.namedBindings.kind === 207) {
                     ts.forEach(importDeclaration.importClause.namedBindings.elements, function (el) {
                         var name = el.propertyName || el.name;
                         exisingImports[name.text] = true;
@@ -28252,7 +33156,9 @@ var ts;
                 if (ts.isEmpty(exisingImports)) {
                     return exports;
                 }
-                return ts.filter(exports, function (e) { return !ts.lookUp(exisingImports, e.name); });
+                return ts.filter(exports, function (e) {
+                    return !ts.lookUp(exisingImports, e.name);
+                });
             }
             function filterContextualMembersList(contextualMemberSymbols, existingMembers) {
                 if (!existingMembers || existingMembers.length === 0) {
@@ -28260,7 +33166,7 @@ var ts;
                 }
                 var existingMemberNames = {};
                 ts.forEach(existingMembers, function (m) {
-                    if (m.kind !== 217 && m.kind !== 218) {
+                    if (m.kind !== 218 && m.kind !== 219) {
                         return;
                     }
                     if (m.getStart() <= position && position <= m.getEnd()) {
@@ -28302,7 +33208,9 @@ var ts;
                     name: entryName,
                     kind: ScriptElementKind.keyword,
                     kindModifiers: ScriptElementKindModifier.none,
-                    displayParts: [ts.displayPart(entryName, 5)],
+                    displayParts: [
+                        ts.displayPart(entryName, 5)
+                    ],
                     documentation: undefined
                 };
             }
@@ -28400,9 +33308,7 @@ var ts;
             return ScriptElementKind.unknown;
         }
         function getSymbolModifiers(symbol) {
-            return symbol && symbol.declarations && symbol.declarations.length > 0
-                ? ts.getNodeModifiers(symbol.declarations[0])
-                : ScriptElementKindModifier.none;
+            return symbol && symbol.declarations && symbol.declarations.length > 0 ? ts.getNodeModifiers(symbol.declarations[0]) : ScriptElementKindModifier.none;
         }
         function getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, sourceFile, enclosingDeclaration, typeResolver, location, semanticMeaning) {
             if (semanticMeaning === void 0) { semanticMeaning = getMeaningFromLocation(location); }
@@ -28485,8 +33391,7 @@ var ts;
                             hasAddedSymbolInfo = true;
                         }
                     }
-                    else if ((isNameOfFunctionDeclaration(location) && !(symbol.flags & 98304)) ||
-                        (location.kind === 113 && location.parent.kind === 133)) {
+                    else if ((isNameOfFunctionDeclaration(location) && !(symbol.flags & 98304)) || (location.kind === 113 && location.parent.kind === 133)) {
                         var signature;
                         var functionDeclaration = location.parent;
                         var allSignatures = functionDeclaration.kind === 133 ? type.getConstructSignatures() : type.getCallSignatures();
@@ -28501,8 +33406,7 @@ var ts;
                             addPrefixForAnyFunctionOrVar(type.symbol, symbolKind);
                         }
                         else {
-                            addPrefixForAnyFunctionOrVar(functionDeclaration.kind === 136 &&
-                                !(type.symbol.flags & 2048 || type.symbol.flags & 4096) ? type.symbol : symbol, symbolKind);
+                            addPrefixForAnyFunctionOrVar(functionDeclaration.kind === 136 && !(type.symbol.flags & 2048 || type.symbol.flags & 4096) ? type.symbol : symbol, symbolKind);
                         }
                         addSignatureDisplayParts(signature, allSignatures);
                         hasAddedSymbolInfo = true;
@@ -28578,7 +33482,7 @@ var ts;
             if (symbolFlags & 8) {
                 addPrefixForAnyFunctionOrVar(symbol, "enum member");
                 var declaration = symbol.declarations[0];
-                if (declaration.kind === 219) {
+                if (declaration.kind === 220) {
                     var constantValue = typeResolver.getConstantValue(declaration);
                     if (constantValue !== undefined) {
                         displayParts.push(ts.spacePart());
@@ -28594,7 +33498,7 @@ var ts;
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 ts.forEach(symbol.declarations, function (declaration) {
-                    if (declaration.kind === 202) {
+                    if (declaration.kind === 203) {
                         var importEqualsDeclaration = declaration;
                         if (ts.isExternalModuleImportEqualsDeclaration(importEqualsDeclaration)) {
                             displayParts.push(ts.spacePart());
@@ -28622,9 +33526,7 @@ var ts;
                 if (symbolKind !== ScriptElementKind.unknown) {
                     if (type) {
                         addPrefixForAnyFunctionOrVar(symbol, symbolKind);
-                        if (symbolKind === ScriptElementKind.memberVariableElement ||
-                            symbolFlags & 3 ||
-                            symbolKind === ScriptElementKind.localVariableElement) {
+                        if (symbolKind === ScriptElementKind.memberVariableElement || symbolFlags & 3 || symbolKind === ScriptElementKind.localVariableElement) {
                             displayParts.push(ts.punctuationPart(51));
                             displayParts.push(ts.spacePart());
                             if (type.symbol && type.symbol.flags & 262144) {
@@ -28637,12 +33539,7 @@ var ts;
                                 displayParts.push.apply(displayParts, ts.typeToDisplayParts(typeResolver, type, enclosingDeclaration));
                             }
                         }
-                        else if (symbolFlags & 16 ||
-                            symbolFlags & 8192 ||
-                            symbolFlags & 16384 ||
-                            symbolFlags & 131072 ||
-                            symbolFlags & 98304 ||
-                            symbolKind === ScriptElementKind.memberFunctionElement) {
+                        else if (symbolFlags & 16 || symbolFlags & 8192 || symbolFlags & 16384 || symbolFlags & 131072 || symbolFlags & 98304 || symbolKind === ScriptElementKind.memberFunctionElement) {
                             var allSignatures = type.getCallSignatures();
                             addSignatureDisplayParts(allSignatures[0], allSignatures);
                         }
@@ -28655,7 +33552,11 @@ var ts;
             if (!documentation) {
                 documentation = symbol.getDocumentationComment();
             }
-            return { displayParts: displayParts, documentation: documentation, symbolKind: symbolKind };
+            return {
+                displayParts: displayParts,
+                documentation: documentation,
+                symbolKind: symbolKind
+            };
             function addNewLineIfDisplayPartsExist() {
                 if (displayParts.length) {
                     displayParts.push(ts.lineBreakPart());
@@ -28742,20 +33643,26 @@ var ts;
             if (isJumpStatementTarget(node)) {
                 var labelName = node.text;
                 var label = getTargetLabel(node.parent, node.text);
-                return label ? [getDefinitionInfo(label, ScriptElementKind.label, labelName, undefined)] : undefined;
+                return label ? [
+                    getDefinitionInfo(label, ScriptElementKind.label, labelName, undefined)
+                ] : undefined;
             }
-            var comment = ts.forEach(sourceFile.referencedFiles, function (r) { return (r.pos <= position && position < r.end) ? r : undefined; });
+            var comment = ts.forEach(sourceFile.referencedFiles, function (r) {
+                return (r.pos <= position && position < r.end) ? r : undefined;
+            });
             if (comment) {
                 var referenceFile = ts.tryResolveScriptReference(program, sourceFile, comment);
                 if (referenceFile) {
-                    return [{
+                    return [
+                        {
                             fileName: referenceFile.fileName,
                             textSpan: ts.createTextSpanFromBounds(0, 0),
                             kind: ScriptElementKind.scriptElement,
                             name: comment.fileName,
                             containerName: undefined,
                             containerKind: undefined
-                        }];
+                        }
+                    ];
                 }
                 return undefined;
             }
@@ -28770,7 +33677,7 @@ var ts;
                 }
             }
             var result = [];
-            if (node.parent.kind === 218) {
+            if (node.parent.kind === 219) {
                 var shorthandSymbol = typeInfoResolver.getShorthandAssignmentValueSymbol(symbol.valueDeclaration);
                 var shorthandDeclarations = shorthandSymbol.getDeclarations();
                 var shorthandSymbolKind = getSymbolKind(shorthandSymbol, typeInfoResolver, node);
@@ -28786,8 +33693,7 @@ var ts;
             var symbolKind = getSymbolKind(symbol, typeInfoResolver, node);
             var containerSymbol = symbol.parent;
             var containerName = containerSymbol ? typeInfoResolver.symbolToString(containerSymbol, node) : "";
-            if (!tryAddConstructSignature(symbol, node, symbolKind, symbolName, containerName, result) &&
-                !tryAddCallSignature(symbol, node, symbolKind, symbolName, containerName, result)) {
+            if (!tryAddConstructSignature(symbol, node, symbolKind, symbolName, containerName, result) && !tryAddCallSignature(symbol, node, symbolKind, symbolName, containerName, result)) {
                 ts.forEach(declarations, function (declaration) {
                     result.push(getDefinitionInfo(declaration, symbolKind, symbolName, containerName));
                 });
@@ -28807,8 +33713,7 @@ var ts;
                 var declarations = [];
                 var definition;
                 ts.forEach(signatureDeclarations, function (d) {
-                    if ((selectConstructors && d.kind === 133) ||
-                        (!selectConstructors && (d.kind === 195 || d.kind === 132 || d.kind === 131))) {
+                    if ((selectConstructors && d.kind === 133) || (!selectConstructors && (d.kind === 195 || d.kind === 132 || d.kind === 131))) {
                         declarations.push(d);
                         if (d.body)
                             definition = d;
@@ -28848,9 +33753,10 @@ var ts;
             if (!node) {
                 return undefined;
             }
-            if (node.kind === 64 || node.kind === 92 || node.kind === 90 ||
-                isLiteralNameOfPropertyDeclarationOrIndexAccess(node) || isNameOfExternalModuleImportOrDeclaration(node)) {
-                return getReferencesForNode(node, [sourceFile], true, false, false);
+            if (node.kind === 64 || node.kind === 92 || node.kind === 90 || isLiteralNameOfPropertyDeclarationOrIndexAccess(node) || isNameOfExternalModuleImportOrDeclaration(node)) {
+                return getReferencesForNode(node, [
+                    sourceFile
+                ], true, false, false);
             }
             switch (node.kind) {
                 case 83:
@@ -28887,8 +33793,8 @@ var ts;
                     break;
                 case 66:
                 case 72:
-                    if (hasKind(parent(parent(node)), 188)) {
-                        return getSwitchCaseDefaultOccurrences(node.parent.parent);
+                    if (hasKind(parent(parent(parent(node))), 188)) {
+                        return getSwitchCaseDefaultOccurrences(node.parent.parent.parent);
                     }
                     break;
                 case 65:
@@ -28898,9 +33804,7 @@ var ts;
                     }
                     break;
                 case 81:
-                    if (hasKind(node.parent, 181) ||
-                        hasKind(node.parent, 182) ||
-                        hasKind(node.parent, 183)) {
+                    if (hasKind(node.parent, 181) || hasKind(node.parent, 182) || hasKind(node.parent, 183)) {
                         return getLoopBreakContinueOccurrences(node.parent);
                     }
                     break;
@@ -28921,8 +33825,7 @@ var ts;
                         return getGetAndSetOccurrences(node.parent);
                     }
                 default:
-                    if (ts.isModifier(node.kind) && node.parent &&
-                        (ts.isDeclaration(node.parent) || node.parent.kind === 175)) {
+                    if (ts.isModifier(node.kind) && node.parent && (ts.isDeclaration(node.parent) || node.parent.kind === 175)) {
                         return getModifierOccurrences(node.kind, node.parent);
                     }
             }
@@ -29031,7 +33934,7 @@ var ts;
                 var child = throwStatement;
                 while (child.parent) {
                     var parent = child.parent;
-                    if (ts.isFunctionBlock(parent) || parent.kind === 220) {
+                    if (ts.isFunctionBlock(parent) || parent.kind === 221) {
                         return parent;
                     }
                     if (parent.kind === 191) {
@@ -29079,7 +33982,7 @@ var ts;
             function getSwitchCaseDefaultOccurrences(switchStatement) {
                 var keywords = [];
                 pushKeywordIf(keywords, switchStatement.getFirstToken(), 91);
-                ts.forEach(switchStatement.clauses, function (clause) {
+                ts.forEach(switchStatement.caseBlock.clauses, function (clause) {
                     pushKeywordIf(keywords, clause.getFirstToken(), 66, 72);
                     var breaksAndContinues = aggregateAllBreakAndContinueStatements(clause);
                     ts.forEach(breaksAndContinues, function (statement) {
@@ -29167,15 +34070,16 @@ var ts;
                 function tryPushAccessorKeyword(accessorSymbol, accessorKind) {
                     var accessor = ts.getDeclarationOfKind(accessorSymbol, accessorKind);
                     if (accessor) {
-                        ts.forEach(accessor.getChildren(), function (child) { return pushKeywordIf(keywords, child, 115, 119); });
+                        ts.forEach(accessor.getChildren(), function (child) {
+                            return pushKeywordIf(keywords, child, 115, 119);
+                        });
                     }
                 }
             }
             function getModifierOccurrences(modifier, declaration) {
                 var container = declaration.parent;
                 if (declaration.flags & 112) {
-                    if (!(container.kind === 196 ||
-                        (declaration.kind === 128 && hasKind(container, 133)))) {
+                    if (!(container.kind === 196 || (declaration.kind === 128 && hasKind(container, 133)))) {
                         return undefined;
                     }
                 }
@@ -29185,7 +34089,7 @@ var ts;
                     }
                 }
                 else if (declaration.flags & (1 | 2)) {
-                    if (!(container.kind === 201 || container.kind === 220)) {
+                    if (!(container.kind === 201 || container.kind === 221)) {
                         return undefined;
                     }
                 }
@@ -29197,7 +34101,7 @@ var ts;
                 var nodes;
                 switch (container.kind) {
                     case 201:
-                    case 220:
+                    case 221:
                         nodes = container.statements;
                         break;
                     case 133:
@@ -29219,7 +34123,9 @@ var ts;
                 }
                 ts.forEach(nodes, function (node) {
                     if (node.modifiers && node.flags & modifierFlag) {
-                        ts.forEach(node.modifiers, function (child) { return pushKeywordIf(keywords, child, modifier); });
+                        ts.forEach(node.modifiers, function (child) {
+                            return pushKeywordIf(keywords, child, modifier);
+                        });
                     }
                 });
                 return ts.map(keywords, getReferenceEntryFromNode);
@@ -29273,9 +34179,7 @@ var ts;
             if (!node) {
                 return undefined;
             }
-            if (node.kind !== 64 &&
-                !isLiteralNameOfPropertyDeclarationOrIndexAccess(node) &&
-                !isNameOfExternalModuleImportOrDeclaration(node)) {
+            if (node.kind !== 64 && !isLiteralNameOfPropertyDeclarationOrIndexAccess(node) && !isNameOfExternalModuleImportOrDeclaration(node)) {
                 return undefined;
             }
             ts.Debug.assert(node.kind === 64 || node.kind === 7 || node.kind === 8);
@@ -29285,7 +34189,9 @@ var ts;
             if (isLabelName(node)) {
                 if (isJumpStatementTarget(node)) {
                     var labelDefinition = getTargetLabel(node.parent, node.text);
-                    return labelDefinition ? getLabelReferencesInNode(labelDefinition.parent, labelDefinition) : [getReferenceEntryFromNode(node)];
+                    return labelDefinition ? getLabelReferencesInNode(labelDefinition.parent, labelDefinition) : [
+                        getReferenceEntryFromNode(node)
+                    ];
                 }
                 else {
                     return getLabelReferencesInNode(node.parent, node);
@@ -29299,7 +34205,9 @@ var ts;
             }
             var symbol = typeInfoResolver.getSymbolAtLocation(node);
             if (!symbol) {
-                return [getReferenceEntryFromNode(node)];
+                return [
+                    getReferenceEntryFromNode(node)
+                ];
             }
             var declarations = symbol.declarations;
             if (!declarations || !declarations.length) {
@@ -29333,17 +34241,17 @@ var ts;
             }
             return result;
             function isImportOrExportSpecifierName(location) {
-                return location.parent &&
-                    (location.parent.kind === 207 || location.parent.kind === 211) &&
-                    location.parent.propertyName === location;
+                return location.parent && (location.parent.kind === 208 || location.parent.kind === 212) && location.parent.propertyName === location;
             }
             function isImportOrExportSpecifierImportSymbol(symbol) {
                 return (symbol.flags & 8388608) && ts.forEach(symbol.declarations, function (declaration) {
-                    return declaration.kind === 207 || declaration.kind === 211;
+                    return declaration.kind === 208 || declaration.kind === 212;
                 });
             }
             function getDeclaredName(symbol, location) {
-                var functionExpression = ts.forEach(symbol.declarations, function (d) { return d.kind === 160 ? d : undefined; });
+                var functionExpression = ts.forEach(symbol.declarations, function (d) {
+                    return d.kind === 160 ? d : undefined;
+                });
                 if (functionExpression && functionExpression.name) {
                     var name = functionExpression.name.text;
                 }
@@ -29357,7 +34265,9 @@ var ts;
                 if (isImportOrExportSpecifierName(location)) {
                     return location.getText();
                 }
-                var functionExpression = ts.forEach(declarations, function (d) { return d.kind === 160 ? d : undefined; });
+                var functionExpression = ts.forEach(declarations, function (d) {
+                    return d.kind === 160 ? d : undefined;
+                });
                 if (functionExpression && functionExpression.name) {
                     var name = functionExpression.name.text;
                 }
@@ -29376,7 +34286,9 @@ var ts;
             }
             function getSymbolScope(symbol) {
                 if (symbol.flags & (4 | 8192)) {
-                    var privateDeclaration = ts.forEach(symbol.getDeclarations(), function (d) { return (d.flags & 32) ? d : undefined; });
+                    var privateDeclaration = ts.forEach(symbol.getDeclarations(), function (d) {
+                        return (d.flags & 32) ? d : undefined;
+                    });
                     if (privateDeclaration) {
                         return ts.getAncestor(privateDeclaration, 196);
                     }
@@ -29398,7 +34310,7 @@ var ts;
                         if (scope && scope !== container) {
                             return undefined;
                         }
-                        if (container.kind === 220 && !ts.isExternalModule(container)) {
+                        if (container.kind === 221 && !ts.isExternalModule(container)) {
                             return undefined;
                         }
                         scope = container;
@@ -29420,8 +34332,7 @@ var ts;
                     if (position > end)
                         break;
                     var endPosition = position + symbolNameLength;
-                    if ((position === 0 || !ts.isIdentifierPart(text.charCodeAt(position - 1), 2)) &&
-                        (endPosition === sourceLength || !ts.isIdentifierPart(text.charCodeAt(endPosition), 2))) {
+                    if ((position === 0 || !ts.isIdentifierPart(text.charCodeAt(position - 1), 2)) && (endPosition === sourceLength || !ts.isIdentifierPart(text.charCodeAt(endPosition), 2))) {
                         positions.push(position);
                     }
                     position = text.indexOf(symbolName, position + symbolNameLength + 1);
@@ -29439,8 +34350,7 @@ var ts;
                     if (!node || node.getWidth() !== labelName.length) {
                         return;
                     }
-                    if (node === targetLabel ||
-                        (isJumpStatementTarget(node) && getTargetLabel(node, labelName) === targetLabel)) {
+                    if (node === targetLabel || (isJumpStatementTarget(node) && getTargetLabel(node, labelName) === targetLabel)) {
                         result.push(getReferenceEntryFromNode(node));
                     }
                 });
@@ -29452,8 +34362,7 @@ var ts;
                         case 64:
                             return node.getWidth() === searchSymbolName.length;
                         case 8:
-                            if (isLiteralNameOfPropertyDeclarationOrIndexAccess(node) ||
-                                isNameOfExternalModuleImportOrDeclaration(node)) {
+                            if (isLiteralNameOfPropertyDeclarationOrIndexAccess(node) || isNameOfExternalModuleImportOrDeclaration(node)) {
                                 return node.getWidth() === searchSymbolName.length + 2;
                             }
                             break;
@@ -29476,8 +34385,7 @@ var ts;
                         cancellationToken.throwIfCancellationRequested();
                         var referenceLocation = ts.getTouchingPropertyName(sourceFile, position);
                         if (!isValidReferencePosition(referenceLocation, searchText)) {
-                            if ((findInStrings && isInString(position)) ||
-                                (findInComments && isInComment(position))) {
+                            if ((findInStrings && isInString(position)) || (findInComments && isInComment(position))) {
                                 result.push({
                                     fileName: sourceFile.fileName,
                                     textSpan: ts.createTextSpan(position, searchText.length),
@@ -29575,7 +34483,7 @@ var ts;
                         staticFlag &= searchSpaceNode.flags;
                         searchSpaceNode = searchSpaceNode.parent;
                         break;
-                    case 220:
+                    case 221:
                         if (ts.isExternalModule(searchSpaceNode)) {
                             return undefined;
                         }
@@ -29586,7 +34494,7 @@ var ts;
                         return undefined;
                 }
                 var result = [];
-                if (searchSpaceNode.kind === 220) {
+                if (searchSpaceNode.kind === 221) {
                     ts.forEach(sourceFiles, function (sourceFile) {
                         var possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "this", sourceFile.getStart(), sourceFile.getEnd());
                         getThisReferencesInFile(sourceFile, sourceFile, possiblePositions, result);
@@ -29624,8 +34532,8 @@ var ts;
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
-                            case 220:
-                                if (container.kind === 220 && !ts.isExternalModule(container)) {
+                            case 221:
+                                if (container.kind === 221 && !ts.isExternalModule(container)) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
@@ -29634,7 +34542,9 @@ var ts;
                 }
             }
             function populateSearchSymbolSet(symbol, location) {
-                var result = [symbol];
+                var result = [
+                    symbol
+                ];
                 if (isImportOrExportSpecifierImportSymbol(symbol)) {
                     result.push(typeInfoResolver.getAliasedSymbol(symbol));
                 }
@@ -29687,13 +34597,14 @@ var ts;
                 if (searchSymbols.indexOf(referenceSymbol) >= 0) {
                     return true;
                 }
-                if (isImportOrExportSpecifierImportSymbol(referenceSymbol) &&
-                    searchSymbols.indexOf(typeInfoResolver.getAliasedSymbol(referenceSymbol)) >= 0) {
+                if (isImportOrExportSpecifierImportSymbol(referenceSymbol) && searchSymbols.indexOf(typeInfoResolver.getAliasedSymbol(referenceSymbol)) >= 0) {
                     return true;
                 }
                 if (isNameOfPropertyAssignment(referenceLocation)) {
                     return ts.forEach(getPropertySymbolsFromContextualType(referenceLocation), function (contextualSymbol) {
-                        return ts.forEach(typeInfoResolver.getRootSymbols(contextualSymbol), function (s) { return searchSymbols.indexOf(s) >= 0; });
+                        return ts.forEach(typeInfoResolver.getRootSymbols(contextualSymbol), function (s) {
+                            return searchSymbols.indexOf(s) >= 0;
+                        });
                     });
                 }
                 return ts.forEach(typeInfoResolver.getRootSymbols(referenceSymbol), function (rootSymbol) {
@@ -29703,7 +34614,9 @@ var ts;
                     if (rootSymbol.parent && rootSymbol.parent.flags & (32 | 64)) {
                         var result = [];
                         getPropertySymbolsFromBaseTypes(rootSymbol.parent, rootSymbol.getName(), result);
-                        return ts.forEach(result, function (s) { return searchSymbols.indexOf(s) >= 0; });
+                        return ts.forEach(result, function (s) {
+                            return searchSymbols.indexOf(s) >= 0;
+                        });
                     }
                     return false;
                 });
@@ -29717,7 +34630,9 @@ var ts;
                         if (contextualType.flags & 16384) {
                             var unionProperty = contextualType.getProperty(name);
                             if (unionProperty) {
-                                return [unionProperty];
+                                return [
+                                    unionProperty
+                                ];
                             }
                             else {
                                 var result = [];
@@ -29733,7 +34648,9 @@ var ts;
                         else {
                             var symbol = contextualType.getProperty(name);
                             if (symbol) {
-                                return [symbol];
+                                return [
+                                    symbol
+                                ];
                             }
                         }
                     }
@@ -29789,7 +34706,9 @@ var ts;
             return ts.NavigateTo.getNavigateToItems(program, cancellationToken, searchValue, maxResultCount);
         }
         function containErrors(diagnostics) {
-            return ts.forEach(diagnostics, function (diagnostic) { return diagnostic.category === 1; });
+            return ts.forEach(diagnostics, function (diagnostic) {
+                return diagnostic.category === 1;
+            });
         }
         function getEmitOutput(fileName) {
             synchronizeHostData();
@@ -29815,9 +34734,9 @@ var ts;
                 case 150:
                 case 130:
                 case 129:
-                case 217:
                 case 218:
                 case 219:
+                case 220:
                 case 132:
                 case 131:
                 case 133:
@@ -29826,7 +34745,7 @@ var ts;
                 case 195:
                 case 160:
                 case 161:
-                case 216:
+                case 217:
                     return 1;
                 case 127:
                 case 197:
@@ -29846,14 +34765,14 @@ var ts;
                     else {
                         return 4;
                     }
-                case 206:
                 case 207:
-                case 202:
-                case 203:
                 case 208:
+                case 203:
+                case 204:
                 case 209:
+                case 210:
                     return 1 | 2 | 4;
-                case 220:
+                case 221:
                     return 4 | 1;
             }
             return 1 | 2 | 4;
@@ -29883,15 +34802,13 @@ var ts;
         }
         function getMeaningFromRightHandSideOfImportEquals(node) {
             ts.Debug.assert(node.kind === 64);
-            if (node.parent.kind === 125 &&
-                node.parent.right === node &&
-                node.parent.parent.kind === 202) {
+            if (node.parent.kind === 125 && node.parent.right === node && node.parent.parent.kind === 203) {
                 return 1 | 2 | 4;
             }
             return 4;
         }
         function getMeaningFromLocation(node) {
-            if (node.parent.kind === 208) {
+            if (node.parent.kind === 209) {
                 return 1 | 2 | 4;
             }
             else if (isInRightSideOfImport(node)) {
@@ -29944,8 +34861,7 @@ var ts;
                     nodeForStartPos = nodeForStartPos.parent;
                 }
                 else if (isNameOfModuleDeclaration(nodeForStartPos)) {
-                    if (nodeForStartPos.parent.parent.kind === 200 &&
-                        nodeForStartPos.parent.parent.body === nodeForStartPos.parent) {
+                    if (nodeForStartPos.parent.parent.kind === 200 && nodeForStartPos.parent.parent.body === nodeForStartPos.parent) {
                         nodeForStartPos = nodeForStartPos.parent.parent.name;
                     }
                     else {
@@ -29992,8 +34908,7 @@ var ts;
                     }
                 }
                 else if (flags & 1536) {
-                    if (meaningAtPosition & 4 ||
-                        (meaningAtPosition & 1 && hasValueSideModule(symbol))) {
+                    if (meaningAtPosition & 4 || (meaningAtPosition & 1 && hasValueSideModule(symbol))) {
                         return ClassificationTypeNames.moduleName;
                     }
                 }
@@ -30118,16 +35033,11 @@ var ts;
                 if (ts.isPunctuation(tokenKind)) {
                     if (token) {
                         if (tokenKind === 52) {
-                            if (token.parent.kind === 193 ||
-                                token.parent.kind === 130 ||
-                                token.parent.kind === 128) {
+                            if (token.parent.kind === 193 || token.parent.kind === 130 || token.parent.kind === 128) {
                                 return ClassificationTypeNames.operator;
                             }
                         }
-                        if (token.parent.kind === 167 ||
-                            token.parent.kind === 165 ||
-                            token.parent.kind === 166 ||
-                            token.parent.kind === 168) {
+                        if (token.parent.kind === 167 || token.parent.kind === 165 || token.parent.kind === 166 || token.parent.kind === 168) {
                             return ClassificationTypeNames.operator;
                         }
                     }
@@ -30225,14 +35135,22 @@ var ts;
             return result;
             function getMatchingTokenKind(token) {
                 switch (token.kind) {
-                    case 14: return 15;
-                    case 16: return 17;
-                    case 18: return 19;
-                    case 24: return 25;
-                    case 15: return 14;
-                    case 17: return 16;
-                    case 19: return 18;
-                    case 25: return 24;
+                    case 14:
+                        return 15;
+                    case 16:
+                        return 17;
+                    case 18:
+                        return 19;
+                    case 24:
+                        return 25;
+                    case 15:
+                        return 14;
+                    case 17:
+                        return 16;
+                    case 19:
+                        return 18;
+                    case 25:
+                        return 24;
                 }
                 return undefined;
             }
@@ -30313,7 +35231,9 @@ var ts;
                 var multiLineCommentStart = /(?:\/\*+\s*)/.source;
                 var anyNumberOfSpacesAndAsterixesAtStartOfLine = /(?:^(?:\s|\*)*)/.source;
                 var preamble = "(" + anyNumberOfSpacesAndAsterixesAtStartOfLine + "|" + singleLineCommentStart + "|" + multiLineCommentStart + ")";
-                var literals = "(?:" + ts.map(descriptors, function (d) { return "(" + escapeRegExp(d.text) + ")"; }).join("|") + ")";
+                var literals = "(?:" + ts.map(descriptors, function (d) {
+                    return "(" + escapeRegExp(d.text) + ")";
+                }).join("|") + ")";
                 var endOfLineOrEndOfComment = /(?:$|\*\/)/.source;
                 var messageRemainder = /(?:.*?)/.source;
                 var messagePortion = "(" + literals + messageRemainder + ")";
@@ -30321,9 +35241,7 @@ var ts;
                 return new RegExp(regExpString, "gim");
             }
             function isLetterOrDigit(char) {
-                return (char >= 97 && char <= 122) ||
-                    (char >= 65 && char <= 90) ||
-                    (char >= 48 && char <= 57);
+                return (char >= 97 && char <= 122) || (char >= 65 && char <= 90) || (char >= 48 && char <= 57);
             }
         }
         function getRenameInfo(fileName, position) {
@@ -30424,9 +35342,7 @@ var ts;
                     break;
                 case 8:
                 case 7:
-                    if (ts.isDeclarationName(node) ||
-                        node.parent.kind === 212 ||
-                        isArgumentOfElementAccessExpression(node)) {
+                    if (ts.isDeclarationName(node) || node.parent.kind === 213 || isArgumentOfElementAccessExpression(node)) {
                         nameTable[node.text] = node.text;
                     }
                     break;
@@ -30436,10 +35352,7 @@ var ts;
         }
     }
     function isArgumentOfElementAccessExpression(node) {
-        return node &&
-            node.parent &&
-            node.parent.kind === 154 &&
-            node.parent.argumentExpression === node;
+        return node && node.parent && node.parent.kind === 154 && node.parent.argumentExpression === node;
     }
     function createClassifier() {
         var scanner = ts.createScanner(2, false);
@@ -30468,10 +35381,7 @@ var ts;
         }
         function canFollow(keyword1, keyword2) {
             if (isAccessibilityModifier(keyword1)) {
-                if (keyword2 === 115 ||
-                    keyword2 === 119 ||
-                    keyword2 === 113 ||
-                    keyword2 === 109) {
+                if (keyword2 === 115 || keyword2 === 119 || keyword2 === 113 || keyword2 === 109) {
                     return true;
                 }
                 return false;
@@ -30529,18 +35439,13 @@ var ts;
                     else if (isKeyword(lastNonTriviaToken) && isKeyword(token) && !canFollow(lastNonTriviaToken, token)) {
                         token = 64;
                     }
-                    else if (lastNonTriviaToken === 64 &&
-                        token === 24) {
+                    else if (lastNonTriviaToken === 64 && token === 24) {
                         angleBracketStack++;
                     }
                     else if (token === 25 && angleBracketStack > 0) {
                         angleBracketStack--;
                     }
-                    else if (token === 111 ||
-                        token === 120 ||
-                        token === 118 ||
-                        token === 112 ||
-                        token === 121) {
+                    else if (token === 111 || token === 120 || token === 118 || token === 112 || token === 121) {
                         if (angleBracketStack > 0 && !syntacticClassifierAbsent) {
                             token = 64;
                         }
@@ -30591,9 +35496,7 @@ var ts;
                             }
                             if (numBackslashes & 1) {
                                 var quoteChar = tokenText.charCodeAt(0);
-                                result.finalLexState = quoteChar === 34
-                                    ? 3
-                                    : 2;
+                                result.finalLexState = quoteChar === 34 ? 3 : 2;
                             }
                         }
                     }
@@ -30625,7 +35528,10 @@ var ts;
                     if (result.entries.length === 0) {
                         length -= offset;
                     }
-                    result.entries.push({ length: length, classification: classification });
+                    result.entries.push({
+                        length: length,
+                        classification: classification
+                    });
                 }
             }
         }
@@ -30720,7 +35626,9 @@ var ts;
                     return 5;
             }
         }
-        return { getClassificationsForLine: getClassificationsForLine };
+        return {
+            getClassificationsForLine: getClassificationsForLine
+        };
     }
     ts.createClassifier = createClassifier;
     function getDefaultLibFilePath(options) {
@@ -30735,7 +35643,7 @@ var ts;
             getNodeConstructor: function (kind) {
                 function Node() {
                 }
-                var proto = kind === 220 ? new SourceFileObject() : new NodeObject();
+                var proto = kind === 221 ? new SourceFileObject() : new NodeObject();
                 proto.kind = kind;
                 proto.pos = 0;
                 proto.end = 0;
@@ -30744,9 +35652,15 @@ var ts;
                 Node.prototype = proto;
                 return Node;
             },
-            getSymbolConstructor: function () { return SymbolObject; },
-            getTypeConstructor: function () { return TypeObject; },
-            getSignatureConstructor: function () { return SignatureObject; }
+            getSymbolConstructor: function () {
+                return SymbolObject;
+            },
+            getTypeConstructor: function () {
+                return TypeObject;
+            },
+            getSignatureConstructor: function () {
+                return SignatureObject;
+            }
         };
     }
     initializeServices();
@@ -30827,7 +35741,9 @@ var ts;
                 return this.compilationSettings;
             };
             LSHost.prototype.getScriptFileNames = function () {
-                return this.roots.map(function (root) { return root.fileName; });
+                return this.roots.map(function (root) {
+                    return root.fileName;
+                });
             };
             LSHost.prototype.getScriptVersion = function (filename) {
                 return this.getScriptInfo(filename).svc.latestVersion().toString();
@@ -30920,7 +35836,10 @@ var ts;
                 var script = this.filenameToScript[filename];
                 var index = script.snap().index;
                 var lineCol = index.charOffsetToLineNumberAndPos(position);
-                return { line: lineCol.line, col: lineCol.col + 1 };
+                return {
+                    line: lineCol.line,
+                    col: lineCol.col + 1
+                };
             };
             return LSHost;
         })();
@@ -30998,7 +35917,9 @@ var ts;
             };
             Project.prototype.filesToString = function () {
                 var strBuilder = "";
-                ts.forEachValue(this.filenameToSourceFile, function (sourceFile) { strBuilder += sourceFile.fileName + "\n"; });
+                ts.forEachValue(this.filenameToSourceFile, function (sourceFile) {
+                    strBuilder += sourceFile.fileName + "\n";
+                });
                 return strBuilder;
             };
             Project.prototype.setProjectOptions = function (projectOptions) {
@@ -31095,8 +36016,7 @@ var ts;
                     for (var i = 0, len = this.openFileRoots.length; i < len; i++) {
                         var r = this.openFileRoots[i];
                         if (info.defaultProject.getSourceFile(r)) {
-                            this.inferredProjects =
-                                copyListRemovingItem(r.defaultProject, this.inferredProjects);
+                            this.inferredProjects = copyListRemovingItem(r.defaultProject, this.inferredProjects);
                             this.openFilesReferenced.push(r);
                             r.defaultProject = info.defaultProject;
                         }
@@ -31218,7 +36138,9 @@ var ts;
                         info = new ScriptInfo(this.host, fileName, content, openedByClient);
                         this.filenameToScriptInfo[fileName] = info;
                         if (!info.isOpen) {
-                            info.fileWatcher = this.host.watchFile(fileName, function (_) { _this.watchedFileChanged(fileName); });
+                            info.fileWatcher = this.host.watchFile(fileName, function (_) {
+                                _this.watchedFileChanged(fileName);
+                            });
                         }
                     }
                 }
@@ -31300,12 +36222,16 @@ var ts;
                 var dirPath = ts.getDirectoryPath(configFilename);
                 var rawConfig = ts.readConfigFile(configFilename);
                 if (!rawConfig) {
-                    return { errorMsg: "tsconfig syntax error" };
+                    return {
+                        errorMsg: "tsconfig syntax error"
+                    };
                 }
                 else {
                     var parsedCommandLine = ts.parseConfigFile(rawConfig);
                     if (parsedCommandLine.errors) {
-                        return { errorMsg: "tsconfig option errors" };
+                        return {
+                            errorMsg: "tsconfig option errors"
+                        };
                     }
                     else if (parsedCommandLine.fileNames) {
                         var proj = this.createProject(configFilename);
@@ -31318,7 +36244,9 @@ var ts;
                                 proj.addRoot(info);
                             }
                             else {
-                                return { errorMsg: "specified file " + rootFilename + " not found" };
+                                return {
+                                    errorMsg: "specified file " + rootFilename + " not found"
+                                };
                             }
                         }
                         var projectOptions = {
@@ -31329,10 +36257,15 @@ var ts;
                             projectOptions.formatCodeOptions = rawConfig.formatCodeOptions;
                         }
                         proj.setProjectOptions(projectOptions);
-                        return { success: true, project: proj };
+                        return {
+                            success: true,
+                            project: proj
+                        };
                     }
                     else {
-                        return { errorMsg: "no files found" };
+                        return {
+                            errorMsg: "no files found"
+                        };
                     }
                 }
             };
@@ -31409,8 +36342,12 @@ var ts;
                 this.trailingText = "";
                 this.suppressTrailingText = false;
                 this.lineIndex.root = new LineNode();
-                this.startPath = [this.lineIndex.root];
-                this.stack = [this.lineIndex.root];
+                this.startPath = [
+                    this.lineIndex.root
+                ];
+                this.stack = [
+                    this.lineIndex.root
+                ];
             }
             EditWalker.prototype.insertLines = function (insertedText) {
                 if (this.suppressTrailingText) {
@@ -31602,9 +36539,7 @@ var ts;
             }
             ScriptVersionCache.prototype.edit = function (pos, deleteLen, insertedText) {
                 this.changes[this.changes.length] = new TextChange(pos, deleteLen, insertedText);
-                if ((this.changes.length > ScriptVersionCache.changeNumberThreshold) ||
-                    (deleteLen > ScriptVersionCache.changeLengthThreshold) ||
-                    (insertedText && (insertedText.length > ScriptVersionCache.changeLengthThreshold))) {
+                if ((this.changes.length > ScriptVersionCache.changeNumberThreshold) || (deleteLen > ScriptVersionCache.changeLengthThreshold) || (insertedText && (insertedText.length > ScriptVersionCache.changeLengthThreshold))) {
                     this.getSnapshot();
                 }
             };
@@ -31650,6 +36585,13 @@ var ts;
                     this.currentVersion = snap.version;
                     this.versions[snap.version] = snap;
                     this.changes = [];
+                    if ((this.currentVersion - this.minVersion) >= ScriptVersionCache.maxVersions) {
+                        var oldMin = this.minVersion;
+                        this.minVersion = (this.currentVersion - ScriptVersionCache.maxVersions) + 1;
+                        for (var j = oldMin; j < this.minVersion; j++) {
+                            this.versions[j] = undefined;
+                        }
+                    }
                 }
                 return snap;
             };
@@ -31685,6 +36627,7 @@ var ts;
             };
             ScriptVersionCache.changeNumberThreshold = 8;
             ScriptVersionCache.changeLengthThreshold = 256;
+            ScriptVersionCache.maxVersions = 8;
             return ScriptVersionCache;
         })();
         server.ScriptVersionCache = ScriptVersionCache;
@@ -31701,7 +36644,9 @@ var ts;
                 return this.index.root.charCount();
             };
             LineIndexSnapshot.prototype.getLineStartPositions = function () {
-                var starts = [-1];
+                var starts = [
+                    -1
+                ];
                 var count = 1;
                 var pos = 0;
                 this.index.every(function (ll, s, len) {
@@ -31880,7 +36825,10 @@ var ts;
             LineIndex.linesFromText = function (text) {
                 var lineStarts = ts.computeLineStarts(text);
                 if (lineStarts.length == 0) {
-                    return { lines: [], lineMap: lineStarts };
+                    return {
+                        lines: [],
+                        lineMap: lineStarts
+                    };
                 }
                 var lines = new Array(lineStarts.length);
                 var lc = lineStarts.length - 1;
@@ -31894,7 +36842,10 @@ var ts;
                 else {
                     lines.length--;
                 }
-                return { lines: lines, lineMap: lineStarts };
+                return {
+                    lines: lines,
+                    lineMap: lineStarts
+                };
             };
             return LineIndex;
         })();
@@ -32008,7 +36959,10 @@ var ts;
                 }
                 else {
                     var lineInfo = this.lineNumberToInfo(this.lineCount(), 0);
-                    return { line: this.lineCount(), col: lineInfo.leaf.charCount() };
+                    return {
+                        line: this.lineCount(),
+                        col: lineInfo.leaf.charCount()
+                    };
                 }
             };
             LineNode.prototype.lineNumberToInfo = function (lineNumber, charOffset) {
@@ -32195,7 +37149,12 @@ var ts;
 (function (ts) {
     var server;
     (function (server) {
-        var spaceCache = [" ", "  ", "   ", "    "];
+        var spaceCache = [
+            " ",
+            "  ",
+            "   ",
+            "    "
+        ];
         function generateSpaces(n) {
             if (!spaceCache[n]) {
                 var strBuilder = "";
@@ -32281,16 +37240,22 @@ var ts;
                 this.fileHash = {};
                 this.nextFileId = 1;
                 this.changeSeq = 0;
-                this.projectService =
-                    new server.ProjectService(host, logger, function (eventName, project, fileName) {
-                        _this.handleEvent(eventName, project, fileName);
-                    });
+                this.projectService = new server.ProjectService(host, logger, function (eventName, project, fileName) {
+                    _this.handleEvent(eventName, project, fileName);
+                });
             }
             Session.prototype.handleEvent = function (eventName, project, fileName) {
                 var _this = this;
                 if (eventName == "context") {
                     this.projectService.log("got context event, updating diagnostics for" + fileName, "Info");
-                    this.updateErrorCheck([{ fileName: fileName, project: project }], this.changeSeq, function (n) { return n == _this.changeSeq; }, 100);
+                    this.updateErrorCheck([
+                        {
+                            fileName: fileName,
+                            project: project
+                        }
+                    ], this.changeSeq, function (n) {
+                        return n == _this.changeSeq;
+                    }, 100);
                 }
             };
             Session.prototype.logError = function (err, cmd) {
@@ -32309,8 +37274,10 @@ var ts;
             };
             Session.prototype.send = function (msg) {
                 var json = JSON.stringify(msg);
-                this.sendLineToClient('Content-Length: ' + (1 + Buffer.byteLength(json, 'utf8')) +
-                    '\r\n\r\n' + json);
+                if (this.logger.isVerbose()) {
+                    this.logger.info(msg.type + ": " + json);
+                }
+                this.sendLineToClient('Content-Length: ' + (1 + Buffer.byteLength(json, 'utf8')) + '\r\n\r\n' + json);
             };
             Session.prototype.event = function (info, eventName) {
                 var ev = {
@@ -32346,8 +37313,13 @@ var ts;
                 try {
                     var diags = project.compilerService.languageService.getSemanticDiagnostics(file);
                     if (diags) {
-                        var bakedDiags = diags.map(function (diag) { return formatDiag(file, project, diag); });
-                        this.event({ file: file, diagnostics: bakedDiags }, "semanticDiag");
+                        var bakedDiags = diags.map(function (diag) {
+                            return formatDiag(file, project, diag);
+                        });
+                        this.event({
+                            file: file,
+                            diagnostics: bakedDiags
+                        }, "semanticDiag");
                     }
                 }
                 catch (err) {
@@ -32358,8 +37330,13 @@ var ts;
                 try {
                     var diags = project.compilerService.languageService.getSyntacticDiagnostics(file);
                     if (diags) {
-                        var bakedDiags = diags.map(function (diag) { return formatDiag(file, project, diag); });
-                        this.event({ file: file, diagnostics: bakedDiags }, "syntaxDiag");
+                        var bakedDiags = diags.map(function (diag) {
+                            return formatDiag(file, project, diag);
+                        });
+                        this.event({
+                            file: file,
+                            diagnostics: bakedDiags
+                        }, "syntaxDiag");
                     }
                 }
                 catch (err) {
@@ -32428,11 +37405,13 @@ var ts;
                 if (!definitions) {
                     return undefined;
                 }
-                return definitions.map(function (def) { return ({
-                    file: def.fileName,
-                    start: compilerService.host.positionToLineCol(def.fileName, def.textSpan.start),
-                    end: compilerService.host.positionToLineCol(def.fileName, ts.textSpanEnd(def.textSpan))
-                }); });
+                return definitions.map(function (def) {
+                    return ({
+                        file: def.fileName,
+                        start: compilerService.host.positionToLineCol(def.fileName, def.textSpan.start),
+                        end: compilerService.host.positionToLineCol(def.fileName, ts.textSpanEnd(def.textSpan))
+                    });
+                });
             };
             Session.prototype.getRenameLocations = function (line, col, fileName, findInComments, findInStrings) {
                 var file = ts.normalizePath(fileName);
@@ -32456,11 +37435,13 @@ var ts;
                 if (!renameLocations) {
                     return undefined;
                 }
-                var bakedRenameLocs = renameLocations.map(function (location) { return ({
-                    file: location.fileName,
-                    start: compilerService.host.positionToLineCol(location.fileName, location.textSpan.start),
-                    end: compilerService.host.positionToLineCol(location.fileName, ts.textSpanEnd(location.textSpan))
-                }); }).sort(function (a, b) {
+                var bakedRenameLocs = renameLocations.map(function (location) {
+                    return ({
+                        file: location.fileName,
+                        start: compilerService.host.positionToLineCol(location.fileName, location.textSpan.start),
+                        end: compilerService.host.positionToLineCol(location.fileName, ts.textSpanEnd(location.textSpan))
+                    });
+                }).sort(function (a, b) {
                     if (a.file < b.file) {
                         return -1;
                     }
@@ -32487,13 +37468,22 @@ var ts;
                         }
                     }
                     if (!curFileAccum) {
-                        curFileAccum = { file: cur.file, locs: [] };
+                        curFileAccum = {
+                            file: cur.file,
+                            locs: []
+                        };
                         accum.push(curFileAccum);
                     }
-                    curFileAccum.locs.push({ start: cur.start, end: cur.end });
+                    curFileAccum.locs.push({
+                        start: cur.start,
+                        end: cur.end
+                    });
                     return accum;
                 }, []);
-                return { info: renameInfo, locs: bakedRenameLocs };
+                return {
+                    info: renameInfo,
+                    locs: bakedRenameLocs
+                };
             };
             Session.prototype.getReferences = function (line, col, fileName) {
                 var file = ts.normalizePath(fileName);
@@ -32593,16 +37583,42 @@ var ts;
                 var position = compilerService.host.lineColToPosition(file, line, col);
                 var edits = compilerService.languageService.getFormattingEditsAfterKeystroke(file, position, key, compilerService.formatCodeOptions);
                 if ((key == "\n") && ((!edits) || (edits.length == 0) || allEditsBeforePos(edits, position))) {
-                    var editorOptions = {
-                        IndentSize: 4,
-                        TabSize: 4,
-                        NewLineCharacter: "\n",
-                        ConvertTabsToSpaces: true
-                    };
-                    var indentPosition = compilerService.languageService.getIndentationAtPosition(file, position, editorOptions);
-                    var spaces = generateSpaces(indentPosition);
-                    if (indentPosition > 0) {
-                        edits.push({ span: ts.createTextSpanFromBounds(position, position), newText: spaces });
+                    var scriptInfo = compilerService.host.getScriptInfo(file);
+                    if (scriptInfo) {
+                        var lineInfo = scriptInfo.getLineInfo(line);
+                        if (lineInfo && (lineInfo.leaf) && (lineInfo.leaf.text)) {
+                            var lineText = lineInfo.leaf.text;
+                            if (lineText.search("\\S") < 0) {
+                                var editorOptions = {
+                                    IndentSize: 4,
+                                    TabSize: 4,
+                                    NewLineCharacter: "\n",
+                                    ConvertTabsToSpaces: true
+                                };
+                                var indentPosition = compilerService.languageService.getIndentationAtPosition(file, position, editorOptions);
+                                for (var i = 0, len = lineText.length; i < len; i++) {
+                                    if (lineText.charAt(i) == " ") {
+                                        indentPosition--;
+                                    }
+                                    else {
+                                        break;
+                                    }
+                                }
+                                if (indentPosition > 0) {
+                                    var spaces = generateSpaces(indentPosition);
+                                    edits.push({
+                                        span: ts.createTextSpanFromBounds(position, position),
+                                        newText: spaces
+                                    });
+                                }
+                                else if (indentPosition < 0) {
+                                    edits.push({
+                                        span: ts.createTextSpanFromBounds(position, position - indentPosition),
+                                        newText: ""
+                                    });
+                                }
+                            }
+                        }
                     }
                 }
                 if (!edits) {
@@ -32660,12 +37676,17 @@ var ts;
                     fileName = ts.normalizePath(fileName);
                     var project = _this.projectService.getProjectForFile(fileName);
                     if (project) {
-                        accum.push({ fileName: fileName, project: project });
+                        accum.push({
+                            fileName: fileName,
+                            project: project
+                        });
                     }
                     return accum;
                 }, []);
                 if (checkList.length > 0) {
-                    this.updateErrorCheck(checkList, this.changeSeq, function (n) { return n == _this.changeSeq; }, delay);
+                    this.updateErrorCheck(checkList, this.changeSeq, function (n) {
+                        return n == _this.changeSeq;
+                    }, delay);
                 }
             };
             Session.prototype.change = function (line, col, endLine, endCol, insertString, fileName) {
@@ -32680,7 +37701,9 @@ var ts;
                         compilerService.host.editScript(file, start, end, insertString);
                         this.changeSeq++;
                     }
-                    this.updateProjectStructure(this.changeSeq, function (n) { return n == _this.changeSeq; });
+                    this.updateProjectStructure(this.changeSeq, function (n) {
+                        return n == _this.changeSeq;
+                    });
                 }
             };
             Session.prototype.reload = function (fileName, tempFileName, reqSeq) {
@@ -32714,16 +37737,20 @@ var ts;
                     return undefined;
                 }
                 var compilerService = project.compilerService;
-                return items.map(function (item) { return ({
-                    text: item.text,
-                    kind: item.kind,
-                    kindModifiers: item.kindModifiers,
-                    spans: item.spans.map(function (span) { return ({
-                        start: compilerService.host.positionToLineCol(fileName, span.start),
-                        end: compilerService.host.positionToLineCol(fileName, ts.textSpanEnd(span))
-                    }); }),
-                    childItems: _this.decorateNavigationBarItem(project, fileName, item.childItems)
-                }); });
+                return items.map(function (item) {
+                    return ({
+                        text: item.text,
+                        kind: item.kind,
+                        kindModifiers: item.kindModifiers,
+                        spans: item.spans.map(function (span) {
+                            return ({
+                                start: compilerService.host.positionToLineCol(fileName, span.start),
+                                end: compilerService.host.positionToLineCol(fileName, ts.textSpanEnd(span))
+                            });
+                        }),
+                        childItems: _this.decorateNavigationBarItem(project, fileName, item.childItems)
+                    });
+                });
             };
             Session.prototype.getNavigationBarItems = function (fileName) {
                 var file = ts.normalizePath(fileName);
@@ -32786,113 +37813,148 @@ var ts;
                 if (!spans) {
                     return undefined;
                 }
-                return spans.map(function (span) { return ({
-                    start: compilerService.host.positionToLineCol(file, span.start),
-                    end: compilerService.host.positionToLineCol(file, span.start + span.length)
-                }); });
+                return spans.map(function (span) {
+                    return ({
+                        start: compilerService.host.positionToLineCol(file, span.start),
+                        end: compilerService.host.positionToLineCol(file, span.start + span.length)
+                    });
+                });
             };
             Session.prototype.onMessage = function (message) {
+                if (this.logger.isVerbose()) {
+                    this.logger.info("request: " + message);
+                    var start = process.hrtime();
+                }
                 try {
                     var request = JSON.parse(message);
                     var response;
                     var errorMessage;
                     var responseRequired = true;
                     switch (request.command) {
-                        case CommandNames.Definition: {
-                            var defArgs = request.arguments;
-                            response = this.getDefinition(defArgs.line, defArgs.col, defArgs.file);
-                            break;
-                        }
-                        case CommandNames.References: {
-                            var refArgs = request.arguments;
-                            response = this.getReferences(refArgs.line, refArgs.col, refArgs.file);
-                            break;
-                        }
-                        case CommandNames.Rename: {
-                            var renameArgs = request.arguments;
-                            response = this.getRenameLocations(renameArgs.line, renameArgs.col, renameArgs.file, renameArgs.findInComments, renameArgs.findInStrings);
-                            break;
-                        }
-                        case CommandNames.Open: {
-                            var openArgs = request.arguments;
-                            this.openClientFile(openArgs.file);
-                            responseRequired = false;
-                            break;
-                        }
-                        case CommandNames.Quickinfo: {
-                            var quickinfoArgs = request.arguments;
-                            response = this.getQuickInfo(quickinfoArgs.line, quickinfoArgs.col, quickinfoArgs.file);
-                            break;
-                        }
-                        case CommandNames.Format: {
-                            var formatArgs = request.arguments;
-                            response = this.getFormattingEditsForRange(formatArgs.line, formatArgs.col, formatArgs.endLine, formatArgs.endCol, formatArgs.file);
-                            break;
-                        }
-                        case CommandNames.Formatonkey: {
-                            var formatOnKeyArgs = request.arguments;
-                            response = this.getFormattingEditsAfterKeystroke(formatOnKeyArgs.line, formatOnKeyArgs.col, formatOnKeyArgs.key, formatOnKeyArgs.file);
-                            break;
-                        }
-                        case CommandNames.Completions: {
-                            var completionsArgs = request.arguments;
-                            response = this.getCompletions(request.arguments.line, request.arguments.col, completionsArgs.prefix, request.arguments.file);
-                            break;
-                        }
-                        case CommandNames.CompletionDetails: {
-                            var completionDetailsArgs = request.arguments;
-                            response = this.getCompletionEntryDetails(request.arguments.line, request.arguments.col, completionDetailsArgs.entryNames, request.arguments.file);
-                            break;
-                        }
-                        case CommandNames.Geterr: {
-                            var geterrArgs = request.arguments;
-                            response = this.getDiagnostics(geterrArgs.delay, geterrArgs.files);
-                            responseRequired = false;
-                            break;
-                        }
-                        case CommandNames.Change: {
-                            var changeArgs = request.arguments;
-                            this.change(changeArgs.line, changeArgs.col, changeArgs.endLine, changeArgs.endCol, changeArgs.insertString, changeArgs.file);
-                            responseRequired = false;
-                            break;
-                        }
-                        case CommandNames.Reload: {
-                            var reloadArgs = request.arguments;
-                            this.reload(reloadArgs.file, reloadArgs.tmpfile, request.seq);
-                            break;
-                        }
-                        case CommandNames.Saveto: {
-                            var savetoArgs = request.arguments;
-                            this.saveToTmp(savetoArgs.file, savetoArgs.tmpfile);
-                            responseRequired = false;
-                            break;
-                        }
-                        case CommandNames.Close: {
-                            var closeArgs = request.arguments;
-                            this.closeClientFile(closeArgs.file);
-                            responseRequired = false;
-                            break;
-                        }
-                        case CommandNames.Navto: {
-                            var navtoArgs = request.arguments;
-                            response = this.getNavigateToItems(navtoArgs.searchValue, navtoArgs.file, navtoArgs.maxResultCount);
-                            break;
-                        }
-                        case CommandNames.Brace: {
-                            var braceArguments = request.arguments;
-                            response = this.getBraceMatching(braceArguments.line, braceArguments.col, braceArguments.file);
-                            break;
-                        }
-                        case CommandNames.NavBar: {
-                            var navBarArgs = request.arguments;
-                            response = this.getNavigationBarItems(navBarArgs.file);
-                            break;
-                        }
-                        default: {
-                            this.projectService.log("Unrecognized JSON command: " + message);
-                            this.output(undefined, CommandNames.Unknown, request.seq, "Unrecognized JSON command: " + request.command);
-                            break;
+                        case CommandNames.Definition:
+                            {
+                                var defArgs = request.arguments;
+                                response = this.getDefinition(defArgs.line, defArgs.col, defArgs.file);
+                                break;
+                            }
+                        case CommandNames.References:
+                            {
+                                var refArgs = request.arguments;
+                                response = this.getReferences(refArgs.line, refArgs.col, refArgs.file);
+                                break;
+                            }
+                        case CommandNames.Rename:
+                            {
+                                var renameArgs = request.arguments;
+                                response = this.getRenameLocations(renameArgs.line, renameArgs.col, renameArgs.file, renameArgs.findInComments, renameArgs.findInStrings);
+                                break;
+                            }
+                        case CommandNames.Open:
+                            {
+                                var openArgs = request.arguments;
+                                this.openClientFile(openArgs.file);
+                                responseRequired = false;
+                                break;
+                            }
+                        case CommandNames.Quickinfo:
+                            {
+                                var quickinfoArgs = request.arguments;
+                                response = this.getQuickInfo(quickinfoArgs.line, quickinfoArgs.col, quickinfoArgs.file);
+                                break;
+                            }
+                        case CommandNames.Format:
+                            {
+                                var formatArgs = request.arguments;
+                                response = this.getFormattingEditsForRange(formatArgs.line, formatArgs.col, formatArgs.endLine, formatArgs.endCol, formatArgs.file);
+                                break;
+                            }
+                        case CommandNames.Formatonkey:
+                            {
+                                var formatOnKeyArgs = request.arguments;
+                                response = this.getFormattingEditsAfterKeystroke(formatOnKeyArgs.line, formatOnKeyArgs.col, formatOnKeyArgs.key, formatOnKeyArgs.file);
+                                break;
+                            }
+                        case CommandNames.Completions:
+                            {
+                                var completionsArgs = request.arguments;
+                                response = this.getCompletions(request.arguments.line, request.arguments.col, completionsArgs.prefix, request.arguments.file);
+                                break;
+                            }
+                        case CommandNames.CompletionDetails:
+                            {
+                                var completionDetailsArgs = request.arguments;
+                                response = this.getCompletionEntryDetails(request.arguments.line, request.arguments.col, completionDetailsArgs.entryNames, request.arguments.file);
+                                break;
+                            }
+                        case CommandNames.Geterr:
+                            {
+                                var geterrArgs = request.arguments;
+                                response = this.getDiagnostics(geterrArgs.delay, geterrArgs.files);
+                                responseRequired = false;
+                                break;
+                            }
+                        case CommandNames.Change:
+                            {
+                                var changeArgs = request.arguments;
+                                this.change(changeArgs.line, changeArgs.col, changeArgs.endLine, changeArgs.endCol, changeArgs.insertString, changeArgs.file);
+                                responseRequired = false;
+                                break;
+                            }
+                        case CommandNames.Reload:
+                            {
+                                var reloadArgs = request.arguments;
+                                this.reload(reloadArgs.file, reloadArgs.tmpfile, request.seq);
+                                break;
+                            }
+                        case CommandNames.Saveto:
+                            {
+                                var savetoArgs = request.arguments;
+                                this.saveToTmp(savetoArgs.file, savetoArgs.tmpfile);
+                                responseRequired = false;
+                                break;
+                            }
+                        case CommandNames.Close:
+                            {
+                                var closeArgs = request.arguments;
+                                this.closeClientFile(closeArgs.file);
+                                responseRequired = false;
+                                break;
+                            }
+                        case CommandNames.Navto:
+                            {
+                                var navtoArgs = request.arguments;
+                                response = this.getNavigateToItems(navtoArgs.searchValue, navtoArgs.file, navtoArgs.maxResultCount);
+                                break;
+                            }
+                        case CommandNames.Brace:
+                            {
+                                var braceArguments = request.arguments;
+                                response = this.getBraceMatching(braceArguments.line, braceArguments.col, braceArguments.file);
+                                break;
+                            }
+                        case CommandNames.NavBar:
+                            {
+                                var navBarArgs = request.arguments;
+                                response = this.getNavigationBarItems(navBarArgs.file);
+                                break;
+                            }
+                        default:
+                            {
+                                this.projectService.log("Unrecognized JSON command: " + message);
+                                this.output(undefined, CommandNames.Unknown, request.seq, "Unrecognized JSON command: " + request.command);
+                                break;
+                            }
+                    }
+                    if (this.logger.isVerbose()) {
+                        var elapsed = process.hrtime(start);
+                        var seconds = elapsed[0];
+                        var nanoseconds = elapsed[1];
+                        var elapsedMs = ((1e9 * seconds) + nanoseconds) / 1000000.0;
+                        var leader = "Elapsed time (in milliseconds)";
+                        if (!responseRequired) {
+                            leader = "Async elapsed time (in milliseconds)";
                         }
+                        this.logger.msg(leader + ": " + elapsedMs.toFixed(4).toString(), "Perf");
                     }
                     if (response) {
                         this.output(response, request.command, request.seq);
@@ -32927,8 +37989,9 @@ var ts;
             terminal: false
         });
         var Logger = (function () {
-            function Logger(logFilename) {
+            function Logger(logFilename, level) {
                 this.logFilename = logFilename;
+                this.level = level;
                 this.fd = -1;
                 this.seq = 0;
                 this.inGroup = false;
@@ -32957,10 +38020,18 @@ var ts;
                 this.seq++;
                 this.firstInGroup = true;
             };
+            Logger.prototype.loggingEnabled = function () {
+                return !!this.logFilename;
+            };
+            Logger.prototype.isVerbose = function () {
+                return this.loggingEnabled() && (this.level == "verbose");
+            };
             Logger.prototype.msg = function (s, type) {
                 if (type === void 0) { type = "Err"; }
                 if (this.fd < 0) {
-                    this.fd = fs.openSync(this.logFilename, "w");
+                    if (this.logFilename) {
+                        this.fd = fs.openSync(this.logFilename, "w");
+                    }
                 }
                 if (this.fd >= 0) {
                     s = s + "\n";
@@ -33064,19 +38135,58 @@ var ts;
                     _this.onMessage(message);
                 });
                 rl.on('close', function () {
-                    _this.projectService.closeLog();
                     _this.projectService.log("Exiting...");
+                    _this.projectService.closeLog();
                     process.exit(0);
                 });
             };
             return IOSession;
         })(server.Session);
-        var logger = new Logger(__dirname + "/.log" + process.pid.toString());
+        function parseLoggingEnvironmentString(logEnvStr) {
+            var logEnv = {};
+            var args = logEnvStr.split(' ');
+            for (var i = 0, len = args.length; i < (len - 1); i += 2) {
+                var option = args[i];
+                var value = args[i + 1];
+                if (option && value) {
+                    switch (option) {
+                        case "-file":
+                            logEnv.file = value;
+                            break;
+                        case "-level":
+                            logEnv.detailLevel = value;
+                            break;
+                    }
+                }
+            }
+            return logEnv;
+        }
+        function createLoggerFromEnv() {
+            var fileName = undefined;
+            var detailLevel = "normal";
+            var logEnvStr = process.env["TSS_LOG"];
+            if (logEnvStr) {
+                var logEnv = parseLoggingEnvironmentString(logEnvStr);
+                if (logEnv.file) {
+                    fileName = logEnv.file;
+                }
+                else {
+                    fileName = __dirname + "/.log" + process.pid.toString();
+                }
+                if (logEnv.detailLevel) {
+                    detailLevel = logEnv.detailLevel;
+                }
+            }
+            return new Logger(fileName, detailLevel);
+        }
+        var logger = createLoggerFromEnv();
         var watchedFileSet = new WatchedFileSet();
         ts.sys.watchFile = function (fileName, callback) {
             var watchedFile = watchedFileSet.addFile(fileName, callback);
             return {
-                close: function () { return watchedFileSet.removeFile(watchedFile); }
+                close: function () {
+                    return watchedFileSet.removeFile(watchedFile);
+                }
             };
         };
         var ioSession = new IOSession(ts.sys, logger);
diff --git a/bin/typescript.d.ts b/bin/typescript.d.ts
index 3de69b45409..bf6b204d3bb 100644
--- a/bin/typescript.d.ts
+++ b/bin/typescript.d.ts
@@ -224,27 +224,28 @@ declare module "typescript" {
         EnumDeclaration = 199,
         ModuleDeclaration = 200,
         ModuleBlock = 201,
-        ImportEqualsDeclaration = 202,
-        ImportDeclaration = 203,
-        ImportClause = 204,
-        NamespaceImport = 205,
-        NamedImports = 206,
-        ImportSpecifier = 207,
-        ExportAssignment = 208,
-        ExportDeclaration = 209,
-        NamedExports = 210,
-        ExportSpecifier = 211,
-        ExternalModuleReference = 212,
-        CaseClause = 213,
-        DefaultClause = 214,
-        HeritageClause = 215,
-        CatchClause = 216,
-        PropertyAssignment = 217,
-        ShorthandPropertyAssignment = 218,
-        EnumMember = 219,
-        SourceFile = 220,
-        SyntaxList = 221,
-        Count = 222,
+        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,
@@ -619,6 +620,9 @@ declare module "typescript" {
     }
     interface SwitchStatement extends Statement {
         expression: Expression;
+        caseBlock: CaseBlock;
+    }
+    interface CaseBlock extends Node {
         clauses: NodeArray<CaseOrDefaultClause>;
     }
     interface CaseClause extends Node {
@@ -1197,6 +1201,7 @@ declare module "typescript" {
         version?: boolean;
         watch?: boolean;
         stripInternal?: boolean;
+        preserveNewLines?: boolean;
         [option: string]: string | number | boolean;
     }
     const enum ModuleKind {
@@ -1437,12 +1442,15 @@ declare module "typescript" {
     function createTypeChecker(host: TypeCheckerHost, produceDiagnostics: boolean): TypeChecker;
 }
 declare module "typescript" {
+    /** The version of the TypeScript compiler release */
+    var version: string;
     function createCompilerHost(options: CompilerOptions): CompilerHost;
     function getPreEmitDiagnostics(program: Program): Diagnostic[];
     function flattenDiagnosticMessageText(messageText: string | DiagnosticMessageChain, newLine: string): string;
     function createProgram(rootNames: string[], options: CompilerOptions, host?: CompilerHost): Program;
 }
 declare module "typescript" {
+    /** The version of the language service API */
     var servicesVersion: string;
     interface Node {
         getSourceFile(): SourceFile;
diff --git a/bin/typescript.js b/bin/typescript.js
index f3c487b2079..0fb345eea1b 100644
--- a/bin/typescript.js
+++ b/bin/typescript.js
@@ -218,27 +218,28 @@ var ts;
         SyntaxKind[SyntaxKind["EnumDeclaration"] = 199] = "EnumDeclaration";
         SyntaxKind[SyntaxKind["ModuleDeclaration"] = 200] = "ModuleDeclaration";
         SyntaxKind[SyntaxKind["ModuleBlock"] = 201] = "ModuleBlock";
-        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 202] = "ImportEqualsDeclaration";
-        SyntaxKind[SyntaxKind["ImportDeclaration"] = 203] = "ImportDeclaration";
-        SyntaxKind[SyntaxKind["ImportClause"] = 204] = "ImportClause";
-        SyntaxKind[SyntaxKind["NamespaceImport"] = 205] = "NamespaceImport";
-        SyntaxKind[SyntaxKind["NamedImports"] = 206] = "NamedImports";
-        SyntaxKind[SyntaxKind["ImportSpecifier"] = 207] = "ImportSpecifier";
-        SyntaxKind[SyntaxKind["ExportAssignment"] = 208] = "ExportAssignment";
-        SyntaxKind[SyntaxKind["ExportDeclaration"] = 209] = "ExportDeclaration";
-        SyntaxKind[SyntaxKind["NamedExports"] = 210] = "NamedExports";
-        SyntaxKind[SyntaxKind["ExportSpecifier"] = 211] = "ExportSpecifier";
-        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 212] = "ExternalModuleReference";
-        SyntaxKind[SyntaxKind["CaseClause"] = 213] = "CaseClause";
-        SyntaxKind[SyntaxKind["DefaultClause"] = 214] = "DefaultClause";
-        SyntaxKind[SyntaxKind["HeritageClause"] = 215] = "HeritageClause";
-        SyntaxKind[SyntaxKind["CatchClause"] = 216] = "CatchClause";
-        SyntaxKind[SyntaxKind["PropertyAssignment"] = 217] = "PropertyAssignment";
-        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 218] = "ShorthandPropertyAssignment";
-        SyntaxKind[SyntaxKind["EnumMember"] = 219] = "EnumMember";
-        SyntaxKind[SyntaxKind["SourceFile"] = 220] = "SourceFile";
-        SyntaxKind[SyntaxKind["SyntaxList"] = 221] = "SyntaxList";
-        SyntaxKind[SyntaxKind["Count"] = 222] = "Count";
+        SyntaxKind[SyntaxKind["CaseBlock"] = 202] = "CaseBlock";
+        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 203] = "ImportEqualsDeclaration";
+        SyntaxKind[SyntaxKind["ImportDeclaration"] = 204] = "ImportDeclaration";
+        SyntaxKind[SyntaxKind["ImportClause"] = 205] = "ImportClause";
+        SyntaxKind[SyntaxKind["NamespaceImport"] = 206] = "NamespaceImport";
+        SyntaxKind[SyntaxKind["NamedImports"] = 207] = "NamedImports";
+        SyntaxKind[SyntaxKind["ImportSpecifier"] = 208] = "ImportSpecifier";
+        SyntaxKind[SyntaxKind["ExportAssignment"] = 209] = "ExportAssignment";
+        SyntaxKind[SyntaxKind["ExportDeclaration"] = 210] = "ExportDeclaration";
+        SyntaxKind[SyntaxKind["NamedExports"] = 211] = "NamedExports";
+        SyntaxKind[SyntaxKind["ExportSpecifier"] = 212] = "ExportSpecifier";
+        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 213] = "ExternalModuleReference";
+        SyntaxKind[SyntaxKind["CaseClause"] = 214] = "CaseClause";
+        SyntaxKind[SyntaxKind["DefaultClause"] = 215] = "DefaultClause";
+        SyntaxKind[SyntaxKind["HeritageClause"] = 216] = "HeritageClause";
+        SyntaxKind[SyntaxKind["CatchClause"] = 217] = "CatchClause";
+        SyntaxKind[SyntaxKind["PropertyAssignment"] = 218] = "PropertyAssignment";
+        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 219] = "ShorthandPropertyAssignment";
+        SyntaxKind[SyntaxKind["EnumMember"] = 220] = "EnumMember";
+        SyntaxKind[SyntaxKind["SourceFile"] = 221] = "SourceFile";
+        SyntaxKind[SyntaxKind["SyntaxList"] = 222] = "SyntaxList";
+        SyntaxKind[SyntaxKind["Count"] = 223] = "Count";
         SyntaxKind[SyntaxKind["FirstAssignment"] = 52] = "FirstAssignment";
         SyntaxKind[SyntaxKind["LastAssignment"] = 63] = "LastAssignment";
         SyntaxKind[SyntaxKind["FirstReservedWord"] = 65] = "FirstReservedWord";
@@ -824,18 +825,21 @@ var ts;
     ts.arrayToMap = arrayToMap;
     function formatStringFromArgs(text, args, baseIndex) {
         baseIndex = baseIndex || 0;
-        return text.replace(/{(\d+)}/g, function (match, index) { return args[+index + baseIndex]; });
+        return text.replace(/{(\d+)}/g, function (match, index) {
+            return args[+index + baseIndex];
+        });
     }
     ts.localizedDiagnosticMessages = undefined;
     function getLocaleSpecificMessage(message) {
-        return ts.localizedDiagnosticMessages && ts.localizedDiagnosticMessages[message]
-            ? ts.localizedDiagnosticMessages[message]
-            : message;
+        return ts.localizedDiagnosticMessages && ts.localizedDiagnosticMessages[message] ? ts.localizedDiagnosticMessages[message] : message;
     }
     ts.getLocaleSpecificMessage = getLocaleSpecificMessage;
     function createFileDiagnostic(file, start, length, message) {
+        var end = start + length;
         Debug.assert(start >= 0, "start must be non-negative, is " + start);
         Debug.assert(length >= 0, "length must be non-negative, is " + length);
+        Debug.assert(start <= file.text.length, "start must be within the bounds of the file. " + start + " > " + file.text.length);
+        Debug.assert(end <= file.text.length, "end must be the bounds of the file. " + end + " > " + file.text.length);
         var text = getLocaleSpecificMessage(message.key);
         if (arguments.length > 4) {
             text = formatStringFromArgs(text, arguments, 4);
@@ -898,12 +902,7 @@ var ts;
         return diagnostic.file ? diagnostic.file.fileName : undefined;
     }
     function compareDiagnostics(d1, d2) {
-        return compareValues(getDiagnosticFileName(d1), getDiagnosticFileName(d2)) ||
-            compareValues(d1.start, d2.start) ||
-            compareValues(d1.length, d2.length) ||
-            compareValues(d1.code, d2.code) ||
-            compareMessageText(d1.messageText, d2.messageText) ||
-            0;
+        return compareValues(getDiagnosticFileName(d1), getDiagnosticFileName(d2)) || compareValues(d1.start, d2.start) || compareValues(d1.length, d2.length) || compareValues(d1.code, d2.code) || compareMessageText(d1.messageText, d2.messageText) || 0;
     }
     ts.compareDiagnostics = compareDiagnostics;
     function compareMessageText(text1, text2) {
@@ -930,7 +929,9 @@ var ts;
         if (diagnostics.length < 2) {
             return diagnostics;
         }
-        var newDiagnostics = [diagnostics[0]];
+        var newDiagnostics = [
+            diagnostics[0]
+        ];
         var previousDiagnostic = diagnostics[0];
         for (var i = 1; i < diagnostics.length; i++) {
             var currentDiagnostic = diagnostics[i];
@@ -1007,7 +1008,9 @@ var ts;
     ts.isRootedDiskPath = isRootedDiskPath;
     function normalizedPathComponents(path, rootLength) {
         var normalizedParts = getNormalizedParts(path, rootLength);
-        return [path.substr(0, rootLength)].concat(normalizedParts);
+        return [
+            path.substr(0, rootLength)
+        ].concat(normalizedParts);
     }
     function getNormalizedPathComponents(path, currentDirectory) {
         var path = normalizeSlashes(path);
@@ -1041,7 +1044,9 @@ var ts;
             }
         }
         if (rootLength === urlLength) {
-            return [url];
+            return [
+                url
+            ];
         }
         var indexOfNextSlash = url.indexOf(ts.directorySeparator, rootLength);
         if (indexOfNextSlash !== -1) {
@@ -1049,7 +1054,9 @@ var ts;
             return normalizedPathComponents(url, rootLength);
         }
         else {
-            return [url + ts.directorySeparator];
+            return [
+                url + ts.directorySeparator
+            ];
         }
     }
     function getNormalizedPathOrUrlComponents(pathOrUrl, currentDirectory) {
@@ -1111,7 +1118,11 @@ var ts;
         return pathLen > extLen && path.substr(pathLen - extLen, extLen) === extension;
     }
     ts.fileExtensionIs = fileExtensionIs;
-    var supportedExtensions = [".d.ts", ".ts", ".js"];
+    var supportedExtensions = [
+        ".d.ts",
+        ".ts",
+        ".js"
+    ];
     function removeFileExtension(path) {
         for (var i = 0; i < supportedExtensions.length; i++) {
             var ext = supportedExtensions[i];
@@ -1165,9 +1176,15 @@ var ts;
             };
             return Node;
         },
-        getSymbolConstructor: function () { return Symbol; },
-        getTypeConstructor: function () { return Type; },
-        getSignatureConstructor: function () { return Signature; }
+        getSymbolConstructor: function () {
+            return Symbol;
+        },
+        getTypeConstructor: function () {
+            return Type;
+        },
+        getSignatureConstructor: function () {
+            return Signature;
+        }
     };
     (function (AssertionLevel) {
         AssertionLevel[AssertionLevel["None"] = 0] = "None";
@@ -1392,9 +1409,14 @@ var ts;
                 readFile: readFile,
                 writeFile: writeFile,
                 watchFile: function (fileName, callback) {
-                    _fs.watchFile(fileName, { persistent: true, interval: 250 }, fileChanged);
+                    _fs.watchFile(fileName, {
+                        persistent: true,
+                        interval: 250
+                    }, fileChanged);
                     return {
-                        close: function () { _fs.unwatchFile(fileName, fileChanged); }
+                        close: function () {
+                            _fs.unwatchFile(fileName, fileChanged);
+                        }
                     };
                     function fileChanged(curr, prev) {
                         if (+curr.mtime <= +prev.mtime) {
@@ -1450,488 +1472,2431 @@ var ts;
 var ts;
 (function (ts) {
     ts.Diagnostics = {
-        Unterminated_string_literal: { code: 1002, category: 1, key: "Unterminated string literal." },
-        Identifier_expected: { code: 1003, category: 1, key: "Identifier expected." },
-        _0_expected: { code: 1005, category: 1, key: "'{0}' expected." },
-        A_file_cannot_have_a_reference_to_itself: { code: 1006, category: 1, key: "A file cannot have a reference to itself." },
-        Trailing_comma_not_allowed: { code: 1009, category: 1, key: "Trailing comma not allowed." },
-        Asterisk_Slash_expected: { code: 1010, category: 1, key: "'*/' expected." },
-        Unexpected_token: { code: 1012, category: 1, key: "Unexpected token." },
-        A_rest_parameter_must_be_last_in_a_parameter_list: { code: 1014, category: 1, key: "A rest parameter must be last in a parameter list." },
-        Parameter_cannot_have_question_mark_and_initializer: { code: 1015, category: 1, key: "Parameter cannot have question mark and initializer." },
-        A_required_parameter_cannot_follow_an_optional_parameter: { code: 1016, category: 1, key: "A required parameter cannot follow an optional parameter." },
-        An_index_signature_cannot_have_a_rest_parameter: { code: 1017, category: 1, key: "An index signature cannot have a rest parameter." },
-        An_index_signature_parameter_cannot_have_an_accessibility_modifier: { code: 1018, category: 1, key: "An index signature parameter cannot have an accessibility modifier." },
-        An_index_signature_parameter_cannot_have_a_question_mark: { code: 1019, category: 1, key: "An index signature parameter cannot have a question mark." },
-        An_index_signature_parameter_cannot_have_an_initializer: { code: 1020, category: 1, key: "An index signature parameter cannot have an initializer." },
-        An_index_signature_must_have_a_type_annotation: { code: 1021, category: 1, key: "An index signature must have a type annotation." },
-        An_index_signature_parameter_must_have_a_type_annotation: { code: 1022, category: 1, key: "An index signature parameter must have a type annotation." },
-        An_index_signature_parameter_type_must_be_string_or_number: { code: 1023, category: 1, key: "An index signature parameter type must be 'string' or 'number'." },
-        A_class_or_interface_declaration_can_only_have_one_extends_clause: { code: 1024, category: 1, key: "A class or interface declaration can only have one 'extends' clause." },
-        An_extends_clause_must_precede_an_implements_clause: { code: 1025, category: 1, key: "An 'extends' clause must precede an 'implements' clause." },
-        A_class_can_only_extend_a_single_class: { code: 1026, category: 1, key: "A class can only extend a single class." },
-        A_class_declaration_can_only_have_one_implements_clause: { code: 1027, category: 1, key: "A class declaration can only have one 'implements' clause." },
-        Accessibility_modifier_already_seen: { code: 1028, category: 1, key: "Accessibility modifier already seen." },
-        _0_modifier_must_precede_1_modifier: { code: 1029, category: 1, key: "'{0}' modifier must precede '{1}' modifier." },
-        _0_modifier_already_seen: { code: 1030, category: 1, key: "'{0}' modifier already seen." },
-        _0_modifier_cannot_appear_on_a_class_element: { code: 1031, category: 1, key: "'{0}' modifier cannot appear on a class element." },
-        An_interface_declaration_cannot_have_an_implements_clause: { code: 1032, category: 1, key: "An interface declaration cannot have an 'implements' clause." },
-        super_must_be_followed_by_an_argument_list_or_member_access: { code: 1034, category: 1, key: "'super' must be followed by an argument list or member access." },
-        Only_ambient_modules_can_use_quoted_names: { code: 1035, category: 1, key: "Only ambient modules can use quoted names." },
-        Statements_are_not_allowed_in_ambient_contexts: { code: 1036, category: 1, key: "Statements are not allowed in ambient contexts." },
-        A_declare_modifier_cannot_be_used_in_an_already_ambient_context: { code: 1038, category: 1, key: "A 'declare' modifier cannot be used in an already ambient context." },
-        Initializers_are_not_allowed_in_ambient_contexts: { code: 1039, category: 1, key: "Initializers are not allowed in ambient contexts." },
-        _0_modifier_cannot_appear_on_a_module_element: { code: 1044, category: 1, key: "'{0}' modifier cannot appear on a module element." },
-        A_declare_modifier_cannot_be_used_with_an_interface_declaration: { code: 1045, category: 1, key: "A 'declare' modifier cannot be used with an interface declaration." },
-        A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file: { code: 1046, category: 1, key: "A 'declare' modifier is required for a top level declaration in a .d.ts file." },
-        A_rest_parameter_cannot_be_optional: { code: 1047, category: 1, key: "A rest parameter cannot be optional." },
-        A_rest_parameter_cannot_have_an_initializer: { code: 1048, category: 1, key: "A rest parameter cannot have an initializer." },
-        A_set_accessor_must_have_exactly_one_parameter: { code: 1049, category: 1, key: "A 'set' accessor must have exactly one parameter." },
-        A_set_accessor_cannot_have_an_optional_parameter: { code: 1051, category: 1, key: "A 'set' accessor cannot have an optional parameter." },
-        A_set_accessor_parameter_cannot_have_an_initializer: { code: 1052, category: 1, key: "A 'set' accessor parameter cannot have an initializer." },
-        A_set_accessor_cannot_have_rest_parameter: { code: 1053, category: 1, key: "A 'set' accessor cannot have rest parameter." },
-        A_get_accessor_cannot_have_parameters: { code: 1054, category: 1, key: "A 'get' accessor cannot have parameters." },
-        Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher: { code: 1056, category: 1, key: "Accessors are only available when targeting ECMAScript 5 and higher." },
-        Enum_member_must_have_initializer: { code: 1061, category: 1, key: "Enum member must have initializer." },
-        An_export_assignment_cannot_be_used_in_an_internal_module: { code: 1063, category: 1, key: "An export assignment cannot be used in an internal module." },
-        Ambient_enum_elements_can_only_have_integer_literal_initializers: { code: 1066, category: 1, key: "Ambient enum elements can only have integer literal initializers." },
-        Unexpected_token_A_constructor_method_accessor_or_property_was_expected: { code: 1068, category: 1, key: "Unexpected token. A constructor, method, accessor, or property was expected." },
-        A_declare_modifier_cannot_be_used_with_an_import_declaration: { code: 1079, category: 1, key: "A 'declare' modifier cannot be used with an import declaration." },
-        Invalid_reference_directive_syntax: { code: 1084, category: 1, key: "Invalid 'reference' directive syntax." },
-        Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher: { code: 1085, category: 1, key: "Octal literals are not available when targeting ECMAScript 5 and higher." },
-        An_accessor_cannot_be_declared_in_an_ambient_context: { code: 1086, category: 1, key: "An accessor cannot be declared in an ambient context." },
-        _0_modifier_cannot_appear_on_a_constructor_declaration: { code: 1089, category: 1, key: "'{0}' modifier cannot appear on a constructor declaration." },
-        _0_modifier_cannot_appear_on_a_parameter: { code: 1090, category: 1, key: "'{0}' modifier cannot appear on a parameter." },
-        Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement: { code: 1091, category: 1, key: "Only a single variable declaration is allowed in a 'for...in' statement." },
-        Type_parameters_cannot_appear_on_a_constructor_declaration: { code: 1092, category: 1, key: "Type parameters cannot appear on a constructor declaration." },
-        Type_annotation_cannot_appear_on_a_constructor_declaration: { code: 1093, category: 1, key: "Type annotation cannot appear on a constructor declaration." },
-        An_accessor_cannot_have_type_parameters: { code: 1094, category: 1, key: "An accessor cannot have type parameters." },
-        A_set_accessor_cannot_have_a_return_type_annotation: { code: 1095, category: 1, key: "A 'set' accessor cannot have a return type annotation." },
-        An_index_signature_must_have_exactly_one_parameter: { code: 1096, category: 1, key: "An index signature must have exactly one parameter." },
-        _0_list_cannot_be_empty: { code: 1097, category: 1, key: "'{0}' list cannot be empty." },
-        Type_parameter_list_cannot_be_empty: { code: 1098, category: 1, key: "Type parameter list cannot be empty." },
-        Type_argument_list_cannot_be_empty: { code: 1099, category: 1, key: "Type argument list cannot be empty." },
-        Invalid_use_of_0_in_strict_mode: { code: 1100, category: 1, key: "Invalid use of '{0}' in strict mode." },
-        with_statements_are_not_allowed_in_strict_mode: { code: 1101, category: 1, key: "'with' statements are not allowed in strict mode." },
-        delete_cannot_be_called_on_an_identifier_in_strict_mode: { code: 1102, category: 1, key: "'delete' cannot be called on an identifier in strict mode." },
-        A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement: { code: 1104, category: 1, key: "A 'continue' statement can only be used within an enclosing iteration statement." },
-        A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement: { code: 1105, category: 1, key: "A 'break' statement can only be used within an enclosing iteration or switch statement." },
-        Jump_target_cannot_cross_function_boundary: { code: 1107, category: 1, key: "Jump target cannot cross function boundary." },
-        A_return_statement_can_only_be_used_within_a_function_body: { code: 1108, category: 1, key: "A 'return' statement can only be used within a function body." },
-        Expression_expected: { code: 1109, category: 1, key: "Expression expected." },
-        Type_expected: { code: 1110, category: 1, key: "Type expected." },
-        A_class_member_cannot_be_declared_optional: { code: 1112, category: 1, key: "A class member cannot be declared optional." },
-        A_default_clause_cannot_appear_more_than_once_in_a_switch_statement: { code: 1113, category: 1, key: "A 'default' clause cannot appear more than once in a 'switch' statement." },
-        Duplicate_label_0: { code: 1114, category: 1, key: "Duplicate label '{0}'" },
-        A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement: { code: 1115, category: 1, key: "A 'continue' statement can only jump to a label of an enclosing iteration statement." },
-        A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement: { code: 1116, category: 1, key: "A 'break' statement can only jump to a label of an enclosing statement." },
-        An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode: { code: 1117, category: 1, key: "An object literal cannot have multiple properties with the same name in strict mode." },
-        An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name: { code: 1118, category: 1, key: "An object literal cannot have multiple get/set accessors with the same name." },
-        An_object_literal_cannot_have_property_and_accessor_with_the_same_name: { code: 1119, category: 1, key: "An object literal cannot have property and accessor with the same name." },
-        An_export_assignment_cannot_have_modifiers: { code: 1120, category: 1, key: "An export assignment cannot have modifiers." },
-        Octal_literals_are_not_allowed_in_strict_mode: { code: 1121, category: 1, key: "Octal literals are not allowed in strict mode." },
-        A_tuple_type_element_list_cannot_be_empty: { code: 1122, category: 1, key: "A tuple type element list cannot be empty." },
-        Variable_declaration_list_cannot_be_empty: { code: 1123, category: 1, key: "Variable declaration list cannot be empty." },
-        Digit_expected: { code: 1124, category: 1, key: "Digit expected." },
-        Hexadecimal_digit_expected: { code: 1125, category: 1, key: "Hexadecimal digit expected." },
-        Unexpected_end_of_text: { code: 1126, category: 1, key: "Unexpected end of text." },
-        Invalid_character: { code: 1127, category: 1, key: "Invalid character." },
-        Declaration_or_statement_expected: { code: 1128, category: 1, key: "Declaration or statement expected." },
-        Statement_expected: { code: 1129, category: 1, key: "Statement expected." },
-        case_or_default_expected: { code: 1130, category: 1, key: "'case' or 'default' expected." },
-        Property_or_signature_expected: { code: 1131, category: 1, key: "Property or signature expected." },
-        Enum_member_expected: { code: 1132, category: 1, key: "Enum member expected." },
-        Type_reference_expected: { code: 1133, category: 1, key: "Type reference expected." },
-        Variable_declaration_expected: { code: 1134, category: 1, key: "Variable declaration expected." },
-        Argument_expression_expected: { code: 1135, category: 1, key: "Argument expression expected." },
-        Property_assignment_expected: { code: 1136, category: 1, key: "Property assignment expected." },
-        Expression_or_comma_expected: { code: 1137, category: 1, key: "Expression or comma expected." },
-        Parameter_declaration_expected: { code: 1138, category: 1, key: "Parameter declaration expected." },
-        Type_parameter_declaration_expected: { code: 1139, category: 1, key: "Type parameter declaration expected." },
-        Type_argument_expected: { code: 1140, category: 1, key: "Type argument expected." },
-        String_literal_expected: { code: 1141, category: 1, key: "String literal expected." },
-        Line_break_not_permitted_here: { code: 1142, category: 1, key: "Line break not permitted here." },
-        or_expected: { code: 1144, category: 1, key: "'{' or ';' expected." },
-        Modifiers_not_permitted_on_index_signature_members: { code: 1145, category: 1, key: "Modifiers not permitted on index signature members." },
-        Declaration_expected: { code: 1146, category: 1, key: "Declaration expected." },
-        Import_declarations_in_an_internal_module_cannot_reference_an_external_module: { code: 1147, category: 1, key: "Import declarations in an internal module cannot reference an external module." },
-        Cannot_compile_external_modules_unless_the_module_flag_is_provided: { code: 1148, category: 1, key: "Cannot compile external modules unless the '--module' flag is provided." },
-        File_name_0_differs_from_already_included_file_name_1_only_in_casing: { code: 1149, category: 1, key: "File name '{0}' differs from already included file name '{1}' only in casing" },
-        new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead: { code: 1150, category: 1, key: "'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead." },
-        var_let_or_const_expected: { code: 1152, category: 1, key: "'var', 'let' or 'const' expected." },
-        let_declarations_are_only_available_when_targeting_ECMAScript_6_and_higher: { code: 1153, category: 1, key: "'let' declarations are only available when targeting ECMAScript 6 and higher." },
-        const_declarations_are_only_available_when_targeting_ECMAScript_6_and_higher: { code: 1154, category: 1, key: "'const' declarations are only available when targeting ECMAScript 6 and higher." },
-        const_declarations_must_be_initialized: { code: 1155, category: 1, key: "'const' declarations must be initialized" },
-        const_declarations_can_only_be_declared_inside_a_block: { code: 1156, category: 1, key: "'const' declarations can only be declared inside a block." },
-        let_declarations_can_only_be_declared_inside_a_block: { code: 1157, category: 1, key: "'let' declarations can only be declared inside a block." },
-        Unterminated_template_literal: { code: 1160, category: 1, key: "Unterminated template literal." },
-        Unterminated_regular_expression_literal: { code: 1161, category: 1, key: "Unterminated regular expression literal." },
-        An_object_member_cannot_be_declared_optional: { code: 1162, category: 1, key: "An object member cannot be declared optional." },
-        yield_expression_must_be_contained_within_a_generator_declaration: { code: 1163, category: 1, key: "'yield' expression must be contained_within a generator declaration." },
-        Computed_property_names_are_not_allowed_in_enums: { code: 1164, category: 1, key: "Computed property names are not allowed in enums." },
-        A_computed_property_name_in_an_ambient_context_must_directly_refer_to_a_built_in_symbol: { code: 1165, category: 1, key: "A computed property name in an ambient context must directly refer to a built-in symbol." },
-        A_computed_property_name_in_a_class_property_declaration_must_directly_refer_to_a_built_in_symbol: { code: 1166, category: 1, key: "A computed property name in a class property declaration must directly refer to a built-in symbol." },
-        Computed_property_names_are_only_available_when_targeting_ECMAScript_6_and_higher: { code: 1167, category: 1, key: "Computed property names are only available when targeting ECMAScript 6 and higher." },
-        A_computed_property_name_in_a_method_overload_must_directly_refer_to_a_built_in_symbol: { code: 1168, category: 1, key: "A computed property name in a method overload must directly refer to a built-in symbol." },
-        A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol: { code: 1169, category: 1, key: "A computed property name in an interface must directly refer to a built-in symbol." },
-        A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol: { code: 1170, category: 1, key: "A computed property name in a type literal must directly refer to a built-in symbol." },
-        A_comma_expression_is_not_allowed_in_a_computed_property_name: { code: 1171, category: 1, key: "A comma expression is not allowed in a computed property name." },
-        extends_clause_already_seen: { code: 1172, category: 1, key: "'extends' clause already seen." },
-        extends_clause_must_precede_implements_clause: { code: 1173, category: 1, key: "'extends' clause must precede 'implements' clause." },
-        Classes_can_only_extend_a_single_class: { code: 1174, category: 1, key: "Classes can only extend a single class." },
-        implements_clause_already_seen: { code: 1175, category: 1, key: "'implements' clause already seen." },
-        Interface_declaration_cannot_have_implements_clause: { code: 1176, category: 1, key: "Interface declaration cannot have 'implements' clause." },
-        Binary_digit_expected: { code: 1177, category: 1, key: "Binary digit expected." },
-        Octal_digit_expected: { code: 1178, category: 1, key: "Octal digit expected." },
-        Unexpected_token_expected: { code: 1179, category: 1, key: "Unexpected token. '{' expected." },
-        Property_destructuring_pattern_expected: { code: 1180, category: 1, key: "Property destructuring pattern expected." },
-        Array_element_destructuring_pattern_expected: { code: 1181, category: 1, key: "Array element destructuring pattern expected." },
-        A_destructuring_declaration_must_have_an_initializer: { code: 1182, category: 1, key: "A destructuring declaration must have an initializer." },
-        Destructuring_declarations_are_not_allowed_in_ambient_contexts: { code: 1183, category: 1, key: "Destructuring declarations are not allowed in ambient contexts." },
-        An_implementation_cannot_be_declared_in_ambient_contexts: { code: 1184, category: 1, key: "An implementation cannot be declared in ambient contexts." },
-        Modifiers_cannot_appear_here: { code: 1184, category: 1, key: "Modifiers cannot appear here." },
-        Merge_conflict_marker_encountered: { code: 1185, category: 1, key: "Merge conflict marker encountered." },
-        A_rest_element_cannot_have_an_initializer: { code: 1186, category: 1, key: "A rest element cannot have an initializer." },
-        A_parameter_property_may_not_be_a_binding_pattern: { code: 1187, category: 1, key: "A parameter property may not be a binding pattern." },
-        Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement: { code: 1188, category: 1, key: "Only a single variable declaration is allowed in a 'for...of' statement." },
-        The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer: { code: 1189, category: 1, key: "The variable declaration of a 'for...in' statement cannot have an initializer." },
-        The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer: { code: 1190, category: 1, key: "The variable declaration of a 'for...of' statement cannot have an initializer." },
-        An_import_declaration_cannot_have_modifiers: { code: 1191, category: 1, key: "An import declaration cannot have modifiers." },
-        External_module_0_has_no_default_export_or_export_assignment: { code: 1192, category: 1, key: "External module '{0}' has no default export or export assignment." },
-        An_export_declaration_cannot_have_modifiers: { code: 1193, category: 1, key: "An export declaration cannot have modifiers." },
-        Export_declarations_are_not_permitted_in_an_internal_module: { code: 1194, category: 1, key: "Export declarations are not permitted in an internal module." },
-        Catch_clause_variable_name_must_be_an_identifier: { code: 1195, category: 1, key: "Catch clause variable name must be an identifier." },
-        Catch_clause_variable_cannot_have_a_type_annotation: { code: 1196, category: 1, key: "Catch clause variable cannot have a type annotation." },
-        Catch_clause_variable_cannot_have_an_initializer: { code: 1197, category: 1, key: "Catch clause variable cannot have an initializer." },
-        An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: { code: 1198, category: 1, key: "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive." },
-        Unterminated_Unicode_escape_sequence: { code: 1199, category: 1, key: "Unterminated Unicode escape sequence." },
-        Duplicate_identifier_0: { code: 2300, category: 1, key: "Duplicate identifier '{0}'." },
-        Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: { code: 2301, category: 1, 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: 1, key: "Static members cannot reference class type parameters." },
-        Circular_definition_of_import_alias_0: { code: 2303, category: 1, key: "Circular definition of import alias '{0}'." },
-        Cannot_find_name_0: { code: 2304, category: 1, key: "Cannot find name '{0}'." },
-        Module_0_has_no_exported_member_1: { code: 2305, category: 1, key: "Module '{0}' has no exported member '{1}'." },
-        File_0_is_not_an_external_module: { code: 2306, category: 1, key: "File '{0}' is not an external module." },
-        Cannot_find_external_module_0: { code: 2307, category: 1, key: "Cannot find external module '{0}'." },
-        A_module_cannot_have_more_than_one_export_assignment: { code: 2308, category: 1, key: "A module cannot have more than one export assignment." },
-        An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements: { code: 2309, category: 1, key: "An export assignment cannot be used in a module with other exported elements." },
-        Type_0_recursively_references_itself_as_a_base_type: { code: 2310, category: 1, key: "Type '{0}' recursively references itself as a base type." },
-        A_class_may_only_extend_another_class: { code: 2311, category: 1, key: "A class may only extend another class." },
-        An_interface_may_only_extend_a_class_or_another_interface: { code: 2312, category: 1, key: "An interface may only extend a class or another interface." },
-        Constraint_of_a_type_parameter_cannot_reference_any_type_parameter_from_the_same_type_parameter_list: { code: 2313, category: 1, key: "Constraint of a type parameter cannot reference any type parameter from the same type parameter list." },
-        Generic_type_0_requires_1_type_argument_s: { code: 2314, category: 1, key: "Generic type '{0}' requires {1} type argument(s)." },
-        Type_0_is_not_generic: { code: 2315, category: 1, key: "Type '{0}' is not generic." },
-        Global_type_0_must_be_a_class_or_interface_type: { code: 2316, category: 1, key: "Global type '{0}' must be a class or interface type." },
-        Global_type_0_must_have_1_type_parameter_s: { code: 2317, category: 1, key: "Global type '{0}' must have {1} type parameter(s)." },
-        Cannot_find_global_type_0: { code: 2318, category: 1, key: "Cannot find global type '{0}'." },
-        Named_property_0_of_types_1_and_2_are_not_identical: { code: 2319, category: 1, key: "Named property '{0}' of types '{1}' and '{2}' are not identical." },
-        Interface_0_cannot_simultaneously_extend_types_1_and_2: { code: 2320, category: 1, key: "Interface '{0}' cannot simultaneously extend types '{1}' and '{2}'." },
-        Excessive_stack_depth_comparing_types_0_and_1: { code: 2321, category: 1, key: "Excessive stack depth comparing types '{0}' and '{1}'." },
-        Type_0_is_not_assignable_to_type_1: { code: 2322, category: 1, key: "Type '{0}' is not assignable to type '{1}'." },
-        Property_0_is_missing_in_type_1: { code: 2324, category: 1, key: "Property '{0}' is missing in type '{1}'." },
-        Property_0_is_private_in_type_1_but_not_in_type_2: { code: 2325, category: 1, key: "Property '{0}' is private in type '{1}' but not in type '{2}'." },
-        Types_of_property_0_are_incompatible: { code: 2326, category: 1, key: "Types of property '{0}' are incompatible." },
-        Property_0_is_optional_in_type_1_but_required_in_type_2: { code: 2327, category: 1, key: "Property '{0}' is optional in type '{1}' but required in type '{2}'." },
-        Types_of_parameters_0_and_1_are_incompatible: { code: 2328, category: 1, key: "Types of parameters '{0}' and '{1}' are incompatible." },
-        Index_signature_is_missing_in_type_0: { code: 2329, category: 1, key: "Index signature is missing in type '{0}'." },
-        Index_signatures_are_incompatible: { code: 2330, category: 1, key: "Index signatures are incompatible." },
-        this_cannot_be_referenced_in_a_module_body: { code: 2331, category: 1, key: "'this' cannot be referenced in a module body." },
-        this_cannot_be_referenced_in_current_location: { code: 2332, category: 1, key: "'this' cannot be referenced in current location." },
-        this_cannot_be_referenced_in_constructor_arguments: { code: 2333, category: 1, key: "'this' cannot be referenced in constructor arguments." },
-        this_cannot_be_referenced_in_a_static_property_initializer: { code: 2334, category: 1, key: "'this' cannot be referenced in a static property initializer." },
-        super_can_only_be_referenced_in_a_derived_class: { code: 2335, category: 1, key: "'super' can only be referenced in a derived class." },
-        super_cannot_be_referenced_in_constructor_arguments: { code: 2336, category: 1, key: "'super' cannot be referenced in constructor arguments." },
-        Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors: { code: 2337, category: 1, key: "Super calls are not permitted outside constructors or in nested functions inside constructors" },
-        super_property_access_is_permitted_only_in_a_constructor_member_function_or_member_accessor_of_a_derived_class: { code: 2338, category: 1, key: "'super' property access is permitted only in a constructor, member function, or member accessor of a derived class" },
-        Property_0_does_not_exist_on_type_1: { code: 2339, category: 1, key: "Property '{0}' does not exist on type '{1}'." },
-        Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword: { code: 2340, category: 1, key: "Only public and protected methods of the base class are accessible via the 'super' keyword" },
-        Property_0_is_private_and_only_accessible_within_class_1: { code: 2341, category: 1, key: "Property '{0}' is private and only accessible within class '{1}'." },
-        An_index_expression_argument_must_be_of_type_string_number_symbol_or_any: { code: 2342, category: 1, key: "An index expression argument must be of type 'string', 'number', 'symbol, or 'any'." },
-        Type_0_does_not_satisfy_the_constraint_1: { code: 2344, category: 1, key: "Type '{0}' does not satisfy the constraint '{1}'." },
-        Argument_of_type_0_is_not_assignable_to_parameter_of_type_1: { code: 2345, category: 1, key: "Argument of type '{0}' is not assignable to parameter of type '{1}'." },
-        Supplied_parameters_do_not_match_any_signature_of_call_target: { code: 2346, category: 1, key: "Supplied parameters do not match any signature of call target." },
-        Untyped_function_calls_may_not_accept_type_arguments: { code: 2347, category: 1, key: "Untyped function calls may not accept type arguments." },
-        Value_of_type_0_is_not_callable_Did_you_mean_to_include_new: { code: 2348, category: 1, key: "Value of type '{0}' is not callable. Did you mean to include 'new'?" },
-        Cannot_invoke_an_expression_whose_type_lacks_a_call_signature: { code: 2349, category: 1, key: "Cannot invoke an expression whose type lacks a call signature." },
-        Only_a_void_function_can_be_called_with_the_new_keyword: { code: 2350, category: 1, key: "Only a void function can be called with the 'new' keyword." },
-        Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature: { code: 2351, category: 1, key: "Cannot use 'new' with an expression whose type lacks a call or construct signature." },
-        Neither_type_0_nor_type_1_is_assignable_to_the_other: { code: 2352, category: 1, key: "Neither type '{0}' nor type '{1}' is assignable to the other." },
-        No_best_common_type_exists_among_return_expressions: { code: 2354, category: 1, key: "No best common type exists among return expressions." },
-        A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_or_consist_of_a_single_throw_statement: { code: 2355, category: 1, key: "A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement." },
-        An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type: { code: 2356, category: 1, key: "An arithmetic operand must be of type 'any', 'number' or an enum type." },
-        The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer: { code: 2357, category: 1, key: "The operand of an increment or decrement operator must be a variable, property or indexer." },
-        The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2358, category: 1, key: "The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter." },
-        The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_Function_interface_type: { code: 2359, category: 1, key: "The right-hand side of an 'instanceof' expression must be of type 'any' or of a type assignable to the 'Function' interface type." },
-        The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol: { code: 2360, category: 1, key: "The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'." },
-        The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2361, category: 1, key: "The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter" },
-        The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2362, category: 1, key: "The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
-        The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2363, category: 1, key: "The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
-        Invalid_left_hand_side_of_assignment_expression: { code: 2364, category: 1, key: "Invalid left-hand side of assignment expression." },
-        Operator_0_cannot_be_applied_to_types_1_and_2: { code: 2365, category: 1, key: "Operator '{0}' cannot be applied to types '{1}' and '{2}'." },
-        Type_parameter_name_cannot_be_0: { code: 2368, category: 1, key: "Type parameter name cannot be '{0}'" },
-        A_parameter_property_is_only_allowed_in_a_constructor_implementation: { code: 2369, category: 1, key: "A parameter property is only allowed in a constructor implementation." },
-        A_rest_parameter_must_be_of_an_array_type: { code: 2370, category: 1, key: "A rest parameter must be of an array type." },
-        A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation: { code: 2371, category: 1, key: "A parameter initializer is only allowed in a function or constructor implementation." },
-        Parameter_0_cannot_be_referenced_in_its_initializer: { code: 2372, category: 1, key: "Parameter '{0}' cannot be referenced in its initializer." },
-        Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it: { code: 2373, category: 1, key: "Initializer of parameter '{0}' cannot reference identifier '{1}' declared after it." },
-        Duplicate_string_index_signature: { code: 2374, category: 1, key: "Duplicate string index signature." },
-        Duplicate_number_index_signature: { code: 2375, category: 1, key: "Duplicate number index signature." },
-        A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_or_has_parameter_properties: { code: 2376, category: 1, key: "A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties." },
-        Constructors_for_derived_classes_must_contain_a_super_call: { code: 2377, category: 1, key: "Constructors for derived classes must contain a 'super' call." },
-        A_get_accessor_must_return_a_value_or_consist_of_a_single_throw_statement: { code: 2378, category: 1, key: "A 'get' accessor must return a value or consist of a single 'throw' statement." },
-        Getter_and_setter_accessors_do_not_agree_in_visibility: { code: 2379, category: 1, key: "Getter and setter accessors do not agree in visibility." },
-        get_and_set_accessor_must_have_the_same_type: { code: 2380, category: 1, key: "'get' and 'set' accessor must have the same type." },
-        A_signature_with_an_implementation_cannot_use_a_string_literal_type: { code: 2381, category: 1, key: "A signature with an implementation cannot use a string literal type." },
-        Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature: { code: 2382, category: 1, key: "Specialized overload signature is not assignable to any non-specialized signature." },
-        Overload_signatures_must_all_be_exported_or_not_exported: { code: 2383, category: 1, key: "Overload signatures must all be exported or not exported." },
-        Overload_signatures_must_all_be_ambient_or_non_ambient: { code: 2384, category: 1, key: "Overload signatures must all be ambient or non-ambient." },
-        Overload_signatures_must_all_be_public_private_or_protected: { code: 2385, category: 1, key: "Overload signatures must all be public, private or protected." },
-        Overload_signatures_must_all_be_optional_or_required: { code: 2386, category: 1, key: "Overload signatures must all be optional or required." },
-        Function_overload_must_be_static: { code: 2387, category: 1, key: "Function overload must be static." },
-        Function_overload_must_not_be_static: { code: 2388, category: 1, key: "Function overload must not be static." },
-        Function_implementation_name_must_be_0: { code: 2389, category: 1, key: "Function implementation name must be '{0}'." },
-        Constructor_implementation_is_missing: { code: 2390, category: 1, key: "Constructor implementation is missing." },
-        Function_implementation_is_missing_or_not_immediately_following_the_declaration: { code: 2391, category: 1, key: "Function implementation is missing or not immediately following the declaration." },
-        Multiple_constructor_implementations_are_not_allowed: { code: 2392, category: 1, key: "Multiple constructor implementations are not allowed." },
-        Duplicate_function_implementation: { code: 2393, category: 1, key: "Duplicate function implementation." },
-        Overload_signature_is_not_compatible_with_function_implementation: { code: 2394, category: 1, key: "Overload signature is not compatible with function implementation." },
-        Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local: { code: 2395, category: 1, key: "Individual declarations in merged declaration {0} must be all exported or all local." },
-        Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters: { code: 2396, category: 1, key: "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters." },
-        Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference: { code: 2399, category: 1, key: "Duplicate identifier '_this'. Compiler uses variable declaration '_this' to capture 'this' reference." },
-        Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference: { code: 2400, category: 1, key: "Expression resolves to variable declaration '_this' that compiler uses to capture 'this' reference." },
-        Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference: { code: 2401, category: 1, key: "Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference." },
-        Expression_resolves_to_super_that_compiler_uses_to_capture_base_class_reference: { code: 2402, category: 1, key: "Expression resolves to '_super' that compiler uses to capture base class reference." },
-        Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2: { code: 2403, category: 1, key: "Subsequent variable declarations must have the same type.  Variable '{0}' must be of type '{1}', but here has type '{2}'." },
-        The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation: { code: 2404, category: 1, key: "The left-hand side of a 'for...in' statement cannot use a type annotation." },
-        The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any: { code: 2405, category: 1, key: "The left-hand side of a 'for...in' statement must be of type 'string' or 'any'." },
-        Invalid_left_hand_side_in_for_in_statement: { code: 2406, category: 1, key: "Invalid left-hand side in 'for...in' statement." },
-        The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2407, category: 1, key: "The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter." },
-        Setters_cannot_return_a_value: { code: 2408, category: 1, key: "Setters cannot return a value." },
-        Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class: { code: 2409, category: 1, key: "Return type of constructor signature must be assignable to the instance type of the class" },
-        All_symbols_within_a_with_block_will_be_resolved_to_any: { code: 2410, category: 1, key: "All symbols within a 'with' block will be resolved to 'any'." },
-        Property_0_of_type_1_is_not_assignable_to_string_index_type_2: { code: 2411, category: 1, key: "Property '{0}' of type '{1}' is not assignable to string index type '{2}'." },
-        Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2: { code: 2412, category: 1, key: "Property '{0}' of type '{1}' is not assignable to numeric index type '{2}'." },
-        Numeric_index_type_0_is_not_assignable_to_string_index_type_1: { code: 2413, category: 1, key: "Numeric index type '{0}' is not assignable to string index type '{1}'." },
-        Class_name_cannot_be_0: { code: 2414, category: 1, key: "Class name cannot be '{0}'" },
-        Class_0_incorrectly_extends_base_class_1: { code: 2415, category: 1, key: "Class '{0}' incorrectly extends base class '{1}'." },
-        Class_static_side_0_incorrectly_extends_base_class_static_side_1: { code: 2417, category: 1, key: "Class static side '{0}' incorrectly extends base class static side '{1}'." },
-        Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0: { code: 2419, category: 1, key: "Type name '{0}' in extends clause does not reference constructor function for '{0}'." },
-        Class_0_incorrectly_implements_interface_1: { code: 2420, category: 1, key: "Class '{0}' incorrectly implements interface '{1}'." },
-        A_class_may_only_implement_another_class_or_interface: { code: 2422, category: 1, key: "A class may only implement another class or interface." },
-        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_accessor: { code: 2423, category: 1, key: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member accessor." },
-        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_property: { code: 2424, category: 1, key: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member property." },
-        Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2425, category: 1, key: "Class '{0}' defines instance member property '{1}', but extended class '{2}' defines it as instance member function." },
-        Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2426, category: 1, key: "Class '{0}' defines instance member accessor '{1}', but extended class '{2}' defines it as instance member function." },
-        Interface_name_cannot_be_0: { code: 2427, category: 1, key: "Interface name cannot be '{0}'" },
-        All_declarations_of_an_interface_must_have_identical_type_parameters: { code: 2428, category: 1, key: "All declarations of an interface must have identical type parameters." },
-        Interface_0_incorrectly_extends_interface_1: { code: 2430, category: 1, key: "Interface '{0}' incorrectly extends interface '{1}'." },
-        Enum_name_cannot_be_0: { code: 2431, category: 1, key: "Enum name cannot be '{0}'" },
-        In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enum_element: { code: 2432, category: 1, key: "In an enum with multiple declarations, only one declaration can omit an initializer for its first enum element." },
-        A_module_declaration_cannot_be_in_a_different_file_from_a_class_or_function_with_which_it_is_merged: { code: 2433, category: 1, key: "A module declaration cannot be in a different file from a class or function with which it is merged" },
-        A_module_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged: { code: 2434, category: 1, key: "A module declaration cannot be located prior to a class or function with which it is merged" },
-        Ambient_external_modules_cannot_be_nested_in_other_modules: { code: 2435, category: 1, key: "Ambient external modules cannot be nested in other modules." },
-        Ambient_external_module_declaration_cannot_specify_relative_module_name: { code: 2436, category: 1, key: "Ambient external module declaration cannot specify relative module name." },
-        Module_0_is_hidden_by_a_local_declaration_with_the_same_name: { code: 2437, category: 1, key: "Module '{0}' is hidden by a local declaration with the same name" },
-        Import_name_cannot_be_0: { code: 2438, category: 1, key: "Import name cannot be '{0}'" },
-        Import_or_export_declaration_in_an_ambient_external_module_declaration_cannot_reference_external_module_through_relative_external_module_name: { code: 2439, category: 1, key: "Import or export declaration in an ambient external module declaration cannot reference external module through relative external module name." },
-        Import_declaration_conflicts_with_local_declaration_of_0: { code: 2440, category: 1, key: "Import declaration conflicts with local declaration of '{0}'" },
-        Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_an_external_module: { code: 2441, category: 1, key: "Duplicate identifier '{0}'. Compiler reserves name '{1}' in top level scope of an external module." },
-        Types_have_separate_declarations_of_a_private_property_0: { code: 2442, category: 1, key: "Types have separate declarations of a private property '{0}'." },
-        Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2: { code: 2443, category: 1, key: "Property '{0}' is protected but type '{1}' is not a class derived from '{2}'." },
-        Property_0_is_protected_in_type_1_but_public_in_type_2: { code: 2444, category: 1, key: "Property '{0}' is protected in type '{1}' but public in type '{2}'." },
-        Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses: { code: 2445, category: 1, key: "Property '{0}' is protected and only accessible within class '{1}' and its subclasses." },
-        Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1: { code: 2446, category: 1, key: "Property '{0}' is protected and only accessible through an instance of class '{1}'." },
-        The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead: { code: 2447, category: 1, key: "The '{0}' operator is not allowed for boolean types. Consider using '{1}' instead." },
-        Block_scoped_variable_0_used_before_its_declaration: { code: 2448, category: 1, key: "Block-scoped variable '{0}' used before its declaration." },
-        The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant: { code: 2449, category: 1, key: "The operand of an increment or decrement operator cannot be a constant." },
-        Left_hand_side_of_assignment_expression_cannot_be_a_constant: { code: 2450, category: 1, key: "Left-hand side of assignment expression cannot be a constant." },
-        Cannot_redeclare_block_scoped_variable_0: { code: 2451, category: 1, key: "Cannot redeclare block-scoped variable '{0}'." },
-        An_enum_member_cannot_have_a_numeric_name: { code: 2452, category: 1, key: "An enum member cannot have a numeric name." },
-        The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_type_arguments_explicitly: { code: 2453, category: 1, key: "The type argument for type parameter '{0}' cannot be inferred from the usage. Consider specifying the type arguments explicitly." },
-        Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0: { code: 2455, category: 1, key: "Type argument candidate '{1}' is not a valid type argument because it is not a supertype of candidate '{0}'." },
-        Type_alias_0_circularly_references_itself: { code: 2456, category: 1, key: "Type alias '{0}' circularly references itself." },
-        Type_alias_name_cannot_be_0: { code: 2457, category: 1, key: "Type alias name cannot be '{0}'" },
-        An_AMD_module_cannot_have_multiple_name_assignments: { code: 2458, category: 1, key: "An AMD module cannot have multiple name assignments." },
-        Type_0_has_no_property_1_and_no_string_index_signature: { code: 2459, category: 1, key: "Type '{0}' has no property '{1}' and no string index signature." },
-        Type_0_has_no_property_1: { code: 2460, category: 1, key: "Type '{0}' has no property '{1}'." },
-        Type_0_is_not_an_array_type: { code: 2461, category: 1, key: "Type '{0}' is not an array type." },
-        A_rest_element_must_be_last_in_an_array_destructuring_pattern: { code: 2462, category: 1, key: "A rest element must be last in an array destructuring pattern" },
-        A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature: { code: 2463, category: 1, key: "A binding pattern parameter cannot be optional in an implementation signature." },
-        A_computed_property_name_must_be_of_type_string_number_symbol_or_any: { code: 2464, category: 1, key: "A computed property name must be of type 'string', 'number', 'symbol', or 'any'." },
-        this_cannot_be_referenced_in_a_computed_property_name: { code: 2465, category: 1, key: "'this' cannot be referenced in a computed property name." },
-        super_cannot_be_referenced_in_a_computed_property_name: { code: 2466, category: 1, key: "'super' cannot be referenced in a computed property name." },
-        A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type: { code: 2467, category: 1, key: "A computed property name cannot reference a type parameter from its containing type." },
-        Cannot_find_global_value_0: { code: 2468, category: 1, key: "Cannot find global value '{0}'." },
-        The_0_operator_cannot_be_applied_to_type_symbol: { code: 2469, category: 1, key: "The '{0}' operator cannot be applied to type 'symbol'." },
-        Symbol_reference_does_not_refer_to_the_global_Symbol_constructor_object: { code: 2470, category: 1, key: "'Symbol' reference does not refer to the global Symbol constructor object." },
-        A_computed_property_name_of_the_form_0_must_be_of_type_symbol: { code: 2471, category: 1, key: "A computed property name of the form '{0}' must be of type 'symbol'." },
-        Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_6_and_higher: { code: 2472, category: 1, key: "Spread operator in 'new' expressions is only available when targeting ECMAScript 6 and higher." },
-        Enum_declarations_must_all_be_const_or_non_const: { code: 2473, category: 1, key: "Enum declarations must all be const or non-const." },
-        In_const_enum_declarations_member_initializer_must_be_constant_expression: { code: 2474, category: 1, key: "In 'const' enum declarations member initializer must be constant expression." },
-        const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment: { code: 2475, category: 1, key: "'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment." },
-        A_const_enum_member_can_only_be_accessed_using_a_string_literal: { code: 2476, category: 1, key: "A const enum member can only be accessed using a string literal." },
-        const_enum_member_initializer_was_evaluated_to_a_non_finite_value: { code: 2477, category: 1, key: "'const' enum member initializer was evaluated to a non-finite value." },
-        const_enum_member_initializer_was_evaluated_to_disallowed_value_NaN: { code: 2478, category: 1, key: "'const' enum member initializer was evaluated to disallowed value 'NaN'." },
-        Property_0_does_not_exist_on_const_enum_1: { code: 2479, category: 1, key: "Property '{0}' does not exist on 'const' enum '{1}'." },
-        let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations: { code: 2480, category: 1, key: "'let' is not allowed to be used as a name in 'let' or 'const' declarations." },
-        Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1: { code: 2481, category: 1, key: "Cannot initialize outer scoped variable '{0}' in the same scope as block scoped declaration '{1}'." },
-        for_of_statements_are_only_available_when_targeting_ECMAScript_6_or_higher: { code: 2482, category: 1, key: "'for...of' statements are only available when targeting ECMAScript 6 or higher." },
-        The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: { code: 2483, category: 1, key: "The left-hand side of a 'for...of' statement cannot use a type annotation." },
-        Export_declaration_conflicts_with_exported_declaration_of_0: { code: 2484, category: 1, key: "Export declaration conflicts with exported declaration of '{0}'" },
-        The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant: { code: 2485, category: 1, key: "The left-hand side of a 'for...of' statement cannot be a previously defined constant." },
-        The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant: { code: 2486, category: 1, key: "The left-hand side of a 'for...in' statement cannot be a previously defined constant." },
-        Invalid_left_hand_side_in_for_of_statement: { code: 2487, category: 1, key: "Invalid left-hand side in 'for...of' statement." },
-        The_right_hand_side_of_a_for_of_statement_must_have_a_Symbol_iterator_method_that_returns_an_iterator: { code: 2488, category: 1, key: "The right-hand side of a 'for...of' statement must have a '[Symbol.iterator]()' method that returns an iterator." },
-        The_iterator_returned_by_the_right_hand_side_of_a_for_of_statement_must_have_a_next_method: { code: 2489, category: 1, key: "The iterator returned by the right-hand side of a 'for...of' statement must have a 'next()' method." },
-        The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: { code: 2490, category: 1, key: "The type returned by the 'next()' method of an iterator must have a 'value' property." },
-        The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern: { code: 2491, category: 1, key: "The left-hand side of a 'for...in' statement cannot be a destructuring pattern." },
-        Cannot_redeclare_identifier_0_in_catch_clause: { code: 2492, category: 1, key: "Cannot redeclare identifier '{0}' in catch clause" },
-        Import_declaration_0_is_using_private_name_1: { code: 4000, category: 1, key: "Import declaration '{0}' is using private name '{1}'." },
-        Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: 1, key: "Type parameter '{0}' of exported class has or is using private name '{1}'." },
-        Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4004, category: 1, key: "Type parameter '{0}' of exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4006, category: 1, key: "Type parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4008, category: 1, key: "Type parameter '{0}' of call signature from exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: { code: 4010, category: 1, key: "Type parameter '{0}' of public static method from exported class has or is using private name '{1}'." },
-        Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: { code: 4012, category: 1, key: "Type parameter '{0}' of public method from exported class has or is using private name '{1}'." },
-        Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: { code: 4014, category: 1, key: "Type parameter '{0}' of method from exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4016, category: 1, key: "Type parameter '{0}' of exported function has or is using private name '{1}'." },
-        Implements_clause_of_exported_class_0_has_or_is_using_private_name_1: { code: 4019, category: 1, key: "Implements clause of exported class '{0}' has or is using private name '{1}'." },
-        Extends_clause_of_exported_class_0_has_or_is_using_private_name_1: { code: 4020, category: 1, key: "Extends clause of exported class '{0}' has or is using private name '{1}'." },
-        Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1: { code: 4022, category: 1, key: "Extends clause of exported interface '{0}' has or is using private name '{1}'." },
-        Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4023, category: 1, key: "Exported variable '{0}' has or is using name '{1}' from external module {2} but cannot be named." },
-        Exported_variable_0_has_or_is_using_name_1_from_private_module_2: { code: 4024, category: 1, key: "Exported variable '{0}' has or is using name '{1}' from private module '{2}'." },
-        Exported_variable_0_has_or_is_using_private_name_1: { code: 4025, category: 1, key: "Exported variable '{0}' has or is using private name '{1}'." },
-        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4026, category: 1, key: "Public static property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4027, category: 1, key: "Public static property '{0}' of exported class has or is using name '{1}' from private module '{2}'." },
-        Public_static_property_0_of_exported_class_has_or_is_using_private_name_1: { code: 4028, category: 1, key: "Public static property '{0}' of exported class has or is using private name '{1}'." },
-        Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4029, category: 1, key: "Public property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4030, category: 1, key: "Public property '{0}' of exported class has or is using name '{1}' from private module '{2}'." },
-        Public_property_0_of_exported_class_has_or_is_using_private_name_1: { code: 4031, category: 1, key: "Public property '{0}' of exported class has or is using private name '{1}'." },
-        Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4032, category: 1, key: "Property '{0}' of exported interface has or is using name '{1}' from private module '{2}'." },
-        Property_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4033, category: 1, key: "Property '{0}' of exported interface has or is using private name '{1}'." },
-        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4034, category: 1, key: "Parameter '{0}' of public static property setter from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1: { code: 4035, category: 1, key: "Parameter '{0}' of public static property setter from exported class has or is using private name '{1}'." },
-        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4036, category: 1, key: "Parameter '{0}' of public property setter from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1: { code: 4037, category: 1, key: "Parameter '{0}' of public property setter from exported class has or is using private name '{1}'." },
-        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4038, category: 1, key: "Return type of public static property getter from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4039, category: 1, key: "Return type of public static property getter from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0: { code: 4040, category: 1, key: "Return type of public static property getter from exported class has or is using private name '{0}'." },
-        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4041, category: 1, key: "Return type of public property getter from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4042, category: 1, key: "Return type of public property getter from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0: { code: 4043, category: 1, key: "Return type of public property getter from exported class has or is using private name '{0}'." },
-        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4044, category: 1, key: "Return type of constructor signature from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4045, category: 1, key: "Return type of constructor signature from exported interface has or is using private name '{0}'." },
-        Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4046, category: 1, key: "Return type of call signature from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4047, category: 1, key: "Return type of call signature from exported interface has or is using private name '{0}'." },
-        Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4048, category: 1, key: "Return type of index signature from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4049, category: 1, key: "Return type of index signature from exported interface has or is using private name '{0}'." },
-        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4050, category: 1, key: "Return type of public static method from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4051, category: 1, key: "Return type of public static method from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0: { code: 4052, category: 1, key: "Return type of public static method from exported class has or is using private name '{0}'." },
-        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4053, category: 1, key: "Return type of public method from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4054, category: 1, key: "Return type of public method from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0: { code: 4055, category: 1, key: "Return type of public method from exported class has or is using private name '{0}'." },
-        Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4056, category: 1, key: "Return type of method from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0: { code: 4057, category: 1, key: "Return type of method from exported interface has or is using private name '{0}'." },
-        Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4058, category: 1, key: "Return type of exported function has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1: { code: 4059, category: 1, key: "Return type of exported function has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_exported_function_has_or_is_using_private_name_0: { code: 4060, category: 1, key: "Return type of exported function has or is using private name '{0}'." },
-        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4061, category: 1, key: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4062, category: 1, key: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1: { code: 4063, category: 1, key: "Parameter '{0}' of constructor from exported class has or is using private name '{1}'." },
-        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4064, category: 1, key: "Parameter '{0}' of constructor signature from exported interface has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4065, category: 1, key: "Parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'." },
-        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4066, category: 1, key: "Parameter '{0}' of call signature from exported interface has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4067, category: 1, key: "Parameter '{0}' of call signature from exported interface has or is using private name '{1}'." },
-        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4068, category: 1, key: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4069, category: 1, key: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: { code: 4070, category: 1, key: "Parameter '{0}' of public static method from exported class has or is using private name '{1}'." },
-        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4071, category: 1, key: "Parameter '{0}' of public method from exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4072, category: 1, key: "Parameter '{0}' of public method from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: { code: 4073, category: 1, key: "Parameter '{0}' of public method from exported class has or is using private name '{1}'." },
-        Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4074, category: 1, key: "Parameter '{0}' of method from exported interface has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: { code: 4075, category: 1, key: "Parameter '{0}' of method from exported interface has or is using private name '{1}'." },
-        Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4076, category: 1, key: "Parameter '{0}' of exported function has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2: { code: 4077, category: 1, key: "Parameter '{0}' of exported function has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4078, category: 1, key: "Parameter '{0}' of exported function has or is using private name '{1}'." },
-        Exported_type_alias_0_has_or_is_using_private_name_1: { code: 4081, category: 1, key: "Exported type alias '{0}' has or is using private name '{1}'." },
-        Loop_contains_block_scoped_variable_0_referenced_by_a_function_in_the_loop_This_is_only_supported_in_ECMAScript_6_or_higher: { code: 4091, category: 1, key: "Loop contains block-scoped variable '{0}' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher." },
-        The_current_host_does_not_support_the_0_option: { code: 5001, category: 1, key: "The current host does not support the '{0}' option." },
-        Cannot_find_the_common_subdirectory_path_for_the_input_files: { code: 5009, category: 1, key: "Cannot find the common subdirectory path for the input files." },
-        Cannot_read_file_0_Colon_1: { code: 5012, category: 1, key: "Cannot read file '{0}': {1}" },
-        Unsupported_file_encoding: { code: 5013, category: 1, key: "Unsupported file encoding." },
-        Unknown_compiler_option_0: { code: 5023, category: 1, key: "Unknown compiler option '{0}'." },
-        Compiler_option_0_requires_a_value_of_type_1: { code: 5024, category: 1, key: "Compiler option '{0}' requires a value of type {1}." },
-        Could_not_write_file_0_Colon_1: { code: 5033, category: 1, key: "Could not write file '{0}': {1}" },
-        Option_mapRoot_cannot_be_specified_without_specifying_sourcemap_option: { code: 5038, category: 1, key: "Option 'mapRoot' cannot be specified without specifying 'sourcemap' option." },
-        Option_sourceRoot_cannot_be_specified_without_specifying_sourcemap_option: { code: 5039, category: 1, key: "Option 'sourceRoot' cannot be specified without specifying 'sourcemap' option." },
-        Option_noEmit_cannot_be_specified_with_option_out_or_outDir: { code: 5040, category: 1, key: "Option 'noEmit' cannot be specified with option 'out' or 'outDir'." },
-        Option_noEmit_cannot_be_specified_with_option_declaration: { code: 5041, category: 1, key: "Option 'noEmit' cannot be specified with option 'declaration'." },
-        Option_project_cannot_be_mixed_with_source_files_on_a_command_line: { code: 5042, category: 1, key: "Option 'project' cannot be mixed with source files on a command line." },
-        Concatenate_and_emit_output_to_single_file: { code: 6001, category: 2, key: "Concatenate and emit output to single file." },
-        Generates_corresponding_d_ts_file: { code: 6002, category: 2, key: "Generates corresponding '.d.ts' file." },
-        Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: { code: 6003, category: 2, key: "Specifies the location where debugger should locate map files instead of generated locations." },
-        Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations: { code: 6004, category: 2, key: "Specifies the location where debugger should locate TypeScript files instead of source locations." },
-        Watch_input_files: { code: 6005, category: 2, key: "Watch input files." },
-        Redirect_output_structure_to_the_directory: { code: 6006, category: 2, key: "Redirect output structure to the directory." },
-        Do_not_erase_const_enum_declarations_in_generated_code: { code: 6007, category: 2, key: "Do not erase const enum declarations in generated code." },
-        Do_not_emit_outputs_if_any_type_checking_errors_were_reported: { code: 6008, category: 2, key: "Do not emit outputs if any type checking errors were reported." },
-        Do_not_emit_comments_to_output: { code: 6009, category: 2, key: "Do not emit comments to output." },
-        Do_not_emit_outputs: { code: 6010, category: 2, key: "Do not emit outputs." },
-        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES6_experimental: { code: 6015, category: 2, key: "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES6' (experimental)" },
-        Specify_module_code_generation_Colon_commonjs_or_amd: { code: 6016, category: 2, key: "Specify module code generation: 'commonjs' or 'amd'" },
-        Print_this_message: { code: 6017, category: 2, key: "Print this message." },
-        Print_the_compiler_s_version: { code: 6019, category: 2, key: "Print the compiler's version." },
-        Compile_the_project_in_the_given_directory: { code: 6020, category: 2, key: "Compile the project in the given directory." },
-        Syntax_Colon_0: { code: 6023, category: 2, key: "Syntax: {0}" },
-        options: { code: 6024, category: 2, key: "options" },
-        file: { code: 6025, category: 2, key: "file" },
-        Examples_Colon_0: { code: 6026, category: 2, key: "Examples: {0}" },
-        Options_Colon: { code: 6027, category: 2, key: "Options:" },
-        Version_0: { code: 6029, category: 2, key: "Version {0}" },
-        Insert_command_line_options_and_files_from_a_file: { code: 6030, category: 2, key: "Insert command line options and files from a file." },
-        File_change_detected_Starting_incremental_compilation: { code: 6032, category: 2, key: "File change detected. Starting incremental compilation..." },
-        KIND: { code: 6034, category: 2, key: "KIND" },
-        FILE: { code: 6035, category: 2, key: "FILE" },
-        VERSION: { code: 6036, category: 2, key: "VERSION" },
-        LOCATION: { code: 6037, category: 2, key: "LOCATION" },
-        DIRECTORY: { code: 6038, category: 2, key: "DIRECTORY" },
-        Compilation_complete_Watching_for_file_changes: { code: 6042, category: 2, key: "Compilation complete. Watching for file changes." },
-        Generates_corresponding_map_file: { code: 6043, category: 2, key: "Generates corresponding '.map' file." },
-        Compiler_option_0_expects_an_argument: { code: 6044, category: 1, key: "Compiler option '{0}' expects an argument." },
-        Unterminated_quoted_string_in_response_file_0: { code: 6045, category: 1, key: "Unterminated quoted string in response file '{0}'." },
-        Argument_for_module_option_must_be_commonjs_or_amd: { code: 6046, category: 1, key: "Argument for '--module' option must be 'commonjs' or 'amd'." },
-        Argument_for_target_option_must_be_es3_es5_or_es6: { code: 6047, category: 1, key: "Argument for '--target' option must be 'es3', 'es5', or 'es6'." },
-        Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1: { code: 6048, category: 1, key: "Locale must be of the form <language> or <language>-<territory>. For example '{0}' or '{1}'." },
-        Unsupported_locale_0: { code: 6049, category: 1, key: "Unsupported locale '{0}'." },
-        Unable_to_open_file_0: { code: 6050, category: 1, key: "Unable to open file '{0}'." },
-        Corrupted_locale_file_0: { code: 6051, category: 1, key: "Corrupted locale file {0}." },
-        Raise_error_on_expressions_and_declarations_with_an_implied_any_type: { code: 6052, category: 2, key: "Raise error on expressions and declarations with an implied 'any' type." },
-        File_0_not_found: { code: 6053, category: 1, key: "File '{0}' not found." },
-        File_0_must_have_extension_ts_or_d_ts: { code: 6054, category: 1, key: "File '{0}' must have extension '.ts' or '.d.ts'." },
-        Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures: { code: 6055, category: 2, key: "Suppress noImplicitAny errors for indexing objects lacking index signatures." },
-        Do_not_emit_declarations_for_code_that_has_an_internal_annotation: { code: 6056, category: 2, key: "Do not emit declarations for code that has an '@internal' annotation." },
-        Variable_0_implicitly_has_an_1_type: { code: 7005, category: 1, key: "Variable '{0}' implicitly has an '{1}' type." },
-        Parameter_0_implicitly_has_an_1_type: { code: 7006, category: 1, key: "Parameter '{0}' implicitly has an '{1}' type." },
-        Member_0_implicitly_has_an_1_type: { code: 7008, category: 1, key: "Member '{0}' implicitly has an '{1}' type." },
-        new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type: { code: 7009, category: 1, key: "'new' expression, whose target lacks a construct signature, implicitly has an 'any' type." },
-        _0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type: { code: 7010, category: 1, key: "'{0}', which lacks return-type annotation, implicitly has an '{1}' return type." },
-        Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type: { code: 7011, category: 1, key: "Function expression, which lacks return-type annotation, implicitly has an '{0}' return type." },
-        Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7013, category: 1, key: "Construct signature, which lacks return-type annotation, implicitly has an 'any' return type." },
-        Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_type_annotation: { code: 7016, category: 1, key: "Property '{0}' implicitly has type 'any', because its 'set' accessor lacks a type annotation." },
-        Index_signature_of_object_type_implicitly_has_an_any_type: { code: 7017, category: 1, key: "Index signature of object type implicitly has an 'any' type." },
-        Object_literal_s_property_0_implicitly_has_an_1_type: { code: 7018, category: 1, key: "Object literal's property '{0}' implicitly has an '{1}' type." },
-        Rest_parameter_0_implicitly_has_an_any_type: { code: 7019, category: 1, key: "Rest parameter '{0}' implicitly has an 'any[]' type." },
-        Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7020, category: 1, key: "Call signature, which lacks return-type annotation, implicitly has an 'any' return type." },
-        _0_implicitly_has_type_any_because_it_is_referenced_directly_or_indirectly_in_its_own_type_annotation: { code: 7021, category: 1, key: "'{0}' implicitly has type 'any' because it is referenced directly or indirectly in its own type annotation." },
-        _0_implicitly_has_type_any_because_it_is_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer: { code: 7022, category: 1, key: "'{0}' implicitly has type 'any' because it is does not have a type annotation and is referenced directly or indirectly in its own initializer." },
-        _0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: { code: 7023, category: 1, key: "'{0}' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions." },
-        Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: { code: 7024, category: 1, key: "Function implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions." },
-        You_cannot_rename_this_element: { code: 8000, category: 1, key: "You cannot rename this element." },
-        You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: { code: 8001, category: 1, key: "You cannot rename elements that are defined in the standard TypeScript library." },
-        yield_expressions_are_not_currently_supported: { code: 9000, category: 1, key: "'yield' expressions are not currently supported." },
-        Generators_are_not_currently_supported: { code: 9001, category: 1, key: "Generators are not currently supported." },
-        The_arguments_object_cannot_be_referenced_in_an_arrow_function_Consider_using_a_standard_function_expression: { code: 9002, category: 1, key: "The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression." }
+        Unterminated_string_literal: {
+            code: 1002,
+            category: 1,
+            key: "Unterminated string literal."
+        },
+        Identifier_expected: {
+            code: 1003,
+            category: 1,
+            key: "Identifier expected."
+        },
+        _0_expected: {
+            code: 1005,
+            category: 1,
+            key: "'{0}' expected."
+        },
+        A_file_cannot_have_a_reference_to_itself: {
+            code: 1006,
+            category: 1,
+            key: "A file cannot have a reference to itself."
+        },
+        Trailing_comma_not_allowed: {
+            code: 1009,
+            category: 1,
+            key: "Trailing comma not allowed."
+        },
+        Asterisk_Slash_expected: {
+            code: 1010,
+            category: 1,
+            key: "'*/' expected."
+        },
+        Unexpected_token: {
+            code: 1012,
+            category: 1,
+            key: "Unexpected token."
+        },
+        A_rest_parameter_must_be_last_in_a_parameter_list: {
+            code: 1014,
+            category: 1,
+            key: "A rest parameter must be last in a parameter list."
+        },
+        Parameter_cannot_have_question_mark_and_initializer: {
+            code: 1015,
+            category: 1,
+            key: "Parameter cannot have question mark and initializer."
+        },
+        A_required_parameter_cannot_follow_an_optional_parameter: {
+            code: 1016,
+            category: 1,
+            key: "A required parameter cannot follow an optional parameter."
+        },
+        An_index_signature_cannot_have_a_rest_parameter: {
+            code: 1017,
+            category: 1,
+            key: "An index signature cannot have a rest parameter."
+        },
+        An_index_signature_parameter_cannot_have_an_accessibility_modifier: {
+            code: 1018,
+            category: 1,
+            key: "An index signature parameter cannot have an accessibility modifier."
+        },
+        An_index_signature_parameter_cannot_have_a_question_mark: {
+            code: 1019,
+            category: 1,
+            key: "An index signature parameter cannot have a question mark."
+        },
+        An_index_signature_parameter_cannot_have_an_initializer: {
+            code: 1020,
+            category: 1,
+            key: "An index signature parameter cannot have an initializer."
+        },
+        An_index_signature_must_have_a_type_annotation: {
+            code: 1021,
+            category: 1,
+            key: "An index signature must have a type annotation."
+        },
+        An_index_signature_parameter_must_have_a_type_annotation: {
+            code: 1022,
+            category: 1,
+            key: "An index signature parameter must have a type annotation."
+        },
+        An_index_signature_parameter_type_must_be_string_or_number: {
+            code: 1023,
+            category: 1,
+            key: "An index signature parameter type must be 'string' or 'number'."
+        },
+        A_class_or_interface_declaration_can_only_have_one_extends_clause: {
+            code: 1024,
+            category: 1,
+            key: "A class or interface declaration can only have one 'extends' clause."
+        },
+        An_extends_clause_must_precede_an_implements_clause: {
+            code: 1025,
+            category: 1,
+            key: "An 'extends' clause must precede an 'implements' clause."
+        },
+        A_class_can_only_extend_a_single_class: {
+            code: 1026,
+            category: 1,
+            key: "A class can only extend a single class."
+        },
+        A_class_declaration_can_only_have_one_implements_clause: {
+            code: 1027,
+            category: 1,
+            key: "A class declaration can only have one 'implements' clause."
+        },
+        Accessibility_modifier_already_seen: {
+            code: 1028,
+            category: 1,
+            key: "Accessibility modifier already seen."
+        },
+        _0_modifier_must_precede_1_modifier: {
+            code: 1029,
+            category: 1,
+            key: "'{0}' modifier must precede '{1}' modifier."
+        },
+        _0_modifier_already_seen: {
+            code: 1030,
+            category: 1,
+            key: "'{0}' modifier already seen."
+        },
+        _0_modifier_cannot_appear_on_a_class_element: {
+            code: 1031,
+            category: 1,
+            key: "'{0}' modifier cannot appear on a class element."
+        },
+        An_interface_declaration_cannot_have_an_implements_clause: {
+            code: 1032,
+            category: 1,
+            key: "An interface declaration cannot have an 'implements' clause."
+        },
+        super_must_be_followed_by_an_argument_list_or_member_access: {
+            code: 1034,
+            category: 1,
+            key: "'super' must be followed by an argument list or member access."
+        },
+        Only_ambient_modules_can_use_quoted_names: {
+            code: 1035,
+            category: 1,
+            key: "Only ambient modules can use quoted names."
+        },
+        Statements_are_not_allowed_in_ambient_contexts: {
+            code: 1036,
+            category: 1,
+            key: "Statements are not allowed in ambient contexts."
+        },
+        A_declare_modifier_cannot_be_used_in_an_already_ambient_context: {
+            code: 1038,
+            category: 1,
+            key: "A 'declare' modifier cannot be used in an already ambient context."
+        },
+        Initializers_are_not_allowed_in_ambient_contexts: {
+            code: 1039,
+            category: 1,
+            key: "Initializers are not allowed in ambient contexts."
+        },
+        _0_modifier_cannot_appear_on_a_module_element: {
+            code: 1044,
+            category: 1,
+            key: "'{0}' modifier cannot appear on a module element."
+        },
+        A_declare_modifier_cannot_be_used_with_an_interface_declaration: {
+            code: 1045,
+            category: 1,
+            key: "A 'declare' modifier cannot be used with an interface declaration."
+        },
+        A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file: {
+            code: 1046,
+            category: 1,
+            key: "A 'declare' modifier is required for a top level declaration in a .d.ts file."
+        },
+        A_rest_parameter_cannot_be_optional: {
+            code: 1047,
+            category: 1,
+            key: "A rest parameter cannot be optional."
+        },
+        A_rest_parameter_cannot_have_an_initializer: {
+            code: 1048,
+            category: 1,
+            key: "A rest parameter cannot have an initializer."
+        },
+        A_set_accessor_must_have_exactly_one_parameter: {
+            code: 1049,
+            category: 1,
+            key: "A 'set' accessor must have exactly one parameter."
+        },
+        A_set_accessor_cannot_have_an_optional_parameter: {
+            code: 1051,
+            category: 1,
+            key: "A 'set' accessor cannot have an optional parameter."
+        },
+        A_set_accessor_parameter_cannot_have_an_initializer: {
+            code: 1052,
+            category: 1,
+            key: "A 'set' accessor parameter cannot have an initializer."
+        },
+        A_set_accessor_cannot_have_rest_parameter: {
+            code: 1053,
+            category: 1,
+            key: "A 'set' accessor cannot have rest parameter."
+        },
+        A_get_accessor_cannot_have_parameters: {
+            code: 1054,
+            category: 1,
+            key: "A 'get' accessor cannot have parameters."
+        },
+        Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher: {
+            code: 1056,
+            category: 1,
+            key: "Accessors are only available when targeting ECMAScript 5 and higher."
+        },
+        Enum_member_must_have_initializer: {
+            code: 1061,
+            category: 1,
+            key: "Enum member must have initializer."
+        },
+        An_export_assignment_cannot_be_used_in_an_internal_module: {
+            code: 1063,
+            category: 1,
+            key: "An export assignment cannot be used in an internal module."
+        },
+        Ambient_enum_elements_can_only_have_integer_literal_initializers: {
+            code: 1066,
+            category: 1,
+            key: "Ambient enum elements can only have integer literal initializers."
+        },
+        Unexpected_token_A_constructor_method_accessor_or_property_was_expected: {
+            code: 1068,
+            category: 1,
+            key: "Unexpected token. A constructor, method, accessor, or property was expected."
+        },
+        A_declare_modifier_cannot_be_used_with_an_import_declaration: {
+            code: 1079,
+            category: 1,
+            key: "A 'declare' modifier cannot be used with an import declaration."
+        },
+        Invalid_reference_directive_syntax: {
+            code: 1084,
+            category: 1,
+            key: "Invalid 'reference' directive syntax."
+        },
+        Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher: {
+            code: 1085,
+            category: 1,
+            key: "Octal literals are not available when targeting ECMAScript 5 and higher."
+        },
+        An_accessor_cannot_be_declared_in_an_ambient_context: {
+            code: 1086,
+            category: 1,
+            key: "An accessor cannot be declared in an ambient context."
+        },
+        _0_modifier_cannot_appear_on_a_constructor_declaration: {
+            code: 1089,
+            category: 1,
+            key: "'{0}' modifier cannot appear on a constructor declaration."
+        },
+        _0_modifier_cannot_appear_on_a_parameter: {
+            code: 1090,
+            category: 1,
+            key: "'{0}' modifier cannot appear on a parameter."
+        },
+        Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement: {
+            code: 1091,
+            category: 1,
+            key: "Only a single variable declaration is allowed in a 'for...in' statement."
+        },
+        Type_parameters_cannot_appear_on_a_constructor_declaration: {
+            code: 1092,
+            category: 1,
+            key: "Type parameters cannot appear on a constructor declaration."
+        },
+        Type_annotation_cannot_appear_on_a_constructor_declaration: {
+            code: 1093,
+            category: 1,
+            key: "Type annotation cannot appear on a constructor declaration."
+        },
+        An_accessor_cannot_have_type_parameters: {
+            code: 1094,
+            category: 1,
+            key: "An accessor cannot have type parameters."
+        },
+        A_set_accessor_cannot_have_a_return_type_annotation: {
+            code: 1095,
+            category: 1,
+            key: "A 'set' accessor cannot have a return type annotation."
+        },
+        An_index_signature_must_have_exactly_one_parameter: {
+            code: 1096,
+            category: 1,
+            key: "An index signature must have exactly one parameter."
+        },
+        _0_list_cannot_be_empty: {
+            code: 1097,
+            category: 1,
+            key: "'{0}' list cannot be empty."
+        },
+        Type_parameter_list_cannot_be_empty: {
+            code: 1098,
+            category: 1,
+            key: "Type parameter list cannot be empty."
+        },
+        Type_argument_list_cannot_be_empty: {
+            code: 1099,
+            category: 1,
+            key: "Type argument list cannot be empty."
+        },
+        Invalid_use_of_0_in_strict_mode: {
+            code: 1100,
+            category: 1,
+            key: "Invalid use of '{0}' in strict mode."
+        },
+        with_statements_are_not_allowed_in_strict_mode: {
+            code: 1101,
+            category: 1,
+            key: "'with' statements are not allowed in strict mode."
+        },
+        delete_cannot_be_called_on_an_identifier_in_strict_mode: {
+            code: 1102,
+            category: 1,
+            key: "'delete' cannot be called on an identifier in strict mode."
+        },
+        A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement: {
+            code: 1104,
+            category: 1,
+            key: "A 'continue' statement can only be used within an enclosing iteration statement."
+        },
+        A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement: {
+            code: 1105,
+            category: 1,
+            key: "A 'break' statement can only be used within an enclosing iteration or switch statement."
+        },
+        Jump_target_cannot_cross_function_boundary: {
+            code: 1107,
+            category: 1,
+            key: "Jump target cannot cross function boundary."
+        },
+        A_return_statement_can_only_be_used_within_a_function_body: {
+            code: 1108,
+            category: 1,
+            key: "A 'return' statement can only be used within a function body."
+        },
+        Expression_expected: {
+            code: 1109,
+            category: 1,
+            key: "Expression expected."
+        },
+        Type_expected: {
+            code: 1110,
+            category: 1,
+            key: "Type expected."
+        },
+        A_class_member_cannot_be_declared_optional: {
+            code: 1112,
+            category: 1,
+            key: "A class member cannot be declared optional."
+        },
+        A_default_clause_cannot_appear_more_than_once_in_a_switch_statement: {
+            code: 1113,
+            category: 1,
+            key: "A 'default' clause cannot appear more than once in a 'switch' statement."
+        },
+        Duplicate_label_0: {
+            code: 1114,
+            category: 1,
+            key: "Duplicate label '{0}'"
+        },
+        A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement: {
+            code: 1115,
+            category: 1,
+            key: "A 'continue' statement can only jump to a label of an enclosing iteration statement."
+        },
+        A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement: {
+            code: 1116,
+            category: 1,
+            key: "A 'break' statement can only jump to a label of an enclosing statement."
+        },
+        An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode: {
+            code: 1117,
+            category: 1,
+            key: "An object literal cannot have multiple properties with the same name in strict mode."
+        },
+        An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name: {
+            code: 1118,
+            category: 1,
+            key: "An object literal cannot have multiple get/set accessors with the same name."
+        },
+        An_object_literal_cannot_have_property_and_accessor_with_the_same_name: {
+            code: 1119,
+            category: 1,
+            key: "An object literal cannot have property and accessor with the same name."
+        },
+        An_export_assignment_cannot_have_modifiers: {
+            code: 1120,
+            category: 1,
+            key: "An export assignment cannot have modifiers."
+        },
+        Octal_literals_are_not_allowed_in_strict_mode: {
+            code: 1121,
+            category: 1,
+            key: "Octal literals are not allowed in strict mode."
+        },
+        A_tuple_type_element_list_cannot_be_empty: {
+            code: 1122,
+            category: 1,
+            key: "A tuple type element list cannot be empty."
+        },
+        Variable_declaration_list_cannot_be_empty: {
+            code: 1123,
+            category: 1,
+            key: "Variable declaration list cannot be empty."
+        },
+        Digit_expected: {
+            code: 1124,
+            category: 1,
+            key: "Digit expected."
+        },
+        Hexadecimal_digit_expected: {
+            code: 1125,
+            category: 1,
+            key: "Hexadecimal digit expected."
+        },
+        Unexpected_end_of_text: {
+            code: 1126,
+            category: 1,
+            key: "Unexpected end of text."
+        },
+        Invalid_character: {
+            code: 1127,
+            category: 1,
+            key: "Invalid character."
+        },
+        Declaration_or_statement_expected: {
+            code: 1128,
+            category: 1,
+            key: "Declaration or statement expected."
+        },
+        Statement_expected: {
+            code: 1129,
+            category: 1,
+            key: "Statement expected."
+        },
+        case_or_default_expected: {
+            code: 1130,
+            category: 1,
+            key: "'case' or 'default' expected."
+        },
+        Property_or_signature_expected: {
+            code: 1131,
+            category: 1,
+            key: "Property or signature expected."
+        },
+        Enum_member_expected: {
+            code: 1132,
+            category: 1,
+            key: "Enum member expected."
+        },
+        Type_reference_expected: {
+            code: 1133,
+            category: 1,
+            key: "Type reference expected."
+        },
+        Variable_declaration_expected: {
+            code: 1134,
+            category: 1,
+            key: "Variable declaration expected."
+        },
+        Argument_expression_expected: {
+            code: 1135,
+            category: 1,
+            key: "Argument expression expected."
+        },
+        Property_assignment_expected: {
+            code: 1136,
+            category: 1,
+            key: "Property assignment expected."
+        },
+        Expression_or_comma_expected: {
+            code: 1137,
+            category: 1,
+            key: "Expression or comma expected."
+        },
+        Parameter_declaration_expected: {
+            code: 1138,
+            category: 1,
+            key: "Parameter declaration expected."
+        },
+        Type_parameter_declaration_expected: {
+            code: 1139,
+            category: 1,
+            key: "Type parameter declaration expected."
+        },
+        Type_argument_expected: {
+            code: 1140,
+            category: 1,
+            key: "Type argument expected."
+        },
+        String_literal_expected: {
+            code: 1141,
+            category: 1,
+            key: "String literal expected."
+        },
+        Line_break_not_permitted_here: {
+            code: 1142,
+            category: 1,
+            key: "Line break not permitted here."
+        },
+        or_expected: {
+            code: 1144,
+            category: 1,
+            key: "'{' or ';' expected."
+        },
+        Modifiers_not_permitted_on_index_signature_members: {
+            code: 1145,
+            category: 1,
+            key: "Modifiers not permitted on index signature members."
+        },
+        Declaration_expected: {
+            code: 1146,
+            category: 1,
+            key: "Declaration expected."
+        },
+        Import_declarations_in_an_internal_module_cannot_reference_an_external_module: {
+            code: 1147,
+            category: 1,
+            key: "Import declarations in an internal module cannot reference an external module."
+        },
+        Cannot_compile_external_modules_unless_the_module_flag_is_provided: {
+            code: 1148,
+            category: 1,
+            key: "Cannot compile external modules unless the '--module' flag is provided."
+        },
+        File_name_0_differs_from_already_included_file_name_1_only_in_casing: {
+            code: 1149,
+            category: 1,
+            key: "File name '{0}' differs from already included file name '{1}' only in casing"
+        },
+        new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead: {
+            code: 1150,
+            category: 1,
+            key: "'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead."
+        },
+        var_let_or_const_expected: {
+            code: 1152,
+            category: 1,
+            key: "'var', 'let' or 'const' expected."
+        },
+        let_declarations_are_only_available_when_targeting_ECMAScript_6_and_higher: {
+            code: 1153,
+            category: 1,
+            key: "'let' declarations are only available when targeting ECMAScript 6 and higher."
+        },
+        const_declarations_are_only_available_when_targeting_ECMAScript_6_and_higher: {
+            code: 1154,
+            category: 1,
+            key: "'const' declarations are only available when targeting ECMAScript 6 and higher."
+        },
+        const_declarations_must_be_initialized: {
+            code: 1155,
+            category: 1,
+            key: "'const' declarations must be initialized"
+        },
+        const_declarations_can_only_be_declared_inside_a_block: {
+            code: 1156,
+            category: 1,
+            key: "'const' declarations can only be declared inside a block."
+        },
+        let_declarations_can_only_be_declared_inside_a_block: {
+            code: 1157,
+            category: 1,
+            key: "'let' declarations can only be declared inside a block."
+        },
+        Unterminated_template_literal: {
+            code: 1160,
+            category: 1,
+            key: "Unterminated template literal."
+        },
+        Unterminated_regular_expression_literal: {
+            code: 1161,
+            category: 1,
+            key: "Unterminated regular expression literal."
+        },
+        An_object_member_cannot_be_declared_optional: {
+            code: 1162,
+            category: 1,
+            key: "An object member cannot be declared optional."
+        },
+        yield_expression_must_be_contained_within_a_generator_declaration: {
+            code: 1163,
+            category: 1,
+            key: "'yield' expression must be contained_within a generator declaration."
+        },
+        Computed_property_names_are_not_allowed_in_enums: {
+            code: 1164,
+            category: 1,
+            key: "Computed property names are not allowed in enums."
+        },
+        A_computed_property_name_in_an_ambient_context_must_directly_refer_to_a_built_in_symbol: {
+            code: 1165,
+            category: 1,
+            key: "A computed property name in an ambient context must directly refer to a built-in symbol."
+        },
+        A_computed_property_name_in_a_class_property_declaration_must_directly_refer_to_a_built_in_symbol: {
+            code: 1166,
+            category: 1,
+            key: "A computed property name in a class property declaration must directly refer to a built-in symbol."
+        },
+        Computed_property_names_are_only_available_when_targeting_ECMAScript_6_and_higher: {
+            code: 1167,
+            category: 1,
+            key: "Computed property names are only available when targeting ECMAScript 6 and higher."
+        },
+        A_computed_property_name_in_a_method_overload_must_directly_refer_to_a_built_in_symbol: {
+            code: 1168,
+            category: 1,
+            key: "A computed property name in a method overload must directly refer to a built-in symbol."
+        },
+        A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol: {
+            code: 1169,
+            category: 1,
+            key: "A computed property name in an interface must directly refer to a built-in symbol."
+        },
+        A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol: {
+            code: 1170,
+            category: 1,
+            key: "A computed property name in a type literal must directly refer to a built-in symbol."
+        },
+        A_comma_expression_is_not_allowed_in_a_computed_property_name: {
+            code: 1171,
+            category: 1,
+            key: "A comma expression is not allowed in a computed property name."
+        },
+        extends_clause_already_seen: {
+            code: 1172,
+            category: 1,
+            key: "'extends' clause already seen."
+        },
+        extends_clause_must_precede_implements_clause: {
+            code: 1173,
+            category: 1,
+            key: "'extends' clause must precede 'implements' clause."
+        },
+        Classes_can_only_extend_a_single_class: {
+            code: 1174,
+            category: 1,
+            key: "Classes can only extend a single class."
+        },
+        implements_clause_already_seen: {
+            code: 1175,
+            category: 1,
+            key: "'implements' clause already seen."
+        },
+        Interface_declaration_cannot_have_implements_clause: {
+            code: 1176,
+            category: 1,
+            key: "Interface declaration cannot have 'implements' clause."
+        },
+        Binary_digit_expected: {
+            code: 1177,
+            category: 1,
+            key: "Binary digit expected."
+        },
+        Octal_digit_expected: {
+            code: 1178,
+            category: 1,
+            key: "Octal digit expected."
+        },
+        Unexpected_token_expected: {
+            code: 1179,
+            category: 1,
+            key: "Unexpected token. '{' expected."
+        },
+        Property_destructuring_pattern_expected: {
+            code: 1180,
+            category: 1,
+            key: "Property destructuring pattern expected."
+        },
+        Array_element_destructuring_pattern_expected: {
+            code: 1181,
+            category: 1,
+            key: "Array element destructuring pattern expected."
+        },
+        A_destructuring_declaration_must_have_an_initializer: {
+            code: 1182,
+            category: 1,
+            key: "A destructuring declaration must have an initializer."
+        },
+        Destructuring_declarations_are_not_allowed_in_ambient_contexts: {
+            code: 1183,
+            category: 1,
+            key: "Destructuring declarations are not allowed in ambient contexts."
+        },
+        An_implementation_cannot_be_declared_in_ambient_contexts: {
+            code: 1184,
+            category: 1,
+            key: "An implementation cannot be declared in ambient contexts."
+        },
+        Modifiers_cannot_appear_here: {
+            code: 1184,
+            category: 1,
+            key: "Modifiers cannot appear here."
+        },
+        Merge_conflict_marker_encountered: {
+            code: 1185,
+            category: 1,
+            key: "Merge conflict marker encountered."
+        },
+        A_rest_element_cannot_have_an_initializer: {
+            code: 1186,
+            category: 1,
+            key: "A rest element cannot have an initializer."
+        },
+        A_parameter_property_may_not_be_a_binding_pattern: {
+            code: 1187,
+            category: 1,
+            key: "A parameter property may not be a binding pattern."
+        },
+        Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement: {
+            code: 1188,
+            category: 1,
+            key: "Only a single variable declaration is allowed in a 'for...of' statement."
+        },
+        The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer: {
+            code: 1189,
+            category: 1,
+            key: "The variable declaration of a 'for...in' statement cannot have an initializer."
+        },
+        The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer: {
+            code: 1190,
+            category: 1,
+            key: "The variable declaration of a 'for...of' statement cannot have an initializer."
+        },
+        An_import_declaration_cannot_have_modifiers: {
+            code: 1191,
+            category: 1,
+            key: "An import declaration cannot have modifiers."
+        },
+        External_module_0_has_no_default_export_or_export_assignment: {
+            code: 1192,
+            category: 1,
+            key: "External module '{0}' has no default export or export assignment."
+        },
+        An_export_declaration_cannot_have_modifiers: {
+            code: 1193,
+            category: 1,
+            key: "An export declaration cannot have modifiers."
+        },
+        Export_declarations_are_not_permitted_in_an_internal_module: {
+            code: 1194,
+            category: 1,
+            key: "Export declarations are not permitted in an internal module."
+        },
+        Catch_clause_variable_name_must_be_an_identifier: {
+            code: 1195,
+            category: 1,
+            key: "Catch clause variable name must be an identifier."
+        },
+        Catch_clause_variable_cannot_have_a_type_annotation: {
+            code: 1196,
+            category: 1,
+            key: "Catch clause variable cannot have a type annotation."
+        },
+        Catch_clause_variable_cannot_have_an_initializer: {
+            code: 1197,
+            category: 1,
+            key: "Catch clause variable cannot have an initializer."
+        },
+        An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: {
+            code: 1198,
+            category: 1,
+            key: "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive."
+        },
+        Unterminated_Unicode_escape_sequence: {
+            code: 1199,
+            category: 1,
+            key: "Unterminated Unicode escape sequence."
+        },
+        Duplicate_identifier_0: {
+            code: 2300,
+            category: 1,
+            key: "Duplicate identifier '{0}'."
+        },
+        Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: {
+            code: 2301,
+            category: 1,
+            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: 1,
+            key: "Static members cannot reference class type parameters."
+        },
+        Circular_definition_of_import_alias_0: {
+            code: 2303,
+            category: 1,
+            key: "Circular definition of import alias '{0}'."
+        },
+        Cannot_find_name_0: {
+            code: 2304,
+            category: 1,
+            key: "Cannot find name '{0}'."
+        },
+        Module_0_has_no_exported_member_1: {
+            code: 2305,
+            category: 1,
+            key: "Module '{0}' has no exported member '{1}'."
+        },
+        File_0_is_not_an_external_module: {
+            code: 2306,
+            category: 1,
+            key: "File '{0}' is not an external module."
+        },
+        Cannot_find_external_module_0: {
+            code: 2307,
+            category: 1,
+            key: "Cannot find external module '{0}'."
+        },
+        A_module_cannot_have_more_than_one_export_assignment: {
+            code: 2308,
+            category: 1,
+            key: "A module cannot have more than one export assignment."
+        },
+        An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements: {
+            code: 2309,
+            category: 1,
+            key: "An export assignment cannot be used in a module with other exported elements."
+        },
+        Type_0_recursively_references_itself_as_a_base_type: {
+            code: 2310,
+            category: 1,
+            key: "Type '{0}' recursively references itself as a base type."
+        },
+        A_class_may_only_extend_another_class: {
+            code: 2311,
+            category: 1,
+            key: "A class may only extend another class."
+        },
+        An_interface_may_only_extend_a_class_or_another_interface: {
+            code: 2312,
+            category: 1,
+            key: "An interface may only extend a class or another interface."
+        },
+        Constraint_of_a_type_parameter_cannot_reference_any_type_parameter_from_the_same_type_parameter_list: {
+            code: 2313,
+            category: 1,
+            key: "Constraint of a type parameter cannot reference any type parameter from the same type parameter list."
+        },
+        Generic_type_0_requires_1_type_argument_s: {
+            code: 2314,
+            category: 1,
+            key: "Generic type '{0}' requires {1} type argument(s)."
+        },
+        Type_0_is_not_generic: {
+            code: 2315,
+            category: 1,
+            key: "Type '{0}' is not generic."
+        },
+        Global_type_0_must_be_a_class_or_interface_type: {
+            code: 2316,
+            category: 1,
+            key: "Global type '{0}' must be a class or interface type."
+        },
+        Global_type_0_must_have_1_type_parameter_s: {
+            code: 2317,
+            category: 1,
+            key: "Global type '{0}' must have {1} type parameter(s)."
+        },
+        Cannot_find_global_type_0: {
+            code: 2318,
+            category: 1,
+            key: "Cannot find global type '{0}'."
+        },
+        Named_property_0_of_types_1_and_2_are_not_identical: {
+            code: 2319,
+            category: 1,
+            key: "Named property '{0}' of types '{1}' and '{2}' are not identical."
+        },
+        Interface_0_cannot_simultaneously_extend_types_1_and_2: {
+            code: 2320,
+            category: 1,
+            key: "Interface '{0}' cannot simultaneously extend types '{1}' and '{2}'."
+        },
+        Excessive_stack_depth_comparing_types_0_and_1: {
+            code: 2321,
+            category: 1,
+            key: "Excessive stack depth comparing types '{0}' and '{1}'."
+        },
+        Type_0_is_not_assignable_to_type_1: {
+            code: 2322,
+            category: 1,
+            key: "Type '{0}' is not assignable to type '{1}'."
+        },
+        Property_0_is_missing_in_type_1: {
+            code: 2324,
+            category: 1,
+            key: "Property '{0}' is missing in type '{1}'."
+        },
+        Property_0_is_private_in_type_1_but_not_in_type_2: {
+            code: 2325,
+            category: 1,
+            key: "Property '{0}' is private in type '{1}' but not in type '{2}'."
+        },
+        Types_of_property_0_are_incompatible: {
+            code: 2326,
+            category: 1,
+            key: "Types of property '{0}' are incompatible."
+        },
+        Property_0_is_optional_in_type_1_but_required_in_type_2: {
+            code: 2327,
+            category: 1,
+            key: "Property '{0}' is optional in type '{1}' but required in type '{2}'."
+        },
+        Types_of_parameters_0_and_1_are_incompatible: {
+            code: 2328,
+            category: 1,
+            key: "Types of parameters '{0}' and '{1}' are incompatible."
+        },
+        Index_signature_is_missing_in_type_0: {
+            code: 2329,
+            category: 1,
+            key: "Index signature is missing in type '{0}'."
+        },
+        Index_signatures_are_incompatible: {
+            code: 2330,
+            category: 1,
+            key: "Index signatures are incompatible."
+        },
+        this_cannot_be_referenced_in_a_module_body: {
+            code: 2331,
+            category: 1,
+            key: "'this' cannot be referenced in a module body."
+        },
+        this_cannot_be_referenced_in_current_location: {
+            code: 2332,
+            category: 1,
+            key: "'this' cannot be referenced in current location."
+        },
+        this_cannot_be_referenced_in_constructor_arguments: {
+            code: 2333,
+            category: 1,
+            key: "'this' cannot be referenced in constructor arguments."
+        },
+        this_cannot_be_referenced_in_a_static_property_initializer: {
+            code: 2334,
+            category: 1,
+            key: "'this' cannot be referenced in a static property initializer."
+        },
+        super_can_only_be_referenced_in_a_derived_class: {
+            code: 2335,
+            category: 1,
+            key: "'super' can only be referenced in a derived class."
+        },
+        super_cannot_be_referenced_in_constructor_arguments: {
+            code: 2336,
+            category: 1,
+            key: "'super' cannot be referenced in constructor arguments."
+        },
+        Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors: {
+            code: 2337,
+            category: 1,
+            key: "Super calls are not permitted outside constructors or in nested functions inside constructors"
+        },
+        super_property_access_is_permitted_only_in_a_constructor_member_function_or_member_accessor_of_a_derived_class: {
+            code: 2338,
+            category: 1,
+            key: "'super' property access is permitted only in a constructor, member function, or member accessor of a derived class"
+        },
+        Property_0_does_not_exist_on_type_1: {
+            code: 2339,
+            category: 1,
+            key: "Property '{0}' does not exist on type '{1}'."
+        },
+        Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword: {
+            code: 2340,
+            category: 1,
+            key: "Only public and protected methods of the base class are accessible via the 'super' keyword"
+        },
+        Property_0_is_private_and_only_accessible_within_class_1: {
+            code: 2341,
+            category: 1,
+            key: "Property '{0}' is private and only accessible within class '{1}'."
+        },
+        An_index_expression_argument_must_be_of_type_string_number_symbol_or_any: {
+            code: 2342,
+            category: 1,
+            key: "An index expression argument must be of type 'string', 'number', 'symbol, or 'any'."
+        },
+        Type_0_does_not_satisfy_the_constraint_1: {
+            code: 2344,
+            category: 1,
+            key: "Type '{0}' does not satisfy the constraint '{1}'."
+        },
+        Argument_of_type_0_is_not_assignable_to_parameter_of_type_1: {
+            code: 2345,
+            category: 1,
+            key: "Argument of type '{0}' is not assignable to parameter of type '{1}'."
+        },
+        Supplied_parameters_do_not_match_any_signature_of_call_target: {
+            code: 2346,
+            category: 1,
+            key: "Supplied parameters do not match any signature of call target."
+        },
+        Untyped_function_calls_may_not_accept_type_arguments: {
+            code: 2347,
+            category: 1,
+            key: "Untyped function calls may not accept type arguments."
+        },
+        Value_of_type_0_is_not_callable_Did_you_mean_to_include_new: {
+            code: 2348,
+            category: 1,
+            key: "Value of type '{0}' is not callable. Did you mean to include 'new'?"
+        },
+        Cannot_invoke_an_expression_whose_type_lacks_a_call_signature: {
+            code: 2349,
+            category: 1,
+            key: "Cannot invoke an expression whose type lacks a call signature."
+        },
+        Only_a_void_function_can_be_called_with_the_new_keyword: {
+            code: 2350,
+            category: 1,
+            key: "Only a void function can be called with the 'new' keyword."
+        },
+        Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature: {
+            code: 2351,
+            category: 1,
+            key: "Cannot use 'new' with an expression whose type lacks a call or construct signature."
+        },
+        Neither_type_0_nor_type_1_is_assignable_to_the_other: {
+            code: 2352,
+            category: 1,
+            key: "Neither type '{0}' nor type '{1}' is assignable to the other."
+        },
+        No_best_common_type_exists_among_return_expressions: {
+            code: 2354,
+            category: 1,
+            key: "No best common type exists among return expressions."
+        },
+        A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_or_consist_of_a_single_throw_statement: {
+            code: 2355,
+            category: 1,
+            key: "A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement."
+        },
+        An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type: {
+            code: 2356,
+            category: 1,
+            key: "An arithmetic operand must be of type 'any', 'number' or an enum type."
+        },
+        The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer: {
+            code: 2357,
+            category: 1,
+            key: "The operand of an increment or decrement operator must be a variable, property or indexer."
+        },
+        The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: {
+            code: 2358,
+            category: 1,
+            key: "The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter."
+        },
+        The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_Function_interface_type: {
+            code: 2359,
+            category: 1,
+            key: "The right-hand side of an 'instanceof' expression must be of type 'any' or of a type assignable to the 'Function' interface type."
+        },
+        The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol: {
+            code: 2360,
+            category: 1,
+            key: "The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'."
+        },
+        The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: {
+            code: 2361,
+            category: 1,
+            key: "The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter"
+        },
+        The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: {
+            code: 2362,
+            category: 1,
+            key: "The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type."
+        },
+        The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: {
+            code: 2363,
+            category: 1,
+            key: "The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type."
+        },
+        Invalid_left_hand_side_of_assignment_expression: {
+            code: 2364,
+            category: 1,
+            key: "Invalid left-hand side of assignment expression."
+        },
+        Operator_0_cannot_be_applied_to_types_1_and_2: {
+            code: 2365,
+            category: 1,
+            key: "Operator '{0}' cannot be applied to types '{1}' and '{2}'."
+        },
+        Type_parameter_name_cannot_be_0: {
+            code: 2368,
+            category: 1,
+            key: "Type parameter name cannot be '{0}'"
+        },
+        A_parameter_property_is_only_allowed_in_a_constructor_implementation: {
+            code: 2369,
+            category: 1,
+            key: "A parameter property is only allowed in a constructor implementation."
+        },
+        A_rest_parameter_must_be_of_an_array_type: {
+            code: 2370,
+            category: 1,
+            key: "A rest parameter must be of an array type."
+        },
+        A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation: {
+            code: 2371,
+            category: 1,
+            key: "A parameter initializer is only allowed in a function or constructor implementation."
+        },
+        Parameter_0_cannot_be_referenced_in_its_initializer: {
+            code: 2372,
+            category: 1,
+            key: "Parameter '{0}' cannot be referenced in its initializer."
+        },
+        Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it: {
+            code: 2373,
+            category: 1,
+            key: "Initializer of parameter '{0}' cannot reference identifier '{1}' declared after it."
+        },
+        Duplicate_string_index_signature: {
+            code: 2374,
+            category: 1,
+            key: "Duplicate string index signature."
+        },
+        Duplicate_number_index_signature: {
+            code: 2375,
+            category: 1,
+            key: "Duplicate number index signature."
+        },
+        A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_or_has_parameter_properties: {
+            code: 2376,
+            category: 1,
+            key: "A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties."
+        },
+        Constructors_for_derived_classes_must_contain_a_super_call: {
+            code: 2377,
+            category: 1,
+            key: "Constructors for derived classes must contain a 'super' call."
+        },
+        A_get_accessor_must_return_a_value_or_consist_of_a_single_throw_statement: {
+            code: 2378,
+            category: 1,
+            key: "A 'get' accessor must return a value or consist of a single 'throw' statement."
+        },
+        Getter_and_setter_accessors_do_not_agree_in_visibility: {
+            code: 2379,
+            category: 1,
+            key: "Getter and setter accessors do not agree in visibility."
+        },
+        get_and_set_accessor_must_have_the_same_type: {
+            code: 2380,
+            category: 1,
+            key: "'get' and 'set' accessor must have the same type."
+        },
+        A_signature_with_an_implementation_cannot_use_a_string_literal_type: {
+            code: 2381,
+            category: 1,
+            key: "A signature with an implementation cannot use a string literal type."
+        },
+        Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature: {
+            code: 2382,
+            category: 1,
+            key: "Specialized overload signature is not assignable to any non-specialized signature."
+        },
+        Overload_signatures_must_all_be_exported_or_not_exported: {
+            code: 2383,
+            category: 1,
+            key: "Overload signatures must all be exported or not exported."
+        },
+        Overload_signatures_must_all_be_ambient_or_non_ambient: {
+            code: 2384,
+            category: 1,
+            key: "Overload signatures must all be ambient or non-ambient."
+        },
+        Overload_signatures_must_all_be_public_private_or_protected: {
+            code: 2385,
+            category: 1,
+            key: "Overload signatures must all be public, private or protected."
+        },
+        Overload_signatures_must_all_be_optional_or_required: {
+            code: 2386,
+            category: 1,
+            key: "Overload signatures must all be optional or required."
+        },
+        Function_overload_must_be_static: {
+            code: 2387,
+            category: 1,
+            key: "Function overload must be static."
+        },
+        Function_overload_must_not_be_static: {
+            code: 2388,
+            category: 1,
+            key: "Function overload must not be static."
+        },
+        Function_implementation_name_must_be_0: {
+            code: 2389,
+            category: 1,
+            key: "Function implementation name must be '{0}'."
+        },
+        Constructor_implementation_is_missing: {
+            code: 2390,
+            category: 1,
+            key: "Constructor implementation is missing."
+        },
+        Function_implementation_is_missing_or_not_immediately_following_the_declaration: {
+            code: 2391,
+            category: 1,
+            key: "Function implementation is missing or not immediately following the declaration."
+        },
+        Multiple_constructor_implementations_are_not_allowed: {
+            code: 2392,
+            category: 1,
+            key: "Multiple constructor implementations are not allowed."
+        },
+        Duplicate_function_implementation: {
+            code: 2393,
+            category: 1,
+            key: "Duplicate function implementation."
+        },
+        Overload_signature_is_not_compatible_with_function_implementation: {
+            code: 2394,
+            category: 1,
+            key: "Overload signature is not compatible with function implementation."
+        },
+        Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local: {
+            code: 2395,
+            category: 1,
+            key: "Individual declarations in merged declaration {0} must be all exported or all local."
+        },
+        Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters: {
+            code: 2396,
+            category: 1,
+            key: "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters."
+        },
+        Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference: {
+            code: 2399,
+            category: 1,
+            key: "Duplicate identifier '_this'. Compiler uses variable declaration '_this' to capture 'this' reference."
+        },
+        Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference: {
+            code: 2400,
+            category: 1,
+            key: "Expression resolves to variable declaration '_this' that compiler uses to capture 'this' reference."
+        },
+        Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference: {
+            code: 2401,
+            category: 1,
+            key: "Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference."
+        },
+        Expression_resolves_to_super_that_compiler_uses_to_capture_base_class_reference: {
+            code: 2402,
+            category: 1,
+            key: "Expression resolves to '_super' that compiler uses to capture base class reference."
+        },
+        Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2: {
+            code: 2403,
+            category: 1,
+            key: "Subsequent variable declarations must have the same type.  Variable '{0}' must be of type '{1}', but here has type '{2}'."
+        },
+        The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation: {
+            code: 2404,
+            category: 1,
+            key: "The left-hand side of a 'for...in' statement cannot use a type annotation."
+        },
+        The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any: {
+            code: 2405,
+            category: 1,
+            key: "The left-hand side of a 'for...in' statement must be of type 'string' or 'any'."
+        },
+        Invalid_left_hand_side_in_for_in_statement: {
+            code: 2406,
+            category: 1,
+            key: "Invalid left-hand side in 'for...in' statement."
+        },
+        The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter: {
+            code: 2407,
+            category: 1,
+            key: "The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter."
+        },
+        Setters_cannot_return_a_value: {
+            code: 2408,
+            category: 1,
+            key: "Setters cannot return a value."
+        },
+        Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class: {
+            code: 2409,
+            category: 1,
+            key: "Return type of constructor signature must be assignable to the instance type of the class"
+        },
+        All_symbols_within_a_with_block_will_be_resolved_to_any: {
+            code: 2410,
+            category: 1,
+            key: "All symbols within a 'with' block will be resolved to 'any'."
+        },
+        Property_0_of_type_1_is_not_assignable_to_string_index_type_2: {
+            code: 2411,
+            category: 1,
+            key: "Property '{0}' of type '{1}' is not assignable to string index type '{2}'."
+        },
+        Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2: {
+            code: 2412,
+            category: 1,
+            key: "Property '{0}' of type '{1}' is not assignable to numeric index type '{2}'."
+        },
+        Numeric_index_type_0_is_not_assignable_to_string_index_type_1: {
+            code: 2413,
+            category: 1,
+            key: "Numeric index type '{0}' is not assignable to string index type '{1}'."
+        },
+        Class_name_cannot_be_0: {
+            code: 2414,
+            category: 1,
+            key: "Class name cannot be '{0}'"
+        },
+        Class_0_incorrectly_extends_base_class_1: {
+            code: 2415,
+            category: 1,
+            key: "Class '{0}' incorrectly extends base class '{1}'."
+        },
+        Class_static_side_0_incorrectly_extends_base_class_static_side_1: {
+            code: 2417,
+            category: 1,
+            key: "Class static side '{0}' incorrectly extends base class static side '{1}'."
+        },
+        Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0: {
+            code: 2419,
+            category: 1,
+            key: "Type name '{0}' in extends clause does not reference constructor function for '{0}'."
+        },
+        Class_0_incorrectly_implements_interface_1: {
+            code: 2420,
+            category: 1,
+            key: "Class '{0}' incorrectly implements interface '{1}'."
+        },
+        A_class_may_only_implement_another_class_or_interface: {
+            code: 2422,
+            category: 1,
+            key: "A class may only implement another class or interface."
+        },
+        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_accessor: {
+            code: 2423,
+            category: 1,
+            key: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member accessor."
+        },
+        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_property: {
+            code: 2424,
+            category: 1,
+            key: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member property."
+        },
+        Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_function: {
+            code: 2425,
+            category: 1,
+            key: "Class '{0}' defines instance member property '{1}', but extended class '{2}' defines it as instance member function."
+        },
+        Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_function: {
+            code: 2426,
+            category: 1,
+            key: "Class '{0}' defines instance member accessor '{1}', but extended class '{2}' defines it as instance member function."
+        },
+        Interface_name_cannot_be_0: {
+            code: 2427,
+            category: 1,
+            key: "Interface name cannot be '{0}'"
+        },
+        All_declarations_of_an_interface_must_have_identical_type_parameters: {
+            code: 2428,
+            category: 1,
+            key: "All declarations of an interface must have identical type parameters."
+        },
+        Interface_0_incorrectly_extends_interface_1: {
+            code: 2430,
+            category: 1,
+            key: "Interface '{0}' incorrectly extends interface '{1}'."
+        },
+        Enum_name_cannot_be_0: {
+            code: 2431,
+            category: 1,
+            key: "Enum name cannot be '{0}'"
+        },
+        In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enum_element: {
+            code: 2432,
+            category: 1,
+            key: "In an enum with multiple declarations, only one declaration can omit an initializer for its first enum element."
+        },
+        A_module_declaration_cannot_be_in_a_different_file_from_a_class_or_function_with_which_it_is_merged: {
+            code: 2433,
+            category: 1,
+            key: "A module declaration cannot be in a different file from a class or function with which it is merged"
+        },
+        A_module_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged: {
+            code: 2434,
+            category: 1,
+            key: "A module declaration cannot be located prior to a class or function with which it is merged"
+        },
+        Ambient_external_modules_cannot_be_nested_in_other_modules: {
+            code: 2435,
+            category: 1,
+            key: "Ambient external modules cannot be nested in other modules."
+        },
+        Ambient_external_module_declaration_cannot_specify_relative_module_name: {
+            code: 2436,
+            category: 1,
+            key: "Ambient external module declaration cannot specify relative module name."
+        },
+        Module_0_is_hidden_by_a_local_declaration_with_the_same_name: {
+            code: 2437,
+            category: 1,
+            key: "Module '{0}' is hidden by a local declaration with the same name"
+        },
+        Import_name_cannot_be_0: {
+            code: 2438,
+            category: 1,
+            key: "Import name cannot be '{0}'"
+        },
+        Import_or_export_declaration_in_an_ambient_external_module_declaration_cannot_reference_external_module_through_relative_external_module_name: {
+            code: 2439,
+            category: 1,
+            key: "Import or export declaration in an ambient external module declaration cannot reference external module through relative external module name."
+        },
+        Import_declaration_conflicts_with_local_declaration_of_0: {
+            code: 2440,
+            category: 1,
+            key: "Import declaration conflicts with local declaration of '{0}'"
+        },
+        Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_an_external_module: {
+            code: 2441,
+            category: 1,
+            key: "Duplicate identifier '{0}'. Compiler reserves name '{1}' in top level scope of an external module."
+        },
+        Types_have_separate_declarations_of_a_private_property_0: {
+            code: 2442,
+            category: 1,
+            key: "Types have separate declarations of a private property '{0}'."
+        },
+        Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2: {
+            code: 2443,
+            category: 1,
+            key: "Property '{0}' is protected but type '{1}' is not a class derived from '{2}'."
+        },
+        Property_0_is_protected_in_type_1_but_public_in_type_2: {
+            code: 2444,
+            category: 1,
+            key: "Property '{0}' is protected in type '{1}' but public in type '{2}'."
+        },
+        Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses: {
+            code: 2445,
+            category: 1,
+            key: "Property '{0}' is protected and only accessible within class '{1}' and its subclasses."
+        },
+        Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1: {
+            code: 2446,
+            category: 1,
+            key: "Property '{0}' is protected and only accessible through an instance of class '{1}'."
+        },
+        The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead: {
+            code: 2447,
+            category: 1,
+            key: "The '{0}' operator is not allowed for boolean types. Consider using '{1}' instead."
+        },
+        Block_scoped_variable_0_used_before_its_declaration: {
+            code: 2448,
+            category: 1,
+            key: "Block-scoped variable '{0}' used before its declaration."
+        },
+        The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant: {
+            code: 2449,
+            category: 1,
+            key: "The operand of an increment or decrement operator cannot be a constant."
+        },
+        Left_hand_side_of_assignment_expression_cannot_be_a_constant: {
+            code: 2450,
+            category: 1,
+            key: "Left-hand side of assignment expression cannot be a constant."
+        },
+        Cannot_redeclare_block_scoped_variable_0: {
+            code: 2451,
+            category: 1,
+            key: "Cannot redeclare block-scoped variable '{0}'."
+        },
+        An_enum_member_cannot_have_a_numeric_name: {
+            code: 2452,
+            category: 1,
+            key: "An enum member cannot have a numeric name."
+        },
+        The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_type_arguments_explicitly: {
+            code: 2453,
+            category: 1,
+            key: "The type argument for type parameter '{0}' cannot be inferred from the usage. Consider specifying the type arguments explicitly."
+        },
+        Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0: {
+            code: 2455,
+            category: 1,
+            key: "Type argument candidate '{1}' is not a valid type argument because it is not a supertype of candidate '{0}'."
+        },
+        Type_alias_0_circularly_references_itself: {
+            code: 2456,
+            category: 1,
+            key: "Type alias '{0}' circularly references itself."
+        },
+        Type_alias_name_cannot_be_0: {
+            code: 2457,
+            category: 1,
+            key: "Type alias name cannot be '{0}'"
+        },
+        An_AMD_module_cannot_have_multiple_name_assignments: {
+            code: 2458,
+            category: 1,
+            key: "An AMD module cannot have multiple name assignments."
+        },
+        Type_0_has_no_property_1_and_no_string_index_signature: {
+            code: 2459,
+            category: 1,
+            key: "Type '{0}' has no property '{1}' and no string index signature."
+        },
+        Type_0_has_no_property_1: {
+            code: 2460,
+            category: 1,
+            key: "Type '{0}' has no property '{1}'."
+        },
+        Type_0_is_not_an_array_type: {
+            code: 2461,
+            category: 1,
+            key: "Type '{0}' is not an array type."
+        },
+        A_rest_element_must_be_last_in_an_array_destructuring_pattern: {
+            code: 2462,
+            category: 1,
+            key: "A rest element must be last in an array destructuring pattern"
+        },
+        A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature: {
+            code: 2463,
+            category: 1,
+            key: "A binding pattern parameter cannot be optional in an implementation signature."
+        },
+        A_computed_property_name_must_be_of_type_string_number_symbol_or_any: {
+            code: 2464,
+            category: 1,
+            key: "A computed property name must be of type 'string', 'number', 'symbol', or 'any'."
+        },
+        this_cannot_be_referenced_in_a_computed_property_name: {
+            code: 2465,
+            category: 1,
+            key: "'this' cannot be referenced in a computed property name."
+        },
+        super_cannot_be_referenced_in_a_computed_property_name: {
+            code: 2466,
+            category: 1,
+            key: "'super' cannot be referenced in a computed property name."
+        },
+        A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type: {
+            code: 2467,
+            category: 1,
+            key: "A computed property name cannot reference a type parameter from its containing type."
+        },
+        Cannot_find_global_value_0: {
+            code: 2468,
+            category: 1,
+            key: "Cannot find global value '{0}'."
+        },
+        The_0_operator_cannot_be_applied_to_type_symbol: {
+            code: 2469,
+            category: 1,
+            key: "The '{0}' operator cannot be applied to type 'symbol'."
+        },
+        Symbol_reference_does_not_refer_to_the_global_Symbol_constructor_object: {
+            code: 2470,
+            category: 1,
+            key: "'Symbol' reference does not refer to the global Symbol constructor object."
+        },
+        A_computed_property_name_of_the_form_0_must_be_of_type_symbol: {
+            code: 2471,
+            category: 1,
+            key: "A computed property name of the form '{0}' must be of type 'symbol'."
+        },
+        Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_6_and_higher: {
+            code: 2472,
+            category: 1,
+            key: "Spread operator in 'new' expressions is only available when targeting ECMAScript 6 and higher."
+        },
+        Enum_declarations_must_all_be_const_or_non_const: {
+            code: 2473,
+            category: 1,
+            key: "Enum declarations must all be const or non-const."
+        },
+        In_const_enum_declarations_member_initializer_must_be_constant_expression: {
+            code: 2474,
+            category: 1,
+            key: "In 'const' enum declarations member initializer must be constant expression."
+        },
+        const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment: {
+            code: 2475,
+            category: 1,
+            key: "'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment."
+        },
+        A_const_enum_member_can_only_be_accessed_using_a_string_literal: {
+            code: 2476,
+            category: 1,
+            key: "A const enum member can only be accessed using a string literal."
+        },
+        const_enum_member_initializer_was_evaluated_to_a_non_finite_value: {
+            code: 2477,
+            category: 1,
+            key: "'const' enum member initializer was evaluated to a non-finite value."
+        },
+        const_enum_member_initializer_was_evaluated_to_disallowed_value_NaN: {
+            code: 2478,
+            category: 1,
+            key: "'const' enum member initializer was evaluated to disallowed value 'NaN'."
+        },
+        Property_0_does_not_exist_on_const_enum_1: {
+            code: 2479,
+            category: 1,
+            key: "Property '{0}' does not exist on 'const' enum '{1}'."
+        },
+        let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations: {
+            code: 2480,
+            category: 1,
+            key: "'let' is not allowed to be used as a name in 'let' or 'const' declarations."
+        },
+        Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1: {
+            code: 2481,
+            category: 1,
+            key: "Cannot initialize outer scoped variable '{0}' in the same scope as block scoped declaration '{1}'."
+        },
+        The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: {
+            code: 2483,
+            category: 1,
+            key: "The left-hand side of a 'for...of' statement cannot use a type annotation."
+        },
+        Export_declaration_conflicts_with_exported_declaration_of_0: {
+            code: 2484,
+            category: 1,
+            key: "Export declaration conflicts with exported declaration of '{0}'"
+        },
+        The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant: {
+            code: 2485,
+            category: 1,
+            key: "The left-hand side of a 'for...of' statement cannot be a previously defined constant."
+        },
+        The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant: {
+            code: 2486,
+            category: 1,
+            key: "The left-hand side of a 'for...in' statement cannot be a previously defined constant."
+        },
+        Invalid_left_hand_side_in_for_of_statement: {
+            code: 2487,
+            category: 1,
+            key: "Invalid left-hand side in 'for...of' statement."
+        },
+        The_right_hand_side_of_a_for_of_statement_must_have_a_Symbol_iterator_method_that_returns_an_iterator: {
+            code: 2488,
+            category: 1,
+            key: "The right-hand side of a 'for...of' statement must have a '[Symbol.iterator]()' method that returns an iterator."
+        },
+        The_iterator_returned_by_the_right_hand_side_of_a_for_of_statement_must_have_a_next_method: {
+            code: 2489,
+            category: 1,
+            key: "The iterator returned by the right-hand side of a 'for...of' statement must have a 'next()' method."
+        },
+        The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: {
+            code: 2490,
+            category: 1,
+            key: "The type returned by the 'next()' method of an iterator must have a 'value' property."
+        },
+        The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern: {
+            code: 2491,
+            category: 1,
+            key: "The left-hand side of a 'for...in' statement cannot be a destructuring pattern."
+        },
+        Cannot_redeclare_identifier_0_in_catch_clause: {
+            code: 2492,
+            category: 1,
+            key: "Cannot redeclare identifier '{0}' in catch clause"
+        },
+        Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2: {
+            code: 2493,
+            category: 1,
+            key: "Tuple type '{0}' with length '{1}' cannot be assigned to tuple with length '{2}'."
+        },
+        Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher: {
+            code: 2494,
+            category: 1,
+            key: "Using a string in a 'for...of' statement is only supported in ECMAScript 5 and higher."
+        },
+        Type_0_is_not_an_array_type_or_a_string_type: {
+            code: 2461,
+            category: 1,
+            key: "Type '{0}' is not an array type or a string type."
+        },
+        Import_declaration_0_is_using_private_name_1: {
+            code: 4000,
+            category: 1,
+            key: "Import declaration '{0}' is using private name '{1}'."
+        },
+        Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: {
+            code: 4002,
+            category: 1,
+            key: "Type parameter '{0}' of exported class has or is using private name '{1}'."
+        },
+        Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: {
+            code: 4004,
+            category: 1,
+            key: "Type parameter '{0}' of exported interface has or is using private name '{1}'."
+        },
+        Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: {
+            code: 4006,
+            category: 1,
+            key: "Type parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'."
+        },
+        Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: {
+            code: 4008,
+            category: 1,
+            key: "Type parameter '{0}' of call signature from exported interface has or is using private name '{1}'."
+        },
+        Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: {
+            code: 4010,
+            category: 1,
+            key: "Type parameter '{0}' of public static method from exported class has or is using private name '{1}'."
+        },
+        Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: {
+            code: 4012,
+            category: 1,
+            key: "Type parameter '{0}' of public method from exported class has or is using private name '{1}'."
+        },
+        Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: {
+            code: 4014,
+            category: 1,
+            key: "Type parameter '{0}' of method from exported interface has or is using private name '{1}'."
+        },
+        Type_parameter_0_of_exported_function_has_or_is_using_private_name_1: {
+            code: 4016,
+            category: 1,
+            key: "Type parameter '{0}' of exported function has or is using private name '{1}'."
+        },
+        Implements_clause_of_exported_class_0_has_or_is_using_private_name_1: {
+            code: 4019,
+            category: 1,
+            key: "Implements clause of exported class '{0}' has or is using private name '{1}'."
+        },
+        Extends_clause_of_exported_class_0_has_or_is_using_private_name_1: {
+            code: 4020,
+            category: 1,
+            key: "Extends clause of exported class '{0}' has or is using private name '{1}'."
+        },
+        Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1: {
+            code: 4022,
+            category: 1,
+            key: "Extends clause of exported interface '{0}' has or is using private name '{1}'."
+        },
+        Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: {
+            code: 4023,
+            category: 1,
+            key: "Exported variable '{0}' has or is using name '{1}' from external module {2} but cannot be named."
+        },
+        Exported_variable_0_has_or_is_using_name_1_from_private_module_2: {
+            code: 4024,
+            category: 1,
+            key: "Exported variable '{0}' has or is using name '{1}' from private module '{2}'."
+        },
+        Exported_variable_0_has_or_is_using_private_name_1: {
+            code: 4025,
+            category: 1,
+            key: "Exported variable '{0}' has or is using private name '{1}'."
+        },
+        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: {
+            code: 4026,
+            category: 1,
+            key: "Public static property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named."
+        },
+        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: {
+            code: 4027,
+            category: 1,
+            key: "Public static property '{0}' of exported class has or is using name '{1}' from private module '{2}'."
+        },
+        Public_static_property_0_of_exported_class_has_or_is_using_private_name_1: {
+            code: 4028,
+            category: 1,
+            key: "Public static property '{0}' of exported class has or is using private name '{1}'."
+        },
+        Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: {
+            code: 4029,
+            category: 1,
+            key: "Public property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named."
+        },
+        Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: {
+            code: 4030,
+            category: 1,
+            key: "Public property '{0}' of exported class has or is using name '{1}' from private module '{2}'."
+        },
+        Public_property_0_of_exported_class_has_or_is_using_private_name_1: {
+            code: 4031,
+            category: 1,
+            key: "Public property '{0}' of exported class has or is using private name '{1}'."
+        },
+        Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2: {
+            code: 4032,
+            category: 1,
+            key: "Property '{0}' of exported interface has or is using name '{1}' from private module '{2}'."
+        },
+        Property_0_of_exported_interface_has_or_is_using_private_name_1: {
+            code: 4033,
+            category: 1,
+            key: "Property '{0}' of exported interface has or is using private name '{1}'."
+        },
+        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: {
+            code: 4034,
+            category: 1,
+            key: "Parameter '{0}' of public static property setter from exported class has or is using name '{1}' from private module '{2}'."
+        },
+        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1: {
+            code: 4035,
+            category: 1,
+            key: "Parameter '{0}' of public static property setter from exported class has or is using private name '{1}'."
+        },
+        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: {
+            code: 4036,
+            category: 1,
+            key: "Parameter '{0}' of public property setter from exported class has or is using name '{1}' from private module '{2}'."
+        },
+        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1: {
+            code: 4037,
+            category: 1,
+            key: "Parameter '{0}' of public property setter from exported class has or is using private name '{1}'."
+        },
+        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: {
+            code: 4038,
+            category: 1,
+            key: "Return type of public static property getter from exported class has or is using name '{0}' from external module {1} but cannot be named."
+        },
+        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: {
+            code: 4039,
+            category: 1,
+            key: "Return type of public static property getter from exported class has or is using name '{0}' from private module '{1}'."
+        },
+        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0: {
+            code: 4040,
+            category: 1,
+            key: "Return type of public static property getter from exported class has or is using private name '{0}'."
+        },
+        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: {
+            code: 4041,
+            category: 1,
+            key: "Return type of public property getter from exported class has or is using name '{0}' from external module {1} but cannot be named."
+        },
+        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: {
+            code: 4042,
+            category: 1,
+            key: "Return type of public property getter from exported class has or is using name '{0}' from private module '{1}'."
+        },
+        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0: {
+            code: 4043,
+            category: 1,
+            key: "Return type of public property getter from exported class has or is using private name '{0}'."
+        },
+        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: {
+            code: 4044,
+            category: 1,
+            key: "Return type of constructor signature from exported interface has or is using name '{0}' from private module '{1}'."
+        },
+        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0: {
+            code: 4045,
+            category: 1,
+            key: "Return type of constructor signature from exported interface has or is using private name '{0}'."
+        },
+        Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: {
+            code: 4046,
+            category: 1,
+            key: "Return type of call signature from exported interface has or is using name '{0}' from private module '{1}'."
+        },
+        Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0: {
+            code: 4047,
+            category: 1,
+            key: "Return type of call signature from exported interface has or is using private name '{0}'."
+        },
+        Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: {
+            code: 4048,
+            category: 1,
+            key: "Return type of index signature from exported interface has or is using name '{0}' from private module '{1}'."
+        },
+        Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0: {
+            code: 4049,
+            category: 1,
+            key: "Return type of index signature from exported interface has or is using private name '{0}'."
+        },
+        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: {
+            code: 4050,
+            category: 1,
+            key: "Return type of public static method from exported class has or is using name '{0}' from external module {1} but cannot be named."
+        },
+        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: {
+            code: 4051,
+            category: 1,
+            key: "Return type of public static method from exported class has or is using name '{0}' from private module '{1}'."
+        },
+        Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0: {
+            code: 4052,
+            category: 1,
+            key: "Return type of public static method from exported class has or is using private name '{0}'."
+        },
+        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: {
+            code: 4053,
+            category: 1,
+            key: "Return type of public method from exported class has or is using name '{0}' from external module {1} but cannot be named."
+        },
+        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: {
+            code: 4054,
+            category: 1,
+            key: "Return type of public method from exported class has or is using name '{0}' from private module '{1}'."
+        },
+        Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0: {
+            code: 4055,
+            category: 1,
+            key: "Return type of public method from exported class has or is using private name '{0}'."
+        },
+        Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1: {
+            code: 4056,
+            category: 1,
+            key: "Return type of method from exported interface has or is using name '{0}' from private module '{1}'."
+        },
+        Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0: {
+            code: 4057,
+            category: 1,
+            key: "Return type of method from exported interface has or is using private name '{0}'."
+        },
+        Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: {
+            code: 4058,
+            category: 1,
+            key: "Return type of exported function has or is using name '{0}' from external module {1} but cannot be named."
+        },
+        Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1: {
+            code: 4059,
+            category: 1,
+            key: "Return type of exported function has or is using name '{0}' from private module '{1}'."
+        },
+        Return_type_of_exported_function_has_or_is_using_private_name_0: {
+            code: 4060,
+            category: 1,
+            key: "Return type of exported function has or is using private name '{0}'."
+        },
+        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: {
+            code: 4061,
+            category: 1,
+            key: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from external module {2} but cannot be named."
+        },
+        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2: {
+            code: 4062,
+            category: 1,
+            key: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from private module '{2}'."
+        },
+        Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1: {
+            code: 4063,
+            category: 1,
+            key: "Parameter '{0}' of constructor from exported class has or is using private name '{1}'."
+        },
+        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: {
+            code: 4064,
+            category: 1,
+            key: "Parameter '{0}' of constructor signature from exported interface has or is using name '{1}' from private module '{2}'."
+        },
+        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: {
+            code: 4065,
+            category: 1,
+            key: "Parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'."
+        },
+        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: {
+            code: 4066,
+            category: 1,
+            key: "Parameter '{0}' of call signature from exported interface has or is using name '{1}' from private module '{2}'."
+        },
+        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: {
+            code: 4067,
+            category: 1,
+            key: "Parameter '{0}' of call signature from exported interface has or is using private name '{1}'."
+        },
+        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: {
+            code: 4068,
+            category: 1,
+            key: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from external module {2} but cannot be named."
+        },
+        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: {
+            code: 4069,
+            category: 1,
+            key: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from private module '{2}'."
+        },
+        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: {
+            code: 4070,
+            category: 1,
+            key: "Parameter '{0}' of public static method from exported class has or is using private name '{1}'."
+        },
+        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: {
+            code: 4071,
+            category: 1,
+            key: "Parameter '{0}' of public method from exported class has or is using name '{1}' from external module {2} but cannot be named."
+        },
+        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: {
+            code: 4072,
+            category: 1,
+            key: "Parameter '{0}' of public method from exported class has or is using name '{1}' from private module '{2}'."
+        },
+        Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: {
+            code: 4073,
+            category: 1,
+            key: "Parameter '{0}' of public method from exported class has or is using private name '{1}'."
+        },
+        Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2: {
+            code: 4074,
+            category: 1,
+            key: "Parameter '{0}' of method from exported interface has or is using name '{1}' from private module '{2}'."
+        },
+        Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: {
+            code: 4075,
+            category: 1,
+            key: "Parameter '{0}' of method from exported interface has or is using private name '{1}'."
+        },
+        Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: {
+            code: 4076,
+            category: 1,
+            key: "Parameter '{0}' of exported function has or is using name '{1}' from external module {2} but cannot be named."
+        },
+        Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2: {
+            code: 4077,
+            category: 1,
+            key: "Parameter '{0}' of exported function has or is using name '{1}' from private module '{2}'."
+        },
+        Parameter_0_of_exported_function_has_or_is_using_private_name_1: {
+            code: 4078,
+            category: 1,
+            key: "Parameter '{0}' of exported function has or is using private name '{1}'."
+        },
+        Exported_type_alias_0_has_or_is_using_private_name_1: {
+            code: 4081,
+            category: 1,
+            key: "Exported type alias '{0}' has or is using private name '{1}'."
+        },
+        Loop_contains_block_scoped_variable_0_referenced_by_a_function_in_the_loop_This_is_only_supported_in_ECMAScript_6_or_higher: {
+            code: 4091,
+            category: 1,
+            key: "Loop contains block-scoped variable '{0}' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher."
+        },
+        The_current_host_does_not_support_the_0_option: {
+            code: 5001,
+            category: 1,
+            key: "The current host does not support the '{0}' option."
+        },
+        Cannot_find_the_common_subdirectory_path_for_the_input_files: {
+            code: 5009,
+            category: 1,
+            key: "Cannot find the common subdirectory path for the input files."
+        },
+        Cannot_read_file_0_Colon_1: {
+            code: 5012,
+            category: 1,
+            key: "Cannot read file '{0}': {1}"
+        },
+        Unsupported_file_encoding: {
+            code: 5013,
+            category: 1,
+            key: "Unsupported file encoding."
+        },
+        Unknown_compiler_option_0: {
+            code: 5023,
+            category: 1,
+            key: "Unknown compiler option '{0}'."
+        },
+        Compiler_option_0_requires_a_value_of_type_1: {
+            code: 5024,
+            category: 1,
+            key: "Compiler option '{0}' requires a value of type {1}."
+        },
+        Could_not_write_file_0_Colon_1: {
+            code: 5033,
+            category: 1,
+            key: "Could not write file '{0}': {1}"
+        },
+        Option_mapRoot_cannot_be_specified_without_specifying_sourcemap_option: {
+            code: 5038,
+            category: 1,
+            key: "Option 'mapRoot' cannot be specified without specifying 'sourcemap' option."
+        },
+        Option_sourceRoot_cannot_be_specified_without_specifying_sourcemap_option: {
+            code: 5039,
+            category: 1,
+            key: "Option 'sourceRoot' cannot be specified without specifying 'sourcemap' option."
+        },
+        Option_noEmit_cannot_be_specified_with_option_out_or_outDir: {
+            code: 5040,
+            category: 1,
+            key: "Option 'noEmit' cannot be specified with option 'out' or 'outDir'."
+        },
+        Option_noEmit_cannot_be_specified_with_option_declaration: {
+            code: 5041,
+            category: 1,
+            key: "Option 'noEmit' cannot be specified with option 'declaration'."
+        },
+        Option_project_cannot_be_mixed_with_source_files_on_a_command_line: {
+            code: 5042,
+            category: 1,
+            key: "Option 'project' cannot be mixed with source files on a command line."
+        },
+        Concatenate_and_emit_output_to_single_file: {
+            code: 6001,
+            category: 2,
+            key: "Concatenate and emit output to single file."
+        },
+        Generates_corresponding_d_ts_file: {
+            code: 6002,
+            category: 2,
+            key: "Generates corresponding '.d.ts' file."
+        },
+        Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: {
+            code: 6003,
+            category: 2,
+            key: "Specifies the location where debugger should locate map files instead of generated locations."
+        },
+        Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations: {
+            code: 6004,
+            category: 2,
+            key: "Specifies the location where debugger should locate TypeScript files instead of source locations."
+        },
+        Watch_input_files: {
+            code: 6005,
+            category: 2,
+            key: "Watch input files."
+        },
+        Redirect_output_structure_to_the_directory: {
+            code: 6006,
+            category: 2,
+            key: "Redirect output structure to the directory."
+        },
+        Do_not_erase_const_enum_declarations_in_generated_code: {
+            code: 6007,
+            category: 2,
+            key: "Do not erase const enum declarations in generated code."
+        },
+        Do_not_emit_outputs_if_any_type_checking_errors_were_reported: {
+            code: 6008,
+            category: 2,
+            key: "Do not emit outputs if any type checking errors were reported."
+        },
+        Do_not_emit_comments_to_output: {
+            code: 6009,
+            category: 2,
+            key: "Do not emit comments to output."
+        },
+        Do_not_emit_outputs: {
+            code: 6010,
+            category: 2,
+            key: "Do not emit outputs."
+        },
+        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES6_experimental: {
+            code: 6015,
+            category: 2,
+            key: "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES6' (experimental)"
+        },
+        Specify_module_code_generation_Colon_commonjs_or_amd: {
+            code: 6016,
+            category: 2,
+            key: "Specify module code generation: 'commonjs' or 'amd'"
+        },
+        Print_this_message: {
+            code: 6017,
+            category: 2,
+            key: "Print this message."
+        },
+        Print_the_compiler_s_version: {
+            code: 6019,
+            category: 2,
+            key: "Print the compiler's version."
+        },
+        Compile_the_project_in_the_given_directory: {
+            code: 6020,
+            category: 2,
+            key: "Compile the project in the given directory."
+        },
+        Syntax_Colon_0: {
+            code: 6023,
+            category: 2,
+            key: "Syntax: {0}"
+        },
+        options: {
+            code: 6024,
+            category: 2,
+            key: "options"
+        },
+        file: {
+            code: 6025,
+            category: 2,
+            key: "file"
+        },
+        Examples_Colon_0: {
+            code: 6026,
+            category: 2,
+            key: "Examples: {0}"
+        },
+        Options_Colon: {
+            code: 6027,
+            category: 2,
+            key: "Options:"
+        },
+        Version_0: {
+            code: 6029,
+            category: 2,
+            key: "Version {0}"
+        },
+        Insert_command_line_options_and_files_from_a_file: {
+            code: 6030,
+            category: 2,
+            key: "Insert command line options and files from a file."
+        },
+        File_change_detected_Starting_incremental_compilation: {
+            code: 6032,
+            category: 2,
+            key: "File change detected. Starting incremental compilation..."
+        },
+        KIND: {
+            code: 6034,
+            category: 2,
+            key: "KIND"
+        },
+        FILE: {
+            code: 6035,
+            category: 2,
+            key: "FILE"
+        },
+        VERSION: {
+            code: 6036,
+            category: 2,
+            key: "VERSION"
+        },
+        LOCATION: {
+            code: 6037,
+            category: 2,
+            key: "LOCATION"
+        },
+        DIRECTORY: {
+            code: 6038,
+            category: 2,
+            key: "DIRECTORY"
+        },
+        Compilation_complete_Watching_for_file_changes: {
+            code: 6042,
+            category: 2,
+            key: "Compilation complete. Watching for file changes."
+        },
+        Generates_corresponding_map_file: {
+            code: 6043,
+            category: 2,
+            key: "Generates corresponding '.map' file."
+        },
+        Compiler_option_0_expects_an_argument: {
+            code: 6044,
+            category: 1,
+            key: "Compiler option '{0}' expects an argument."
+        },
+        Unterminated_quoted_string_in_response_file_0: {
+            code: 6045,
+            category: 1,
+            key: "Unterminated quoted string in response file '{0}'."
+        },
+        Argument_for_module_option_must_be_commonjs_or_amd: {
+            code: 6046,
+            category: 1,
+            key: "Argument for '--module' option must be 'commonjs' or 'amd'."
+        },
+        Argument_for_target_option_must_be_es3_es5_or_es6: {
+            code: 6047,
+            category: 1,
+            key: "Argument for '--target' option must be 'es3', 'es5', or 'es6'."
+        },
+        Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1: {
+            code: 6048,
+            category: 1,
+            key: "Locale must be of the form <language> or <language>-<territory>. For example '{0}' or '{1}'."
+        },
+        Unsupported_locale_0: {
+            code: 6049,
+            category: 1,
+            key: "Unsupported locale '{0}'."
+        },
+        Unable_to_open_file_0: {
+            code: 6050,
+            category: 1,
+            key: "Unable to open file '{0}'."
+        },
+        Corrupted_locale_file_0: {
+            code: 6051,
+            category: 1,
+            key: "Corrupted locale file {0}."
+        },
+        Raise_error_on_expressions_and_declarations_with_an_implied_any_type: {
+            code: 6052,
+            category: 2,
+            key: "Raise error on expressions and declarations with an implied 'any' type."
+        },
+        File_0_not_found: {
+            code: 6053,
+            category: 1,
+            key: "File '{0}' not found."
+        },
+        File_0_must_have_extension_ts_or_d_ts: {
+            code: 6054,
+            category: 1,
+            key: "File '{0}' must have extension '.ts' or '.d.ts'."
+        },
+        Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures: {
+            code: 6055,
+            category: 2,
+            key: "Suppress noImplicitAny errors for indexing objects lacking index signatures."
+        },
+        Do_not_emit_declarations_for_code_that_has_an_internal_annotation: {
+            code: 6056,
+            category: 2,
+            key: "Do not emit declarations for code that has an '@internal' annotation."
+        },
+        Preserve_new_lines_when_emitting_code: {
+            code: 6057,
+            category: 2,
+            key: "Preserve new-lines when emitting code."
+        },
+        Variable_0_implicitly_has_an_1_type: {
+            code: 7005,
+            category: 1,
+            key: "Variable '{0}' implicitly has an '{1}' type."
+        },
+        Parameter_0_implicitly_has_an_1_type: {
+            code: 7006,
+            category: 1,
+            key: "Parameter '{0}' implicitly has an '{1}' type."
+        },
+        Member_0_implicitly_has_an_1_type: {
+            code: 7008,
+            category: 1,
+            key: "Member '{0}' implicitly has an '{1}' type."
+        },
+        new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type: {
+            code: 7009,
+            category: 1,
+            key: "'new' expression, whose target lacks a construct signature, implicitly has an 'any' type."
+        },
+        _0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type: {
+            code: 7010,
+            category: 1,
+            key: "'{0}', which lacks return-type annotation, implicitly has an '{1}' return type."
+        },
+        Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type: {
+            code: 7011,
+            category: 1,
+            key: "Function expression, which lacks return-type annotation, implicitly has an '{0}' return type."
+        },
+        Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: {
+            code: 7013,
+            category: 1,
+            key: "Construct signature, which lacks return-type annotation, implicitly has an 'any' return type."
+        },
+        Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_type_annotation: {
+            code: 7016,
+            category: 1,
+            key: "Property '{0}' implicitly has type 'any', because its 'set' accessor lacks a type annotation."
+        },
+        Index_signature_of_object_type_implicitly_has_an_any_type: {
+            code: 7017,
+            category: 1,
+            key: "Index signature of object type implicitly has an 'any' type."
+        },
+        Object_literal_s_property_0_implicitly_has_an_1_type: {
+            code: 7018,
+            category: 1,
+            key: "Object literal's property '{0}' implicitly has an '{1}' type."
+        },
+        Rest_parameter_0_implicitly_has_an_any_type: {
+            code: 7019,
+            category: 1,
+            key: "Rest parameter '{0}' implicitly has an 'any[]' type."
+        },
+        Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: {
+            code: 7020,
+            category: 1,
+            key: "Call signature, which lacks return-type annotation, implicitly has an 'any' return type."
+        },
+        _0_implicitly_has_type_any_because_it_is_referenced_directly_or_indirectly_in_its_own_type_annotation: {
+            code: 7021,
+            category: 1,
+            key: "'{0}' implicitly has type 'any' because it is referenced directly or indirectly in its own type annotation."
+        },
+        _0_implicitly_has_type_any_because_it_is_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer: {
+            code: 7022,
+            category: 1,
+            key: "'{0}' implicitly has type 'any' because it is does not have a type annotation and is referenced directly or indirectly in its own initializer."
+        },
+        _0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: {
+            code: 7023,
+            category: 1,
+            key: "'{0}' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions."
+        },
+        Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: {
+            code: 7024,
+            category: 1,
+            key: "Function implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions."
+        },
+        You_cannot_rename_this_element: {
+            code: 8000,
+            category: 1,
+            key: "You cannot rename this element."
+        },
+        You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: {
+            code: 8001,
+            category: 1,
+            key: "You cannot rename elements that are defined in the standard TypeScript library."
+        },
+        yield_expressions_are_not_currently_supported: {
+            code: 9000,
+            category: 1,
+            key: "'yield' expressions are not currently supported."
+        },
+        Generators_are_not_currently_supported: {
+            code: 9001,
+            category: 1,
+            key: "Generators are not currently supported."
+        },
+        The_arguments_object_cannot_be_referenced_in_an_arrow_function_Consider_using_a_standard_function_expression: {
+            code: 9002,
+            category: 1,
+            key: "The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression."
+        }
     };
 })(ts || (ts = {}));
 var ts;
@@ -2048,10 +4013,2806 @@ var ts;
         "|=": 62,
         "^=": 63
     };
-    var unicodeES3IdentifierStart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 543, 546, 563, 592, 685, 688, 696, 699, 705, 720, 721, 736, 740, 750, 750, 890, 890, 902, 902, 904, 906, 908, 908, 910, 929, 931, 974, 976, 983, 986, 1011, 1024, 1153, 1164, 1220, 1223, 1224, 1227, 1228, 1232, 1269, 1272, 1273, 1329, 1366, 1369, 1369, 1377, 1415, 1488, 1514, 1520, 1522, 1569, 1594, 1600, 1610, 1649, 1747, 1749, 1749, 1765, 1766, 1786, 1788, 1808, 1808, 1810, 1836, 1920, 1957, 2309, 2361, 2365, 2365, 2384, 2384, 2392, 2401, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2524, 2525, 2527, 2529, 2544, 2545, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2649, 2652, 2654, 2654, 2674, 2676, 2693, 2699, 2701, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2749, 2749, 2768, 2768, 2784, 2784, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2870, 2873, 2877, 2877, 2908, 2909, 2911, 2913, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 2997, 2999, 3001, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3168, 3169, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3294, 3294, 3296, 3297, 3333, 3340, 3342, 3344, 3346, 3368, 3370, 3385, 3424, 3425, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3585, 3632, 3634, 3635, 3648, 3654, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3760, 3762, 3763, 3773, 3773, 3776, 3780, 3782, 3782, 3804, 3805, 3840, 3840, 3904, 3911, 3913, 3946, 3976, 3979, 4096, 4129, 4131, 4135, 4137, 4138, 4176, 4181, 4256, 4293, 4304, 4342, 4352, 4441, 4447, 4514, 4520, 4601, 4608, 4614, 4616, 4678, 4680, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4742, 4744, 4744, 4746, 4749, 4752, 4782, 4784, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4814, 4816, 4822, 4824, 4846, 4848, 4878, 4880, 4880, 4882, 4885, 4888, 4894, 4896, 4934, 4936, 4954, 5024, 5108, 5121, 5740, 5743, 5750, 5761, 5786, 5792, 5866, 6016, 6067, 6176, 6263, 6272, 6312, 7680, 7835, 7840, 7929, 7936, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8319, 8319, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8497, 8499, 8505, 8544, 8579, 12293, 12295, 12321, 12329, 12337, 12341, 12344, 12346, 12353, 12436, 12445, 12446, 12449, 12538, 12540, 12542, 12549, 12588, 12593, 12686, 12704, 12727, 13312, 19893, 19968, 40869, 40960, 42124, 44032, 55203, 63744, 64045, 64256, 64262, 64275, 64279, 64285, 64285, 64287, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65136, 65138, 65140, 65140, 65142, 65276, 65313, 65338, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500,];
-    var unicodeES3IdentifierPart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 543, 546, 563, 592, 685, 688, 696, 699, 705, 720, 721, 736, 740, 750, 750, 768, 846, 864, 866, 890, 890, 902, 902, 904, 906, 908, 908, 910, 929, 931, 974, 976, 983, 986, 1011, 1024, 1153, 1155, 1158, 1164, 1220, 1223, 1224, 1227, 1228, 1232, 1269, 1272, 1273, 1329, 1366, 1369, 1369, 1377, 1415, 1425, 1441, 1443, 1465, 1467, 1469, 1471, 1471, 1473, 1474, 1476, 1476, 1488, 1514, 1520, 1522, 1569, 1594, 1600, 1621, 1632, 1641, 1648, 1747, 1749, 1756, 1759, 1768, 1770, 1773, 1776, 1788, 1808, 1836, 1840, 1866, 1920, 1968, 2305, 2307, 2309, 2361, 2364, 2381, 2384, 2388, 2392, 2403, 2406, 2415, 2433, 2435, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2492, 2492, 2494, 2500, 2503, 2504, 2507, 2509, 2519, 2519, 2524, 2525, 2527, 2531, 2534, 2545, 2562, 2562, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2620, 2620, 2622, 2626, 2631, 2632, 2635, 2637, 2649, 2652, 2654, 2654, 2662, 2676, 2689, 2691, 2693, 2699, 2701, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2748, 2757, 2759, 2761, 2763, 2765, 2768, 2768, 2784, 2784, 2790, 2799, 2817, 2819, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2870, 2873, 2876, 2883, 2887, 2888, 2891, 2893, 2902, 2903, 2908, 2909, 2911, 2913, 2918, 2927, 2946, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 2997, 2999, 3001, 3006, 3010, 3014, 3016, 3018, 3021, 3031, 3031, 3047, 3055, 3073, 3075, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3134, 3140, 3142, 3144, 3146, 3149, 3157, 3158, 3168, 3169, 3174, 3183, 3202, 3203, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3262, 3268, 3270, 3272, 3274, 3277, 3285, 3286, 3294, 3294, 3296, 3297, 3302, 3311, 3330, 3331, 3333, 3340, 3342, 3344, 3346, 3368, 3370, 3385, 3390, 3395, 3398, 3400, 3402, 3405, 3415, 3415, 3424, 3425, 3430, 3439, 3458, 3459, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3530, 3530, 3535, 3540, 3542, 3542, 3544, 3551, 3570, 3571, 3585, 3642, 3648, 3662, 3664, 3673, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3769, 3771, 3773, 3776, 3780, 3782, 3782, 3784, 3789, 3792, 3801, 3804, 3805, 3840, 3840, 3864, 3865, 3872, 3881, 3893, 3893, 3895, 3895, 3897, 3897, 3902, 3911, 3913, 3946, 3953, 3972, 3974, 3979, 3984, 3991, 3993, 4028, 4038, 4038, 4096, 4129, 4131, 4135, 4137, 4138, 4140, 4146, 4150, 4153, 4160, 4169, 4176, 4185, 4256, 4293, 4304, 4342, 4352, 4441, 4447, 4514, 4520, 4601, 4608, 4614, 4616, 4678, 4680, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4742, 4744, 4744, 4746, 4749, 4752, 4782, 4784, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4814, 4816, 4822, 4824, 4846, 4848, 4878, 4880, 4880, 4882, 4885, 4888, 4894, 4896, 4934, 4936, 4954, 4969, 4977, 5024, 5108, 5121, 5740, 5743, 5750, 5761, 5786, 5792, 5866, 6016, 6099, 6112, 6121, 6160, 6169, 6176, 6263, 6272, 6313, 7680, 7835, 7840, 7929, 7936, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8255, 8256, 8319, 8319, 8400, 8412, 8417, 8417, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8497, 8499, 8505, 8544, 8579, 12293, 12295, 12321, 12335, 12337, 12341, 12344, 12346, 12353, 12436, 12441, 12442, 12445, 12446, 12449, 12542, 12549, 12588, 12593, 12686, 12704, 12727, 13312, 19893, 19968, 40869, 40960, 42124, 44032, 55203, 63744, 64045, 64256, 64262, 64275, 64279, 64285, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65056, 65059, 65075, 65076, 65101, 65103, 65136, 65138, 65140, 65140, 65142, 65276, 65296, 65305, 65313, 65338, 65343, 65343, 65345, 65370, 65381, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500,];
-    var unicodeES5IdentifierStart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 705, 710, 721, 736, 740, 748, 748, 750, 750, 880, 884, 886, 887, 890, 893, 902, 902, 904, 906, 908, 908, 910, 929, 931, 1013, 1015, 1153, 1162, 1319, 1329, 1366, 1369, 1369, 1377, 1415, 1488, 1514, 1520, 1522, 1568, 1610, 1646, 1647, 1649, 1747, 1749, 1749, 1765, 1766, 1774, 1775, 1786, 1788, 1791, 1791, 1808, 1808, 1810, 1839, 1869, 1957, 1969, 1969, 1994, 2026, 2036, 2037, 2042, 2042, 2048, 2069, 2074, 2074, 2084, 2084, 2088, 2088, 2112, 2136, 2208, 2208, 2210, 2220, 2308, 2361, 2365, 2365, 2384, 2384, 2392, 2401, 2417, 2423, 2425, 2431, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2493, 2493, 2510, 2510, 2524, 2525, 2527, 2529, 2544, 2545, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2649, 2652, 2654, 2654, 2674, 2676, 2693, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2749, 2749, 2768, 2768, 2784, 2785, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2869, 2873, 2877, 2877, 2908, 2909, 2911, 2913, 2929, 2929, 2947, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 3001, 3024, 3024, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3133, 3133, 3160, 3161, 3168, 3169, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3261, 3261, 3294, 3294, 3296, 3297, 3313, 3314, 3333, 3340, 3342, 3344, 3346, 3386, 3389, 3389, 3406, 3406, 3424, 3425, 3450, 3455, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3585, 3632, 3634, 3635, 3648, 3654, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3760, 3762, 3763, 3773, 3773, 3776, 3780, 3782, 3782, 3804, 3807, 3840, 3840, 3904, 3911, 3913, 3948, 3976, 3980, 4096, 4138, 4159, 4159, 4176, 4181, 4186, 4189, 4193, 4193, 4197, 4198, 4206, 4208, 4213, 4225, 4238, 4238, 4256, 4293, 4295, 4295, 4301, 4301, 4304, 4346, 4348, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4744, 4746, 4749, 4752, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4822, 4824, 4880, 4882, 4885, 4888, 4954, 4992, 5007, 5024, 5108, 5121, 5740, 5743, 5759, 5761, 5786, 5792, 5866, 5870, 5872, 5888, 5900, 5902, 5905, 5920, 5937, 5952, 5969, 5984, 5996, 5998, 6000, 6016, 6067, 6103, 6103, 6108, 6108, 6176, 6263, 6272, 6312, 6314, 6314, 6320, 6389, 6400, 6428, 6480, 6509, 6512, 6516, 6528, 6571, 6593, 6599, 6656, 6678, 6688, 6740, 6823, 6823, 6917, 6963, 6981, 6987, 7043, 7072, 7086, 7087, 7098, 7141, 7168, 7203, 7245, 7247, 7258, 7293, 7401, 7404, 7406, 7409, 7413, 7414, 7424, 7615, 7680, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8305, 8305, 8319, 8319, 8336, 8348, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8505, 8508, 8511, 8517, 8521, 8526, 8526, 8544, 8584, 11264, 11310, 11312, 11358, 11360, 11492, 11499, 11502, 11506, 11507, 11520, 11557, 11559, 11559, 11565, 11565, 11568, 11623, 11631, 11631, 11648, 11670, 11680, 11686, 11688, 11694, 11696, 11702, 11704, 11710, 11712, 11718, 11720, 11726, 11728, 11734, 11736, 11742, 11823, 11823, 12293, 12295, 12321, 12329, 12337, 12341, 12344, 12348, 12353, 12438, 12445, 12447, 12449, 12538, 12540, 12543, 12549, 12589, 12593, 12686, 12704, 12730, 12784, 12799, 13312, 19893, 19968, 40908, 40960, 42124, 42192, 42237, 42240, 42508, 42512, 42527, 42538, 42539, 42560, 42606, 42623, 42647, 42656, 42735, 42775, 42783, 42786, 42888, 42891, 42894, 42896, 42899, 42912, 42922, 43000, 43009, 43011, 43013, 43015, 43018, 43020, 43042, 43072, 43123, 43138, 43187, 43250, 43255, 43259, 43259, 43274, 43301, 43312, 43334, 43360, 43388, 43396, 43442, 43471, 43471, 43520, 43560, 43584, 43586, 43588, 43595, 43616, 43638, 43642, 43642, 43648, 43695, 43697, 43697, 43701, 43702, 43705, 43709, 43712, 43712, 43714, 43714, 43739, 43741, 43744, 43754, 43762, 43764, 43777, 43782, 43785, 43790, 43793, 43798, 43808, 43814, 43816, 43822, 43968, 44002, 44032, 55203, 55216, 55238, 55243, 55291, 63744, 64109, 64112, 64217, 64256, 64262, 64275, 64279, 64285, 64285, 64287, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65136, 65140, 65142, 65276, 65313, 65338, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500,];
-    var unicodeES5IdentifierPart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 705, 710, 721, 736, 740, 748, 748, 750, 750, 768, 884, 886, 887, 890, 893, 902, 902, 904, 906, 908, 908, 910, 929, 931, 1013, 1015, 1153, 1155, 1159, 1162, 1319, 1329, 1366, 1369, 1369, 1377, 1415, 1425, 1469, 1471, 1471, 1473, 1474, 1476, 1477, 1479, 1479, 1488, 1514, 1520, 1522, 1552, 1562, 1568, 1641, 1646, 1747, 1749, 1756, 1759, 1768, 1770, 1788, 1791, 1791, 1808, 1866, 1869, 1969, 1984, 2037, 2042, 2042, 2048, 2093, 2112, 2139, 2208, 2208, 2210, 2220, 2276, 2302, 2304, 2403, 2406, 2415, 2417, 2423, 2425, 2431, 2433, 2435, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2492, 2500, 2503, 2504, 2507, 2510, 2519, 2519, 2524, 2525, 2527, 2531, 2534, 2545, 2561, 2563, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2620, 2620, 2622, 2626, 2631, 2632, 2635, 2637, 2641, 2641, 2649, 2652, 2654, 2654, 2662, 2677, 2689, 2691, 2693, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2748, 2757, 2759, 2761, 2763, 2765, 2768, 2768, 2784, 2787, 2790, 2799, 2817, 2819, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2869, 2873, 2876, 2884, 2887, 2888, 2891, 2893, 2902, 2903, 2908, 2909, 2911, 2915, 2918, 2927, 2929, 2929, 2946, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 3001, 3006, 3010, 3014, 3016, 3018, 3021, 3024, 3024, 3031, 3031, 3046, 3055, 3073, 3075, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3133, 3140, 3142, 3144, 3146, 3149, 3157, 3158, 3160, 3161, 3168, 3171, 3174, 3183, 3202, 3203, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3260, 3268, 3270, 3272, 3274, 3277, 3285, 3286, 3294, 3294, 3296, 3299, 3302, 3311, 3313, 3314, 3330, 3331, 3333, 3340, 3342, 3344, 3346, 3386, 3389, 3396, 3398, 3400, 3402, 3406, 3415, 3415, 3424, 3427, 3430, 3439, 3450, 3455, 3458, 3459, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3530, 3530, 3535, 3540, 3542, 3542, 3544, 3551, 3570, 3571, 3585, 3642, 3648, 3662, 3664, 3673, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3769, 3771, 3773, 3776, 3780, 3782, 3782, 3784, 3789, 3792, 3801, 3804, 3807, 3840, 3840, 3864, 3865, 3872, 3881, 3893, 3893, 3895, 3895, 3897, 3897, 3902, 3911, 3913, 3948, 3953, 3972, 3974, 3991, 3993, 4028, 4038, 4038, 4096, 4169, 4176, 4253, 4256, 4293, 4295, 4295, 4301, 4301, 4304, 4346, 4348, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4744, 4746, 4749, 4752, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4822, 4824, 4880, 4882, 4885, 4888, 4954, 4957, 4959, 4992, 5007, 5024, 5108, 5121, 5740, 5743, 5759, 5761, 5786, 5792, 5866, 5870, 5872, 5888, 5900, 5902, 5908, 5920, 5940, 5952, 5971, 5984, 5996, 5998, 6000, 6002, 6003, 6016, 6099, 6103, 6103, 6108, 6109, 6112, 6121, 6155, 6157, 6160, 6169, 6176, 6263, 6272, 6314, 6320, 6389, 6400, 6428, 6432, 6443, 6448, 6459, 6470, 6509, 6512, 6516, 6528, 6571, 6576, 6601, 6608, 6617, 6656, 6683, 6688, 6750, 6752, 6780, 6783, 6793, 6800, 6809, 6823, 6823, 6912, 6987, 6992, 7001, 7019, 7027, 7040, 7155, 7168, 7223, 7232, 7241, 7245, 7293, 7376, 7378, 7380, 7414, 7424, 7654, 7676, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8204, 8205, 8255, 8256, 8276, 8276, 8305, 8305, 8319, 8319, 8336, 8348, 8400, 8412, 8417, 8417, 8421, 8432, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8505, 8508, 8511, 8517, 8521, 8526, 8526, 8544, 8584, 11264, 11310, 11312, 11358, 11360, 11492, 11499, 11507, 11520, 11557, 11559, 11559, 11565, 11565, 11568, 11623, 11631, 11631, 11647, 11670, 11680, 11686, 11688, 11694, 11696, 11702, 11704, 11710, 11712, 11718, 11720, 11726, 11728, 11734, 11736, 11742, 11744, 11775, 11823, 11823, 12293, 12295, 12321, 12335, 12337, 12341, 12344, 12348, 12353, 12438, 12441, 12442, 12445, 12447, 12449, 12538, 12540, 12543, 12549, 12589, 12593, 12686, 12704, 12730, 12784, 12799, 13312, 19893, 19968, 40908, 40960, 42124, 42192, 42237, 42240, 42508, 42512, 42539, 42560, 42607, 42612, 42621, 42623, 42647, 42655, 42737, 42775, 42783, 42786, 42888, 42891, 42894, 42896, 42899, 42912, 42922, 43000, 43047, 43072, 43123, 43136, 43204, 43216, 43225, 43232, 43255, 43259, 43259, 43264, 43309, 43312, 43347, 43360, 43388, 43392, 43456, 43471, 43481, 43520, 43574, 43584, 43597, 43600, 43609, 43616, 43638, 43642, 43643, 43648, 43714, 43739, 43741, 43744, 43759, 43762, 43766, 43777, 43782, 43785, 43790, 43793, 43798, 43808, 43814, 43816, 43822, 43968, 44010, 44012, 44013, 44016, 44025, 44032, 55203, 55216, 55238, 55243, 55291, 63744, 64109, 64112, 64217, 64256, 64262, 64275, 64279, 64285, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65024, 65039, 65056, 65062, 65075, 65076, 65101, 65103, 65136, 65140, 65142, 65276, 65296, 65305, 65313, 65338, 65343, 65343, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500,];
+    var unicodeES3IdentifierStart = [
+        170,
+        170,
+        181,
+        181,
+        186,
+        186,
+        192,
+        214,
+        216,
+        246,
+        248,
+        543,
+        546,
+        563,
+        592,
+        685,
+        688,
+        696,
+        699,
+        705,
+        720,
+        721,
+        736,
+        740,
+        750,
+        750,
+        890,
+        890,
+        902,
+        902,
+        904,
+        906,
+        908,
+        908,
+        910,
+        929,
+        931,
+        974,
+        976,
+        983,
+        986,
+        1011,
+        1024,
+        1153,
+        1164,
+        1220,
+        1223,
+        1224,
+        1227,
+        1228,
+        1232,
+        1269,
+        1272,
+        1273,
+        1329,
+        1366,
+        1369,
+        1369,
+        1377,
+        1415,
+        1488,
+        1514,
+        1520,
+        1522,
+        1569,
+        1594,
+        1600,
+        1610,
+        1649,
+        1747,
+        1749,
+        1749,
+        1765,
+        1766,
+        1786,
+        1788,
+        1808,
+        1808,
+        1810,
+        1836,
+        1920,
+        1957,
+        2309,
+        2361,
+        2365,
+        2365,
+        2384,
+        2384,
+        2392,
+        2401,
+        2437,
+        2444,
+        2447,
+        2448,
+        2451,
+        2472,
+        2474,
+        2480,
+        2482,
+        2482,
+        2486,
+        2489,
+        2524,
+        2525,
+        2527,
+        2529,
+        2544,
+        2545,
+        2565,
+        2570,
+        2575,
+        2576,
+        2579,
+        2600,
+        2602,
+        2608,
+        2610,
+        2611,
+        2613,
+        2614,
+        2616,
+        2617,
+        2649,
+        2652,
+        2654,
+        2654,
+        2674,
+        2676,
+        2693,
+        2699,
+        2701,
+        2701,
+        2703,
+        2705,
+        2707,
+        2728,
+        2730,
+        2736,
+        2738,
+        2739,
+        2741,
+        2745,
+        2749,
+        2749,
+        2768,
+        2768,
+        2784,
+        2784,
+        2821,
+        2828,
+        2831,
+        2832,
+        2835,
+        2856,
+        2858,
+        2864,
+        2866,
+        2867,
+        2870,
+        2873,
+        2877,
+        2877,
+        2908,
+        2909,
+        2911,
+        2913,
+        2949,
+        2954,
+        2958,
+        2960,
+        2962,
+        2965,
+        2969,
+        2970,
+        2972,
+        2972,
+        2974,
+        2975,
+        2979,
+        2980,
+        2984,
+        2986,
+        2990,
+        2997,
+        2999,
+        3001,
+        3077,
+        3084,
+        3086,
+        3088,
+        3090,
+        3112,
+        3114,
+        3123,
+        3125,
+        3129,
+        3168,
+        3169,
+        3205,
+        3212,
+        3214,
+        3216,
+        3218,
+        3240,
+        3242,
+        3251,
+        3253,
+        3257,
+        3294,
+        3294,
+        3296,
+        3297,
+        3333,
+        3340,
+        3342,
+        3344,
+        3346,
+        3368,
+        3370,
+        3385,
+        3424,
+        3425,
+        3461,
+        3478,
+        3482,
+        3505,
+        3507,
+        3515,
+        3517,
+        3517,
+        3520,
+        3526,
+        3585,
+        3632,
+        3634,
+        3635,
+        3648,
+        3654,
+        3713,
+        3714,
+        3716,
+        3716,
+        3719,
+        3720,
+        3722,
+        3722,
+        3725,
+        3725,
+        3732,
+        3735,
+        3737,
+        3743,
+        3745,
+        3747,
+        3749,
+        3749,
+        3751,
+        3751,
+        3754,
+        3755,
+        3757,
+        3760,
+        3762,
+        3763,
+        3773,
+        3773,
+        3776,
+        3780,
+        3782,
+        3782,
+        3804,
+        3805,
+        3840,
+        3840,
+        3904,
+        3911,
+        3913,
+        3946,
+        3976,
+        3979,
+        4096,
+        4129,
+        4131,
+        4135,
+        4137,
+        4138,
+        4176,
+        4181,
+        4256,
+        4293,
+        4304,
+        4342,
+        4352,
+        4441,
+        4447,
+        4514,
+        4520,
+        4601,
+        4608,
+        4614,
+        4616,
+        4678,
+        4680,
+        4680,
+        4682,
+        4685,
+        4688,
+        4694,
+        4696,
+        4696,
+        4698,
+        4701,
+        4704,
+        4742,
+        4744,
+        4744,
+        4746,
+        4749,
+        4752,
+        4782,
+        4784,
+        4784,
+        4786,
+        4789,
+        4792,
+        4798,
+        4800,
+        4800,
+        4802,
+        4805,
+        4808,
+        4814,
+        4816,
+        4822,
+        4824,
+        4846,
+        4848,
+        4878,
+        4880,
+        4880,
+        4882,
+        4885,
+        4888,
+        4894,
+        4896,
+        4934,
+        4936,
+        4954,
+        5024,
+        5108,
+        5121,
+        5740,
+        5743,
+        5750,
+        5761,
+        5786,
+        5792,
+        5866,
+        6016,
+        6067,
+        6176,
+        6263,
+        6272,
+        6312,
+        7680,
+        7835,
+        7840,
+        7929,
+        7936,
+        7957,
+        7960,
+        7965,
+        7968,
+        8005,
+        8008,
+        8013,
+        8016,
+        8023,
+        8025,
+        8025,
+        8027,
+        8027,
+        8029,
+        8029,
+        8031,
+        8061,
+        8064,
+        8116,
+        8118,
+        8124,
+        8126,
+        8126,
+        8130,
+        8132,
+        8134,
+        8140,
+        8144,
+        8147,
+        8150,
+        8155,
+        8160,
+        8172,
+        8178,
+        8180,
+        8182,
+        8188,
+        8319,
+        8319,
+        8450,
+        8450,
+        8455,
+        8455,
+        8458,
+        8467,
+        8469,
+        8469,
+        8473,
+        8477,
+        8484,
+        8484,
+        8486,
+        8486,
+        8488,
+        8488,
+        8490,
+        8493,
+        8495,
+        8497,
+        8499,
+        8505,
+        8544,
+        8579,
+        12293,
+        12295,
+        12321,
+        12329,
+        12337,
+        12341,
+        12344,
+        12346,
+        12353,
+        12436,
+        12445,
+        12446,
+        12449,
+        12538,
+        12540,
+        12542,
+        12549,
+        12588,
+        12593,
+        12686,
+        12704,
+        12727,
+        13312,
+        19893,
+        19968,
+        40869,
+        40960,
+        42124,
+        44032,
+        55203,
+        63744,
+        64045,
+        64256,
+        64262,
+        64275,
+        64279,
+        64285,
+        64285,
+        64287,
+        64296,
+        64298,
+        64310,
+        64312,
+        64316,
+        64318,
+        64318,
+        64320,
+        64321,
+        64323,
+        64324,
+        64326,
+        64433,
+        64467,
+        64829,
+        64848,
+        64911,
+        64914,
+        64967,
+        65008,
+        65019,
+        65136,
+        65138,
+        65140,
+        65140,
+        65142,
+        65276,
+        65313,
+        65338,
+        65345,
+        65370,
+        65382,
+        65470,
+        65474,
+        65479,
+        65482,
+        65487,
+        65490,
+        65495,
+        65498,
+        65500,
+    ];
+    var unicodeES3IdentifierPart = [
+        170,
+        170,
+        181,
+        181,
+        186,
+        186,
+        192,
+        214,
+        216,
+        246,
+        248,
+        543,
+        546,
+        563,
+        592,
+        685,
+        688,
+        696,
+        699,
+        705,
+        720,
+        721,
+        736,
+        740,
+        750,
+        750,
+        768,
+        846,
+        864,
+        866,
+        890,
+        890,
+        902,
+        902,
+        904,
+        906,
+        908,
+        908,
+        910,
+        929,
+        931,
+        974,
+        976,
+        983,
+        986,
+        1011,
+        1024,
+        1153,
+        1155,
+        1158,
+        1164,
+        1220,
+        1223,
+        1224,
+        1227,
+        1228,
+        1232,
+        1269,
+        1272,
+        1273,
+        1329,
+        1366,
+        1369,
+        1369,
+        1377,
+        1415,
+        1425,
+        1441,
+        1443,
+        1465,
+        1467,
+        1469,
+        1471,
+        1471,
+        1473,
+        1474,
+        1476,
+        1476,
+        1488,
+        1514,
+        1520,
+        1522,
+        1569,
+        1594,
+        1600,
+        1621,
+        1632,
+        1641,
+        1648,
+        1747,
+        1749,
+        1756,
+        1759,
+        1768,
+        1770,
+        1773,
+        1776,
+        1788,
+        1808,
+        1836,
+        1840,
+        1866,
+        1920,
+        1968,
+        2305,
+        2307,
+        2309,
+        2361,
+        2364,
+        2381,
+        2384,
+        2388,
+        2392,
+        2403,
+        2406,
+        2415,
+        2433,
+        2435,
+        2437,
+        2444,
+        2447,
+        2448,
+        2451,
+        2472,
+        2474,
+        2480,
+        2482,
+        2482,
+        2486,
+        2489,
+        2492,
+        2492,
+        2494,
+        2500,
+        2503,
+        2504,
+        2507,
+        2509,
+        2519,
+        2519,
+        2524,
+        2525,
+        2527,
+        2531,
+        2534,
+        2545,
+        2562,
+        2562,
+        2565,
+        2570,
+        2575,
+        2576,
+        2579,
+        2600,
+        2602,
+        2608,
+        2610,
+        2611,
+        2613,
+        2614,
+        2616,
+        2617,
+        2620,
+        2620,
+        2622,
+        2626,
+        2631,
+        2632,
+        2635,
+        2637,
+        2649,
+        2652,
+        2654,
+        2654,
+        2662,
+        2676,
+        2689,
+        2691,
+        2693,
+        2699,
+        2701,
+        2701,
+        2703,
+        2705,
+        2707,
+        2728,
+        2730,
+        2736,
+        2738,
+        2739,
+        2741,
+        2745,
+        2748,
+        2757,
+        2759,
+        2761,
+        2763,
+        2765,
+        2768,
+        2768,
+        2784,
+        2784,
+        2790,
+        2799,
+        2817,
+        2819,
+        2821,
+        2828,
+        2831,
+        2832,
+        2835,
+        2856,
+        2858,
+        2864,
+        2866,
+        2867,
+        2870,
+        2873,
+        2876,
+        2883,
+        2887,
+        2888,
+        2891,
+        2893,
+        2902,
+        2903,
+        2908,
+        2909,
+        2911,
+        2913,
+        2918,
+        2927,
+        2946,
+        2947,
+        2949,
+        2954,
+        2958,
+        2960,
+        2962,
+        2965,
+        2969,
+        2970,
+        2972,
+        2972,
+        2974,
+        2975,
+        2979,
+        2980,
+        2984,
+        2986,
+        2990,
+        2997,
+        2999,
+        3001,
+        3006,
+        3010,
+        3014,
+        3016,
+        3018,
+        3021,
+        3031,
+        3031,
+        3047,
+        3055,
+        3073,
+        3075,
+        3077,
+        3084,
+        3086,
+        3088,
+        3090,
+        3112,
+        3114,
+        3123,
+        3125,
+        3129,
+        3134,
+        3140,
+        3142,
+        3144,
+        3146,
+        3149,
+        3157,
+        3158,
+        3168,
+        3169,
+        3174,
+        3183,
+        3202,
+        3203,
+        3205,
+        3212,
+        3214,
+        3216,
+        3218,
+        3240,
+        3242,
+        3251,
+        3253,
+        3257,
+        3262,
+        3268,
+        3270,
+        3272,
+        3274,
+        3277,
+        3285,
+        3286,
+        3294,
+        3294,
+        3296,
+        3297,
+        3302,
+        3311,
+        3330,
+        3331,
+        3333,
+        3340,
+        3342,
+        3344,
+        3346,
+        3368,
+        3370,
+        3385,
+        3390,
+        3395,
+        3398,
+        3400,
+        3402,
+        3405,
+        3415,
+        3415,
+        3424,
+        3425,
+        3430,
+        3439,
+        3458,
+        3459,
+        3461,
+        3478,
+        3482,
+        3505,
+        3507,
+        3515,
+        3517,
+        3517,
+        3520,
+        3526,
+        3530,
+        3530,
+        3535,
+        3540,
+        3542,
+        3542,
+        3544,
+        3551,
+        3570,
+        3571,
+        3585,
+        3642,
+        3648,
+        3662,
+        3664,
+        3673,
+        3713,
+        3714,
+        3716,
+        3716,
+        3719,
+        3720,
+        3722,
+        3722,
+        3725,
+        3725,
+        3732,
+        3735,
+        3737,
+        3743,
+        3745,
+        3747,
+        3749,
+        3749,
+        3751,
+        3751,
+        3754,
+        3755,
+        3757,
+        3769,
+        3771,
+        3773,
+        3776,
+        3780,
+        3782,
+        3782,
+        3784,
+        3789,
+        3792,
+        3801,
+        3804,
+        3805,
+        3840,
+        3840,
+        3864,
+        3865,
+        3872,
+        3881,
+        3893,
+        3893,
+        3895,
+        3895,
+        3897,
+        3897,
+        3902,
+        3911,
+        3913,
+        3946,
+        3953,
+        3972,
+        3974,
+        3979,
+        3984,
+        3991,
+        3993,
+        4028,
+        4038,
+        4038,
+        4096,
+        4129,
+        4131,
+        4135,
+        4137,
+        4138,
+        4140,
+        4146,
+        4150,
+        4153,
+        4160,
+        4169,
+        4176,
+        4185,
+        4256,
+        4293,
+        4304,
+        4342,
+        4352,
+        4441,
+        4447,
+        4514,
+        4520,
+        4601,
+        4608,
+        4614,
+        4616,
+        4678,
+        4680,
+        4680,
+        4682,
+        4685,
+        4688,
+        4694,
+        4696,
+        4696,
+        4698,
+        4701,
+        4704,
+        4742,
+        4744,
+        4744,
+        4746,
+        4749,
+        4752,
+        4782,
+        4784,
+        4784,
+        4786,
+        4789,
+        4792,
+        4798,
+        4800,
+        4800,
+        4802,
+        4805,
+        4808,
+        4814,
+        4816,
+        4822,
+        4824,
+        4846,
+        4848,
+        4878,
+        4880,
+        4880,
+        4882,
+        4885,
+        4888,
+        4894,
+        4896,
+        4934,
+        4936,
+        4954,
+        4969,
+        4977,
+        5024,
+        5108,
+        5121,
+        5740,
+        5743,
+        5750,
+        5761,
+        5786,
+        5792,
+        5866,
+        6016,
+        6099,
+        6112,
+        6121,
+        6160,
+        6169,
+        6176,
+        6263,
+        6272,
+        6313,
+        7680,
+        7835,
+        7840,
+        7929,
+        7936,
+        7957,
+        7960,
+        7965,
+        7968,
+        8005,
+        8008,
+        8013,
+        8016,
+        8023,
+        8025,
+        8025,
+        8027,
+        8027,
+        8029,
+        8029,
+        8031,
+        8061,
+        8064,
+        8116,
+        8118,
+        8124,
+        8126,
+        8126,
+        8130,
+        8132,
+        8134,
+        8140,
+        8144,
+        8147,
+        8150,
+        8155,
+        8160,
+        8172,
+        8178,
+        8180,
+        8182,
+        8188,
+        8255,
+        8256,
+        8319,
+        8319,
+        8400,
+        8412,
+        8417,
+        8417,
+        8450,
+        8450,
+        8455,
+        8455,
+        8458,
+        8467,
+        8469,
+        8469,
+        8473,
+        8477,
+        8484,
+        8484,
+        8486,
+        8486,
+        8488,
+        8488,
+        8490,
+        8493,
+        8495,
+        8497,
+        8499,
+        8505,
+        8544,
+        8579,
+        12293,
+        12295,
+        12321,
+        12335,
+        12337,
+        12341,
+        12344,
+        12346,
+        12353,
+        12436,
+        12441,
+        12442,
+        12445,
+        12446,
+        12449,
+        12542,
+        12549,
+        12588,
+        12593,
+        12686,
+        12704,
+        12727,
+        13312,
+        19893,
+        19968,
+        40869,
+        40960,
+        42124,
+        44032,
+        55203,
+        63744,
+        64045,
+        64256,
+        64262,
+        64275,
+        64279,
+        64285,
+        64296,
+        64298,
+        64310,
+        64312,
+        64316,
+        64318,
+        64318,
+        64320,
+        64321,
+        64323,
+        64324,
+        64326,
+        64433,
+        64467,
+        64829,
+        64848,
+        64911,
+        64914,
+        64967,
+        65008,
+        65019,
+        65056,
+        65059,
+        65075,
+        65076,
+        65101,
+        65103,
+        65136,
+        65138,
+        65140,
+        65140,
+        65142,
+        65276,
+        65296,
+        65305,
+        65313,
+        65338,
+        65343,
+        65343,
+        65345,
+        65370,
+        65381,
+        65470,
+        65474,
+        65479,
+        65482,
+        65487,
+        65490,
+        65495,
+        65498,
+        65500,
+    ];
+    var unicodeES5IdentifierStart = [
+        170,
+        170,
+        181,
+        181,
+        186,
+        186,
+        192,
+        214,
+        216,
+        246,
+        248,
+        705,
+        710,
+        721,
+        736,
+        740,
+        748,
+        748,
+        750,
+        750,
+        880,
+        884,
+        886,
+        887,
+        890,
+        893,
+        902,
+        902,
+        904,
+        906,
+        908,
+        908,
+        910,
+        929,
+        931,
+        1013,
+        1015,
+        1153,
+        1162,
+        1319,
+        1329,
+        1366,
+        1369,
+        1369,
+        1377,
+        1415,
+        1488,
+        1514,
+        1520,
+        1522,
+        1568,
+        1610,
+        1646,
+        1647,
+        1649,
+        1747,
+        1749,
+        1749,
+        1765,
+        1766,
+        1774,
+        1775,
+        1786,
+        1788,
+        1791,
+        1791,
+        1808,
+        1808,
+        1810,
+        1839,
+        1869,
+        1957,
+        1969,
+        1969,
+        1994,
+        2026,
+        2036,
+        2037,
+        2042,
+        2042,
+        2048,
+        2069,
+        2074,
+        2074,
+        2084,
+        2084,
+        2088,
+        2088,
+        2112,
+        2136,
+        2208,
+        2208,
+        2210,
+        2220,
+        2308,
+        2361,
+        2365,
+        2365,
+        2384,
+        2384,
+        2392,
+        2401,
+        2417,
+        2423,
+        2425,
+        2431,
+        2437,
+        2444,
+        2447,
+        2448,
+        2451,
+        2472,
+        2474,
+        2480,
+        2482,
+        2482,
+        2486,
+        2489,
+        2493,
+        2493,
+        2510,
+        2510,
+        2524,
+        2525,
+        2527,
+        2529,
+        2544,
+        2545,
+        2565,
+        2570,
+        2575,
+        2576,
+        2579,
+        2600,
+        2602,
+        2608,
+        2610,
+        2611,
+        2613,
+        2614,
+        2616,
+        2617,
+        2649,
+        2652,
+        2654,
+        2654,
+        2674,
+        2676,
+        2693,
+        2701,
+        2703,
+        2705,
+        2707,
+        2728,
+        2730,
+        2736,
+        2738,
+        2739,
+        2741,
+        2745,
+        2749,
+        2749,
+        2768,
+        2768,
+        2784,
+        2785,
+        2821,
+        2828,
+        2831,
+        2832,
+        2835,
+        2856,
+        2858,
+        2864,
+        2866,
+        2867,
+        2869,
+        2873,
+        2877,
+        2877,
+        2908,
+        2909,
+        2911,
+        2913,
+        2929,
+        2929,
+        2947,
+        2947,
+        2949,
+        2954,
+        2958,
+        2960,
+        2962,
+        2965,
+        2969,
+        2970,
+        2972,
+        2972,
+        2974,
+        2975,
+        2979,
+        2980,
+        2984,
+        2986,
+        2990,
+        3001,
+        3024,
+        3024,
+        3077,
+        3084,
+        3086,
+        3088,
+        3090,
+        3112,
+        3114,
+        3123,
+        3125,
+        3129,
+        3133,
+        3133,
+        3160,
+        3161,
+        3168,
+        3169,
+        3205,
+        3212,
+        3214,
+        3216,
+        3218,
+        3240,
+        3242,
+        3251,
+        3253,
+        3257,
+        3261,
+        3261,
+        3294,
+        3294,
+        3296,
+        3297,
+        3313,
+        3314,
+        3333,
+        3340,
+        3342,
+        3344,
+        3346,
+        3386,
+        3389,
+        3389,
+        3406,
+        3406,
+        3424,
+        3425,
+        3450,
+        3455,
+        3461,
+        3478,
+        3482,
+        3505,
+        3507,
+        3515,
+        3517,
+        3517,
+        3520,
+        3526,
+        3585,
+        3632,
+        3634,
+        3635,
+        3648,
+        3654,
+        3713,
+        3714,
+        3716,
+        3716,
+        3719,
+        3720,
+        3722,
+        3722,
+        3725,
+        3725,
+        3732,
+        3735,
+        3737,
+        3743,
+        3745,
+        3747,
+        3749,
+        3749,
+        3751,
+        3751,
+        3754,
+        3755,
+        3757,
+        3760,
+        3762,
+        3763,
+        3773,
+        3773,
+        3776,
+        3780,
+        3782,
+        3782,
+        3804,
+        3807,
+        3840,
+        3840,
+        3904,
+        3911,
+        3913,
+        3948,
+        3976,
+        3980,
+        4096,
+        4138,
+        4159,
+        4159,
+        4176,
+        4181,
+        4186,
+        4189,
+        4193,
+        4193,
+        4197,
+        4198,
+        4206,
+        4208,
+        4213,
+        4225,
+        4238,
+        4238,
+        4256,
+        4293,
+        4295,
+        4295,
+        4301,
+        4301,
+        4304,
+        4346,
+        4348,
+        4680,
+        4682,
+        4685,
+        4688,
+        4694,
+        4696,
+        4696,
+        4698,
+        4701,
+        4704,
+        4744,
+        4746,
+        4749,
+        4752,
+        4784,
+        4786,
+        4789,
+        4792,
+        4798,
+        4800,
+        4800,
+        4802,
+        4805,
+        4808,
+        4822,
+        4824,
+        4880,
+        4882,
+        4885,
+        4888,
+        4954,
+        4992,
+        5007,
+        5024,
+        5108,
+        5121,
+        5740,
+        5743,
+        5759,
+        5761,
+        5786,
+        5792,
+        5866,
+        5870,
+        5872,
+        5888,
+        5900,
+        5902,
+        5905,
+        5920,
+        5937,
+        5952,
+        5969,
+        5984,
+        5996,
+        5998,
+        6000,
+        6016,
+        6067,
+        6103,
+        6103,
+        6108,
+        6108,
+        6176,
+        6263,
+        6272,
+        6312,
+        6314,
+        6314,
+        6320,
+        6389,
+        6400,
+        6428,
+        6480,
+        6509,
+        6512,
+        6516,
+        6528,
+        6571,
+        6593,
+        6599,
+        6656,
+        6678,
+        6688,
+        6740,
+        6823,
+        6823,
+        6917,
+        6963,
+        6981,
+        6987,
+        7043,
+        7072,
+        7086,
+        7087,
+        7098,
+        7141,
+        7168,
+        7203,
+        7245,
+        7247,
+        7258,
+        7293,
+        7401,
+        7404,
+        7406,
+        7409,
+        7413,
+        7414,
+        7424,
+        7615,
+        7680,
+        7957,
+        7960,
+        7965,
+        7968,
+        8005,
+        8008,
+        8013,
+        8016,
+        8023,
+        8025,
+        8025,
+        8027,
+        8027,
+        8029,
+        8029,
+        8031,
+        8061,
+        8064,
+        8116,
+        8118,
+        8124,
+        8126,
+        8126,
+        8130,
+        8132,
+        8134,
+        8140,
+        8144,
+        8147,
+        8150,
+        8155,
+        8160,
+        8172,
+        8178,
+        8180,
+        8182,
+        8188,
+        8305,
+        8305,
+        8319,
+        8319,
+        8336,
+        8348,
+        8450,
+        8450,
+        8455,
+        8455,
+        8458,
+        8467,
+        8469,
+        8469,
+        8473,
+        8477,
+        8484,
+        8484,
+        8486,
+        8486,
+        8488,
+        8488,
+        8490,
+        8493,
+        8495,
+        8505,
+        8508,
+        8511,
+        8517,
+        8521,
+        8526,
+        8526,
+        8544,
+        8584,
+        11264,
+        11310,
+        11312,
+        11358,
+        11360,
+        11492,
+        11499,
+        11502,
+        11506,
+        11507,
+        11520,
+        11557,
+        11559,
+        11559,
+        11565,
+        11565,
+        11568,
+        11623,
+        11631,
+        11631,
+        11648,
+        11670,
+        11680,
+        11686,
+        11688,
+        11694,
+        11696,
+        11702,
+        11704,
+        11710,
+        11712,
+        11718,
+        11720,
+        11726,
+        11728,
+        11734,
+        11736,
+        11742,
+        11823,
+        11823,
+        12293,
+        12295,
+        12321,
+        12329,
+        12337,
+        12341,
+        12344,
+        12348,
+        12353,
+        12438,
+        12445,
+        12447,
+        12449,
+        12538,
+        12540,
+        12543,
+        12549,
+        12589,
+        12593,
+        12686,
+        12704,
+        12730,
+        12784,
+        12799,
+        13312,
+        19893,
+        19968,
+        40908,
+        40960,
+        42124,
+        42192,
+        42237,
+        42240,
+        42508,
+        42512,
+        42527,
+        42538,
+        42539,
+        42560,
+        42606,
+        42623,
+        42647,
+        42656,
+        42735,
+        42775,
+        42783,
+        42786,
+        42888,
+        42891,
+        42894,
+        42896,
+        42899,
+        42912,
+        42922,
+        43000,
+        43009,
+        43011,
+        43013,
+        43015,
+        43018,
+        43020,
+        43042,
+        43072,
+        43123,
+        43138,
+        43187,
+        43250,
+        43255,
+        43259,
+        43259,
+        43274,
+        43301,
+        43312,
+        43334,
+        43360,
+        43388,
+        43396,
+        43442,
+        43471,
+        43471,
+        43520,
+        43560,
+        43584,
+        43586,
+        43588,
+        43595,
+        43616,
+        43638,
+        43642,
+        43642,
+        43648,
+        43695,
+        43697,
+        43697,
+        43701,
+        43702,
+        43705,
+        43709,
+        43712,
+        43712,
+        43714,
+        43714,
+        43739,
+        43741,
+        43744,
+        43754,
+        43762,
+        43764,
+        43777,
+        43782,
+        43785,
+        43790,
+        43793,
+        43798,
+        43808,
+        43814,
+        43816,
+        43822,
+        43968,
+        44002,
+        44032,
+        55203,
+        55216,
+        55238,
+        55243,
+        55291,
+        63744,
+        64109,
+        64112,
+        64217,
+        64256,
+        64262,
+        64275,
+        64279,
+        64285,
+        64285,
+        64287,
+        64296,
+        64298,
+        64310,
+        64312,
+        64316,
+        64318,
+        64318,
+        64320,
+        64321,
+        64323,
+        64324,
+        64326,
+        64433,
+        64467,
+        64829,
+        64848,
+        64911,
+        64914,
+        64967,
+        65008,
+        65019,
+        65136,
+        65140,
+        65142,
+        65276,
+        65313,
+        65338,
+        65345,
+        65370,
+        65382,
+        65470,
+        65474,
+        65479,
+        65482,
+        65487,
+        65490,
+        65495,
+        65498,
+        65500,
+    ];
+    var unicodeES5IdentifierPart = [
+        170,
+        170,
+        181,
+        181,
+        186,
+        186,
+        192,
+        214,
+        216,
+        246,
+        248,
+        705,
+        710,
+        721,
+        736,
+        740,
+        748,
+        748,
+        750,
+        750,
+        768,
+        884,
+        886,
+        887,
+        890,
+        893,
+        902,
+        902,
+        904,
+        906,
+        908,
+        908,
+        910,
+        929,
+        931,
+        1013,
+        1015,
+        1153,
+        1155,
+        1159,
+        1162,
+        1319,
+        1329,
+        1366,
+        1369,
+        1369,
+        1377,
+        1415,
+        1425,
+        1469,
+        1471,
+        1471,
+        1473,
+        1474,
+        1476,
+        1477,
+        1479,
+        1479,
+        1488,
+        1514,
+        1520,
+        1522,
+        1552,
+        1562,
+        1568,
+        1641,
+        1646,
+        1747,
+        1749,
+        1756,
+        1759,
+        1768,
+        1770,
+        1788,
+        1791,
+        1791,
+        1808,
+        1866,
+        1869,
+        1969,
+        1984,
+        2037,
+        2042,
+        2042,
+        2048,
+        2093,
+        2112,
+        2139,
+        2208,
+        2208,
+        2210,
+        2220,
+        2276,
+        2302,
+        2304,
+        2403,
+        2406,
+        2415,
+        2417,
+        2423,
+        2425,
+        2431,
+        2433,
+        2435,
+        2437,
+        2444,
+        2447,
+        2448,
+        2451,
+        2472,
+        2474,
+        2480,
+        2482,
+        2482,
+        2486,
+        2489,
+        2492,
+        2500,
+        2503,
+        2504,
+        2507,
+        2510,
+        2519,
+        2519,
+        2524,
+        2525,
+        2527,
+        2531,
+        2534,
+        2545,
+        2561,
+        2563,
+        2565,
+        2570,
+        2575,
+        2576,
+        2579,
+        2600,
+        2602,
+        2608,
+        2610,
+        2611,
+        2613,
+        2614,
+        2616,
+        2617,
+        2620,
+        2620,
+        2622,
+        2626,
+        2631,
+        2632,
+        2635,
+        2637,
+        2641,
+        2641,
+        2649,
+        2652,
+        2654,
+        2654,
+        2662,
+        2677,
+        2689,
+        2691,
+        2693,
+        2701,
+        2703,
+        2705,
+        2707,
+        2728,
+        2730,
+        2736,
+        2738,
+        2739,
+        2741,
+        2745,
+        2748,
+        2757,
+        2759,
+        2761,
+        2763,
+        2765,
+        2768,
+        2768,
+        2784,
+        2787,
+        2790,
+        2799,
+        2817,
+        2819,
+        2821,
+        2828,
+        2831,
+        2832,
+        2835,
+        2856,
+        2858,
+        2864,
+        2866,
+        2867,
+        2869,
+        2873,
+        2876,
+        2884,
+        2887,
+        2888,
+        2891,
+        2893,
+        2902,
+        2903,
+        2908,
+        2909,
+        2911,
+        2915,
+        2918,
+        2927,
+        2929,
+        2929,
+        2946,
+        2947,
+        2949,
+        2954,
+        2958,
+        2960,
+        2962,
+        2965,
+        2969,
+        2970,
+        2972,
+        2972,
+        2974,
+        2975,
+        2979,
+        2980,
+        2984,
+        2986,
+        2990,
+        3001,
+        3006,
+        3010,
+        3014,
+        3016,
+        3018,
+        3021,
+        3024,
+        3024,
+        3031,
+        3031,
+        3046,
+        3055,
+        3073,
+        3075,
+        3077,
+        3084,
+        3086,
+        3088,
+        3090,
+        3112,
+        3114,
+        3123,
+        3125,
+        3129,
+        3133,
+        3140,
+        3142,
+        3144,
+        3146,
+        3149,
+        3157,
+        3158,
+        3160,
+        3161,
+        3168,
+        3171,
+        3174,
+        3183,
+        3202,
+        3203,
+        3205,
+        3212,
+        3214,
+        3216,
+        3218,
+        3240,
+        3242,
+        3251,
+        3253,
+        3257,
+        3260,
+        3268,
+        3270,
+        3272,
+        3274,
+        3277,
+        3285,
+        3286,
+        3294,
+        3294,
+        3296,
+        3299,
+        3302,
+        3311,
+        3313,
+        3314,
+        3330,
+        3331,
+        3333,
+        3340,
+        3342,
+        3344,
+        3346,
+        3386,
+        3389,
+        3396,
+        3398,
+        3400,
+        3402,
+        3406,
+        3415,
+        3415,
+        3424,
+        3427,
+        3430,
+        3439,
+        3450,
+        3455,
+        3458,
+        3459,
+        3461,
+        3478,
+        3482,
+        3505,
+        3507,
+        3515,
+        3517,
+        3517,
+        3520,
+        3526,
+        3530,
+        3530,
+        3535,
+        3540,
+        3542,
+        3542,
+        3544,
+        3551,
+        3570,
+        3571,
+        3585,
+        3642,
+        3648,
+        3662,
+        3664,
+        3673,
+        3713,
+        3714,
+        3716,
+        3716,
+        3719,
+        3720,
+        3722,
+        3722,
+        3725,
+        3725,
+        3732,
+        3735,
+        3737,
+        3743,
+        3745,
+        3747,
+        3749,
+        3749,
+        3751,
+        3751,
+        3754,
+        3755,
+        3757,
+        3769,
+        3771,
+        3773,
+        3776,
+        3780,
+        3782,
+        3782,
+        3784,
+        3789,
+        3792,
+        3801,
+        3804,
+        3807,
+        3840,
+        3840,
+        3864,
+        3865,
+        3872,
+        3881,
+        3893,
+        3893,
+        3895,
+        3895,
+        3897,
+        3897,
+        3902,
+        3911,
+        3913,
+        3948,
+        3953,
+        3972,
+        3974,
+        3991,
+        3993,
+        4028,
+        4038,
+        4038,
+        4096,
+        4169,
+        4176,
+        4253,
+        4256,
+        4293,
+        4295,
+        4295,
+        4301,
+        4301,
+        4304,
+        4346,
+        4348,
+        4680,
+        4682,
+        4685,
+        4688,
+        4694,
+        4696,
+        4696,
+        4698,
+        4701,
+        4704,
+        4744,
+        4746,
+        4749,
+        4752,
+        4784,
+        4786,
+        4789,
+        4792,
+        4798,
+        4800,
+        4800,
+        4802,
+        4805,
+        4808,
+        4822,
+        4824,
+        4880,
+        4882,
+        4885,
+        4888,
+        4954,
+        4957,
+        4959,
+        4992,
+        5007,
+        5024,
+        5108,
+        5121,
+        5740,
+        5743,
+        5759,
+        5761,
+        5786,
+        5792,
+        5866,
+        5870,
+        5872,
+        5888,
+        5900,
+        5902,
+        5908,
+        5920,
+        5940,
+        5952,
+        5971,
+        5984,
+        5996,
+        5998,
+        6000,
+        6002,
+        6003,
+        6016,
+        6099,
+        6103,
+        6103,
+        6108,
+        6109,
+        6112,
+        6121,
+        6155,
+        6157,
+        6160,
+        6169,
+        6176,
+        6263,
+        6272,
+        6314,
+        6320,
+        6389,
+        6400,
+        6428,
+        6432,
+        6443,
+        6448,
+        6459,
+        6470,
+        6509,
+        6512,
+        6516,
+        6528,
+        6571,
+        6576,
+        6601,
+        6608,
+        6617,
+        6656,
+        6683,
+        6688,
+        6750,
+        6752,
+        6780,
+        6783,
+        6793,
+        6800,
+        6809,
+        6823,
+        6823,
+        6912,
+        6987,
+        6992,
+        7001,
+        7019,
+        7027,
+        7040,
+        7155,
+        7168,
+        7223,
+        7232,
+        7241,
+        7245,
+        7293,
+        7376,
+        7378,
+        7380,
+        7414,
+        7424,
+        7654,
+        7676,
+        7957,
+        7960,
+        7965,
+        7968,
+        8005,
+        8008,
+        8013,
+        8016,
+        8023,
+        8025,
+        8025,
+        8027,
+        8027,
+        8029,
+        8029,
+        8031,
+        8061,
+        8064,
+        8116,
+        8118,
+        8124,
+        8126,
+        8126,
+        8130,
+        8132,
+        8134,
+        8140,
+        8144,
+        8147,
+        8150,
+        8155,
+        8160,
+        8172,
+        8178,
+        8180,
+        8182,
+        8188,
+        8204,
+        8205,
+        8255,
+        8256,
+        8276,
+        8276,
+        8305,
+        8305,
+        8319,
+        8319,
+        8336,
+        8348,
+        8400,
+        8412,
+        8417,
+        8417,
+        8421,
+        8432,
+        8450,
+        8450,
+        8455,
+        8455,
+        8458,
+        8467,
+        8469,
+        8469,
+        8473,
+        8477,
+        8484,
+        8484,
+        8486,
+        8486,
+        8488,
+        8488,
+        8490,
+        8493,
+        8495,
+        8505,
+        8508,
+        8511,
+        8517,
+        8521,
+        8526,
+        8526,
+        8544,
+        8584,
+        11264,
+        11310,
+        11312,
+        11358,
+        11360,
+        11492,
+        11499,
+        11507,
+        11520,
+        11557,
+        11559,
+        11559,
+        11565,
+        11565,
+        11568,
+        11623,
+        11631,
+        11631,
+        11647,
+        11670,
+        11680,
+        11686,
+        11688,
+        11694,
+        11696,
+        11702,
+        11704,
+        11710,
+        11712,
+        11718,
+        11720,
+        11726,
+        11728,
+        11734,
+        11736,
+        11742,
+        11744,
+        11775,
+        11823,
+        11823,
+        12293,
+        12295,
+        12321,
+        12335,
+        12337,
+        12341,
+        12344,
+        12348,
+        12353,
+        12438,
+        12441,
+        12442,
+        12445,
+        12447,
+        12449,
+        12538,
+        12540,
+        12543,
+        12549,
+        12589,
+        12593,
+        12686,
+        12704,
+        12730,
+        12784,
+        12799,
+        13312,
+        19893,
+        19968,
+        40908,
+        40960,
+        42124,
+        42192,
+        42237,
+        42240,
+        42508,
+        42512,
+        42539,
+        42560,
+        42607,
+        42612,
+        42621,
+        42623,
+        42647,
+        42655,
+        42737,
+        42775,
+        42783,
+        42786,
+        42888,
+        42891,
+        42894,
+        42896,
+        42899,
+        42912,
+        42922,
+        43000,
+        43047,
+        43072,
+        43123,
+        43136,
+        43204,
+        43216,
+        43225,
+        43232,
+        43255,
+        43259,
+        43259,
+        43264,
+        43309,
+        43312,
+        43347,
+        43360,
+        43388,
+        43392,
+        43456,
+        43471,
+        43481,
+        43520,
+        43574,
+        43584,
+        43597,
+        43600,
+        43609,
+        43616,
+        43638,
+        43642,
+        43643,
+        43648,
+        43714,
+        43739,
+        43741,
+        43744,
+        43759,
+        43762,
+        43766,
+        43777,
+        43782,
+        43785,
+        43790,
+        43793,
+        43798,
+        43808,
+        43814,
+        43816,
+        43822,
+        43968,
+        44010,
+        44012,
+        44013,
+        44016,
+        44025,
+        44032,
+        55203,
+        55216,
+        55238,
+        55243,
+        55291,
+        63744,
+        64109,
+        64112,
+        64217,
+        64256,
+        64262,
+        64275,
+        64279,
+        64285,
+        64296,
+        64298,
+        64310,
+        64312,
+        64316,
+        64318,
+        64318,
+        64320,
+        64321,
+        64323,
+        64324,
+        64326,
+        64433,
+        64467,
+        64829,
+        64848,
+        64911,
+        64914,
+        64967,
+        65008,
+        65019,
+        65024,
+        65039,
+        65056,
+        65062,
+        65075,
+        65076,
+        65101,
+        65103,
+        65136,
+        65140,
+        65142,
+        65276,
+        65296,
+        65305,
+        65313,
+        65338,
+        65343,
+        65343,
+        65345,
+        65370,
+        65382,
+        65470,
+        65474,
+        65479,
+        65482,
+        65487,
+        65490,
+        65495,
+        65498,
+        65500,
+    ];
     function lookupInUnicodeMap(code, map) {
         if (code < map[0]) {
             return false;
@@ -2075,15 +6836,11 @@ var ts;
         return false;
     }
     function isUnicodeIdentifierStart(code, languageVersion) {
-        return languageVersion >= 1 ?
-            lookupInUnicodeMap(code, unicodeES5IdentifierStart) :
-            lookupInUnicodeMap(code, unicodeES3IdentifierStart);
+        return languageVersion >= 1 ? lookupInUnicodeMap(code, unicodeES5IdentifierStart) : lookupInUnicodeMap(code, unicodeES3IdentifierStart);
     }
     ts.isUnicodeIdentifierStart = isUnicodeIdentifierStart;
     function isUnicodeIdentifierPart(code, languageVersion) {
-        return languageVersion >= 1 ?
-            lookupInUnicodeMap(code, unicodeES5IdentifierPart) :
-            lookupInUnicodeMap(code, unicodeES3IdentifierPart);
+        return languageVersion >= 1 ? lookupInUnicodeMap(code, unicodeES5IdentifierPart) : lookupInUnicodeMap(code, unicodeES3IdentifierPart);
     }
     function makeReverseMap(source) {
         var result = [];
@@ -2156,9 +6913,7 @@ var ts;
     ts.getLineAndCharacterOfPosition = getLineAndCharacterOfPosition;
     var hasOwnProperty = Object.prototype.hasOwnProperty;
     function isWhiteSpace(ch) {
-        return ch === 32 || ch === 9 || ch === 11 || ch === 12 ||
-            ch === 160 || ch === 5760 || ch >= 8192 && ch <= 8203 ||
-            ch === 8239 || ch === 8287 || ch === 12288 || ch === 65279;
+        return ch === 32 || ch === 9 || ch === 11 || ch === 12 || ch === 160 || ch === 5760 || ch >= 8192 && ch <= 8203 || ch === 8239 || ch === 8287 || ch === 12288 || ch === 65279;
     }
     ts.isWhiteSpace = isWhiteSpace;
     function isLineBreak(ch) {
@@ -2245,8 +7000,7 @@ var ts;
                         return false;
                     }
                 }
-                return ch === 61 ||
-                    text.charCodeAt(pos + mergeConflictMarkerLength) === 32;
+                return ch === 61 || text.charCodeAt(pos + mergeConflictMarkerLength) === 32;
             }
         }
         return false;
@@ -2326,7 +7080,11 @@ var ts;
                         if (collecting) {
                             if (!result)
                                 result = [];
-                            result.push({ pos: startPos, end: pos, hasTrailingNewLine: hasTrailingNewLine });
+                            result.push({
+                                pos: startPos,
+                                end: pos,
+                                hasTrailingNewLine: hasTrailingNewLine
+                            });
                         }
                         continue;
                     }
@@ -2353,15 +7111,11 @@ var ts;
     }
     ts.getTrailingCommentRanges = getTrailingCommentRanges;
     function isIdentifierStart(ch, languageVersion) {
-        return ch >= 65 && ch <= 90 || ch >= 97 && ch <= 122 ||
-            ch === 36 || ch === 95 ||
-            ch > 127 && isUnicodeIdentifierStart(ch, languageVersion);
+        return ch >= 65 && ch <= 90 || ch >= 97 && ch <= 122 || ch === 36 || ch === 95 || ch > 127 && isUnicodeIdentifierStart(ch, languageVersion);
     }
     ts.isIdentifierStart = isIdentifierStart;
     function isIdentifierPart(ch, languageVersion) {
-        return ch >= 65 && ch <= 90 || ch >= 97 && ch <= 122 ||
-            ch >= 48 && ch <= 57 || ch === 36 || ch === 95 ||
-            ch > 127 && isUnicodeIdentifierPart(ch, languageVersion);
+        return ch >= 65 && ch <= 90 || ch >= 97 && ch <= 122 || ch >= 48 && ch <= 57 || ch === 36 || ch === 95 || ch > 127 && isUnicodeIdentifierPart(ch, languageVersion);
     }
     ts.isIdentifierPart = isIdentifierPart;
     function createScanner(languageVersion, skipTrivia, text, onError) {
@@ -2380,14 +7134,10 @@ var ts;
             }
         }
         function isIdentifierStart(ch) {
-            return ch >= 65 && ch <= 90 || ch >= 97 && ch <= 122 ||
-                ch === 36 || ch === 95 ||
-                ch > 127 && isUnicodeIdentifierStart(ch, languageVersion);
+            return ch >= 65 && ch <= 90 || ch >= 97 && ch <= 122 || ch === 36 || ch === 95 || ch > 127 && isUnicodeIdentifierStart(ch, languageVersion);
         }
         function isIdentifierPart(ch) {
-            return ch >= 65 && ch <= 90 || ch >= 97 && ch <= 122 ||
-                ch >= 48 && ch <= 57 || ch === 36 || ch === 95 ||
-                ch > 127 && isUnicodeIdentifierPart(ch, languageVersion);
+            return ch >= 65 && ch <= 90 || ch >= 97 && ch <= 122 || ch >= 48 && ch <= 57 || ch === 36 || ch === 95 || ch > 127 && isUnicodeIdentifierPart(ch, languageVersion);
         }
         function scanNumber() {
             var start = pos;
@@ -3110,17 +7860,39 @@ var ts;
         }
         setText(text);
         return {
-            getStartPos: function () { return startPos; },
-            getTextPos: function () { return pos; },
-            getToken: function () { return token; },
-            getTokenPos: function () { return tokenPos; },
-            getTokenText: function () { return text.substring(tokenPos, pos); },
-            getTokenValue: function () { return tokenValue; },
-            hasExtendedUnicodeEscape: function () { return hasExtendedUnicodeEscape; },
-            hasPrecedingLineBreak: function () { return precedingLineBreak; },
-            isIdentifier: function () { return token === 64 || token > 100; },
-            isReservedWord: function () { return token >= 65 && token <= 100; },
-            isUnterminated: function () { return tokenIsUnterminated; },
+            getStartPos: function () {
+                return startPos;
+            },
+            getTextPos: function () {
+                return pos;
+            },
+            getToken: function () {
+                return token;
+            },
+            getTokenPos: function () {
+                return tokenPos;
+            },
+            getTokenText: function () {
+                return text.substring(tokenPos, pos);
+            },
+            getTokenValue: function () {
+                return tokenValue;
+            },
+            hasExtendedUnicodeEscape: function () {
+                return hasExtendedUnicodeEscape;
+            },
+            hasPrecedingLineBreak: function () {
+                return precedingLineBreak;
+            },
+            isIdentifier: function () {
+                return token === 64 || token > 100;
+            },
+            isReservedWord: function () {
+                return token >= 65 && token <= 100;
+            },
+            isUnterminated: function () {
+                return tokenIsUnterminated;
+            },
             reScanGreaterToken: reScanGreaterToken,
             reScanSlashToken: reScanSlashToken,
             reScanTemplateToken: reScanTemplateToken,
@@ -3150,9 +7922,13 @@ var ts;
     function getSingleLineStringWriter() {
         if (stringWriters.length == 0) {
             var str = "";
-            var writeText = function (text) { return str += text; };
+            var writeText = function (text) {
+                return str += text;
+            };
             return {
-                string: function () { return str; },
+                string: function () {
+                    return str;
+                },
                 writeKeyword: writeText,
                 writeOperator: writeText,
                 writePunctuation: writeText,
@@ -3160,11 +7936,18 @@ var ts;
                 writeStringLiteral: writeText,
                 writeParameter: writeText,
                 writeSymbol: writeText,
-                writeLine: function () { return str += " "; },
-                increaseIndent: function () { },
-                decreaseIndent: function () { },
-                clear: function () { return str = ""; },
-                trackSymbol: function () { }
+                writeLine: function () {
+                    return str += " ";
+                },
+                increaseIndent: function () {
+                },
+                decreaseIndent: function () {
+                },
+                clear: function () {
+                    return str = "";
+                },
+                trackSymbol: function () {
+                }
             };
         }
         return stringWriters.pop();
@@ -3186,8 +7969,7 @@ var ts;
     ts.containsParseError = containsParseError;
     function aggregateChildData(node) {
         if (!(node.parserContextFlags & 64)) {
-            var thisNodeOrAnySubNodesHasError = ((node.parserContextFlags & 16) !== 0) ||
-                ts.forEachChild(node, containsParseError);
+            var thisNodeOrAnySubNodesHasError = ((node.parserContextFlags & 16) !== 0) || ts.forEachChild(node, containsParseError);
             if (thisNodeOrAnySubNodesHasError) {
                 node.parserContextFlags |= 32;
             }
@@ -3195,7 +7977,7 @@ var ts;
         }
     }
     function getSourceFileOfNode(node) {
-        while (node && node.kind !== 220) {
+        while (node && node.kind !== 221) {
             node = node.parent;
         }
         return node;
@@ -3266,15 +8048,35 @@ var ts;
     }
     ts.makeIdentifierFromModuleName = makeIdentifierFromModuleName;
     function isBlockOrCatchScoped(declaration) {
-        return (getCombinedNodeFlags(declaration) & 12288) !== 0 ||
-            isCatchClauseVariableDeclaration(declaration);
+        return (getCombinedNodeFlags(declaration) & 12288) !== 0 || isCatchClauseVariableDeclaration(declaration);
     }
     ts.isBlockOrCatchScoped = isBlockOrCatchScoped;
+    function getEnclosingBlockScopeContainer(node) {
+        var current = node;
+        while (current) {
+            if (isFunctionLike(current)) {
+                return current;
+            }
+            switch (current.kind) {
+                case 221:
+                case 202:
+                case 217:
+                case 200:
+                case 181:
+                case 182:
+                case 183:
+                    return current;
+                case 174:
+                    if (!isFunctionLike(current.parent)) {
+                        return current;
+                    }
+            }
+            current = current.parent;
+        }
+    }
+    ts.getEnclosingBlockScopeContainer = getEnclosingBlockScopeContainer;
     function isCatchClauseVariableDeclaration(declaration) {
-        return declaration &&
-            declaration.kind === 193 &&
-            declaration.parent &&
-            declaration.parent.kind === 216;
+        return declaration && declaration.kind === 193 && declaration.parent && declaration.parent.kind === 217;
     }
     ts.isCatchClauseVariableDeclaration = isCatchClauseVariableDeclaration;
     function declarationNameToString(name) {
@@ -3317,7 +8119,7 @@ var ts;
             case 197:
             case 200:
             case 199:
-            case 219:
+            case 220:
             case 195:
             case 160:
                 errorNode = node.name;
@@ -3326,9 +8128,7 @@ var ts;
         if (errorNode === undefined) {
             return getSpanOfTokenAtPosition(sourceFile, node.pos);
         }
-        var pos = nodeIsMissing(errorNode)
-            ? errorNode.pos
-            : ts.skipTrivia(sourceFile.text, errorNode.pos);
+        var pos = nodeIsMissing(errorNode) ? errorNode.pos : ts.skipTrivia(sourceFile.text, errorNode.pos);
         return createTextSpanFromBounds(pos, errorNode.end);
     }
     ts.getErrorSpanForNode = getErrorSpanForNode;
@@ -3391,9 +8191,7 @@ var ts;
     function getJsDocComments(node, sourceFileOfNode) {
         return ts.filter(getLeadingCommentRangesOfNode(node, sourceFileOfNode), isJsDocComment);
         function isJsDocComment(comment) {
-            return sourceFileOfNode.text.charCodeAt(comment.pos + 1) === 42 &&
-                sourceFileOfNode.text.charCodeAt(comment.pos + 2) === 42 &&
-                sourceFileOfNode.text.charCodeAt(comment.pos + 3) !== 47;
+            return sourceFileOfNode.text.charCodeAt(comment.pos + 1) === 42 && sourceFileOfNode.text.charCodeAt(comment.pos + 2) === 42 && sourceFileOfNode.text.charCodeAt(comment.pos + 3) !== 47;
         }
     }
     ts.getJsDocComments = getJsDocComments;
@@ -3404,6 +8202,7 @@ var ts;
             switch (node.kind) {
                 case 186:
                     return visitor(node);
+                case 202:
                 case 174:
                 case 178:
                 case 179:
@@ -3413,11 +8212,11 @@ var ts;
                 case 183:
                 case 187:
                 case 188:
-                case 213:
                 case 214:
+                case 215:
                 case 189:
                 case 191:
-                case 216:
+                case 217:
                     return ts.forEachChild(node, traverse);
             }
         }
@@ -3427,12 +8226,12 @@ var ts;
         if (node) {
             switch (node.kind) {
                 case 150:
-                case 219:
+                case 220:
                 case 128:
-                case 217:
+                case 218:
                 case 130:
                 case 129:
-                case 218:
+                case 219:
                 case 193:
                     return true;
             }
@@ -3510,7 +8309,7 @@ var ts;
                 case 134:
                 case 135:
                 case 199:
-                case 220:
+                case 221:
                     return node;
             }
         }
@@ -3601,8 +8400,8 @@ var ts;
                     case 128:
                     case 130:
                     case 129:
-                    case 219:
-                    case 217:
+                    case 220:
+                    case 218:
                     case 150:
                         return parent.initializer === node;
                     case 177:
@@ -3612,20 +8411,17 @@ var ts;
                     case 186:
                     case 187:
                     case 188:
-                    case 213:
+                    case 214:
                     case 190:
                     case 188:
                         return parent.expression === node;
                     case 181:
                         var forStatement = parent;
-                        return (forStatement.initializer === node && forStatement.initializer.kind !== 194) ||
-                            forStatement.condition === node ||
-                            forStatement.iterator === node;
+                        return (forStatement.initializer === node && forStatement.initializer.kind !== 194) || forStatement.condition === node || forStatement.iterator === node;
                     case 182:
                     case 183:
                         var forInStatement = parent;
-                        return (forInStatement.initializer === node && forInStatement.initializer.kind !== 194) ||
-                            forInStatement.expression === node;
+                        return (forInStatement.initializer === node && forInStatement.initializer.kind !== 194) || forInStatement.expression === node;
                     case 158:
                         return node === parent.expression;
                     case 173:
@@ -3643,12 +8439,11 @@ var ts;
     ts.isExpression = isExpression;
     function isInstantiatedModule(node, preserveConstEnums) {
         var moduleState = ts.getModuleInstanceState(node);
-        return moduleState === 1 ||
-            (preserveConstEnums && moduleState === 2);
+        return moduleState === 1 || (preserveConstEnums && moduleState === 2);
     }
     ts.isInstantiatedModule = isInstantiatedModule;
     function isExternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 202 && node.moduleReference.kind === 212;
+        return node.kind === 203 && node.moduleReference.kind === 213;
     }
     ts.isExternalModuleImportEqualsDeclaration = isExternalModuleImportEqualsDeclaration;
     function getExternalModuleImportEqualsDeclarationExpression(node) {
@@ -3657,20 +8452,20 @@ var ts;
     }
     ts.getExternalModuleImportEqualsDeclarationExpression = getExternalModuleImportEqualsDeclarationExpression;
     function isInternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 202 && node.moduleReference.kind !== 212;
+        return node.kind === 203 && node.moduleReference.kind !== 213;
     }
     ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration;
     function getExternalModuleName(node) {
-        if (node.kind === 203) {
+        if (node.kind === 204) {
             return node.moduleSpecifier;
         }
-        if (node.kind === 202) {
+        if (node.kind === 203) {
             var reference = node.moduleReference;
-            if (reference.kind === 212) {
+            if (reference.kind === 213) {
                 return reference.expression;
             }
         }
-        if (node.kind === 209) {
+        if (node.kind === 210) {
             return node.moduleSpecifier;
         }
     }
@@ -3687,8 +8482,8 @@ var ts;
                 case 132:
                 case 131:
                     return node.questionToken !== undefined;
+                case 219:
                 case 218:
-                case 217:
                 case 130:
                 case 129:
                     return node.questionToken !== undefined;
@@ -3734,25 +8529,25 @@ var ts;
             case 196:
             case 133:
             case 199:
-            case 219:
-            case 211:
+            case 220:
+            case 212:
             case 195:
             case 160:
             case 134:
-            case 204:
-            case 202:
-            case 207:
+            case 205:
+            case 203:
+            case 208:
             case 197:
             case 132:
             case 131:
             case 200:
-            case 205:
+            case 206:
             case 128:
-            case 217:
+            case 218:
             case 130:
             case 129:
             case 135:
-            case 218:
+            case 219:
             case 198:
             case 127:
             case 193:
@@ -3781,7 +8576,7 @@ var ts;
             case 175:
             case 180:
             case 187:
-            case 208:
+            case 209:
                 return true;
             default:
                 return false;
@@ -3793,7 +8588,7 @@ var ts;
             return false;
         }
         var parent = name.parent;
-        if (parent.kind === 207 || parent.kind === 211) {
+        if (parent.kind === 208 || parent.kind === 212) {
             if (parent.propertyName) {
                 return true;
             }
@@ -3891,9 +8686,7 @@ var ts;
     }
     ts.isTrivia = isTrivia;
     function hasDynamicName(declaration) {
-        return declaration.name &&
-            declaration.name.kind === 126 &&
-            !isWellKnownSymbolSyntactically(declaration.name.expression);
+        return declaration.name && declaration.name.kind === 126 && !isWellKnownSymbolSyntactically(declaration.name.expression);
     }
     ts.hasDynamicName = hasDynamicName;
     function isWellKnownSymbolSyntactically(node) {
@@ -3997,7 +8790,10 @@ var ts;
         if (length < 0) {
             throw new Error("length < 0");
         }
-        return { start: start, length: length };
+        return {
+            start: start,
+            length: length
+        };
     }
     ts.createTextSpan = createTextSpan;
     function createTextSpanFromBounds(start, end) {
@@ -4016,7 +8812,10 @@ var ts;
         if (newLength < 0) {
             throw new Error("newLength < 0");
         }
-        return { span: span, newLength: newLength };
+        return {
+            span: span,
+            newLength: newLength
+        };
     }
     ts.createTextChangeRange = createTextChangeRange;
     ts.unchangedTextChangeRange = createTextChangeRange(createTextSpan(0, 0), 0);
@@ -4047,11 +8846,11 @@ var ts;
     }
     ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions;
     function nodeStartsNewLexicalEnvironment(n) {
-        return isFunctionLike(n) || n.kind === 200 || n.kind === 220;
+        return isFunctionLike(n) || n.kind === 200 || n.kind === 221;
     }
     ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment;
     function nodeIsSynthesized(node) {
-        return node.pos === -1 && node.end === -1;
+        return node.pos === -1;
     }
     ts.nodeIsSynthesized = nodeIsSynthesized;
     function createSynthesizedNode(kind, startsOnNewLine) {
@@ -4177,15 +8976,15 @@ var ts;
     }
     var nonAsciiCharacters = /[^\u0000-\u007F]/g;
     function escapeNonAsciiCharacters(s) {
-        return nonAsciiCharacters.test(s) ?
-            s.replace(nonAsciiCharacters, function (c) { return get16BitUnicodeEscapeSequence(c.charCodeAt(0)); }) :
-            s;
+        return nonAsciiCharacters.test(s) ? s.replace(nonAsciiCharacters, function (c) {
+            return get16BitUnicodeEscapeSequence(c.charCodeAt(0));
+        }) : s;
     }
     ts.escapeNonAsciiCharacters = escapeNonAsciiCharacters;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    var nodeConstructors = new Array(222);
+    var nodeConstructors = new Array(223);
     ts.parseTime = 0;
     function getNodeConstructor(kind) {
         return nodeConstructors[kind] || (nodeConstructors[kind] = ts.objectAllocator.getNodeConstructor(kind));
@@ -4223,35 +9022,23 @@ var ts;
         var cbNodes = cbNodeArray || cbNode;
         switch (node.kind) {
             case 125:
-                return visitNode(cbNode, node.left) ||
-                    visitNode(cbNode, node.right);
+                return visitNode(cbNode, node.left) || visitNode(cbNode, node.right);
             case 127:
-                return visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.constraint) ||
-                    visitNode(cbNode, node.expression);
+                return visitNode(cbNode, node.name) || visitNode(cbNode, node.constraint) || visitNode(cbNode, node.expression);
             case 128:
             case 130:
             case 129:
-            case 217:
             case 218:
+            case 219:
             case 193:
             case 150:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.propertyName) ||
-                    visitNode(cbNode, node.dotDotDotToken) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.questionToken) ||
-                    visitNode(cbNode, node.type) ||
-                    visitNode(cbNode, node.initializer);
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.propertyName) || visitNode(cbNode, node.dotDotDotToken) || visitNode(cbNode, node.name) || visitNode(cbNode, node.questionToken) || visitNode(cbNode, node.type) || visitNode(cbNode, node.initializer);
             case 140:
             case 141:
             case 136:
             case 137:
             case 138:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNodes(cbNodes, node.typeParameters) ||
-                    visitNodes(cbNodes, node.parameters) ||
-                    visitNode(cbNode, node.type);
+                return visitNodes(cbNodes, node.modifiers) || visitNodes(cbNodes, node.typeParameters) || visitNodes(cbNodes, node.parameters) || visitNode(cbNode, node.type);
             case 132:
             case 131:
             case 133:
@@ -4260,17 +9047,9 @@ var ts;
             case 160:
             case 195:
             case 161:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.asteriskToken) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.questionToken) ||
-                    visitNodes(cbNodes, node.typeParameters) ||
-                    visitNodes(cbNodes, node.parameters) ||
-                    visitNode(cbNode, node.type) ||
-                    visitNode(cbNode, node.body);
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.asteriskToken) || visitNode(cbNode, node.name) || visitNode(cbNode, node.questionToken) || visitNodes(cbNodes, node.typeParameters) || visitNodes(cbNodes, node.parameters) || visitNode(cbNode, node.type) || visitNode(cbNode, node.body);
             case 139:
-                return visitNode(cbNode, node.typeName) ||
-                    visitNodes(cbNodes, node.typeArguments);
+                return visitNode(cbNode, node.typeName) || visitNodes(cbNodes, node.typeArguments);
             case 142:
                 return visitNode(cbNode, node.exprName);
             case 143:
@@ -4291,23 +9070,16 @@ var ts;
             case 152:
                 return visitNodes(cbNodes, node.properties);
             case 153:
-                return visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.dotToken) ||
-                    visitNode(cbNode, node.name);
+                return visitNode(cbNode, node.expression) || visitNode(cbNode, node.dotToken) || visitNode(cbNode, node.name);
             case 154:
-                return visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.argumentExpression);
+                return visitNode(cbNode, node.expression) || visitNode(cbNode, node.argumentExpression);
             case 155:
             case 156:
-                return visitNode(cbNode, node.expression) ||
-                    visitNodes(cbNodes, node.typeArguments) ||
-                    visitNodes(cbNodes, node.arguments);
+                return visitNode(cbNode, node.expression) || visitNodes(cbNodes, node.typeArguments) || visitNodes(cbNodes, node.arguments);
             case 157:
-                return visitNode(cbNode, node.tag) ||
-                    visitNode(cbNode, node.template);
+                return visitNode(cbNode, node.tag) || visitNode(cbNode, node.template);
             case 158:
-                return visitNode(cbNode, node.type) ||
-                    visitNode(cbNode, node.expression);
+                return visitNode(cbNode, node.type) || visitNode(cbNode, node.expression);
             case 159:
                 return visitNode(cbNode, node.expression);
             case 162:
@@ -4319,149 +9091,100 @@ var ts;
             case 165:
                 return visitNode(cbNode, node.operand);
             case 170:
-                return visitNode(cbNode, node.asteriskToken) ||
-                    visitNode(cbNode, node.expression);
+                return visitNode(cbNode, node.asteriskToken) || visitNode(cbNode, node.expression);
             case 166:
                 return visitNode(cbNode, node.operand);
             case 167:
-                return visitNode(cbNode, node.left) ||
-                    visitNode(cbNode, node.operatorToken) ||
-                    visitNode(cbNode, node.right);
+                return visitNode(cbNode, node.left) || visitNode(cbNode, node.operatorToken) || visitNode(cbNode, node.right);
             case 168:
-                return visitNode(cbNode, node.condition) ||
-                    visitNode(cbNode, node.questionToken) ||
-                    visitNode(cbNode, node.whenTrue) ||
-                    visitNode(cbNode, node.colonToken) ||
-                    visitNode(cbNode, node.whenFalse);
+                return visitNode(cbNode, node.condition) || visitNode(cbNode, node.questionToken) || visitNode(cbNode, node.whenTrue) || visitNode(cbNode, node.colonToken) || visitNode(cbNode, node.whenFalse);
             case 171:
                 return visitNode(cbNode, node.expression);
             case 174:
             case 201:
                 return visitNodes(cbNodes, node.statements);
-            case 220:
-                return visitNodes(cbNodes, node.statements) ||
-                    visitNode(cbNode, node.endOfFileToken);
+            case 221:
+                return visitNodes(cbNodes, node.statements) || visitNode(cbNode, node.endOfFileToken);
             case 175:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.declarationList);
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.declarationList);
             case 194:
                 return visitNodes(cbNodes, node.declarations);
             case 177:
                 return visitNode(cbNode, node.expression);
             case 178:
-                return visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.thenStatement) ||
-                    visitNode(cbNode, node.elseStatement);
+                return visitNode(cbNode, node.expression) || visitNode(cbNode, node.thenStatement) || visitNode(cbNode, node.elseStatement);
             case 179:
-                return visitNode(cbNode, node.statement) ||
-                    visitNode(cbNode, node.expression);
+                return visitNode(cbNode, node.statement) || visitNode(cbNode, node.expression);
             case 180:
-                return visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.statement);
+                return visitNode(cbNode, node.expression) || visitNode(cbNode, node.statement);
             case 181:
-                return visitNode(cbNode, node.initializer) ||
-                    visitNode(cbNode, node.condition) ||
-                    visitNode(cbNode, node.iterator) ||
-                    visitNode(cbNode, node.statement);
+                return visitNode(cbNode, node.initializer) || visitNode(cbNode, node.condition) || visitNode(cbNode, node.iterator) || visitNode(cbNode, node.statement);
             case 182:
-                return visitNode(cbNode, node.initializer) ||
-                    visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.statement);
+                return visitNode(cbNode, node.initializer) || visitNode(cbNode, node.expression) || visitNode(cbNode, node.statement);
             case 183:
-                return visitNode(cbNode, node.initializer) ||
-                    visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.statement);
+                return visitNode(cbNode, node.initializer) || visitNode(cbNode, node.expression) || visitNode(cbNode, node.statement);
             case 184:
             case 185:
                 return visitNode(cbNode, node.label);
             case 186:
                 return visitNode(cbNode, node.expression);
             case 187:
-                return visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.statement);
+                return visitNode(cbNode, node.expression) || visitNode(cbNode, node.statement);
             case 188:
-                return visitNode(cbNode, node.expression) ||
-                    visitNodes(cbNodes, node.clauses);
-            case 213:
-                return visitNode(cbNode, node.expression) ||
-                    visitNodes(cbNodes, node.statements);
+                return visitNode(cbNode, node.expression) || visitNode(cbNode, node.caseBlock);
+            case 202:
+                return visitNodes(cbNodes, node.clauses);
             case 214:
+                return visitNode(cbNode, node.expression) || visitNodes(cbNodes, node.statements);
+            case 215:
                 return visitNodes(cbNodes, node.statements);
             case 189:
-                return visitNode(cbNode, node.label) ||
-                    visitNode(cbNode, node.statement);
+                return visitNode(cbNode, node.label) || visitNode(cbNode, node.statement);
             case 190:
                 return visitNode(cbNode, node.expression);
             case 191:
-                return visitNode(cbNode, node.tryBlock) ||
-                    visitNode(cbNode, node.catchClause) ||
-                    visitNode(cbNode, node.finallyBlock);
-            case 216:
-                return visitNode(cbNode, node.variableDeclaration) ||
-                    visitNode(cbNode, node.block);
+                return visitNode(cbNode, node.tryBlock) || visitNode(cbNode, node.catchClause) || visitNode(cbNode, node.finallyBlock);
+            case 217:
+                return visitNode(cbNode, node.variableDeclaration) || visitNode(cbNode, node.block);
             case 196:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNodes(cbNodes, node.typeParameters) ||
-                    visitNodes(cbNodes, node.heritageClauses) ||
-                    visitNodes(cbNodes, node.members);
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.name) || visitNodes(cbNodes, node.typeParameters) || visitNodes(cbNodes, node.heritageClauses) || visitNodes(cbNodes, node.members);
             case 197:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNodes(cbNodes, node.typeParameters) ||
-                    visitNodes(cbNodes, node.heritageClauses) ||
-                    visitNodes(cbNodes, node.members);
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.name) || visitNodes(cbNodes, node.typeParameters) || visitNodes(cbNodes, node.heritageClauses) || visitNodes(cbNodes, node.members);
             case 198:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.type);
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.name) || visitNode(cbNode, node.type);
             case 199:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNodes(cbNodes, node.members);
-            case 219:
-                return visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.initializer);
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.name) || visitNodes(cbNodes, node.members);
+            case 220:
+                return visitNode(cbNode, node.name) || visitNode(cbNode, node.initializer);
             case 200:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.body);
-            case 202:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.moduleReference);
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.name) || visitNode(cbNode, node.body);
             case 203:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.importClause) ||
-                    visitNode(cbNode, node.moduleSpecifier);
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.name) || visitNode(cbNode, node.moduleReference);
             case 204:
-                return visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.namedBindings);
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.importClause) || visitNode(cbNode, node.moduleSpecifier);
             case 205:
-                return visitNode(cbNode, node.name);
+                return visitNode(cbNode, node.name) || visitNode(cbNode, node.namedBindings);
             case 206:
-            case 210:
-                return visitNodes(cbNodes, node.elements);
-            case 209:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.exportClause) ||
-                    visitNode(cbNode, node.moduleSpecifier);
+                return visitNode(cbNode, node.name);
             case 207:
             case 211:
-                return visitNode(cbNode, node.propertyName) ||
-                    visitNode(cbNode, node.name);
+                return visitNodes(cbNodes, node.elements);
+            case 210:
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.exportClause) || visitNode(cbNode, node.moduleSpecifier);
             case 208:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.expression);
+            case 212:
+                return visitNode(cbNode, node.propertyName) || visitNode(cbNode, node.name);
+            case 209:
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.expression);
             case 169:
                 return visitNode(cbNode, node.head) || visitNodes(cbNodes, node.templateSpans);
             case 173:
                 return visitNode(cbNode, node.expression) || visitNode(cbNode, node.literal);
             case 126:
                 return visitNode(cbNode, node.expression);
-            case 215:
+            case 216:
                 return visitNodes(cbNodes, node.types);
-            case 212:
+            case 213:
                 return visitNode(cbNode, node.expression);
         }
     }
@@ -4499,40 +9222,69 @@ var ts;
     })(Tristate || (Tristate = {}));
     function parsingContextErrors(context) {
         switch (context) {
-            case 0: return ts.Diagnostics.Declaration_or_statement_expected;
-            case 1: return ts.Diagnostics.Declaration_or_statement_expected;
-            case 2: return ts.Diagnostics.Statement_expected;
-            case 3: return ts.Diagnostics.case_or_default_expected;
-            case 4: return ts.Diagnostics.Statement_expected;
-            case 5: return ts.Diagnostics.Property_or_signature_expected;
-            case 6: return ts.Diagnostics.Unexpected_token_A_constructor_method_accessor_or_property_was_expected;
-            case 7: return ts.Diagnostics.Enum_member_expected;
-            case 8: return ts.Diagnostics.Type_reference_expected;
-            case 9: return ts.Diagnostics.Variable_declaration_expected;
-            case 10: return ts.Diagnostics.Property_destructuring_pattern_expected;
-            case 11: return ts.Diagnostics.Array_element_destructuring_pattern_expected;
-            case 12: return ts.Diagnostics.Argument_expression_expected;
-            case 13: return ts.Diagnostics.Property_assignment_expected;
-            case 14: return ts.Diagnostics.Expression_or_comma_expected;
-            case 15: return ts.Diagnostics.Parameter_declaration_expected;
-            case 16: return ts.Diagnostics.Type_parameter_declaration_expected;
-            case 17: return ts.Diagnostics.Type_argument_expected;
-            case 18: return ts.Diagnostics.Type_expected;
-            case 19: return ts.Diagnostics.Unexpected_token_expected;
-            case 20: return ts.Diagnostics.Identifier_expected;
+            case 0:
+                return ts.Diagnostics.Declaration_or_statement_expected;
+            case 1:
+                return ts.Diagnostics.Declaration_or_statement_expected;
+            case 2:
+                return ts.Diagnostics.Statement_expected;
+            case 3:
+                return ts.Diagnostics.case_or_default_expected;
+            case 4:
+                return ts.Diagnostics.Statement_expected;
+            case 5:
+                return ts.Diagnostics.Property_or_signature_expected;
+            case 6:
+                return ts.Diagnostics.Unexpected_token_A_constructor_method_accessor_or_property_was_expected;
+            case 7:
+                return ts.Diagnostics.Enum_member_expected;
+            case 8:
+                return ts.Diagnostics.Type_reference_expected;
+            case 9:
+                return ts.Diagnostics.Variable_declaration_expected;
+            case 10:
+                return ts.Diagnostics.Property_destructuring_pattern_expected;
+            case 11:
+                return ts.Diagnostics.Array_element_destructuring_pattern_expected;
+            case 12:
+                return ts.Diagnostics.Argument_expression_expected;
+            case 13:
+                return ts.Diagnostics.Property_assignment_expected;
+            case 14:
+                return ts.Diagnostics.Expression_or_comma_expected;
+            case 15:
+                return ts.Diagnostics.Parameter_declaration_expected;
+            case 16:
+                return ts.Diagnostics.Type_parameter_declaration_expected;
+            case 17:
+                return ts.Diagnostics.Type_argument_expected;
+            case 18:
+                return ts.Diagnostics.Type_expected;
+            case 19:
+                return ts.Diagnostics.Unexpected_token_expected;
+            case 20:
+                return ts.Diagnostics.Identifier_expected;
         }
     }
     ;
     function modifierToFlag(token) {
         switch (token) {
-            case 109: return 128;
-            case 108: return 16;
-            case 107: return 64;
-            case 106: return 32;
-            case 77: return 1;
-            case 114: return 2;
-            case 69: return 8192;
-            case 72: return 256;
+            case 109:
+                return 128;
+            case 108:
+                return 16;
+            case 107:
+                return 64;
+            case 106:
+                return 32;
+            case 77:
+                return 1;
+            case 114:
+                return 2;
+            case 69:
+                return 8192;
+            case 72:
+                return 256;
         }
         return 0;
     }
@@ -4763,8 +9515,7 @@ var ts;
     }
     ts.updateSourceFile = updateSourceFile;
     function isEvalOrArgumentsIdentifier(node) {
-        return node.kind === 64 &&
-            (node.text === "eval" || node.text === "arguments");
+        return node.kind === 64 && (node.text === "eval" || node.text === "arguments");
     }
     ts.isEvalOrArgumentsIdentifier = isEvalOrArgumentsIdentifier;
     function isUseStrictPrologueDirective(sourceFile, node) {
@@ -4850,7 +9601,7 @@ var ts;
         var identifierCount = 0;
         var nodeCount = 0;
         var token;
-        var sourceFile = createNode(220, 0);
+        var sourceFile = createNode(221, 0);
         sourceFile.pos = 0;
         sourceFile.end = sourceText.length;
         sourceFile.text = sourceText;
@@ -4986,9 +9737,7 @@ var ts;
             var saveParseDiagnosticsLength = sourceFile.parseDiagnostics.length;
             var saveParseErrorBeforeNextFinishedNode = parseErrorBeforeNextFinishedNode;
             var saveContextFlags = contextFlags;
-            var result = isLookAhead
-                ? scanner.lookAhead(callback)
-                : scanner.tryScan(callback);
+            var result = isLookAhead ? scanner.lookAhead(callback) : scanner.tryScan(callback);
             ts.Debug.assert(saveContextFlags === contextFlags);
             if (!result || isLookAhead) {
                 token = saveToken;
@@ -5039,8 +9788,7 @@ var ts;
             return undefined;
         }
         function parseExpectedToken(t, reportAtCurrentPosition, diagnosticMessage, arg0) {
-            return parseOptionalToken(t) ||
-                createMissingNode(t, reportAtCurrentPosition, diagnosticMessage, arg0);
+            return parseOptionalToken(t) || createMissingNode(t, reportAtCurrentPosition, diagnosticMessage, arg0);
         }
         function parseTokenNode() {
             var node = createNode(token);
@@ -5117,9 +9865,7 @@ var ts;
             return createIdentifier(isIdentifierOrKeyword());
         }
         function isLiteralPropertyName() {
-            return isIdentifierOrKeyword() ||
-                token === 8 ||
-                token === 7;
+            return isIdentifierOrKeyword() || token === 8 || token === 7;
         }
         function parsePropertyName() {
             if (token === 8 || token === 7) {
@@ -5172,10 +9918,7 @@ var ts;
             return canFollowModifier();
         }
         function canFollowModifier() {
-            return token === 18
-                || token === 14
-                || token === 35
-                || isLiteralPropertyName();
+            return token === 18 || token === 14 || token === 35 || isLiteralPropertyName();
         }
         function nextTokenIsClassOrFunction() {
             nextToken();
@@ -5233,8 +9976,7 @@ var ts;
             return isIdentifier();
         }
         function isNotHeritageClauseTypeName() {
-            if (token === 102 ||
-                token === 78) {
+            if (token === 102 || token === 78) {
                 return lookAhead(nextTokenIsIdentifier);
             }
             return false;
@@ -5400,10 +10142,10 @@ var ts;
         function isReusableModuleElement(node) {
             if (node) {
                 switch (node.kind) {
+                    case 204:
                     case 203:
-                    case 202:
+                    case 210:
                     case 209:
-                    case 208:
                     case 196:
                     case 197:
                     case 200:
@@ -5431,8 +10173,8 @@ var ts;
         function isReusableSwitchClause(node) {
             if (node) {
                 switch (node.kind) {
-                    case 213:
                     case 214:
+                    case 215:
                         return true;
                 }
             }
@@ -5467,7 +10209,7 @@ var ts;
             return false;
         }
         function isReusableEnumMember(node) {
-            return node.kind === 219;
+            return node.kind === 220;
         }
         function isReusableTypeMember(node) {
             if (node) {
@@ -5615,9 +10357,7 @@ var ts;
             var tokenPos = scanner.getTokenPos();
             nextToken();
             finishNode(node);
-            if (node.kind === 7
-                && sourceText.charCodeAt(tokenPos) === 48
-                && ts.isOctalDigit(sourceText.charCodeAt(tokenPos + 1))) {
+            if (node.kind === 7 && sourceText.charCodeAt(tokenPos) === 48 && ts.isOctalDigit(sourceText.charCodeAt(tokenPos + 1))) {
                 node.flags |= 16384;
             }
             return node;
@@ -5656,9 +10396,7 @@ var ts;
         }
         function parseParameterType() {
             if (parseOptional(51)) {
-                return token === 8
-                    ? parseLiteralNode(true)
-                    : parseType();
+                return token === 8 ? parseLiteralNode(true) : parseType();
             }
             return undefined;
         }
@@ -5816,11 +10554,7 @@ var ts;
         }
         function isTypeMemberWithLiteralPropertyName() {
             nextToken();
-            return token === 16 ||
-                token === 24 ||
-                token === 50 ||
-                token === 51 ||
-                canParseSemicolon();
+            return token === 16 || token === 24 || token === 50 || token === 51 || canParseSemicolon();
         }
         function parseTypeMember() {
             switch (token) {
@@ -5828,9 +10562,7 @@ var ts;
                 case 24:
                     return parseSignatureMember(136);
                 case 18:
-                    return isIndexSignature()
-                        ? parseIndexSignatureDeclaration(undefined)
-                        : parsePropertyOrMethodSignature();
+                    return isIndexSignature() ? parseIndexSignatureDeclaration(undefined) : parsePropertyOrMethodSignature();
                 case 87:
                     if (lookAhead(isStartOfConstructSignature)) {
                         return parseSignatureMember(137);
@@ -5852,9 +10584,7 @@ var ts;
         }
         function parseIndexSignatureWithModifiers() {
             var modifiers = parseModifiers();
-            return isIndexSignature()
-                ? parseIndexSignatureDeclaration(modifiers)
-                : undefined;
+            return isIndexSignature() ? parseIndexSignatureDeclaration(modifiers) : undefined;
         }
         function isStartOfConstructSignature() {
             nextToken();
@@ -5960,7 +10690,9 @@ var ts;
         function parseUnionTypeOrHigher() {
             var type = parseArrayTypeOrHigher();
             if (token === 44) {
-                var types = [type];
+                var types = [
+                    type
+                ];
                 types.pos = type.pos;
                 while (parseOptional(44)) {
                     types.push(parseArrayTypeOrHigher());
@@ -5985,9 +10717,7 @@ var ts;
             }
             if (isIdentifier() || ts.isModifier(token)) {
                 nextToken();
-                if (token === 51 || token === 23 ||
-                    token === 50 || token === 52 ||
-                    isIdentifier() || ts.isModifier(token)) {
+                if (token === 51 || token === 23 || token === 50 || token === 52 || isIdentifier() || ts.isModifier(token)) {
                     return true;
                 }
                 if (token === 17) {
@@ -6115,8 +10845,7 @@ var ts;
         function parseYieldExpression() {
             var node = createNode(170);
             nextToken();
-            if (!scanner.hasPrecedingLineBreak() &&
-                (token === 35 || isStartOfExpression())) {
+            if (!scanner.hasPrecedingLineBreak() && (token === 35 || isStartOfExpression())) {
                 node.asteriskToken = parseOptionalToken(35);
                 node.expression = parseAssignmentExpressionOrHigher();
                 return finishNode(node);
@@ -6131,7 +10860,9 @@ var ts;
             var parameter = createNode(128, identifier.pos);
             parameter.name = identifier;
             finishNode(parameter);
-            node.parameters = [parameter];
+            node.parameters = [
+                parameter
+            ];
             node.parameters.pos = parameter.pos;
             node.parameters.end = parameter.end;
             parseExpected(32);
@@ -6143,9 +10874,7 @@ var ts;
             if (triState === 0) {
                 return undefined;
             }
-            var arrowFunction = triState === 1
-                ? parseParenthesizedArrowFunctionExpressionHead(true)
-                : tryParse(parsePossibleParenthesizedArrowFunctionExpressionHead);
+            var arrowFunction = triState === 1 ? parseParenthesizedArrowFunctionExpressionHead(true) : tryParse(parsePossibleParenthesizedArrowFunctionExpressionHead);
             if (!arrowFunction) {
                 return undefined;
             }
@@ -6367,9 +11096,7 @@ var ts;
             return expression;
         }
         function parseLeftHandSideExpressionOrHigher() {
-            var expression = token === 90
-                ? parseSuperExpression()
-                : parseMemberExpressionOrHigher();
+            var expression = token === 90 ? parseSuperExpression() : parseMemberExpressionOrHigher();
             return parseCallExpressionRest(expression);
         }
         function parseMemberExpressionOrHigher() {
@@ -6423,9 +11150,7 @@ var ts;
                 if (token === 10 || token === 11) {
                     var tagExpression = createNode(157, expression.pos);
                     tagExpression.tag = expression;
-                    tagExpression.template = token === 10
-                        ? parseLiteralNode()
-                        : parseTemplateExpression();
+                    tagExpression.template = token === 10 ? parseLiteralNode() : parseTemplateExpression();
                     expression = finishNode(tagExpression);
                     continue;
                 }
@@ -6471,9 +11196,7 @@ var ts;
             if (!parseExpected(25)) {
                 return undefined;
             }
-            return typeArguments && canFollowTypeArgumentsInExpression()
-                ? typeArguments
-                : undefined;
+            return typeArguments && canFollowTypeArgumentsInExpression() ? typeArguments : undefined;
         }
         function canFollowTypeArgumentsInExpression() {
             switch (token) {
@@ -6548,9 +11271,7 @@ var ts;
             return finishNode(node);
         }
         function parseArgumentOrArrayLiteralElement() {
-            return token === 21 ? parseSpreadElement() :
-                token === 23 ? createNode(172) :
-                    parseAssignmentExpressionOrHigher();
+            return token === 21 ? parseSpreadElement() : token === 23 ? createNode(172) : parseAssignmentExpressionOrHigher();
         }
         function parseArgumentExpression() {
             return allowInAnd(parseArgumentOrArrayLiteralElement);
@@ -6589,13 +11310,13 @@ var ts;
                 return parseMethodDeclaration(fullStart, modifiers, asteriskToken, propertyName, questionToken);
             }
             if ((token === 23 || token === 15) && tokenIsIdentifier) {
-                var shorthandDeclaration = createNode(218, fullStart);
+                var shorthandDeclaration = createNode(219, fullStart);
                 shorthandDeclaration.name = propertyName;
                 shorthandDeclaration.questionToken = questionToken;
                 return finishNode(shorthandDeclaration);
             }
             else {
-                var propertyAssignment = createNode(217, fullStart);
+                var propertyAssignment = createNode(218, fullStart);
                 propertyAssignment.name = propertyName;
                 propertyAssignment.questionToken = questionToken;
                 parseExpected(51);
@@ -6761,7 +11482,7 @@ var ts;
             return finishNode(node);
         }
         function parseCaseClause() {
-            var node = createNode(213);
+            var node = createNode(214);
             parseExpected(66);
             node.expression = allowInAnd(parseExpression);
             parseExpected(51);
@@ -6769,7 +11490,7 @@ var ts;
             return finishNode(node);
         }
         function parseDefaultClause() {
-            var node = createNode(214);
+            var node = createNode(215);
             parseExpected(72);
             parseExpected(51);
             node.statements = parseList(4, false, parseStatement);
@@ -6784,9 +11505,11 @@ var ts;
             parseExpected(16);
             node.expression = allowInAnd(parseExpression);
             parseExpected(17);
+            var caseBlock = createNode(202, scanner.getStartPos());
             parseExpected(14);
-            node.clauses = parseList(3, false, parseCaseOrDefaultClause);
+            caseBlock.clauses = parseList(3, false, parseCaseOrDefaultClause);
             parseExpected(15);
+            node.caseBlock = finishNode(caseBlock);
             return finishNode(node);
         }
         function parseThrowStatement() {
@@ -6808,7 +11531,7 @@ var ts;
             return finishNode(node);
         }
         function parseCatchClause() {
-            var result = createNode(216);
+            var result = createNode(217);
             parseExpected(67);
             if (parseExpected(16)) {
                 result.variableDeclaration = parseVariableDeclaration();
@@ -7198,11 +11921,7 @@ var ts;
             if (isIndexSignature()) {
                 return parseIndexSignatureDeclaration(modifiers);
             }
-            if (isIdentifierOrKeyword() ||
-                token === 8 ||
-                token === 7 ||
-                token === 35 ||
-                token === 18) {
+            if (isIdentifierOrKeyword() || token === 8 || token === 7 || token === 35 || token === 18) {
                 return parsePropertyOrMethodDeclaration(fullStart, modifiers);
             }
             ts.Debug.fail("Should not have attempted to parse class member declaration.");
@@ -7215,9 +11934,7 @@ var ts;
             node.typeParameters = parseTypeParameters();
             node.heritageClauses = parseHeritageClauses(true);
             if (parseExpected(14)) {
-                node.members = inGeneratorParameterContext()
-                    ? doOutsideOfYieldContext(parseClassMembers)
-                    : parseClassMembers();
+                node.members = inGeneratorParameterContext() ? doOutsideOfYieldContext(parseClassMembers) : parseClassMembers();
                 parseExpected(15);
             }
             else {
@@ -7227,9 +11944,7 @@ var ts;
         }
         function parseHeritageClauses(isClassHeritageClause) {
             if (isHeritageClause()) {
-                return isClassHeritageClause && inGeneratorParameterContext()
-                    ? doOutsideOfYieldContext(parseHeritageClausesWorker)
-                    : parseHeritageClausesWorker();
+                return isClassHeritageClause && inGeneratorParameterContext() ? doOutsideOfYieldContext(parseHeritageClausesWorker) : parseHeritageClausesWorker();
             }
             return undefined;
         }
@@ -7238,7 +11953,7 @@ var ts;
         }
         function parseHeritageClause() {
             if (token === 78 || token === 102) {
-                var node = createNode(215);
+                var node = createNode(216);
                 node.token = token;
                 nextToken();
                 node.types = parseDelimitedList(8, parseTypeReference);
@@ -7273,7 +11988,7 @@ var ts;
             return finishNode(node);
         }
         function parseEnumMember() {
-            var node = createNode(219, scanner.getStartPos());
+            var node = createNode(220, scanner.getStartPos());
             node.name = parsePropertyName();
             node.initializer = allowInAnd(parseNonParameterInitializer);
             return finishNode(node);
@@ -7308,9 +12023,7 @@ var ts;
             setModifiers(node, modifiers);
             node.flags |= flags;
             node.name = parseIdentifier();
-            node.body = parseOptional(20)
-                ? parseInternalModuleTail(getNodePos(), undefined, 1)
-                : parseModuleBlock();
+            node.body = parseOptional(20) ? parseInternalModuleTail(getNodePos(), undefined, 1) : parseModuleBlock();
             return finishNode(node);
         }
         function parseAmbientExternalModuleDeclaration(fullStart, modifiers) {
@@ -7322,21 +12035,17 @@ var ts;
         }
         function parseModuleDeclaration(fullStart, modifiers) {
             parseExpected(116);
-            return token === 8
-                ? parseAmbientExternalModuleDeclaration(fullStart, modifiers)
-                : parseInternalModuleTail(fullStart, modifiers, modifiers ? modifiers.flags : 0);
+            return token === 8 ? parseAmbientExternalModuleDeclaration(fullStart, modifiers) : parseInternalModuleTail(fullStart, modifiers, modifiers ? modifiers.flags : 0);
         }
         function isExternalModuleReference() {
-            return token === 117 &&
-                lookAhead(nextTokenIsOpenParen);
+            return token === 117 && lookAhead(nextTokenIsOpenParen);
         }
         function nextTokenIsOpenParen() {
             return nextToken() === 16;
         }
         function nextTokenIsCommaOrFromKeyword() {
             nextToken();
-            return token === 23 ||
-                token === 123;
+            return token === 23 || token === 123;
         }
         function parseImportDeclarationOrImportEqualsDeclaration(fullStart, modifiers) {
             parseExpected(84);
@@ -7345,7 +12054,7 @@ var ts;
             if (isIdentifier()) {
                 identifier = parseIdentifier();
                 if (token !== 23 && token !== 123) {
-                    var importEqualsDeclaration = createNode(202, fullStart);
+                    var importEqualsDeclaration = createNode(203, fullStart);
                     setModifiers(importEqualsDeclaration, modifiers);
                     importEqualsDeclaration.name = identifier;
                     parseExpected(52);
@@ -7354,11 +12063,9 @@ var ts;
                     return finishNode(importEqualsDeclaration);
                 }
             }
-            var importDeclaration = createNode(203, fullStart);
+            var importDeclaration = createNode(204, fullStart);
             setModifiers(importDeclaration, modifiers);
-            if (identifier ||
-                token === 35 ||
-                token === 14) {
+            if (identifier || token === 35 || token === 14) {
                 importDeclaration.importClause = parseImportClause(identifier, afterImportPos);
                 parseExpected(123);
             }
@@ -7367,23 +12074,20 @@ var ts;
             return finishNode(importDeclaration);
         }
         function parseImportClause(identifier, fullStart) {
-            var importClause = createNode(204, fullStart);
+            var importClause = createNode(205, fullStart);
             if (identifier) {
                 importClause.name = identifier;
             }
-            if (!importClause.name ||
-                parseOptional(23)) {
-                importClause.namedBindings = token === 35 ? parseNamespaceImport() : parseNamedImportsOrExports(206);
+            if (!importClause.name || parseOptional(23)) {
+                importClause.namedBindings = token === 35 ? parseNamespaceImport() : parseNamedImportsOrExports(207);
             }
             return finishNode(importClause);
         }
         function parseModuleReference() {
-            return isExternalModuleReference()
-                ? parseExternalModuleReference()
-                : parseEntityName(false);
+            return isExternalModuleReference() ? parseExternalModuleReference() : parseEntityName(false);
         }
         function parseExternalModuleReference() {
-            var node = createNode(212);
+            var node = createNode(213);
             parseExpected(117);
             parseExpected(16);
             node.expression = parseModuleSpecifier();
@@ -7398,7 +12102,7 @@ var ts;
             return result;
         }
         function parseNamespaceImport() {
-            var namespaceImport = createNode(205);
+            var namespaceImport = createNode(206);
             parseExpected(35);
             parseExpected(101);
             namespaceImport.name = parseIdentifier();
@@ -7406,14 +12110,14 @@ var ts;
         }
         function parseNamedImportsOrExports(kind) {
             var node = createNode(kind);
-            node.elements = parseBracketedList(20, kind === 206 ? parseImportSpecifier : parseExportSpecifier, 14, 15);
+            node.elements = parseBracketedList(20, kind === 207 ? parseImportSpecifier : parseExportSpecifier, 14, 15);
             return finishNode(node);
         }
         function parseExportSpecifier() {
-            return parseImportOrExportSpecifier(211);
+            return parseImportOrExportSpecifier(212);
         }
         function parseImportSpecifier() {
-            return parseImportOrExportSpecifier(207);
+            return parseImportOrExportSpecifier(208);
         }
         function parseImportOrExportSpecifier(kind) {
             var node = createNode(kind);
@@ -7439,14 +12143,14 @@ var ts;
             return finishNode(node);
         }
         function parseExportDeclaration(fullStart, modifiers) {
-            var node = createNode(209, fullStart);
+            var node = createNode(210, fullStart);
             setModifiers(node, modifiers);
             if (parseOptional(35)) {
                 parseExpected(123);
                 node.moduleSpecifier = parseModuleSpecifier();
             }
             else {
-                node.exportClause = parseNamedImportsOrExports(210);
+                node.exportClause = parseNamedImportsOrExports(211);
                 if (parseOptional(123)) {
                     node.moduleSpecifier = parseModuleSpecifier();
                 }
@@ -7455,7 +12159,7 @@ var ts;
             return finishNode(node);
         }
         function parseExportAssignment(fullStart, modifiers) {
-            var node = createNode(208, fullStart);
+            var node = createNode(209, fullStart);
             setModifiers(node, modifiers);
             if (parseOptional(52)) {
                 node.isExportEquals = true;
@@ -7510,13 +12214,11 @@ var ts;
         }
         function nextTokenCanFollowImportKeyword() {
             nextToken();
-            return isIdentifierOrKeyword() || token === 8 ||
-                token === 35 || token === 14;
+            return isIdentifierOrKeyword() || token === 8 || token === 35 || token === 14;
         }
         function nextTokenCanFollowExportKeyword() {
             nextToken();
-            return token === 52 || token === 35 ||
-                token === 14 || token === 72 || isDeclarationStart();
+            return token === 52 || token === 35 || token === 14 || token === 72 || isDeclarationStart();
         }
         function nextTokenIsDeclarationStart() {
             nextToken();
@@ -7570,9 +12272,7 @@ var ts;
             return parseSourceElementOrModuleElement();
         }
         function parseSourceElementOrModuleElement() {
-            return isDeclarationStart()
-                ? parseDeclaration()
-                : parseStatement();
+            return isDeclarationStart() ? parseDeclaration() : parseStatement();
         }
         function processReferenceComments(sourceFile) {
             var triviaScanner = ts.createScanner(sourceFile.languageVersion, false, sourceText);
@@ -7587,7 +12287,10 @@ var ts;
                 if (kind !== 2) {
                     break;
                 }
-                var range = { pos: triviaScanner.getTokenPos(), end: triviaScanner.getTextPos() };
+                var range = {
+                    pos: triviaScanner.getTokenPos(),
+                    end: triviaScanner.getTextPos()
+                };
                 var comment = sourceText.substring(range.pos, range.end);
                 var referencePathMatchResult = ts.getFileReferenceFromReferencePath(comment, range);
                 if (referencePathMatchResult) {
@@ -7618,7 +12321,10 @@ var ts;
                         var pathMatchResult = pathRegex.exec(comment);
                         var nameMatchResult = nameRegex.exec(comment);
                         if (pathMatchResult) {
-                            var amdDependency = { path: pathMatchResult[2], name: nameMatchResult ? nameMatchResult[2] : undefined };
+                            var amdDependency = {
+                                path: pathMatchResult[2],
+                                name: nameMatchResult ? nameMatchResult[2] : undefined
+                            };
                             amdDependencies.push(amdDependency);
                         }
                     }
@@ -7630,13 +12336,7 @@ var ts;
         }
         function setExternalModuleIndicator(sourceFile) {
             sourceFile.externalModuleIndicator = ts.forEach(sourceFile.statements, function (node) {
-                return node.flags & 1
-                    || node.kind === 202 && node.moduleReference.kind === 212
-                    || node.kind === 203
-                    || node.kind === 208
-                    || node.kind === 209
-                    ? node
-                    : undefined;
+                return node.flags & 1 || node.kind === 203 && node.moduleReference.kind === 213 || node.kind === 204 || node.kind === 209 || node.kind === 210 ? node : undefined;
             });
         }
     }
@@ -7690,7 +12390,7 @@ var ts;
         else if (ts.isConstEnumDeclaration(node)) {
             return 2;
         }
-        else if ((node.kind === 203 || node.kind === 202) && !(node.flags & 1)) {
+        else if ((node.kind === 204 || node.kind === 203) && !(node.flags & 1)) {
             return 0;
         }
         else if (node.kind === 201) {
@@ -7783,9 +12483,9 @@ var ts;
                     return "__new";
                 case 138:
                     return "__index";
-                case 209:
+                case 210:
                     return "__export";
-                case 208:
+                case 209:
                     return "default";
                 case 195:
                 case 196:
@@ -7804,9 +12504,7 @@ var ts;
                     if (node.name) {
                         node.name.parent = node;
                     }
-                    var message = symbol.flags & 2
-                        ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0
-                        : ts.Diagnostics.Duplicate_identifier_0;
+                    var message = symbol.flags & 2 ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 : ts.Diagnostics.Duplicate_identifier_0;
                     ts.forEach(symbol.declarations, function (declaration) {
                         file.bindDiagnostics.push(ts.createDiagnosticForNode(declaration.name || declaration, message, getDisplayName(declaration)));
                     });
@@ -7843,7 +12541,7 @@ var ts;
         function declareModuleMember(node, symbolKind, symbolExcludes) {
             var hasExportModifier = ts.getCombinedNodeFlags(node) & 1;
             if (symbolKind & 8388608) {
-                if (node.kind === 211 || (node.kind === 202 && hasExportModifier)) {
+                if (node.kind === 212 || (node.kind === 203 && hasExportModifier)) {
                     declareSymbol(container.symbol.exports, container.symbol, node, symbolKind, symbolExcludes);
                 }
                 else {
@@ -7852,9 +12550,7 @@ var ts;
             }
             else {
                 if (hasExportModifier || isAmbientContext(container)) {
-                    var exportKind = (symbolKind & 107455 ? 1048576 : 0) |
-                        (symbolKind & 793056 ? 2097152 : 0) |
-                        (symbolKind & 1536 ? 4194304 : 0);
+                    var exportKind = (symbolKind & 107455 ? 1048576 : 0) | (symbolKind & 793056 ? 2097152 : 0) | (symbolKind & 1536 ? 4194304 : 0);
                     var local = declareSymbol(container.locals, undefined, node, exportKind, symbolExcludes);
                     local.exportSymbol = declareSymbol(container.symbol.exports, container.symbol, node, symbolKind, symbolExcludes);
                     node.localSymbol = local;
@@ -7880,7 +12576,7 @@ var ts;
                 lastContainer = container;
             }
             if (isBlockScopeContainer) {
-                setBlockScopeContainer(node, (symbolKind & 255504) === 0 && node.kind !== 220);
+                setBlockScopeContainer(node, (symbolKind & 255504) === 0 && node.kind !== 221);
             }
             ts.forEachChild(node, bind);
             container = saveContainer;
@@ -7892,7 +12588,7 @@ var ts;
                 case 200:
                     declareModuleMember(node, symbolKind, symbolExcludes);
                     break;
-                case 220:
+                case 221:
                     if (ts.isExternalModule(container)) {
                         declareModuleMember(node, symbolKind, symbolExcludes);
                         break;
@@ -7970,7 +12666,7 @@ var ts;
                 case 200:
                     declareModuleMember(node, 2, 107455);
                     break;
-                case 220:
+                case 221:
                     if (ts.isExternalModule(container)) {
                         declareModuleMember(node, 2, 107455);
                         break;
@@ -8011,11 +12707,11 @@ var ts;
                 case 129:
                     bindPropertyOrMethodOrAccessor(node, 4 | (node.questionToken ? 536870912 : 0), 107455, false);
                     break;
-                case 217:
                 case 218:
+                case 219:
                     bindPropertyOrMethodOrAccessor(node, 4, 107455, false);
                     break;
-                case 219:
+                case 220:
                     bindPropertyOrMethodOrAccessor(node, 8, 107455, false);
                     break;
                 case 136:
@@ -8053,7 +12749,7 @@ var ts;
                 case 161:
                     bindAnonymousDeclaration(node, 16, "__function", true);
                     break;
-                case 216:
+                case 217:
                     bindCatchVariableDeclaration(node);
                     break;
                 case 196:
@@ -8076,13 +12772,13 @@ var ts;
                 case 200:
                     bindModuleDeclaration(node);
                     break;
-                case 202:
-                case 205:
-                case 207:
-                case 211:
+                case 203:
+                case 206:
+                case 208:
+                case 212:
                     bindDeclaration(node, 8388608, 8388608, false);
                     break;
-                case 204:
+                case 205:
                     if (node.name) {
                         bindDeclaration(node, 8388608, 8388608, false);
                     }
@@ -8090,13 +12786,13 @@ var ts;
                         bindChildren(node, 0, false);
                     }
                     break;
-                case 209:
+                case 210:
                     if (!node.exportClause) {
                         declareSymbol(container.symbol.exports, container.symbol, node, 1073741824, 0);
                     }
                     bindChildren(node, 0, false);
                     break;
-                case 208:
+                case 209:
                     if (node.expression.kind === 64) {
                         declareSymbol(container.symbol.exports, container.symbol, node, 8388608, 8388608);
                     }
@@ -8105,7 +12801,7 @@ var ts;
                     }
                     bindChildren(node, 0, false);
                     break;
-                case 220:
+                case 221:
                     if (ts.isExternalModule(node)) {
                         bindAnonymousDeclaration(node, 512, '"' + ts.removeFileExtension(node.fileName) + '"', true);
                         break;
@@ -8113,11 +12809,11 @@ var ts;
                 case 174:
                     bindChildren(node, 0, !ts.isFunctionLike(node.parent));
                     break;
-                case 216:
+                case 217:
                 case 181:
                 case 182:
                 case 183:
-                case 188:
+                case 202:
                     bindChildren(node, 0, true);
                     break;
                 default:
@@ -8134,9 +12830,7 @@ var ts;
             else {
                 bindDeclaration(node, 1, 107455, false);
             }
-            if (node.flags & 112 &&
-                node.parent.kind === 133 &&
-                node.parent.parent.kind === 196) {
+            if (node.flags & 112 && node.parent.kind === 133 && node.parent.parent.kind === 196) {
                 var classDeclaration = node.parent.parent;
                 declareSymbol(classDeclaration.symbol.members, classDeclaration.symbol, node, 4, 107455);
             }
@@ -8168,12 +12862,24 @@ var ts;
         var languageVersion = compilerOptions.target || 0;
         var emitResolver = createResolver();
         var checker = {
-            getNodeCount: function () { return ts.sum(host.getSourceFiles(), "nodeCount"); },
-            getIdentifierCount: function () { return ts.sum(host.getSourceFiles(), "identifierCount"); },
-            getSymbolCount: function () { return ts.sum(host.getSourceFiles(), "symbolCount"); },
-            getTypeCount: function () { return typeCount; },
-            isUndefinedSymbol: function (symbol) { return symbol === undefinedSymbol; },
-            isArgumentsSymbol: function (symbol) { return symbol === argumentsSymbol; },
+            getNodeCount: function () {
+                return ts.sum(host.getSourceFiles(), "nodeCount");
+            },
+            getIdentifierCount: function () {
+                return ts.sum(host.getSourceFiles(), "identifierCount");
+            },
+            getSymbolCount: function () {
+                return ts.sum(host.getSourceFiles(), "symbolCount");
+            },
+            getTypeCount: function () {
+                return typeCount;
+            },
+            isUndefinedSymbol: function (symbol) {
+                return symbol === undefinedSymbol;
+            },
+            isArgumentsSymbol: function (symbol) {
+                return symbol === argumentsSymbol;
+            },
             getDiagnostics: getDiagnostics,
             getGlobalDiagnostics: getGlobalDiagnostics,
             getTypeOfSymbolAtLocation: getTypeOfSymbolAtLocation,
@@ -8269,9 +12975,7 @@ var ts;
             return emitResolver;
         }
         function error(location, message, arg0, arg1, arg2) {
-            var diagnostic = location
-                ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2)
-                : ts.createCompilerDiagnostic(message, arg0, arg1, arg2);
+            var diagnostic = location ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2) : ts.createCompilerDiagnostic(message, arg0, arg1, arg2);
             diagnostics.add(diagnostic);
         }
         function createSymbol(flags, name) {
@@ -8357,8 +13061,7 @@ var ts;
                 recordMergedSymbol(target, source);
             }
             else {
-                var message = target.flags & 2 || source.flags & 2
-                    ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 : ts.Diagnostics.Duplicate_identifier_0;
+                var message = target.flags & 2 || source.flags & 2 ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 : ts.Diagnostics.Duplicate_identifier_0;
                 ts.forEach(source.declarations, function (node) {
                     error(node.name ? node.name : node, message, symbolToString(source));
                 });
@@ -8405,10 +13108,10 @@ var ts;
             return nodeLinks[node.id] || (nodeLinks[node.id] = {});
         }
         function getSourceFile(node) {
-            return ts.getAncestor(node, 220);
+            return ts.getAncestor(node, 221);
         }
         function isGlobalSourceFile(node) {
-            return node.kind === 220 && !ts.isExternalModule(node);
+            return node.kind === 221 && !ts.isExternalModule(node);
         }
         function getSymbol(symbols, name, meaning) {
             if (meaning && ts.hasProperty(symbols, name)) {
@@ -8449,12 +13152,12 @@ var ts;
                     }
                 }
                 switch (location.kind) {
-                    case 220:
+                    case 221:
                         if (!ts.isExternalModule(location))
                             break;
                     case 200:
                         if (result = getSymbol(getSymbolOfNode(location).exports, name, meaning & 8914931)) {
-                            if (!(result.flags & 8388608 && getDeclarationOfAliasSymbol(result).kind === 211)) {
+                            if (!(result.flags & 8388608 && getDeclarationOfAliasSymbol(result).kind === 212)) {
                                 break loop;
                             }
                             result = undefined;
@@ -8538,28 +13241,54 @@ var ts;
                     return undefined;
                 }
                 if (result.flags & 2) {
-                    var declaration = ts.forEach(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) ? d : undefined; });
-                    ts.Debug.assert(declaration !== undefined, "Block-scoped variable declaration is undefined");
-                    if (!isDefinedBefore(declaration, errorLocation)) {
-                        error(errorLocation, ts.Diagnostics.Block_scoped_variable_0_used_before_its_declaration, ts.declarationNameToString(declaration.name));
-                    }
+                    checkResolvedBlockScopedVariable(result, errorLocation);
                 }
             }
             return result;
         }
+        function checkResolvedBlockScopedVariable(result, errorLocation) {
+            ts.Debug.assert((result.flags & 2) !== 0);
+            var declaration = ts.forEach(result.declarations, function (d) {
+                return ts.isBlockOrCatchScoped(d) ? d : undefined;
+            });
+            ts.Debug.assert(declaration !== undefined, "Block-scoped variable declaration is undefined");
+            var isUsedBeforeDeclaration = !isDefinedBefore(declaration, errorLocation);
+            if (!isUsedBeforeDeclaration) {
+                var variableDeclaration = ts.getAncestor(declaration, 193);
+                var container = ts.getEnclosingBlockScopeContainer(variableDeclaration);
+                if (variableDeclaration.parent.parent.kind === 175 || variableDeclaration.parent.parent.kind === 181) {
+                    isUsedBeforeDeclaration = isSameScopeDescendentOf(errorLocation, variableDeclaration, container);
+                }
+                else if (variableDeclaration.parent.parent.kind === 183 || variableDeclaration.parent.parent.kind === 182) {
+                    var expression = variableDeclaration.parent.parent.expression;
+                    isUsedBeforeDeclaration = isSameScopeDescendentOf(errorLocation, expression, container);
+                }
+            }
+            if (isUsedBeforeDeclaration) {
+                error(errorLocation, ts.Diagnostics.Block_scoped_variable_0_used_before_its_declaration, ts.declarationNameToString(declaration.name));
+            }
+        }
+        function isSameScopeDescendentOf(initial, parent, stopAt) {
+            if (!parent) {
+                return false;
+            }
+            for (var current = initial; current && current !== stopAt && !ts.isFunctionLike(current); current = current.parent) {
+                if (current === parent) {
+                    return true;
+                }
+            }
+            return false;
+        }
         function isAliasSymbolDeclaration(node) {
-            return node.kind === 202 ||
-                node.kind === 204 && !!node.name ||
-                node.kind === 205 ||
-                node.kind === 207 ||
-                node.kind === 211 ||
-                node.kind === 208;
+            return node.kind === 203 || node.kind === 205 && !!node.name || node.kind === 206 || node.kind === 208 || node.kind === 212 || node.kind === 209;
         }
         function getDeclarationOfAliasSymbol(symbol) {
-            return ts.forEach(symbol.declarations, function (d) { return isAliasSymbolDeclaration(d) ? d : undefined; });
+            return ts.forEach(symbol.declarations, function (d) {
+                return isAliasSymbolDeclaration(d) ? d : undefined;
+            });
         }
         function getTargetOfImportEqualsDeclaration(node) {
-            if (node.moduleReference.kind === 212) {
+            if (node.moduleReference.kind === 213) {
                 var moduleSymbol = resolveExternalModuleName(node, ts.getExternalModuleImportEqualsDeclarationExpression(node));
                 var exportAssignmentSymbol = moduleSymbol && getResolvedExportAssignmentSymbol(moduleSymbol);
                 return exportAssignmentSymbol || moduleSymbol;
@@ -8597,26 +13326,24 @@ var ts;
             return getExternalModuleMember(node.parent.parent.parent, node);
         }
         function getTargetOfExportSpecifier(node) {
-            return node.parent.parent.moduleSpecifier ?
-                getExternalModuleMember(node.parent.parent, node) :
-                resolveEntityName(node.propertyName || node.name, 107455 | 793056 | 1536);
+            return node.parent.parent.moduleSpecifier ? getExternalModuleMember(node.parent.parent, node) : resolveEntityName(node.propertyName || node.name, 107455 | 793056 | 1536);
         }
         function getTargetOfExportAssignment(node) {
             return resolveEntityName(node.expression, 107455 | 793056 | 1536);
         }
         function getTargetOfImportDeclaration(node) {
             switch (node.kind) {
-                case 202:
+                case 203:
                     return getTargetOfImportEqualsDeclaration(node);
-                case 204:
-                    return getTargetOfImportClause(node);
                 case 205:
+                    return getTargetOfImportClause(node);
+                case 206:
                     return getTargetOfNamespaceImport(node);
-                case 207:
-                    return getTargetOfImportSpecifier(node);
-                case 211:
-                    return getTargetOfExportSpecifier(node);
                 case 208:
+                    return getTargetOfImportSpecifier(node);
+                case 212:
+                    return getTargetOfExportSpecifier(node);
+                case 209:
                     return getTargetOfExportAssignment(node);
             }
         }
@@ -8651,10 +13378,10 @@ var ts;
             if (!links.referenced) {
                 links.referenced = true;
                 var node = getDeclarationOfAliasSymbol(symbol);
-                if (node.kind === 208) {
+                if (node.kind === 209) {
                     checkExpressionCached(node.expression);
                 }
-                else if (node.kind === 211) {
+                else if (node.kind === 212) {
                     checkExpressionCached(node.propertyName || node.name);
                 }
                 else if (ts.isInternalModuleImportEqualsDeclaration(node)) {
@@ -8664,7 +13391,7 @@ var ts;
         }
         function getSymbolOfPartOfRightHandSideOfImportEquals(entityName, importDeclaration) {
             if (!importDeclaration) {
-                importDeclaration = ts.getAncestor(entityName, 202);
+                importDeclaration = ts.getAncestor(entityName, 203);
                 ts.Debug.assert(importDeclaration !== undefined);
             }
             if (entityName.kind === 64 && isRightSideOfQualifiedNameOrPropertyAccess(entityName)) {
@@ -8674,7 +13401,7 @@ var ts;
                 return resolveEntityName(entityName, 1536);
             }
             else {
-                ts.Debug.assert(entityName.parent.kind === 202);
+                ts.Debug.assert(entityName.parent.kind === 203);
                 return resolveEntityName(entityName, 107455 | 793056 | 1536);
             }
         }
@@ -8814,9 +13541,7 @@ var ts;
             return getMergedSymbol(symbol.parent);
         }
         function getExportSymbolOfValueSymbolIfExported(symbol) {
-            return symbol && (symbol.flags & 1048576) !== 0
-                ? getMergedSymbol(symbol.exportSymbol)
-                : symbol;
+            return symbol && (symbol.flags & 1048576) !== 0 ? getMergedSymbol(symbol.exportSymbol) : symbol;
         }
         function symbolIsValue(symbol) {
             if (symbol.flags & 16777216) {
@@ -8855,10 +13580,7 @@ var ts;
             return type;
         }
         function isReservedMemberName(name) {
-            return name.charCodeAt(0) === 95 &&
-                name.charCodeAt(1) === 95 &&
-                name.charCodeAt(2) !== 95 &&
-                name.charCodeAt(2) !== 64;
+            return name.charCodeAt(0) === 95 && name.charCodeAt(1) === 95 && name.charCodeAt(2) !== 95 && name.charCodeAt(2) !== 64;
         }
         function getNamedMembers(members) {
             var result;
@@ -8899,7 +13621,7 @@ var ts;
                     }
                 }
                 switch (location.kind) {
-                    case 220:
+                    case 221:
                         if (!ts.isExternalModule(location)) {
                             break;
                         }
@@ -8932,24 +13654,28 @@ var ts;
                 }
                 function isAccessible(symbolFromSymbolTable, resolvedAliasSymbol) {
                     if (symbol === (resolvedAliasSymbol || symbolFromSymbolTable)) {
-                        return !ts.forEach(symbolFromSymbolTable.declarations, hasExternalModuleSymbol) &&
-                            canQualifySymbol(symbolFromSymbolTable, meaning);
+                        return !ts.forEach(symbolFromSymbolTable.declarations, hasExternalModuleSymbol) && canQualifySymbol(symbolFromSymbolTable, meaning);
                     }
                 }
                 if (isAccessible(ts.lookUp(symbols, symbol.name))) {
-                    return [symbol];
+                    return [
+                        symbol
+                    ];
                 }
                 return ts.forEachValue(symbols, function (symbolFromSymbolTable) {
                     if (symbolFromSymbolTable.flags & 8388608) {
-                        if (!useOnlyExternalAliasing ||
-                            ts.forEach(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration)) {
+                        if (!useOnlyExternalAliasing || ts.forEach(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration)) {
                             var resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable);
                             if (isAccessible(symbolFromSymbolTable, resolveAlias(symbolFromSymbolTable))) {
-                                return [symbolFromSymbolTable];
+                                return [
+                                    symbolFromSymbolTable
+                                ];
                             }
                             var accessibleSymbolsFromExports = resolvedImportedSymbol.exports ? getAccessibleSymbolChainFromSymbolTable(resolvedImportedSymbol.exports) : undefined;
                             if (accessibleSymbolsFromExports && canQualifySymbol(symbolFromSymbolTable, getQualifiedLeftMeaning(meaning))) {
-                                return [symbolFromSymbolTable].concat(accessibleSymbolsFromExports);
+                                return [
+                                    symbolFromSymbolTable
+                                ].concat(accessibleSymbolsFromExports);
                             }
                         }
                     }
@@ -9014,7 +13740,9 @@ var ts;
                     errorSymbolName: symbolToString(initialSymbol, enclosingDeclaration, meaning)
                 };
             }
-            return { accessibility: 0 };
+            return {
+                accessibility: 0
+            };
             function getExternalModuleContainer(declaration) {
                 for (; declaration; declaration = declaration.parent) {
                     if (hasExternalModuleSymbol(declaration)) {
@@ -9024,20 +13752,22 @@ var ts;
             }
         }
         function hasExternalModuleSymbol(declaration) {
-            return (declaration.kind === 200 && declaration.name.kind === 8) ||
-                (declaration.kind === 220 && ts.isExternalModule(declaration));
+            return (declaration.kind === 200 && declaration.name.kind === 8) || (declaration.kind === 221 && ts.isExternalModule(declaration));
         }
         function hasVisibleDeclarations(symbol) {
             var aliasesToMakeVisible;
-            if (ts.forEach(symbol.declarations, function (declaration) { return !getIsDeclarationVisible(declaration); })) {
+            if (ts.forEach(symbol.declarations, function (declaration) {
+                return !getIsDeclarationVisible(declaration);
+            })) {
                 return undefined;
             }
-            return { accessibility: 0, aliasesToMakeVisible: aliasesToMakeVisible };
+            return {
+                accessibility: 0,
+                aliasesToMakeVisible: aliasesToMakeVisible
+            };
             function getIsDeclarationVisible(declaration) {
                 if (!isDeclarationVisible(declaration)) {
-                    if (declaration.kind === 202 &&
-                        !(declaration.flags & 1) &&
-                        isDeclarationVisible(declaration.parent)) {
+                    if (declaration.kind === 203 && !(declaration.flags & 1) && isDeclarationVisible(declaration.parent)) {
                         getNodeLinks(declaration).isVisible = true;
                         if (aliasesToMakeVisible) {
                             if (!ts.contains(aliasesToMakeVisible, declaration)) {
@@ -9045,7 +13775,9 @@ var ts;
                             }
                         }
                         else {
-                            aliasesToMakeVisible = [declaration];
+                            aliasesToMakeVisible = [
+                                declaration
+                            ];
                         }
                         return true;
                     }
@@ -9059,8 +13791,7 @@ var ts;
             if (entityName.parent.kind === 142) {
                 meaning = 107455 | 1048576;
             }
-            else if (entityName.kind === 125 ||
-                entityName.parent.kind === 202) {
+            else if (entityName.kind === 125 || entityName.parent.kind === 203) {
                 meaning = 1536;
             }
             else {
@@ -9146,8 +13877,7 @@ var ts;
                 function walkSymbol(symbol, meaning) {
                     if (symbol) {
                         var accessibleSymbolChain = getAccessibleSymbolChain(symbol, enclosingDeclaration, meaning, !!(flags & 2));
-                        if (!accessibleSymbolChain ||
-                            needsQualification(accessibleSymbolChain[0], enclosingDeclaration, accessibleSymbolChain.length === 1 ? meaning : getQualifiedLeftMeaning(meaning))) {
+                        if (!accessibleSymbolChain || needsQualification(accessibleSymbolChain[0], enclosingDeclaration, accessibleSymbolChain.length === 1 ? meaning : getQualifiedLeftMeaning(meaning))) {
                             walkSymbol(getParentOfSymbol(accessibleSymbolChain ? accessibleSymbolChain[0] : symbol), getQualifiedLeftMeaning(meaning));
                         }
                         if (accessibleSymbolChain) {
@@ -9179,8 +13909,7 @@ var ts;
                 return writeType(type, globalFlags);
                 function writeType(type, flags) {
                     if (type.flags & 1048703) {
-                        writer.writeKeyword(!(globalFlags & 16) &&
-                            (type.flags & 1) ? "any" : type.intrinsicName);
+                        writer.writeKeyword(!(globalFlags & 16) && (type.flags & 1) ? "any" : type.intrinsicName);
                     }
                     else if (type.flags & 4096) {
                         writeTypeReference(type, flags);
@@ -9273,16 +14002,14 @@ var ts;
                     }
                     function shouldWriteTypeOfFunctionSymbol() {
                         if (type.symbol) {
-                            var isStaticMethodSymbol = !!(type.symbol.flags & 8192 &&
-                                ts.forEach(type.symbol.declarations, function (declaration) { return declaration.flags & 128; }));
-                            var isNonLocalFunctionSymbol = !!(type.symbol.flags & 16) &&
-                                (type.symbol.parent ||
-                                    ts.forEach(type.symbol.declarations, function (declaration) {
-                                        return declaration.parent.kind === 220 || declaration.parent.kind === 201;
-                                    }));
+                            var isStaticMethodSymbol = !!(type.symbol.flags & 8192 && ts.forEach(type.symbol.declarations, function (declaration) {
+                                return declaration.flags & 128;
+                            }));
+                            var isNonLocalFunctionSymbol = !!(type.symbol.flags & 16) && (type.symbol.parent || ts.forEach(type.symbol.declarations, function (declaration) {
+                                return declaration.parent.kind === 221 || declaration.parent.kind === 201;
+                            }));
                             if (isStaticMethodSymbol || isNonLocalFunctionSymbol) {
-                                return !!(flags & 2) ||
-                                    (typeStack && ts.contains(typeStack, type));
+                                return !!(flags & 2) || (typeStack && ts.contains(typeStack, type));
                             }
                         }
                     }
@@ -9512,7 +14239,7 @@ var ts;
                             return node;
                         }
                     }
-                    else if (node.kind === 220) {
+                    else if (node.kind === 221) {
                         return ts.isExternalModule(node) ? node : undefined;
                     }
                 }
@@ -9562,10 +14289,9 @@ var ts;
                     case 198:
                     case 195:
                     case 199:
-                    case 202:
+                    case 203:
                         var parent = getDeclarationContainer(node);
-                        if (!(ts.getCombinedNodeFlags(node) & 1) &&
-                            !(node.kind !== 202 && parent.kind !== 220 && ts.isInAmbientContext(parent))) {
+                        if (!(ts.getCombinedNodeFlags(node) & 1) && !(node.kind !== 203 && parent.kind !== 221 && ts.isInAmbientContext(parent))) {
                             return isGlobalSourceFile(parent) || isUsedInExportAssignment(node);
                         }
                         return isDeclarationVisible(parent);
@@ -9594,7 +14320,7 @@ var ts;
                     case 147:
                         return isDeclarationVisible(node.parent);
                     case 127:
-                    case 220:
+                    case 221:
                         return true;
                     default:
                         ts.Debug.fail("isDeclarationVisible unknown: SyntaxKind: " + node.kind);
@@ -9620,7 +14346,9 @@ var ts;
         }
         function getTypeOfPrototypeProperty(prototype) {
             var classType = getDeclaredTypeOfSymbol(prototype.parent);
-            return classType.typeParameters ? createTypeReference(classType, ts.map(classType.typeParameters, function (_) { return anyType; })) : classType;
+            return classType.typeParameters ? createTypeReference(classType, ts.map(classType.typeParameters, function (_) {
+                return anyType;
+            })) : classType;
         }
         function getTypeOfPropertyOfType(type, name) {
             var prop = getPropertyOfType(type, name);
@@ -9640,9 +14368,7 @@ var ts;
             }
             if (pattern.kind === 148) {
                 var name = declaration.propertyName || declaration.name;
-                var type = getTypeOfPropertyOfType(parentType, name.text) ||
-                    isNumericLiteralName(name.text) && getIndexTypeOfType(parentType, 1) ||
-                    getIndexTypeOfType(parentType, 0);
+                var type = getTypeOfPropertyOfType(parentType, name.text) || isNumericLiteralName(name.text) && getIndexTypeOfType(parentType, 1) || getIndexTypeOfType(parentType, 0);
                 if (!type) {
                     error(name, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(parentType), ts.declarationNameToString(name));
                     return unknownType;
@@ -9657,7 +14383,12 @@ var ts;
                     var propName = "" + ts.indexOf(pattern.elements, declaration);
                     var type = isTupleLikeType(parentType) ? getTypeOfPropertyOfType(parentType, propName) : getIndexTypeOfType(parentType, 1);
                     if (!type) {
-                        error(declaration, ts.Diagnostics.Type_0_has_no_property_1, typeToString(parentType), propName);
+                        if (isTupleType(parentType)) {
+                            error(declaration, ts.Diagnostics.Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2, typeToString(parentType), parentType.elementTypes.length, pattern.elements.length);
+                        }
+                        else {
+                            error(declaration, ts.Diagnostics.Type_0_has_no_property_1, typeToString(parentType), propName);
+                        }
                         return unknownType;
                     }
                 }
@@ -9672,7 +14403,7 @@ var ts;
                 return anyType;
             }
             if (declaration.parent.parent.kind === 183) {
-                return getTypeForVariableDeclarationInForOfStatement(declaration.parent.parent);
+                return checkRightHandSideOfForOf(declaration.parent.parent.expression) || anyType;
             }
             if (ts.isBindingPattern(declaration.parent)) {
                 return getTypeForBindingElement(declaration);
@@ -9696,7 +14427,7 @@ var ts;
             if (declaration.initializer) {
                 return checkExpressionCached(declaration.initializer);
             }
-            if (declaration.kind === 218) {
+            if (declaration.kind === 219) {
                 return checkIdentifier(declaration.name);
             }
             return undefined;
@@ -9733,9 +14464,7 @@ var ts;
             return !elementTypes.length ? anyArrayType : hasSpreadElement ? createArrayType(getUnionType(elementTypes)) : createTupleType(elementTypes);
         }
         function getTypeFromBindingPattern(pattern) {
-            return pattern.kind === 148
-                ? getTypeFromObjectBindingPattern(pattern)
-                : getTypeFromArrayBindingPattern(pattern);
+            return pattern.kind === 148 ? getTypeFromObjectBindingPattern(pattern) : getTypeFromArrayBindingPattern(pattern);
         }
         function getWidenedTypeForVariableLikeDeclaration(declaration, reportErrors) {
             var type = getTypeForVariableLikeDeclaration(declaration);
@@ -9743,7 +14472,7 @@ var ts;
                 if (reportErrors) {
                     reportErrorsFromWidening(declaration, type);
                 }
-                return declaration.kind !== 217 ? getWidenedType(type) : type;
+                return declaration.kind !== 218 ? getWidenedType(type) : type;
             }
             if (ts.isBindingPattern(declaration.name)) {
                 return getTypeFromBindingPattern(declaration.name);
@@ -9764,10 +14493,10 @@ var ts;
                     return links.type = getTypeOfPrototypeProperty(symbol);
                 }
                 var declaration = symbol.valueDeclaration;
-                if (declaration.parent.kind === 216) {
+                if (declaration.parent.kind === 217) {
                     return links.type = anyType;
                 }
-                if (declaration.kind === 208) {
+                if (declaration.kind === 209) {
                     return links.type = checkExpression(declaration.expression);
                 }
                 links.type = resolvingType;
@@ -9779,9 +14508,7 @@ var ts;
             else if (links.type === resolvingType) {
                 links.type = anyType;
                 if (compilerOptions.noImplicitAny) {
-                    var diagnostic = symbol.valueDeclaration.type ?
-                        ts.Diagnostics._0_implicitly_has_type_any_because_it_is_referenced_directly_or_indirectly_in_its_own_type_annotation :
-                        ts.Diagnostics._0_implicitly_has_type_any_because_it_is_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer;
+                    var diagnostic = symbol.valueDeclaration.type ? ts.Diagnostics._0_implicitly_has_type_any_because_it_is_referenced_directly_or_indirectly_in_its_own_type_annotation : ts.Diagnostics._0_implicitly_has_type_any_because_it_is_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer;
                     error(symbol.valueDeclaration, diagnostic, symbolToString(symbol));
                 }
             }
@@ -9915,7 +14642,9 @@ var ts;
                         ts.forEach(declaration.typeParameters, function (node) {
                             var tp = getDeclaredTypeOfTypeParameter(getSymbolOfNode(node));
                             if (!result) {
-                                result = [tp];
+                                result = [
+                                    tp
+                                ];
                             }
                             else if (!ts.contains(result, tp)) {
                                 result.push(tp);
@@ -10161,14 +14890,15 @@ var ts;
                 var baseType = classType.baseTypes[0];
                 var baseSignatures = getSignaturesOfType(getTypeOfSymbol(baseType.symbol), 1);
                 return ts.map(baseSignatures, function (baseSignature) {
-                    var signature = baseType.flags & 4096 ?
-                        getSignatureInstantiation(baseSignature, baseType.typeArguments) : cloneSignature(baseSignature);
+                    var signature = baseType.flags & 4096 ? getSignatureInstantiation(baseSignature, baseType.typeArguments) : cloneSignature(baseSignature);
                     signature.typeParameters = classType.typeParameters;
                     signature.resolvedReturnType = classType;
                     return signature;
                 });
             }
-            return [createSignature(undefined, classType.typeParameters, emptyArray, classType, 0, false, false)];
+            return [
+                createSignature(undefined, classType.typeParameters, emptyArray, classType, 0, false, false)
+            ];
         }
         function createTupleTypeMemberSymbols(memberTypes) {
             var members = {};
@@ -10197,7 +14927,9 @@ var ts;
             return true;
         }
         function getUnionSignatures(types, kind) {
-            var signatureLists = ts.map(types, function (t) { return getSignaturesOfType(t, kind); });
+            var signatureLists = ts.map(types, function (t) {
+                return getSignaturesOfType(t, kind);
+            });
             var signatures = signatureLists[0];
             for (var i = 0; i < signatures.length; i++) {
                 if (signatures[i].typeParameters) {
@@ -10213,7 +14945,9 @@ var ts;
             for (var i = 0; i < result.length; i++) {
                 var s = result[i];
                 s.resolvedReturnType = undefined;
-                s.unionSignatures = ts.map(signatureLists, function (signatures) { return signatures[i]; });
+                s.unionSignatures = ts.map(signatureLists, function (signatures) {
+                    return signatures[i];
+                });
             }
             return result;
         }
@@ -10357,7 +15091,9 @@ var ts;
                         return undefined;
                     }
                     if (!props) {
-                        props = [prop];
+                        props = [
+                            prop
+                        ];
                     }
                     else {
                         props.push(prop);
@@ -10457,8 +15193,7 @@ var ts;
             var links = getNodeLinks(declaration);
             if (!links.resolvedSignature) {
                 var classType = declaration.kind === 133 ? getDeclaredTypeOfClass(declaration.parent.symbol) : undefined;
-                var typeParameters = classType ? classType.typeParameters :
-                    declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) : undefined;
+                var typeParameters = classType ? classType.typeParameters : declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) : undefined;
                 var parameters = [];
                 var hasStringLiterals = false;
                 var minArgumentCount = -1;
@@ -10589,8 +15324,12 @@ var ts;
                 var type = createObjectType(32768 | 65536);
                 type.members = emptySymbols;
                 type.properties = emptyArray;
-                type.callSignatures = !isConstructor ? [signature] : emptyArray;
-                type.constructSignatures = isConstructor ? [signature] : emptyArray;
+                type.callSignatures = !isConstructor ? [
+                    signature
+                ] : emptyArray;
+                type.constructSignatures = isConstructor ? [
+                    signature
+                ] : emptyArray;
                 signature.isolatedSignatureType = type;
             }
             return signature.isolatedSignatureType;
@@ -10617,9 +15356,7 @@ var ts;
         }
         function getIndexTypeOfSymbol(symbol, kind) {
             var declaration = getIndexDeclarationOfSymbol(symbol, kind);
-            return declaration
-                ? declaration.type ? getTypeFromTypeNode(declaration.type) : anyType
-                : undefined;
+            return declaration ? declaration.type ? getTypeFromTypeNode(declaration.type) : anyType : undefined;
         }
         function getConstraintOfTypeParameter(type) {
             if (!type.constraint) {
@@ -10673,7 +15410,9 @@ var ts;
                 return links.isIllegalTypeReferenceInConstraint;
             }
             var currentNode = typeReferenceNode;
-            while (!ts.forEach(typeParameterSymbol.declarations, function (d) { return d.parent === currentNode.parent; })) {
+            while (!ts.forEach(typeParameterSymbol.declarations, function (d) {
+                return d.parent === currentNode.parent;
+            })) {
                 currentNode = currentNode.parent;
             }
             links.isIllegalTypeReferenceInConstraint = currentNode.kind === 127;
@@ -10687,7 +15426,9 @@ var ts;
                     if (links.isIllegalTypeReferenceInConstraint === undefined) {
                         var symbol = resolveName(typeParameter, n.typeName.text, 793056, undefined, undefined);
                         if (symbol && (symbol.flags & 262144)) {
-                            links.isIllegalTypeReferenceInConstraint = ts.forEach(symbol.declarations, function (d) { return d.parent == typeParameter.parent; });
+                            links.isIllegalTypeReferenceInConstraint = ts.forEach(symbol.declarations, function (d) {
+                                return d.parent == typeParameter.parent;
+                            });
                         }
                     }
                     if (links.isIllegalTypeReferenceInConstraint) {
@@ -10786,7 +15527,9 @@ var ts;
         }
         function createArrayType(elementType) {
             var arrayType = globalArrayType || getDeclaredTypeOfSymbol(globalArraySymbol);
-            return arrayType !== emptyObjectType ? createTypeReference(arrayType, [elementType]) : emptyObjectType;
+            return arrayType !== emptyObjectType ? createTypeReference(arrayType, [
+                elementType
+            ]) : emptyObjectType;
         }
         function getTypeFromArrayTypeNode(node) {
             var links = getNodeLinks(node);
@@ -10972,15 +15715,21 @@ var ts;
             return items;
         }
         function createUnaryTypeMapper(source, target) {
-            return function (t) { return t === source ? target : t; };
+            return function (t) {
+                return t === source ? target : t;
+            };
         }
         function createBinaryTypeMapper(source1, target1, source2, target2) {
-            return function (t) { return t === source1 ? target1 : t === source2 ? target2 : t; };
+            return function (t) {
+                return t === source1 ? target1 : t === source2 ? target2 : t;
+            };
         }
         function createTypeMapper(sources, targets) {
             switch (sources.length) {
-                case 1: return createUnaryTypeMapper(sources[0], targets[0]);
-                case 2: return createBinaryTypeMapper(sources[0], targets[0], sources[1], targets[1]);
+                case 1:
+                    return createUnaryTypeMapper(sources[0], targets[0]);
+                case 2:
+                    return createBinaryTypeMapper(sources[0], targets[0], sources[1], targets[1]);
             }
             return function (t) {
                 for (var i = 0; i < sources.length; i++) {
@@ -10991,15 +15740,21 @@ var ts;
             };
         }
         function createUnaryTypeEraser(source) {
-            return function (t) { return t === source ? anyType : t; };
+            return function (t) {
+                return t === source ? anyType : t;
+            };
         }
         function createBinaryTypeEraser(source1, source2) {
-            return function (t) { return t === source1 || t === source2 ? anyType : t; };
+            return function (t) {
+                return t === source1 || t === source2 ? anyType : t;
+            };
         }
         function createTypeEraser(sources) {
             switch (sources.length) {
-                case 1: return createUnaryTypeEraser(sources[0]);
-                case 2: return createBinaryTypeEraser(sources[0], sources[1]);
+                case 1:
+                    return createUnaryTypeEraser(sources[0]);
+                case 2:
+                    return createBinaryTypeEraser(sources[0], sources[1]);
             }
             return function (t) {
                 for (var i = 0; i < sources.length; i++) {
@@ -11023,7 +15778,9 @@ var ts;
             return type;
         }
         function combineTypeMappers(mapper1, mapper2) {
-            return function (t) { return mapper2(mapper1(t)); };
+            return function (t) {
+                return mapper2(mapper1(t));
+            };
         }
         function instantiateTypeParameter(typeParameter, mapper) {
             var result = createType(512);
@@ -11083,8 +15840,7 @@ var ts;
                     return mapper(type);
                 }
                 if (type.flags & 32768) {
-                    return type.symbol && type.symbol.flags & (16 | 8192 | 2048 | 4096) ?
-                        instantiateAnonymousType(type, mapper) : type;
+                    return type.symbol && type.symbol.flags & (16 | 8192 | 2048 | 4096) ? instantiateAnonymousType(type, mapper) : type;
                 }
                 if (type.flags & 4096) {
                     return createTypeReference(type.target, instantiateList(type.typeArguments, mapper, instantiateType));
@@ -11109,12 +15865,10 @@ var ts;
                 case 151:
                     return ts.forEach(node.elements, isContextSensitive);
                 case 168:
-                    return isContextSensitive(node.whenTrue) ||
-                        isContextSensitive(node.whenFalse);
+                    return isContextSensitive(node.whenTrue) || isContextSensitive(node.whenFalse);
                 case 167:
-                    return node.operatorToken.kind === 49 &&
-                        (isContextSensitive(node.left) || isContextSensitive(node.right));
-                case 217:
+                    return node.operatorToken.kind === 49 && (isContextSensitive(node.left) || isContextSensitive(node.right));
+                case 218:
                     return isContextSensitive(node.initializer);
                 case 132:
                 case 131:
@@ -11125,7 +15879,9 @@ var ts;
             return false;
         }
         function isContextSensitiveFunctionLikeDeclaration(node) {
-            return !node.typeParameters && node.parameters.length && !ts.forEach(node.parameters, function (p) { return p.type; });
+            return !node.typeParameters && node.parameters.length && !ts.forEach(node.parameters, function (p) {
+                return p.type;
+            });
         }
         function getTypeWithoutConstructors(type) {
             if (type.flags & 48128) {
@@ -11264,8 +16020,7 @@ var ts;
                     }
                     var reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo;
                     var sourceOrApparentType = relation === identityRelation ? source : getApparentType(source);
-                    if (sourceOrApparentType.flags & 48128 && target.flags & 48128 &&
-                        (result = objectTypeRelatedTo(sourceOrApparentType, target, reportStructuralErrors, elaborateErrors))) {
+                    if (sourceOrApparentType.flags & 48128 && target.flags & 48128 && (result = objectTypeRelatedTo(sourceOrApparentType, target, reportStructuralErrors, elaborateErrors))) {
                         errorInfo = saveErrorInfo;
                         return result;
                     }
@@ -11722,9 +16477,7 @@ var ts;
             if (source === target) {
                 return -1;
             }
-            if (source.parameters.length !== target.parameters.length ||
-                source.minArgumentCount !== target.minArgumentCount ||
-                source.hasRestParameter !== target.hasRestParameter) {
+            if (source.parameters.length !== target.parameters.length || source.minArgumentCount !== target.minArgumentCount || source.hasRestParameter !== target.hasRestParameter) {
                 return 0;
             }
             var result = -1;
@@ -11767,7 +16520,9 @@ var ts;
             return true;
         }
         function getCommonSupertype(types) {
-            return ts.forEach(types, function (t) { return isSupertypeOfEach(t, types) ? t : undefined; });
+            return ts.forEach(types, function (t) {
+                return isSupertypeOfEach(t, types) ? t : undefined;
+            });
         }
         function reportNoCommonSupertypeError(types, errorLocation, errorMessageChainHead) {
             var bestSupertype;
@@ -11804,6 +16559,9 @@ var ts;
         function isTupleLikeType(type) {
             return !!getPropertyOfType(type, "0");
         }
+        function isTupleType(type) {
+            return (type.flags & 8192) && !!type.elementTypes;
+        }
         function getWidenedTypeOfObjectLiteral(type) {
             var properties = getPropertiesOfObjectType(type);
             var members = {};
@@ -11883,9 +16641,7 @@ var ts;
                     var diagnostic = ts.Diagnostics.Member_0_implicitly_has_an_1_type;
                     break;
                 case 128:
-                    var diagnostic = declaration.dotDotDotToken ?
-                        ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type :
-                        ts.Diagnostics.Parameter_0_implicitly_has_an_1_type;
+                    var diagnostic = declaration.dotDotDotToken ? ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type : ts.Diagnostics.Parameter_0_implicitly_has_an_1_type;
                     break;
                 case 195:
                 case 132:
@@ -11941,7 +16697,10 @@ var ts;
         function createInferenceContext(typeParameters, inferUnionTypes) {
             var inferences = [];
             for (var i = 0; i < typeParameters.length; i++) {
-                inferences.push({ primary: undefined, secondary: undefined });
+                inferences.push({
+                    primary: undefined,
+                    secondary: undefined
+                });
             }
             return {
                 typeParameters: typeParameters,
@@ -11986,9 +16745,7 @@ var ts;
                     for (var i = 0; i < typeParameters.length; i++) {
                         if (target === typeParameters[i]) {
                             var inferences = context.inferences[i];
-                            var candidates = inferiority ?
-                                inferences.secondary || (inferences.secondary = []) :
-                                inferences.primary || (inferences.primary = []);
+                            var candidates = inferiority ? inferences.secondary || (inferences.secondary = []) : inferences.primary || (inferences.primary = []);
                             if (!ts.contains(candidates, source))
                                 candidates.push(source);
                             break;
@@ -12028,8 +16785,7 @@ var ts;
                         inferFromTypes(sourceTypes[i], target);
                     }
                 }
-                else if (source.flags & 48128 && (target.flags & (4096 | 8192) ||
-                    (target.flags & 32768) && target.symbol && target.symbol.flags & (8192 | 2048))) {
+                else if (source.flags & 48128 && (target.flags & (4096 | 8192) || (target.flags & 32768) && target.symbol && target.symbol.flags & (8192 | 2048))) {
                     if (!isInProcess(source, target) && isWithinDepthLimit(source, sourceStack) && isWithinDepthLimit(target, targetStack)) {
                         if (depth === 0) {
                             sourceStack = [];
@@ -12136,16 +16892,23 @@ var ts;
             }
             ts.Debug.fail("should not get here");
         }
-        function removeTypesFromUnionType(type, typeKind, isOfTypeKind) {
+        function removeTypesFromUnionType(type, typeKind, isOfTypeKind, allowEmptyUnionResult) {
             if (type.flags & 16384) {
                 var types = type.types;
-                if (ts.forEach(types, function (t) { return !!(t.flags & typeKind) === isOfTypeKind; })) {
-                    var narrowedType = getUnionType(ts.filter(types, function (t) { return !(t.flags & typeKind) === isOfTypeKind; }));
-                    if (narrowedType !== emptyObjectType) {
+                if (ts.forEach(types, function (t) {
+                    return !!(t.flags & typeKind) === isOfTypeKind;
+                })) {
+                    var narrowedType = getUnionType(ts.filter(types, function (t) {
+                        return !(t.flags & typeKind) === isOfTypeKind;
+                    }));
+                    if (allowEmptyUnionResult || narrowedType !== emptyObjectType) {
                         return narrowedType;
                     }
                 }
             }
+            else if (allowEmptyUnionResult && !!(type.flags & typeKind) === isOfTypeKind) {
+                return getUnionType(emptyArray);
+            }
             return type;
         }
         function hasInitializer(node) {
@@ -12217,12 +16980,12 @@ var ts;
                     case 186:
                     case 187:
                     case 188:
-                    case 213:
                     case 214:
+                    case 215:
                     case 189:
                     case 190:
                     case 191:
-                    case 216:
+                    case 217:
                         return ts.forEachChild(node, isAssignedIn);
                 }
                 return false;
@@ -12231,12 +16994,13 @@ var ts;
         function resolveLocation(node) {
             var containerNodes = [];
             for (var parent = node.parent; parent; parent = parent.parent) {
-                if ((ts.isExpression(parent) || ts.isObjectLiteralMethod(node)) &&
-                    isContextSensitive(parent)) {
+                if ((ts.isExpression(parent) || ts.isObjectLiteralMethod(node)) && isContextSensitive(parent)) {
                     containerNodes.unshift(parent);
                 }
             }
-            ts.forEach(containerNodes, function (node) { getTypeOfNode(node); });
+            ts.forEach(containerNodes, function (node) {
+                getTypeOfNode(node);
+            });
         }
         function getSymbolAtLocation(node) {
             resolveLocation(node);
@@ -12278,7 +17042,7 @@ var ts;
                                 }
                             }
                             break;
-                        case 220:
+                        case 221:
                         case 200:
                         case 195:
                         case 132:
@@ -12312,16 +17076,16 @@ var ts;
                 }
                 if (assumeTrue) {
                     if (!typeInfo) {
-                        return removeTypesFromUnionType(type, 258 | 132 | 8 | 1048576, true);
+                        return removeTypesFromUnionType(type, 258 | 132 | 8 | 1048576, true, false);
                     }
                     if (isTypeSubtypeOf(typeInfo.type, type)) {
                         return typeInfo.type;
                     }
-                    return removeTypesFromUnionType(type, typeInfo.flags, false);
+                    return removeTypesFromUnionType(type, typeInfo.flags, false, false);
                 }
                 else {
                     if (typeInfo) {
-                        return removeTypesFromUnionType(type, typeInfo.flags, true);
+                        return removeTypesFromUnionType(type, typeInfo.flags, true, false);
                     }
                     return type;
                 }
@@ -12365,7 +17129,9 @@ var ts;
                     return targetType;
                 }
                 if (type.flags & 16384) {
-                    return getUnionType(ts.filter(type.types, function (t) { return isTypeSubtypeOf(t, targetType); }));
+                    return getUnionType(ts.filter(type.types, function (t) {
+                        return isTypeSubtypeOf(t, targetType);
+                    }));
                 }
                 return type;
             }
@@ -12421,9 +17187,7 @@ var ts;
             return false;
         }
         function checkBlockScopedBindingCapturedInLoop(node, symbol) {
-            if (languageVersion >= 2 ||
-                (symbol.flags & 2) === 0 ||
-                symbol.valueDeclaration.parent.kind === 216) {
+            if (languageVersion >= 2 || (symbol.flags & 2) === 0 || symbol.valueDeclaration.parent.kind === 217) {
                 return;
             }
             var container = symbol.valueDeclaration;
@@ -12530,21 +17294,10 @@ var ts;
                     }
                     if (container && container.parent && container.parent.kind === 196) {
                         if (container.flags & 128) {
-                            canUseSuperExpression =
-                                container.kind === 132 ||
-                                    container.kind === 131 ||
-                                    container.kind === 134 ||
-                                    container.kind === 135;
+                            canUseSuperExpression = container.kind === 132 || container.kind === 131 || container.kind === 134 || container.kind === 135;
                         }
                         else {
-                            canUseSuperExpression =
-                                container.kind === 132 ||
-                                    container.kind === 131 ||
-                                    container.kind === 134 ||
-                                    container.kind === 135 ||
-                                    container.kind === 130 ||
-                                    container.kind === 129 ||
-                                    container.kind === 133;
+                            canUseSuperExpression = container.kind === 132 || container.kind === 131 || container.kind === 134 || container.kind === 135 || container.kind === 130 || container.kind === 129 || container.kind === 133;
                         }
                     }
                 }
@@ -12591,8 +17344,7 @@ var ts;
                         if (indexOfParameter < len) {
                             return getTypeAtPosition(contextualSignature, indexOfParameter);
                         }
-                        if (indexOfParameter === (func.parameters.length - 1) &&
-                            funcHasRestParameters && contextualSignature.hasRestParameter && func.parameters.length >= contextualSignature.parameters.length) {
+                        if (indexOfParameter === (func.parameters.length - 1) && funcHasRestParameters && contextualSignature.hasRestParameter && func.parameters.length >= contextualSignature.parameters.length) {
                             return getTypeOfSymbol(contextualSignature.parameters[contextualSignature.parameters.length - 1]);
                         }
                     }
@@ -12677,7 +17429,10 @@ var ts;
                         mappedType = t;
                     }
                     else if (!mappedTypes) {
-                        mappedTypes = [mappedType, t];
+                        mappedTypes = [
+                            mappedType,
+                            t
+                        ];
                     }
                     else {
                         mappedTypes.push(t);
@@ -12693,13 +17448,17 @@ var ts;
             });
         }
         function getIndexTypeOfContextualType(type, kind) {
-            return applyToContextualType(type, function (t) { return getIndexTypeOfObjectOrUnionType(t, kind); });
+            return applyToContextualType(type, function (t) {
+                return getIndexTypeOfObjectOrUnionType(t, kind);
+            });
         }
         function contextualTypeIsTupleLikeType(type) {
             return !!(type.flags & 16384 ? ts.forEach(type.types, isTupleLikeType) : isTupleLikeType(type));
         }
         function contextualTypeHasIndexSignature(type, kind) {
-            return !!(type.flags & 16384 ? ts.forEach(type.types, function (t) { return getIndexTypeOfObjectOrUnionType(t, kind); }) : getIndexTypeOfObjectOrUnionType(type, kind));
+            return !!(type.flags & 16384 ? ts.forEach(type.types, function (t) {
+                return getIndexTypeOfObjectOrUnionType(t, kind);
+            }) : getIndexTypeOfObjectOrUnionType(type, kind));
         }
         function getContextualTypeForObjectLiteralMethod(node) {
             ts.Debug.assert(ts.isObjectLiteralMethod(node));
@@ -12719,8 +17478,7 @@ var ts;
                         return propertyType;
                     }
                 }
-                return isNumericName(element.name) && getIndexTypeOfContextualType(type, 1) ||
-                    getIndexTypeOfContextualType(type, 0);
+                return isNumericName(element.name) && getIndexTypeOfContextualType(type, 1) || getIndexTypeOfContextualType(type, 0);
             }
             return undefined;
         }
@@ -12729,9 +17487,7 @@ var ts;
             var type = getContextualType(arrayLiteral);
             if (type) {
                 var index = ts.indexOf(arrayLiteral.elements, node);
-                return getTypeOfPropertyOfContextualType(type, "" + index)
-                    || getIndexTypeOfContextualType(type, 1)
-                    || (languageVersion >= 2 ? checkIteratedType(type, undefined) : undefined);
+                return getTypeOfPropertyOfContextualType(type, "" + index) || getIndexTypeOfContextualType(type, 1) || (languageVersion >= 2 ? checkIteratedType(type, undefined) : undefined);
             }
             return undefined;
         }
@@ -12764,7 +17520,7 @@ var ts;
                     return getTypeFromTypeNode(parent.type);
                 case 167:
                     return getContextualTypeForBinaryOperand(node);
-                case 217:
+                case 218:
                     return getContextualTypeForObjectLiteralElement(parent);
                 case 151:
                     return getContextualTypeForElementExpression(node);
@@ -12795,9 +17551,7 @@ var ts;
         }
         function getContextualSignature(node) {
             ts.Debug.assert(node.kind !== 132 || ts.isObjectLiteralMethod(node));
-            var type = ts.isObjectLiteralMethod(node)
-                ? getContextualTypeForObjectLiteralMethod(node)
-                : getContextualType(node);
+            var type = ts.isObjectLiteralMethod(node) ? getContextualTypeForObjectLiteralMethod(node) : getContextualType(node);
             if (!type) {
                 return undefined;
             }
@@ -12807,14 +17561,15 @@ var ts;
             var signatureList;
             var types = type.types;
             for (var i = 0; i < types.length; i++) {
-                if (signatureList &&
-                    getSignaturesOfObjectOrUnionType(types[i], 0).length > 1) {
+                if (signatureList && getSignaturesOfObjectOrUnionType(types[i], 0).length > 1) {
                     return undefined;
                 }
                 var signature = getNonGenericSignature(types[i]);
                 if (signature) {
                     if (!signatureList) {
-                        signatureList = [signature];
+                        signatureList = [
+                            signature
+                        ];
                     }
                     else if (!compareSignatures(signatureList[0], signature, false, compareTypes)) {
                         return undefined;
@@ -12840,7 +17595,7 @@ var ts;
             if (parent.kind === 167 && parent.operatorToken.kind === 52 && parent.left === node) {
                 return true;
             }
-            if (parent.kind === 217) {
+            if (parent.kind === 218) {
                 return isAssignmentTarget(parent.parent);
             }
             if (parent.kind === 151) {
@@ -12912,20 +17667,16 @@ var ts;
             for (var i = 0; i < node.properties.length; i++) {
                 var memberDecl = node.properties[i];
                 var member = memberDecl.symbol;
-                if (memberDecl.kind === 217 ||
-                    memberDecl.kind === 218 ||
-                    ts.isObjectLiteralMethod(memberDecl)) {
-                    if (memberDecl.kind === 217) {
+                if (memberDecl.kind === 218 || memberDecl.kind === 219 || ts.isObjectLiteralMethod(memberDecl)) {
+                    if (memberDecl.kind === 218) {
                         var type = checkPropertyAssignment(memberDecl, contextualMapper);
                     }
                     else if (memberDecl.kind === 132) {
                         var type = checkObjectLiteralMethod(memberDecl, contextualMapper);
                     }
                     else {
-                        ts.Debug.assert(memberDecl.kind === 218);
-                        var type = memberDecl.name.kind === 126
-                            ? unknownType
-                            : checkExpression(memberDecl.name, contextualMapper);
+                        ts.Debug.assert(memberDecl.kind === 219);
+                        var type = memberDecl.name.kind === 126 ? unknownType : checkExpression(memberDecl.name, contextualMapper);
                     }
                     typeFlags |= type.flags;
                     var prop = createSymbol(4 | 67108864 | member.flags, member.name);
@@ -13041,9 +17792,7 @@ var ts;
             return anyType;
         }
         function isValidPropertyAccess(node, propertyName) {
-            var left = node.kind === 153
-                ? node.expression
-                : node.left;
+            var left = node.kind === 153 ? node.expression : node.left;
             var type = checkExpressionOrQualifiedName(left);
             if (type !== unknownType && type !== anyType) {
                 var prop = getPropertyOfType(getWidenedType(type), propertyName);
@@ -13080,8 +17829,7 @@ var ts;
                 return unknownType;
             }
             var isConstEnum = isConstEnumObjectType(objectType);
-            if (isConstEnum &&
-                (!node.argumentExpression || node.argumentExpression.kind !== 8)) {
+            if (isConstEnum && (!node.argumentExpression || node.argumentExpression.kind !== 8)) {
                 error(node.argumentExpression, ts.Diagnostics.A_const_enum_member_can_only_be_accessed_using_a_string_literal);
                 return unknownType;
             }
@@ -13248,8 +17996,7 @@ var ts;
                 callIsIncomplete = callExpression.arguments.end === callExpression.end;
                 typeArguments = callExpression.typeArguments;
             }
-            var hasRightNumberOfTypeArgs = !typeArguments ||
-                (signature.typeParameters && typeArguments.length === signature.typeParameters.length);
+            var hasRightNumberOfTypeArgs = !typeArguments || (signature.typeParameters && typeArguments.length === signature.typeParameters.length);
             if (!hasRightNumberOfTypeArgs) {
                 return false;
             }
@@ -13266,8 +18013,7 @@ var ts;
         function getSingleCallSignature(type) {
             if (type.flags & 48128) {
                 var resolved = resolveObjectOrUnionTypeMembers(type);
-                if (resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0 &&
-                    resolved.properties.length === 0 && !resolved.stringIndexType && !resolved.numberIndexType) {
+                if (resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0 && resolved.properties.length === 0 && !resolved.stringIndexType && !resolved.numberIndexType) {
                     return resolved.callSignatures[0];
                 }
             }
@@ -13337,9 +18083,7 @@ var ts;
                 var arg = args[i];
                 if (arg.kind !== 172) {
                     var paramType = getTypeAtPosition(signature, arg.kind === 171 ? -1 : i);
-                    var argType = i === 0 && node.kind === 157 ? globalTemplateStringsArrayType :
-                        arg.kind === 8 && !reportErrors ? getStringLiteralType(arg) :
-                            checkExpressionWithContextualType(arg, paramType, excludeArgument && excludeArgument[i] ? identityMapper : undefined);
+                    var argType = i === 0 && node.kind === 157 ? globalTemplateStringsArrayType : arg.kind === 8 && !reportErrors ? getStringLiteralType(arg) : checkExpressionWithContextualType(arg, paramType, excludeArgument && excludeArgument[i] ? identityMapper : undefined);
                     if (!checkTypeRelatedTo(argType, paramType, relation, reportErrors ? arg : undefined, ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1)) {
                         return false;
                     }
@@ -13351,7 +18095,9 @@ var ts;
             var args;
             if (node.kind === 157) {
                 var template = node.template;
-                args = [template];
+                args = [
+                    template
+                ];
                 if (template.kind === 169) {
                     ts.forEach(template.templateSpans, function (span) {
                         args.push(span.expression);
@@ -13603,10 +18349,7 @@ var ts;
             }
             if (node.kind === 156) {
                 var declaration = signature.declaration;
-                if (declaration &&
-                    declaration.kind !== 133 &&
-                    declaration.kind !== 137 &&
-                    declaration.kind !== 141) {
+                if (declaration && declaration.kind !== 133 && declaration.kind !== 137 && declaration.kind !== 141) {
                     if (compilerOptions.noImplicitAny) {
                         error(node, ts.Diagnostics.new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type);
                     }
@@ -13631,13 +18374,9 @@ var ts;
         }
         function getTypeAtPosition(signature, pos) {
             if (pos >= 0) {
-                return signature.hasRestParameter ?
-                    pos < signature.parameters.length - 1 ? getTypeOfSymbol(signature.parameters[pos]) : getRestTypeOfSignature(signature) :
-                    pos < signature.parameters.length ? getTypeOfSymbol(signature.parameters[pos]) : anyType;
+                return signature.hasRestParameter ? pos < signature.parameters.length - 1 ? getTypeOfSymbol(signature.parameters[pos]) : getRestTypeOfSignature(signature) : pos < signature.parameters.length ? getTypeOfSymbol(signature.parameters[pos]) : anyType;
             }
-            return signature.hasRestParameter ?
-                getTypeOfSymbol(signature.parameters[signature.parameters.length - 1]) :
-                anyArrayType;
+            return signature.hasRestParameter ? getTypeOfSymbol(signature.parameters[signature.parameters.length - 1]) : anyArrayType;
         }
         function assignContextualParameterTypes(signature, context, mapper) {
             var len = signature.parameters.length - (signature.hasRestParameter ? 1 : 0);
@@ -13937,12 +18676,9 @@ var ts;
             var properties = node.properties;
             for (var i = 0; i < properties.length; i++) {
                 var p = properties[i];
-                if (p.kind === 217 || p.kind === 218) {
+                if (p.kind === 218 || p.kind === 219) {
                     var name = p.name;
-                    var type = sourceType.flags & 1 ? sourceType :
-                        getTypeOfPropertyOfType(sourceType, name.text) ||
-                            isNumericLiteralName(name.text) && getIndexTypeOfType(sourceType, 1) ||
-                            getIndexTypeOfType(sourceType, 0);
+                    var type = sourceType.flags & 1 ? sourceType : getTypeOfPropertyOfType(sourceType, name.text) || isNumericLiteralName(name.text) && getIndexTypeOfType(sourceType, 1) || getIndexTypeOfType(sourceType, 0);
                     if (type) {
                         checkDestructuringAssignment(p.initializer || name, type);
                     }
@@ -13967,14 +18703,17 @@ var ts;
                 if (e.kind !== 172) {
                     if (e.kind !== 171) {
                         var propName = "" + i;
-                        var type = sourceType.flags & 1 ? sourceType :
-                            isTupleLikeType(sourceType) ? getTypeOfPropertyOfType(sourceType, propName) :
-                                getIndexTypeOfType(sourceType, 1);
+                        var type = sourceType.flags & 1 ? sourceType : isTupleLikeType(sourceType) ? getTypeOfPropertyOfType(sourceType, propName) : getIndexTypeOfType(sourceType, 1);
                         if (type) {
                             checkDestructuringAssignment(e, type, contextualMapper);
                         }
                         else {
-                            error(e, ts.Diagnostics.Type_0_has_no_property_1, typeToString(sourceType), propName);
+                            if (isTupleType(sourceType)) {
+                                error(e, ts.Diagnostics.Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2, typeToString(sourceType), sourceType.elementTypes.length, elements.length);
+                            }
+                            else {
+                                error(e, ts.Diagnostics.Type_0_has_no_property_1, typeToString(sourceType), propName);
+                            }
                         }
                     }
                     else {
@@ -14045,9 +18784,7 @@ var ts;
                     if (rightType.flags & (32 | 64))
                         rightType = leftType;
                     var suggestedOperator;
-                    if ((leftType.flags & 8) &&
-                        (rightType.flags & 8) &&
-                        (suggestedOperator = getSuggestedBooleanOperator(node.operatorToken.kind)) !== undefined) {
+                    if ((leftType.flags & 8) && (rightType.flags & 8) && (suggestedOperator = getSuggestedBooleanOperator(node.operatorToken.kind)) !== undefined) {
                         error(node, ts.Diagnostics.The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead, ts.tokenToString(node.operatorToken.kind), ts.tokenToString(suggestedOperator));
                     }
                     else {
@@ -14109,7 +18846,10 @@ var ts;
                 case 48:
                     return rightType;
                 case 49:
-                    return getUnionType([leftType, rightType]);
+                    return getUnionType([
+                        leftType,
+                        rightType
+                    ]);
                 case 52:
                     checkAssignmentOperator(rightType);
                     return rightType;
@@ -14117,9 +18857,7 @@ var ts;
                     return rightType;
             }
             function checkForDisallowedESSymbolOperand(operator) {
-                var offendingSymbolOperand = someConstituentTypeHasKind(leftType, 1048576) ? node.left :
-                    someConstituentTypeHasKind(rightType, 1048576) ? node.right :
-                        undefined;
+                var offendingSymbolOperand = someConstituentTypeHasKind(leftType, 1048576) ? node.left : someConstituentTypeHasKind(rightType, 1048576) ? node.right : undefined;
                 if (offendingSymbolOperand) {
                     error(offendingSymbolOperand, ts.Diagnostics.The_0_operator_cannot_be_applied_to_type_symbol, ts.tokenToString(operator));
                     return false;
@@ -14165,7 +18903,10 @@ var ts;
             checkExpression(node.condition);
             var type1 = checkExpression(node.whenTrue, contextualMapper);
             var type2 = checkExpression(node.whenFalse, contextualMapper);
-            return getUnionType([type1, type2]);
+            return getUnionType([
+                type1,
+                type2
+            ]);
         }
         function checkTemplateExpression(node) {
             ts.forEach(node.templateSpans, function (templateSpan) {
@@ -14229,9 +18970,7 @@ var ts;
                 type = instantiateTypeWithSingleGenericCallSignature(node, uninstantiatedType, contextualMapper);
             }
             if (isConstEnumObjectType(type)) {
-                var ok = (node.parent.kind === 153 && node.parent.expression === node) ||
-                    (node.parent.kind === 154 && node.parent.expression === node) ||
-                    ((node.kind === 64 || node.kind === 125) && isInRightSideOfImportOrExportAssignment(node));
+                var ok = (node.parent.kind === 153 && node.parent.expression === node) || (node.parent.kind === 154 && node.parent.expression === node) || ((node.kind === 64 || node.kind === 125) && isInRightSideOfImportOrExportAssignment(node));
                 if (!ok) {
                     error(node, ts.Diagnostics.const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment);
                 }
@@ -14341,9 +19080,7 @@ var ts;
             if (node.kind === 138) {
                 checkGrammarIndexSignature(node);
             }
-            else if (node.kind === 140 || node.kind === 195 || node.kind === 141 ||
-                node.kind === 136 || node.kind === 133 ||
-                node.kind === 137) {
+            else if (node.kind === 140 || node.kind === 195 || node.kind === 141 || node.kind === 136 || node.kind === 133 || node.kind === 137) {
                 checkGrammarFunctionLikeDeclaration(node);
             }
             checkTypeParameters(node.typeParameters);
@@ -14436,8 +19173,10 @@ var ts;
                     case 160:
                     case 195:
                     case 161:
-                    case 152: return false;
-                    default: return ts.forEachChild(n, containsSuperCall);
+                    case 152:
+                        return false;
+                    default:
+                        return ts.forEachChild(n, containsSuperCall);
                 }
             }
             function markThisReferencesAsErrors(n) {
@@ -14449,14 +19188,13 @@ var ts;
                 }
             }
             function isInstancePropertyWithInitializer(n) {
-                return n.kind === 130 &&
-                    !(n.flags & 128) &&
-                    !!n.initializer;
+                return n.kind === 130 && !(n.flags & 128) && !!n.initializer;
             }
             if (ts.getClassBaseTypeNode(node.parent)) {
                 if (containsSuperCall(node.body)) {
-                    var superCallShouldBeFirst = ts.forEach(node.parent.members, isInstancePropertyWithInitializer) ||
-                        ts.forEach(node.parameters, function (p) { return p.flags & (16 | 32 | 64); });
+                    var superCallShouldBeFirst = ts.forEach(node.parent.members, isInstancePropertyWithInitializer) || ts.forEach(node.parameters, function (p) {
+                        return p.flags & (16 | 32 | 64);
+                    });
                     if (superCallShouldBeFirst) {
                         var statements = node.body.statements;
                         if (!statements.length || statements[0].kind !== 177 || !isSuperCallExpression(statements[0].expression)) {
@@ -14778,16 +19516,16 @@ var ts;
                     case 197:
                         return 2097152;
                     case 200:
-                        return d.name.kind === 8 || ts.getModuleInstanceState(d) !== 0
-                            ? 4194304 | 1048576
-                            : 4194304;
+                        return d.name.kind === 8 || ts.getModuleInstanceState(d) !== 0 ? 4194304 | 1048576 : 4194304;
                     case 196:
                     case 199:
                         return 2097152 | 1048576;
-                    case 202:
+                    case 203:
                         var result = 0;
                         var target = resolveAlias(getSymbolOfNode(d));
-                        ts.forEach(target.declarations, function (d) { result |= getDeclarationSpaces(d); });
+                        ts.forEach(target.declarations, function (d) {
+                            result |= getDeclarationSpaces(d);
+                        });
                         return result;
                     default:
                         return 1048576;
@@ -14796,10 +19534,7 @@ var ts;
         }
         function checkFunctionDeclaration(node) {
             if (produceDiagnostics) {
-                checkFunctionLikeDeclaration(node) ||
-                    checkGrammarDisallowedModifiersInBlockOrObjectLiteralExpression(node) ||
-                    checkGrammarFunctionName(node.name) ||
-                    checkGrammarForGenerator(node);
+                checkFunctionLikeDeclaration(node) || checkGrammarDisallowedModifiersInBlockOrObjectLiteralExpression(node) || checkGrammarFunctionName(node.name) || checkGrammarForGenerator(node);
                 checkCollisionWithCapturedSuperVariable(node, node.name);
                 checkCollisionWithCapturedThisVariable(node, node.name);
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
@@ -14854,12 +19589,7 @@ var ts;
             if (!(identifier && identifier.text === name)) {
                 return false;
             }
-            if (node.kind === 130 ||
-                node.kind === 129 ||
-                node.kind === 132 ||
-                node.kind === 131 ||
-                node.kind === 134 ||
-                node.kind === 135) {
+            if (node.kind === 130 || node.kind === 129 || node.kind === 132 || node.kind === 131 || node.kind === 134 || node.kind === 135) {
                 return false;
             }
             if (ts.isInAmbientContext(node)) {
@@ -14918,7 +19648,7 @@ var ts;
                 return;
             }
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 220 && ts.isExternalModule(parent)) {
+            if (parent.kind === 221 && ts.isExternalModule(parent)) {
                 error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_an_external_module, ts.declarationNameToString(name), ts.declarationNameToString(name));
             }
         }
@@ -14927,17 +19657,11 @@ var ts;
                 var symbol = getSymbolOfNode(node);
                 if (symbol.flags & 1) {
                     var localDeclarationSymbol = resolveName(node, node.name.text, 3, undefined, undefined);
-                    if (localDeclarationSymbol &&
-                        localDeclarationSymbol !== symbol &&
-                        localDeclarationSymbol.flags & 2) {
+                    if (localDeclarationSymbol && localDeclarationSymbol !== symbol && localDeclarationSymbol.flags & 2) {
                         if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & 12288) {
                             var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 194);
-                            var container = varDeclList.parent.kind === 175 &&
-                                varDeclList.parent.parent;
-                            var namesShareScope = container &&
-                                (container.kind === 174 && ts.isFunctionLike(container.parent) ||
-                                    (container.kind === 201 && container.kind === 200) ||
-                                    container.kind === 220);
+                            var container = varDeclList.parent.kind === 175 && varDeclList.parent.parent;
+                            var namesShareScope = container && (container.kind === 174 && ts.isFunctionLike(container.parent) || (container.kind === 201 && container.kind === 200) || container.kind === 221);
                             if (!namesShareScope) {
                                 var name = symbolToString(localDeclarationSymbol);
                                 error(node, ts.Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name, name);
@@ -15096,18 +19820,13 @@ var ts;
             checkSourceElement(node.statement);
         }
         function checkForOfStatement(node) {
-            if (languageVersion < 2) {
-                grammarErrorOnFirstToken(node, ts.Diagnostics.for_of_statements_are_only_available_when_targeting_ECMAScript_6_or_higher);
-                return;
-            }
             checkGrammarForInOrForOfStatement(node);
             if (node.initializer.kind === 194) {
                 checkForInOrForOfVariableDeclaration(node);
             }
             else {
                 var varExpr = node.initializer;
-                var rightType = checkExpression(node.expression);
-                var iteratedType = checkIteratedType(rightType, node.expression);
+                var iteratedType = checkRightHandSideOfForOf(node.expression);
                 if (varExpr.kind === 151 || varExpr.kind === 152) {
                     checkDestructuringAssignment(varExpr, iteratedType || unknownType);
                 }
@@ -15156,20 +19875,17 @@ var ts;
                 checkVariableDeclaration(decl);
             }
         }
-        function getTypeForVariableDeclarationInForOfStatement(forOfStatement) {
-            if (languageVersion < 2) {
-                return anyType;
-            }
-            var expressionType = getTypeOfExpression(forOfStatement.expression);
-            return checkIteratedType(expressionType, forOfStatement.expression) || anyType;
+        function checkRightHandSideOfForOf(rhsExpression) {
+            var expressionType = getTypeOfExpression(rhsExpression);
+            return languageVersion >= 2 ? checkIteratedType(expressionType, rhsExpression) : checkElementTypeOfArrayOrString(expressionType, rhsExpression);
         }
         function checkIteratedType(iterable, expressionForError) {
             ts.Debug.assert(languageVersion >= 2);
             var iteratedType = getIteratedType(iterable, expressionForError);
             if (expressionForError && iteratedType) {
-                var completeIterableType = globalIterableType !== emptyObjectType
-                    ? createTypeReference(globalIterableType, [iteratedType])
-                    : emptyObjectType;
+                var completeIterableType = globalIterableType !== emptyObjectType ? createTypeReference(globalIterableType, [
+                    iteratedType
+                ]) : emptyObjectType;
                 checkTypeAssignableTo(iterable, completeIterableType, expressionForError);
             }
             return iteratedType;
@@ -15217,6 +19933,39 @@ var ts;
                 return iteratorNextValue;
             }
         }
+        function checkElementTypeOfArrayOrString(arrayOrStringType, expressionForError) {
+            ts.Debug.assert(languageVersion < 2);
+            var arrayType = removeTypesFromUnionType(arrayOrStringType, 258, true, true);
+            var hasStringConstituent = arrayOrStringType !== arrayType;
+            var reportedError = false;
+            if (hasStringConstituent) {
+                if (languageVersion < 1) {
+                    error(expressionForError, ts.Diagnostics.Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher);
+                    reportedError = true;
+                }
+                if (arrayType === emptyObjectType) {
+                    return stringType;
+                }
+            }
+            if (!isArrayLikeType(arrayType)) {
+                if (!reportedError) {
+                    var diagnostic = hasStringConstituent ? ts.Diagnostics.Type_0_is_not_an_array_type : ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type;
+                    error(expressionForError, diagnostic, typeToString(arrayType));
+                }
+                return hasStringConstituent ? stringType : unknownType;
+            }
+            var arrayElementType = getIndexTypeOfType(arrayType, 1) || unknownType;
+            if (hasStringConstituent) {
+                if (arrayElementType.flags & 258) {
+                    return stringType;
+                }
+                return getUnionType([
+                    arrayElementType,
+                    stringType
+                ]);
+            }
+            return arrayElementType;
+        }
         function checkBreakOrContinueStatement(node) {
             checkGrammarStatementInAmbientContext(node) || checkGrammarBreakOrContinueStatement(node);
         }
@@ -15265,8 +20014,8 @@ var ts;
             var firstDefaultClause;
             var hasDuplicateDefaultClause = false;
             var expressionType = checkExpression(node.expression);
-            ts.forEach(node.clauses, function (clause) {
-                if (clause.kind === 214 && !hasDuplicateDefaultClause) {
+            ts.forEach(node.caseBlock.clauses, function (clause) {
+                if (clause.kind === 215 && !hasDuplicateDefaultClause) {
                     if (firstDefaultClause === undefined) {
                         firstDefaultClause = clause;
                     }
@@ -15278,7 +20027,7 @@ var ts;
                         hasDuplicateDefaultClause = true;
                     }
                 }
-                if (produceDiagnostics && clause.kind === 213) {
+                if (produceDiagnostics && clause.kind === 214) {
                     var caseClause = clause;
                     var caseType = checkExpression(caseClause.expression);
                     if (!isTypeAssignableTo(expressionType, caseType)) {
@@ -15375,7 +20124,9 @@ var ts;
             if (stringIndexType && numberIndexType) {
                 errorNode = declaredNumberIndexer || declaredStringIndexer;
                 if (!errorNode && (type.flags & 2048)) {
-                    var someBaseTypeHasBothIndexers = ts.forEach(type.baseTypes, function (base) { return getIndexTypeOfType(base, 0) && getIndexTypeOfType(base, 1); });
+                    var someBaseTypeHasBothIndexers = ts.forEach(type.baseTypes, function (base) {
+                        return getIndexTypeOfType(base, 0) && getIndexTypeOfType(base, 1);
+                    });
                     errorNode = someBaseTypeHasBothIndexers ? undefined : type.symbol.declarations[0];
                 }
             }
@@ -15397,13 +20148,13 @@ var ts;
                     errorNode = indexDeclaration;
                 }
                 else if (containingType.flags & 2048) {
-                    var someBaseClassHasBothPropertyAndIndexer = ts.forEach(containingType.baseTypes, function (base) { return getPropertyOfObjectType(base, prop.name) && getIndexTypeOfType(base, indexKind); });
+                    var someBaseClassHasBothPropertyAndIndexer = ts.forEach(containingType.baseTypes, function (base) {
+                        return getPropertyOfObjectType(base, prop.name) && getIndexTypeOfType(base, indexKind);
+                    });
                     errorNode = someBaseClassHasBothPropertyAndIndexer ? undefined : containingType.symbol.declarations[0];
                 }
                 if (errorNode && !isTypeAssignableTo(propertyType, indexType)) {
-                    var errorMessage = indexKind === 0
-                        ? ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_string_index_type_2
-                        : ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2;
+                    var errorMessage = indexKind === 0 ? ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_string_index_type_2 : ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2;
                     error(errorNode, errorMessage, symbolToString(prop), typeToString(propertyType), typeToString(indexType));
                 }
             }
@@ -15567,7 +20318,12 @@ var ts;
                 return true;
             }
             var seen = {};
-            ts.forEach(type.declaredProperties, function (p) { seen[p.name] = { prop: p, containingType: type }; });
+            ts.forEach(type.declaredProperties, function (p) {
+                seen[p.name] = {
+                    prop: p,
+                    containingType: type
+                };
+            });
             var ok = true;
             for (var i = 0, len = type.baseTypes.length; i < len; ++i) {
                 var base = type.baseTypes[i];
@@ -15575,7 +20331,10 @@ var ts;
                 for (var j = 0, proplen = properties.length; j < proplen; ++j) {
                     var prop = properties[j];
                     if (!ts.hasProperty(seen, prop.name)) {
-                        seen[prop.name] = { prop: prop, containingType: base };
+                        seen[prop.name] = {
+                            prop: prop,
+                            containingType: base
+                        };
                     }
                     else {
                         var existing = seen[prop.name];
@@ -15678,9 +20437,12 @@ var ts;
                                 return undefined;
                             }
                             switch (e.operator) {
-                                case 33: return value;
-                                case 34: return -value;
-                                case 47: return enumIsConst ? ~value : undefined;
+                                case 33:
+                                    return value;
+                                case 34:
+                                    return -value;
+                                case 47:
+                                    return enumIsConst ? ~value : undefined;
                             }
                             return undefined;
                         case 167:
@@ -15696,17 +20458,28 @@ var ts;
                                 return undefined;
                             }
                             switch (e.operatorToken.kind) {
-                                case 44: return left | right;
-                                case 43: return left & right;
-                                case 41: return left >> right;
-                                case 42: return left >>> right;
-                                case 40: return left << right;
-                                case 45: return left ^ right;
-                                case 35: return left * right;
-                                case 36: return left / right;
-                                case 33: return left + right;
-                                case 34: return left - right;
-                                case 37: return left % right;
+                                case 44:
+                                    return left | right;
+                                case 43:
+                                    return left & right;
+                                case 41:
+                                    return left >> right;
+                                case 42:
+                                    return left >>> right;
+                                case 40:
+                                    return left << right;
+                                case 45:
+                                    return left ^ right;
+                                case 35:
+                                    return left * right;
+                                case 36:
+                                    return left / right;
+                                case 33:
+                                    return left + right;
+                                case 34:
+                                    return left - right;
+                                case 37:
+                                    return left % right;
                             }
                             return undefined;
                         case 7:
@@ -15729,8 +20502,7 @@ var ts;
                             }
                             else {
                                 if (e.kind === 154) {
-                                    if (e.argumentExpression === undefined ||
-                                        e.argumentExpression.kind !== 8) {
+                                    if (e.argumentExpression === undefined || e.argumentExpression.kind !== 8) {
                                         return undefined;
                                     }
                                     var enumType = getTypeOfNode(e.expression);
@@ -15826,10 +20598,7 @@ var ts;
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
                 checkExportsOnMergedDeclarations(node);
                 var symbol = getSymbolOfNode(node);
-                if (symbol.flags & 512
-                    && symbol.declarations.length > 1
-                    && !ts.isInAmbientContext(node)
-                    && ts.isInstantiatedModule(node, compilerOptions.preserveConstEnums)) {
+                if (symbol.flags & 512 && symbol.declarations.length > 1 && !ts.isInAmbientContext(node) && ts.isInstantiatedModule(node, compilerOptions.preserveConstEnums)) {
                     var classOrFunc = getFirstNonAmbientClassOrFunctionDeclaration(symbol);
                     if (classOrFunc) {
                         if (ts.getSourceFileOfNode(node) !== ts.getSourceFileOfNode(classOrFunc)) {
@@ -15864,10 +20633,8 @@ var ts;
                 return false;
             }
             var inAmbientExternalModule = node.parent.kind === 201 && node.parent.parent.name.kind === 8;
-            if (node.parent.kind !== 220 && !inAmbientExternalModule) {
-                error(moduleName, node.kind === 209 ?
-                    ts.Diagnostics.Export_declarations_are_not_permitted_in_an_internal_module :
-                    ts.Diagnostics.Import_declarations_in_an_internal_module_cannot_reference_an_external_module);
+            if (node.parent.kind !== 221 && !inAmbientExternalModule) {
+                error(moduleName, node.kind === 210 ? ts.Diagnostics.Export_declarations_are_not_permitted_in_an_internal_module : ts.Diagnostics.Import_declarations_in_an_internal_module_cannot_reference_an_external_module);
                 return false;
             }
             if (inAmbientExternalModule && isExternalModuleNameRelative(moduleName.text)) {
@@ -15880,13 +20647,9 @@ var ts;
             var symbol = getSymbolOfNode(node);
             var target = resolveAlias(symbol);
             if (target !== unknownSymbol) {
-                var excludedMeanings = (symbol.flags & 107455 ? 107455 : 0) |
-                    (symbol.flags & 793056 ? 793056 : 0) |
-                    (symbol.flags & 1536 ? 1536 : 0);
+                var excludedMeanings = (symbol.flags & 107455 ? 107455 : 0) | (symbol.flags & 793056 ? 793056 : 0) | (symbol.flags & 1536 ? 1536 : 0);
                 if (target.flags & excludedMeanings) {
-                    var message = node.kind === 211 ?
-                        ts.Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 :
-                        ts.Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0;
+                    var message = node.kind === 212 ? ts.Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 : ts.Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0;
                     error(node, message, symbolToString(symbol));
                 }
             }
@@ -15907,7 +20670,7 @@ var ts;
                         checkImportBinding(importClause);
                     }
                     if (importClause.namedBindings) {
-                        if (importClause.namedBindings.kind === 205) {
+                        if (importClause.namedBindings.kind === 206) {
                             checkImportBinding(importClause.namedBindings);
                         }
                         else {
@@ -15957,7 +20720,7 @@ var ts;
             }
         }
         function checkExportAssignment(node) {
-            var container = node.parent.kind === 220 ? node.parent : node.parent.parent;
+            var container = node.parent.kind === 221 ? node.parent : node.parent.parent;
             if (container.kind === 200 && container.name.kind === 64) {
                 error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_an_internal_module);
                 return;
@@ -15974,7 +20737,7 @@ var ts;
             checkExternalModuleExports(container);
         }
         function getModuleStatements(node) {
-            if (node.kind === 220) {
+            if (node.kind === 221) {
                 return node.statements;
             }
             if (node.kind === 200 && node.body.kind === 201) {
@@ -15988,7 +20751,7 @@ var ts;
                 var statements = getModuleStatements(declarations[i]);
                 for (var j = 0; j < statements.length; j++) {
                     var node = statements[j];
-                    if (node.kind === 209) {
+                    if (node.kind === 210) {
                         var exportClause = node.exportClause;
                         if (!exportClause) {
                             return true;
@@ -16001,7 +20764,7 @@ var ts;
                             }
                         }
                     }
-                    else if (node.kind !== 208 && node.flags & 1 && !(node.flags & 256)) {
+                    else if (node.kind !== 209 && node.flags & 1 && !(node.flags & 256)) {
                         return true;
                     }
                 }
@@ -16111,13 +20874,13 @@ var ts;
                     return checkEnumDeclaration(node);
                 case 200:
                     return checkModuleDeclaration(node);
-                case 203:
+                case 204:
                     return checkImportDeclaration(node);
-                case 202:
+                case 203:
                     return checkImportEqualsDeclaration(node);
-                case 209:
+                case 210:
                     return checkExportDeclaration(node);
-                case 208:
+                case 209:
                     return checkExportAssignment(node);
                 case 176:
                     checkGrammarStatementInAmbientContext(node);
@@ -16158,7 +20921,7 @@ var ts;
                 case 150:
                 case 151:
                 case 152:
-                case 217:
+                case 218:
                 case 153:
                 case 154:
                 case 155:
@@ -16190,19 +20953,20 @@ var ts;
                 case 185:
                 case 186:
                 case 188:
-                case 213:
+                case 202:
                 case 214:
+                case 215:
                 case 189:
                 case 190:
                 case 191:
-                case 216:
+                case 217:
                 case 193:
                 case 194:
                 case 196:
                 case 199:
-                case 219:
-                case 208:
                 case 220:
+                case 209:
+                case 221:
                     ts.forEachChild(node, checkFunctionExpressionBodies);
                     break;
             }
@@ -16290,7 +21054,7 @@ var ts;
                     copySymbols(location.locals, meaning);
                 }
                 switch (location.kind) {
-                    case 220:
+                    case 221:
                         if (!ts.isExternalModule(location))
                             break;
                     case 200:
@@ -16318,9 +21082,7 @@ var ts;
             return ts.mapToArray(symbols);
         }
         function isTypeDeclarationName(name) {
-            return name.kind == 64 &&
-                isTypeDeclaration(name.parent) &&
-                name.parent.name === name;
+            return name.kind == 64 && isTypeDeclaration(name.parent) && name.parent.name === name;
         }
         function isTypeDeclaration(node) {
             switch (node.kind) {
@@ -16402,10 +21164,10 @@ var ts;
             while (nodeOnRightSide.parent.kind === 125) {
                 nodeOnRightSide = nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 202) {
+            if (nodeOnRightSide.parent.kind === 203) {
                 return nodeOnRightSide.parent.moduleReference === nodeOnRightSide && nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 208) {
+            if (nodeOnRightSide.parent.kind === 209) {
                 return nodeOnRightSide.parent.expression === nodeOnRightSide && nodeOnRightSide.parent;
             }
             return undefined;
@@ -16414,14 +21176,13 @@ var ts;
             return getLeftSideOfImportEqualsOrExportAssignment(node) !== undefined;
         }
         function isRightSideOfQualifiedNameOrPropertyAccess(node) {
-            return (node.parent.kind === 125 && node.parent.right === node) ||
-                (node.parent.kind === 153 && node.parent.name === node);
+            return (node.parent.kind === 125 && node.parent.right === node) || (node.parent.kind === 153 && node.parent.name === node);
         }
         function getSymbolOfEntityNameOrPropertyAccessExpression(entityName) {
             if (ts.isDeclarationName(entityName)) {
                 return getSymbolOfNode(entityName.parent);
             }
-            if (entityName.parent.kind === 208) {
+            if (entityName.parent.kind === 209) {
                 return resolveEntityName(entityName, 107455 | 793056 | 1536 | 8388608);
             }
             if (entityName.kind !== 153) {
@@ -16470,9 +21231,7 @@ var ts;
                 return getSymbolOfNode(node.parent);
             }
             if (node.kind === 64 && isInRightSideOfImportOrExportAssignment(node)) {
-                return node.parent.kind === 208
-                    ? getSymbolOfEntityNameOrPropertyAccessExpression(node)
-                    : getSymbolOfPartOfRightHandSideOfImportEquals(node);
+                return node.parent.kind === 209 ? getSymbolOfEntityNameOrPropertyAccessExpression(node) : getSymbolOfPartOfRightHandSideOfImportEquals(node);
             }
             switch (node.kind) {
                 case 64:
@@ -16491,10 +21250,7 @@ var ts;
                     return undefined;
                 case 8:
                     var moduleName;
-                    if ((ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) &&
-                        ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) ||
-                        ((node.parent.kind === 203 || node.parent.kind === 209) &&
-                            node.parent.moduleSpecifier === node)) {
+                    if ((ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) && ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) || ((node.parent.kind === 204 || node.parent.kind === 210) && node.parent.moduleSpecifier === node)) {
                         return resolveExternalModuleName(node, node);
                     }
                 case 7:
@@ -16512,7 +21268,7 @@ var ts;
             return undefined;
         }
         function getShorthandAssignmentValueSymbol(location) {
-            if (location && location.kind === 218) {
+            if (location && location.kind === 219) {
                 return resolveEntityName(location.name, 107455);
             }
             return undefined;
@@ -16580,13 +21336,17 @@ var ts;
             else if (symbol.flags & 67108864) {
                 var target = getSymbolLinks(symbol).target;
                 if (target) {
-                    return [target];
+                    return [
+                        target
+                    ];
                 }
             }
-            return [symbol];
+            return [
+                symbol
+            ];
         }
         function isExternalModuleSymbol(symbol) {
-            return symbol.flags & 512 && symbol.declarations.length === 1 && symbol.declarations[0].kind === 220;
+            return symbol.flags & 512 && symbol.declarations.length === 1 && symbol.declarations[0].kind === 221;
         }
         function isNodeDescendentOf(node, ancestor) {
             while (node) {
@@ -16627,16 +21387,16 @@ var ts;
                     case 199:
                         generateNameForModuleOrEnum(node);
                         break;
-                    case 203:
+                    case 204:
                         generateNameForImportDeclaration(node);
                         break;
-                    case 209:
+                    case 210:
                         generateNameForExportDeclaration(node);
                         break;
-                    case 208:
+                    case 209:
                         generateNameForExportAssignment(node);
                         break;
-                    case 220:
+                    case 221:
                     case 201:
                         ts.forEach(node.statements, generateNames);
                         break;
@@ -16665,12 +21425,11 @@ var ts;
             }
             function generateNameForImportOrExportDeclaration(node) {
                 var expr = ts.getExternalModuleName(node);
-                var baseName = expr.kind === 8 ?
-                    ts.escapeIdentifier(ts.makeIdentifierFromModuleName(expr.text)) : "module";
+                var baseName = expr.kind === 8 ? ts.escapeIdentifier(ts.makeIdentifierFromModuleName(expr.text)) : "module";
                 assignGeneratedName(node, makeUniqueName(baseName));
             }
             function generateNameForImportDeclaration(node) {
-                if (node.importClause && node.importClause.namedBindings && node.importClause.namedBindings.kind === 206) {
+                if (node.importClause && node.importClause.namedBindings && node.importClause.namedBindings.kind === 207) {
                     generateNameForImportOrExportDeclaration(node);
                 }
             }
@@ -16700,7 +21459,7 @@ var ts;
         }
         function getAliasNameSubstitution(symbol) {
             var declaration = getDeclarationOfAliasSymbol(symbol);
-            if (declaration && declaration.kind === 207) {
+            if (declaration && declaration.kind === 208) {
                 var moduleName = getGeneratedNameForNode(declaration.parent.parent.parent);
                 var propertyName = declaration.propertyName || declaration.name;
                 return moduleName + "." + ts.unescapeIdentifier(propertyName.text);
@@ -16739,7 +21498,7 @@ var ts;
             return symbol && symbol !== unknownSymbol && symbolIsValue(symbol) && !isConstEnumSymbol(symbol);
         }
         function isTopLevelValueImportEqualsWithEntityName(node) {
-            if (node.parent.kind !== 220 || !ts.isInternalModuleImportEqualsDeclaration(node)) {
+            if (node.parent.kind !== 221 || !ts.isInternalModuleImportEqualsDeclaration(node)) {
                 return false;
             }
             return isAliasResolvedToValue(getSymbolOfNode(node));
@@ -16764,8 +21523,7 @@ var ts;
             if (ts.nodeIsPresent(node.body)) {
                 var symbol = getSymbolOfNode(node);
                 var signaturesOfSymbol = getSignaturesOfSymbol(symbol);
-                return signaturesOfSymbol.length > 1 ||
-                    (signaturesOfSymbol.length === 1 && signaturesOfSymbol[0].declaration !== node);
+                return signaturesOfSymbol.length > 1 || (signaturesOfSymbol.length === 1 && signaturesOfSymbol[0].declaration !== node);
             }
             return false;
         }
@@ -16777,14 +21535,14 @@ var ts;
             return getNodeLinks(node).enumMemberValue;
         }
         function getConstantValue(node) {
-            if (node.kind === 219) {
+            if (node.kind === 220) {
                 return getEnumMemberValue(node);
             }
             var symbol = getNodeLinks(node).resolvedSymbol;
             if (symbol && (symbol.flags & 8)) {
                 var declaration = symbol.valueDeclaration;
                 var constantValue;
-                if (declaration.kind === 219) {
+                if (declaration.kind === 220) {
                     return getEnumMemberValue(declaration);
                 }
             }
@@ -16792,9 +21550,7 @@ var ts;
         }
         function writeTypeOfDeclaration(declaration, enclosingDeclaration, flags, writer) {
             var symbol = getSymbolOfNode(declaration);
-            var type = symbol && !(symbol.flags & (2048 | 131072))
-                ? getTypeOfSymbol(symbol)
-                : unknownType;
+            var type = symbol && !(symbol.flags & (2048 | 131072)) ? getTypeOfSymbol(symbol) : unknownType;
             getSymbolDisplayBuilder().buildTypeDisplay(type, writer, enclosingDeclaration, flags);
         }
         function writeReturnTypeOfSignatureDeclaration(signatureDeclaration, enclosingDeclaration, flags, writer) {
@@ -16802,29 +21558,20 @@ var ts;
             getSymbolDisplayBuilder().buildTypeDisplay(getReturnTypeOfSignature(signature), writer, enclosingDeclaration, flags);
         }
         function isUnknownIdentifier(location, name) {
-            return !resolveName(location, name, 107455, undefined, undefined) &&
-                !ts.hasProperty(getGeneratedNamesForSourceFile(getSourceFile(location)), name);
+            ts.Debug.assert(!ts.nodeIsSynthesized(location), "isUnknownIdentifier called with a synthesized location");
+            return !resolveName(location, name, 107455, undefined, undefined) && !ts.hasProperty(getGeneratedNamesForSourceFile(getSourceFile(location)), name);
         }
         function getBlockScopedVariableId(n) {
             ts.Debug.assert(!ts.nodeIsSynthesized(n));
-            if (n.parent.kind === 153 &&
-                n.parent.name === n) {
+            if (n.parent.kind === 153 && n.parent.name === n) {
                 return undefined;
             }
-            if (n.parent.kind === 150 &&
-                n.parent.propertyName === n) {
+            if (n.parent.kind === 150 && n.parent.propertyName === n) {
                 return undefined;
             }
-            var declarationSymbol = (n.parent.kind === 193 && n.parent.name === n) ||
-                n.parent.kind === 150
-                ? getSymbolOfNode(n.parent)
-                : undefined;
-            var symbol = declarationSymbol ||
-                getNodeLinks(n).resolvedSymbol ||
-                resolveName(n, n.text, 2 | 8388608, undefined, undefined);
-            var isLetOrConst = symbol &&
-                (symbol.flags & 2) &&
-                symbol.valueDeclaration.parent.kind !== 216;
+            var declarationSymbol = (n.parent.kind === 193 && n.parent.name === n) || n.parent.kind === 150 ? getSymbolOfNode(n.parent) : undefined;
+            var symbol = declarationSymbol || getNodeLinks(n).resolvedSymbol || resolveName(n, n.text, 2 | 8388608, undefined, undefined);
+            var isLetOrConst = symbol && (symbol.flags & 2) && symbol.valueDeclaration.parent.kind !== 217;
             if (isLetOrConst) {
                 getSymbolLinks(symbol);
                 return symbol.id;
@@ -16901,10 +21648,10 @@ var ts;
                 case 175:
                 case 195:
                 case 198:
+                case 204:
                 case 203:
-                case 202:
+                case 210:
                 case 209:
-                case 208:
                 case 128:
                     break;
                 default:
@@ -16939,7 +21686,7 @@ var ts;
                         else if (flags & 128) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "static");
                         }
-                        else if (node.parent.kind === 201 || node.parent.kind === 220) {
+                        else if (node.parent.kind === 201 || node.parent.kind === 221) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_element, text);
                         }
                         flags |= ts.modifierToFlag(modifier.kind);
@@ -16948,7 +21695,7 @@ var ts;
                         if (flags & 128) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "static");
                         }
-                        else if (node.parent.kind === 201 || node.parent.kind === 220) {
+                        else if (node.parent.kind === 201 || node.parent.kind === 221) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_element, "static");
                         }
                         else if (node.kind === 128) {
@@ -17001,7 +21748,7 @@ var ts;
                     return grammarErrorOnNode(lastPrivate, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "private");
                 }
             }
-            else if ((node.kind === 203 || node.kind === 202) && flags & 2) {
+            else if ((node.kind === 204 || node.kind === 203) && flags & 2) {
                 return grammarErrorOnNode(lastDeclare, ts.Diagnostics.A_declare_modifier_cannot_be_used_with_an_import_declaration, "declare");
             }
             else if (node.kind === 197 && flags & 2) {
@@ -17114,8 +21861,7 @@ var ts;
             }
         }
         function checkGrammarTypeArguments(node, typeArguments) {
-            return checkGrammarForDisallowedTrailingComma(typeArguments) ||
-                checkGrammarForAtLeastOneTypeArgument(node, typeArguments);
+            return checkGrammarForDisallowedTrailingComma(typeArguments) || checkGrammarForAtLeastOneTypeArgument(node, typeArguments);
         }
         function checkGrammarForOmittedArgument(node, arguments) {
             if (arguments) {
@@ -17129,8 +21875,7 @@ var ts;
             }
         }
         function checkGrammarArguments(node, arguments) {
-            return checkGrammarForDisallowedTrailingComma(arguments) ||
-                checkGrammarForOmittedArgument(node, arguments);
+            return checkGrammarForDisallowedTrailingComma(arguments) || checkGrammarForOmittedArgument(node, arguments);
         }
         function checkGrammarHeritageClause(node) {
             var types = node.types;
@@ -17226,13 +21971,12 @@ var ts;
             for (var i = 0, n = node.properties.length; i < n; i++) {
                 var prop = node.properties[i];
                 var name = prop.name;
-                if (prop.kind === 172 ||
-                    name.kind === 126) {
+                if (prop.kind === 172 || name.kind === 126) {
                     checkGrammarComputedPropertyName(name);
                     continue;
                 }
                 var currentKind;
-                if (prop.kind === 217 || prop.kind === 218) {
+                if (prop.kind === 218 || prop.kind === 219) {
                     checkGrammarForInvalidQuestionMark(prop, prop.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional);
                     if (name.kind === 7) {
                         checkGrammarNumbericLiteral(name);
@@ -17283,22 +22027,16 @@ var ts;
                 var variableList = forInOrOfStatement.initializer;
                 if (!checkGrammarVariableDeclarationList(variableList)) {
                     if (variableList.declarations.length > 1) {
-                        var diagnostic = forInOrOfStatement.kind === 182
-                            ? ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement
-                            : ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement;
+                        var diagnostic = forInOrOfStatement.kind === 182 ? ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement : ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement;
                         return grammarErrorOnFirstToken(variableList.declarations[1], diagnostic);
                     }
                     var firstDeclaration = variableList.declarations[0];
                     if (firstDeclaration.initializer) {
-                        var diagnostic = forInOrOfStatement.kind === 182
-                            ? ts.Diagnostics.The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer
-                            : ts.Diagnostics.The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer;
+                        var diagnostic = forInOrOfStatement.kind === 182 ? ts.Diagnostics.The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer : ts.Diagnostics.The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer;
                         return grammarErrorOnNode(firstDeclaration.name, diagnostic);
                     }
                     if (firstDeclaration.type) {
-                        var diagnostic = forInOrOfStatement.kind === 182
-                            ? ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation
-                            : ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation;
+                        var diagnostic = forInOrOfStatement.kind === 182 ? ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation : ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation;
                         return grammarErrorOnNode(firstDeclaration, diagnostic);
                     }
                 }
@@ -17352,9 +22090,7 @@ var ts;
             }
         }
         function checkGrammarMethod(node) {
-            if (checkGrammarDisallowedModifiersInBlockOrObjectLiteralExpression(node) ||
-                checkGrammarFunctionLikeDeclaration(node) ||
-                checkGrammarForGenerator(node)) {
+            if (checkGrammarDisallowedModifiersInBlockOrObjectLiteralExpression(node) || checkGrammarFunctionLikeDeclaration(node) || checkGrammarForGenerator(node)) {
                 return true;
             }
             if (node.parent.kind === 152) {
@@ -17405,8 +22141,7 @@ var ts;
                 switch (current.kind) {
                     case 189:
                         if (node.label && current.label.text === node.label.text) {
-                            var isMisplacedContinueLabel = node.kind === 184
-                                && !isIterationStatement(current.statement, true);
+                            var isMisplacedContinueLabel = node.kind === 184 && !isIterationStatement(current.statement, true);
                             if (isMisplacedContinueLabel) {
                                 return grammarErrorOnNode(node, ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement);
                             }
@@ -17427,15 +22162,11 @@ var ts;
                 current = current.parent;
             }
             if (node.label) {
-                var message = node.kind === 185
-                    ? ts.Diagnostics.A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement
-                    : ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement;
+                var message = node.kind === 185 ? ts.Diagnostics.A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement : ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement;
                 return grammarErrorOnNode(node, message);
             }
             else {
-                var message = node.kind === 185
-                    ? ts.Diagnostics.A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement
-                    : ts.Diagnostics.A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement;
+                var message = node.kind === 185 ? ts.Diagnostics.A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement : ts.Diagnostics.A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement;
                 return grammarErrorOnNode(node, message);
             }
         }
@@ -17472,8 +22203,7 @@ var ts;
                 }
             }
             var checkLetConstNames = languageVersion >= 2 && (ts.isLet(node) || ts.isConst(node));
-            return (checkLetConstNames && checkGrammarNameInLetOrConstDeclarations(node.name)) ||
-                checkGrammarEvalOrArgumentsInStrictMode(node, node.name);
+            return (checkLetConstNames && checkGrammarNameInLetOrConstDeclarations(node.name)) || checkGrammarEvalOrArgumentsInStrictMode(node, node.name);
         }
         function checkGrammarNameInLetOrConstDeclarations(name) {
             if (name.kind === 64) {
@@ -17605,8 +22335,7 @@ var ts;
         }
         function checkGrammarProperty(node) {
             if (node.parent.kind === 196) {
-                if (checkGrammarForInvalidQuestionMark(node, node.questionToken, ts.Diagnostics.A_class_member_cannot_be_declared_optional) ||
-                    checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_class_property_declaration_must_directly_refer_to_a_built_in_symbol)) {
+                if (checkGrammarForInvalidQuestionMark(node, node.questionToken, ts.Diagnostics.A_class_member_cannot_be_declared_optional) || checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_class_property_declaration_must_directly_refer_to_a_built_in_symbol)) {
                     return true;
                 }
             }
@@ -17625,12 +22354,7 @@ var ts;
             }
         }
         function checkGrammarTopLevelElementForRequiredDeclareModifier(node) {
-            if (node.kind === 197 ||
-                node.kind === 203 ||
-                node.kind === 202 ||
-                node.kind === 209 ||
-                node.kind === 208 ||
-                (node.flags & 2)) {
+            if (node.kind === 197 || node.kind === 204 || node.kind === 203 || node.kind === 210 || node.kind === 209 || (node.flags & 2)) {
                 return false;
             }
             return grammarErrorOnFirstToken(node, ts.Diagnostics.A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file);
@@ -17657,7 +22381,7 @@ var ts;
                 if (!links.hasReportedStatementInAmbientContext && ts.isFunctionLike(node.parent)) {
                     return getNodeLinks(node).hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.An_implementation_cannot_be_declared_in_ambient_contexts);
                 }
-                if (node.parent.kind === 174 || node.parent.kind === 201 || node.parent.kind === 220) {
+                if (node.parent.kind === 174 || node.parent.kind === 201 || node.parent.kind === 221) {
                     var links = getNodeLinks(node.parent);
                     if (!links.hasReportedStatementInAmbientContext) {
                         return links.hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.Statements_are_not_allowed_in_ambient_contexts);
@@ -17692,7 +22416,10 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    var indentStrings = ["", "    "];
+    var indentStrings = [
+        "",
+        "    "
+    ];
     function getIndentString(level) {
         if (indentStrings[level] === undefined) {
             indentStrings[level] = getIndentString(level - 1) + indentStrings[1];
@@ -17767,21 +22494,34 @@ var ts;
             writeTextOfNode: writeTextOfNode,
             writeLiteral: writeLiteral,
             writeLine: writeLine,
-            increaseIndent: function () { return indent++; },
-            decreaseIndent: function () { return indent--; },
-            getIndent: function () { return indent; },
-            getTextPos: function () { return output.length; },
-            getLine: function () { return lineCount + 1; },
-            getColumn: function () { return lineStart ? indent * getIndentSize() + 1 : output.length - linePos + 1; },
-            getText: function () { return output; }
+            increaseIndent: function () {
+                return indent++;
+            },
+            decreaseIndent: function () {
+                return indent--;
+            },
+            getIndent: function () {
+                return indent;
+            },
+            getTextPos: function () {
+                return output.length;
+            },
+            getLine: function () {
+                return lineCount + 1;
+            },
+            getColumn: function () {
+                return lineStart ? indent * getIndentSize() + 1 : output.length - linePos + 1;
+            },
+            getText: function () {
+                return output;
+            }
         };
     }
     function getLineOfLocalPosition(currentSourceFile, pos) {
         return ts.getLineAndCharacterOfPosition(currentSourceFile, pos).line;
     }
     function emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments) {
-        if (leadingComments && leadingComments.length && node.pos !== leadingComments[0].pos &&
-            getLineOfLocalPosition(currentSourceFile, node.pos) !== getLineOfLocalPosition(currentSourceFile, leadingComments[0].pos)) {
+        if (leadingComments && leadingComments.length && node.pos !== leadingComments[0].pos && getLineOfLocalPosition(currentSourceFile, node.pos) !== getLineOfLocalPosition(currentSourceFile, leadingComments[0].pos)) {
             writer.writeLine();
         }
     }
@@ -17810,9 +22550,7 @@ var ts;
             var lineCount = ts.getLineStarts(currentSourceFile).length;
             var firstCommentLineIndent;
             for (var pos = comment.pos, currentLine = firstCommentLineAndCharacter.line; pos < comment.end; currentLine++) {
-                var nextLineStart = (currentLine + 1) === lineCount
-                    ? currentSourceFile.text.length + 1
-                    : ts.getStartPositionOfLine(currentLine + 1, currentSourceFile);
+                var nextLineStart = (currentLine + 1) === lineCount ? currentSourceFile.text.length + 1 : ts.getStartPositionOfLine(currentLine + 1, currentSourceFile);
                 if (pos !== comment.pos) {
                     if (firstCommentLineIndent === undefined) {
                         firstCommentLineIndent = calculateIndent(ts.getStartPositionOfLine(firstCommentLineAndCharacter.line, currentSourceFile), comment.pos);
@@ -17890,8 +22628,7 @@ var ts;
         }
         else {
             ts.forEach(declarations, function (member) {
-                if ((member.kind === 134 || member.kind === 135)
-                    && (member.flags & 128) === (accessor.flags & 128)) {
+                if ((member.kind === 134 || member.kind === 135) && (member.flags & 128) === (accessor.flags & 128)) {
                     var memberName = ts.getPropertyNameForPropertyNameNode(member.name);
                     var accessorName = ts.getPropertyNameForPropertyNameNode(accessor.name);
                     if (memberName === accessorName) {
@@ -17947,7 +22684,8 @@ var ts;
         var enclosingDeclaration;
         var currentSourceFile;
         var reportedDeclarationError = false;
-        var emitJsDocComments = compilerOptions.removeComments ? function (declaration) { } : writeJsDocComments;
+        var emitJsDocComments = compilerOptions.removeComments ? function (declaration) {
+        } : writeJsDocComments;
         var emit = compilerOptions.stripInternal ? stripInternal : emitNode;
         var aliasDeclarationEmitInfo = [];
         var referencePathsOutput = "";
@@ -17956,9 +22694,7 @@ var ts;
                 var addedGlobalFileReference = false;
                 ts.forEach(root.referencedFiles, function (fileReference) {
                     var referencedFile = ts.tryResolveScriptReference(host, root, fileReference);
-                    if (referencedFile && ((referencedFile.flags & 2048) ||
-                        shouldEmitToOwnFile(referencedFile, compilerOptions) ||
-                        !addedGlobalFileReference)) {
+                    if (referencedFile && ((referencedFile.flags & 2048) || shouldEmitToOwnFile(referencedFile, compilerOptions) || !addedGlobalFileReference)) {
                         writeReferencePath(referencedFile);
                         if (!isExternalModuleOrDeclarationFile(referencedFile)) {
                             addedGlobalFileReference = true;
@@ -17975,8 +22711,7 @@ var ts;
                     if (!compilerOptions.noResolve) {
                         ts.forEach(sourceFile.referencedFiles, function (fileReference) {
                             var referencedFile = ts.tryResolveScriptReference(host, sourceFile, fileReference);
-                            if (referencedFile && (isExternalModuleOrDeclarationFile(referencedFile) &&
-                                !ts.contains(emittedReferencedFiles, referencedFile))) {
+                            if (referencedFile && (isExternalModuleOrDeclarationFile(referencedFile) && !ts.contains(emittedReferencedFiles, referencedFile))) {
                                 writeReferencePath(referencedFile);
                                 emittedReferencedFiles.push(referencedFile);
                             }
@@ -18030,7 +22765,9 @@ var ts;
         function writeAsychronousImportEqualsDeclarations(importEqualsDeclarations) {
             var oldWriter = writer;
             ts.forEach(importEqualsDeclarations, function (aliasToWrite) {
-                var aliasEmitInfo = ts.forEach(aliasDeclarationEmitInfo, function (declEmitInfo) { return declEmitInfo.declaration === aliasToWrite ? declEmitInfo : undefined; });
+                var aliasEmitInfo = ts.forEach(aliasDeclarationEmitInfo, function (declEmitInfo) {
+                    return declEmitInfo.declaration === aliasToWrite ? declEmitInfo : undefined;
+                });
                 if (aliasEmitInfo) {
                     createAndSetNewTextWriterWithSymbolWriter();
                     for (var declarationIndent = aliasEmitInfo.indent; declarationIndent; declarationIndent--) {
@@ -18148,7 +22885,7 @@ var ts;
                     ts.Debug.fail("Unknown type annotation: " + type.kind);
             }
             function emitEntityName(entityName) {
-                var visibilityResult = resolver.isEntityNameVisible(entityName, entityName.parent.kind === 202 ? entityName.parent : enclosingDeclaration);
+                var visibilityResult = resolver.isEntityNameVisible(entityName, entityName.parent.kind === 203 ? entityName.parent : enclosingDeclaration);
                 handleSymbolAccessibilityError(visibilityResult);
                 writeEntityName(entityName);
                 function writeEntityName(entityName) {
@@ -18355,15 +23092,8 @@ var ts;
                 writeTextOfNode(currentSourceFile, node.name);
                 if (node.constraint && !isPrivateMethodTypeParameter(node)) {
                     write(" extends ");
-                    if (node.parent.kind === 140 ||
-                        node.parent.kind === 141 ||
-                        (node.parent.parent && node.parent.parent.kind === 143)) {
-                        ts.Debug.assert(node.parent.kind === 132 ||
-                            node.parent.kind === 131 ||
-                            node.parent.kind === 140 ||
-                            node.parent.kind === 141 ||
-                            node.parent.kind === 136 ||
-                            node.parent.kind === 137);
+                    if (node.parent.kind === 140 || node.parent.kind === 141 || (node.parent.parent && node.parent.parent.kind === 143)) {
+                        ts.Debug.assert(node.parent.kind === 132 || node.parent.kind === 131 || node.parent.kind === 140 || node.parent.kind === 141 || node.parent.kind === 136 || node.parent.kind === 137);
                         emitType(node.constraint);
                     }
                     else {
@@ -18426,9 +23156,7 @@ var ts;
                 function getHeritageClauseVisibilityError(symbolAccesibilityResult) {
                     var diagnosticMessage;
                     if (node.parent.parent.kind === 196) {
-                        diagnosticMessage = isImplementsList ?
-                            ts.Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 :
-                            ts.Diagnostics.Extends_clause_of_exported_class_0_has_or_is_using_private_name_1;
+                        diagnosticMessage = isImplementsList ? ts.Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 : ts.Diagnostics.Extends_clause_of_exported_class_0_has_or_is_using_private_name_1;
                     }
                     else {
                         diagnosticMessage = ts.Diagnostics.Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1;
@@ -18461,7 +23189,9 @@ var ts;
                 emitTypeParameters(node.typeParameters);
                 var baseTypeNode = ts.getClassBaseTypeNode(node);
                 if (baseTypeNode) {
-                    emitHeritageClause([baseTypeNode], false);
+                    emitHeritageClause([
+                        baseTypeNode
+                    ], false);
                 }
                 emitHeritageClause(ts.getClassImplementedTypeNodes(node), true);
                 write(" {");
@@ -18521,31 +23251,17 @@ var ts;
             function getVariableDeclarationTypeVisibilityError(symbolAccesibilityResult) {
                 var diagnosticMessage;
                 if (node.kind === 193) {
-                    diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                        symbolAccesibilityResult.accessibility === 2 ?
-                            ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
-                            ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_private_module_2 :
-                        ts.Diagnostics.Exported_variable_0_has_or_is_using_private_name_1;
+                    diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Exported_variable_0_has_or_is_using_private_name_1;
                 }
                 else if (node.kind === 130 || node.kind === 129) {
                     if (node.flags & 128) {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
-                                ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
-                                ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1;
                     }
                     else if (node.parent.kind === 196) {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
-                                ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
-                                ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_private_name_1;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_private_name_1;
                     }
                     else {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_private_name_1;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_private_name_1;
                     }
                 }
                 return diagnosticMessage !== undefined ? {
@@ -18562,7 +23278,9 @@ var ts;
             }
         }
         function emitVariableStatement(node) {
-            var hasDeclarationWithEmit = ts.forEach(node.declarationList.declarations, function (varDeclaration) { return resolver.isDeclarationVisible(varDeclaration); });
+            var hasDeclarationWithEmit = ts.forEach(node.declarationList.declarations, function (varDeclaration) {
+                return resolver.isDeclarationVisible(varDeclaration);
+            });
             if (hasDeclarationWithEmit) {
                 emitJsDocComments(node);
                 emitModuleElementDeclarationFlags(node);
@@ -18607,25 +23325,17 @@ var ts;
             }
             function getTypeAnnotationFromAccessor(accessor) {
                 if (accessor) {
-                    return accessor.kind === 134
-                        ? accessor.type
-                        : accessor.parameters.length > 0
-                            ? accessor.parameters[0].type
-                            : undefined;
+                    return accessor.kind === 134 ? accessor.type : accessor.parameters.length > 0 ? accessor.parameters[0].type : undefined;
                 }
             }
             function getAccessorDeclarationTypeVisibilityError(symbolAccesibilityResult) {
                 var diagnosticMessage;
                 if (accessorWithTypeAnnotation.kind === 135) {
                     if (accessorWithTypeAnnotation.parent.flags & 128) {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1;
                     }
                     else {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1;
                     }
                     return {
                         diagnosticMessage: diagnosticMessage,
@@ -18635,18 +23345,10 @@ var ts;
                 }
                 else {
                     if (accessorWithTypeAnnotation.flags & 128) {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
-                                ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
-                                ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
-                            ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0;
                     }
                     else {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
-                                ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
-                                ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
-                            ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0;
                     }
                     return {
                         diagnosticMessage: diagnosticMessage,
@@ -18660,8 +23362,7 @@ var ts;
             if (ts.hasDynamicName(node)) {
                 return;
             }
-            if ((node.kind !== 195 || resolver.isDeclarationVisible(node)) &&
-                !resolver.isImplementationOfOverload(node)) {
+            if ((node.kind !== 195 || resolver.isDeclarationVisible(node)) && !resolver.isImplementationOfOverload(node)) {
                 emitJsDocComments(node);
                 if (node.kind === 195) {
                     emitModuleElementDeclarationFlags(node);
@@ -18728,48 +23429,28 @@ var ts;
                 var diagnosticMessage;
                 switch (node.kind) {
                     case 137:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
-                            ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0;
                         break;
                     case 136:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
-                            ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0;
                         break;
                     case 138:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
-                            ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0;
                         break;
                     case 132:
                     case 131:
                         if (node.flags & 128) {
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === 2 ?
-                                    ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
-                                    ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
-                                ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0;
+                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0;
                         }
                         else if (node.parent.kind === 196) {
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === 2 ?
-                                    ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
-                                    ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
-                                ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0;
+                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0;
                         }
                         else {
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                                ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
-                                ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0;
+                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0;
                         }
                         break;
                     case 195:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
-                                ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
-                                ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1 :
-                            ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_private_name_0;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_private_name_0;
                         break;
                     default:
                         ts.Debug.fail("This is unknown kind for signature: " + node.kind);
@@ -18796,9 +23477,7 @@ var ts;
                 write("?");
             }
             decreaseIndent();
-            if (node.parent.kind === 140 ||
-                node.parent.kind === 141 ||
-                node.parent.parent.kind === 143) {
+            if (node.parent.kind === 140 || node.parent.kind === 141 || node.parent.parent.kind === 143) {
                 emitTypeOfVariableDeclarationFromTypeLiteral(node);
             }
             else if (!(node.parent.flags & 32)) {
@@ -18808,50 +23487,28 @@ var ts;
                 var diagnosticMessage;
                 switch (node.parent.kind) {
                     case 133:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
-                                ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
-                                ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1;
                         break;
                     case 137:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
                         break;
                     case 136:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
                         break;
                     case 132:
                     case 131:
                         if (node.parent.flags & 128) {
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === 2 ?
-                                    ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
-                                    ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
-                                ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
+                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
                         }
                         else if (node.parent.parent.kind === 196) {
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === 2 ?
-                                    ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
-                                    ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
-                                ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1;
+                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1;
                         }
                         else {
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                                ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
-                                ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
+                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
                         }
                         break;
                     case 195:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
-                                ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
-                                ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_private_name_1;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_private_name_1;
                         break;
                     default:
                         ts.Debug.fail("This is unknown parent for parameter: " + node.parent.kind);
@@ -18888,26 +23545,22 @@ var ts;
                     return emitClassDeclaration(node);
                 case 198:
                     return emitTypeAliasDeclaration(node);
-                case 219:
+                case 220:
                     return emitEnumMemberDeclaration(node);
                 case 199:
                     return emitEnumDeclaration(node);
                 case 200:
                     return emitModuleDeclaration(node);
-                case 202:
+                case 203:
                     return emitImportEqualsDeclaration(node);
-                case 208:
+                case 209:
                     return emitExportAssignment(node);
-                case 220:
+                case 221:
                     return emitSourceFile(node);
             }
         }
         function writeReferencePath(referencedFile) {
-            var declFileName = referencedFile.flags & 2048
-                ? referencedFile.fileName
-                : shouldEmitToOwnFile(referencedFile, compilerOptions)
-                    ? getOwnEmitOutputFilePath(referencedFile, host, ".d.ts")
-                    : ts.removeFileExtension(compilerOptions.out) + ".d.ts";
+            var declFileName = referencedFile.flags & 2048 ? referencedFile.fileName : shouldEmitToOwnFile(referencedFile, compilerOptions) ? getOwnEmitOutputFilePath(referencedFile, host, ".d.ts") : ts.removeFileExtension(compilerOptions.out) + ".d.ts";
             declFileName = ts.getRelativePathToDirectoryOrUrl(ts.getDirectoryPath(ts.normalizeSlashes(jsFilePath)), declFileName, host.getCurrentDirectory(), host.getCanonicalFileName, false);
             referencePathsOutput += "/// <reference path=\"" + declFileName + "\" />" + newLine;
         }
@@ -18958,6 +23611,7 @@ var ts;
             var writeLine = writer.writeLine;
             var increaseIndent = writer.increaseIndent;
             var decreaseIndent = writer.decreaseIndent;
+            var preserveNewLines = compilerOptions.preserveNewLines || false;
             var currentSourceFile;
             var lastFrame;
             var currentScopeNames;
@@ -18970,41 +23624,57 @@ var ts;
             var exportSpecifiers;
             var exportDefault;
             var writeEmittedFiles = writeJavaScriptFile;
-            var emitLeadingComments = compilerOptions.removeComments ? function (node) { } : emitLeadingDeclarationComments;
-            var emitTrailingComments = compilerOptions.removeComments ? function (node) { } : emitTrailingDeclarationComments;
-            var emitLeadingCommentsOfPosition = compilerOptions.removeComments ? function (pos) { } : emitLeadingCommentsOfLocalPosition;
+            var emitLeadingComments = compilerOptions.removeComments ? function (node) {
+            } : emitLeadingDeclarationComments;
+            var emitTrailingComments = compilerOptions.removeComments ? function (node) {
+            } : emitTrailingDeclarationComments;
+            var emitLeadingCommentsOfPosition = compilerOptions.removeComments ? function (pos) {
+            } : emitLeadingCommentsOfLocalPosition;
             var detachedCommentsInfo;
-            var emitDetachedComments = compilerOptions.removeComments ? function (node) { } : emitDetachedCommentsAtPosition;
-            var emitPinnedOrTripleSlashComments = compilerOptions.removeComments ? function (node) { } : emitPinnedOrTripleSlashCommentsOfNode;
+            var emitDetachedComments = compilerOptions.removeComments ? function (node) {
+            } : emitDetachedCommentsAtPosition;
             var writeComment = writeCommentRange;
-            var emit = emitNode;
-            var emitStart = function (node) { };
-            var emitEnd = function (node) { };
+            var emitNodeWithoutSourceMap = compilerOptions.removeComments ? emitNodeWithoutSourceMapWithoutComments : emitNodeWithoutSourceMapWithComments;
+            var emit = emitNodeWithoutSourceMap;
+            var emitWithoutComments = emitNodeWithoutSourceMapWithoutComments;
+            var emitStart = function (node) {
+            };
+            var emitEnd = function (node) {
+            };
             var emitToken = emitTokenText;
-            var scopeEmitStart = function (scopeDeclaration, scopeName) { };
-            var scopeEmitEnd = function () { };
+            var scopeEmitStart = function (scopeDeclaration, scopeName) {
+            };
+            var scopeEmitEnd = function () {
+            };
             var sourceMapData;
             if (compilerOptions.sourceMap) {
                 initializeEmitterWithSourceMaps();
             }
             if (root) {
-                emit(root);
+                emitSourceFile(root);
             }
             else {
                 ts.forEach(host.getSourceFiles(), function (sourceFile) {
                     if (!isExternalModuleOrDeclarationFile(sourceFile)) {
-                        emit(sourceFile);
+                        emitSourceFile(sourceFile);
                     }
                 });
             }
             writeLine();
             writeEmittedFiles(writer.getText(), compilerOptions.emitBOM);
             return;
+            function emitSourceFile(sourceFile) {
+                currentSourceFile = sourceFile;
+                emit(sourceFile);
+            }
             function enterNameScope() {
                 var names = currentScopeNames;
                 currentScopeNames = undefined;
                 if (names) {
-                    lastFrame = { names: names, previous: lastFrame };
+                    lastFrame = {
+                        names: names,
+                        previous: lastFrame
+                    };
                     return true;
                 }
                 return false;
@@ -19024,8 +23694,13 @@ var ts;
                     name = baseName;
                 }
                 else {
-                    name = ts.generateUniqueName(baseName, function (n) { return isExistingName(location, n); });
+                    name = ts.generateUniqueName(baseName, function (n) {
+                        return isExistingName(location, n);
+                    });
                 }
+                return recordNameInCurrentScope(name);
+            }
+            function recordNameInCurrentScope(name) {
                 if (!currentScopeNames) {
                     currentScopeNames = {};
                 }
@@ -19121,12 +23796,7 @@ var ts;
                     sourceLinePos.character++;
                     var emittedLine = writer.getLine();
                     var emittedColumn = writer.getColumn();
-                    if (!lastRecordedSourceMapSpan ||
-                        lastRecordedSourceMapSpan.emittedLine != emittedLine ||
-                        lastRecordedSourceMapSpan.emittedColumn != emittedColumn ||
-                        (lastRecordedSourceMapSpan.sourceIndex === sourceMapSourceIndex &&
-                            (lastRecordedSourceMapSpan.sourceLine > sourceLinePos.line ||
-                                (lastRecordedSourceMapSpan.sourceLine === sourceLinePos.line && lastRecordedSourceMapSpan.sourceColumn > sourceLinePos.character)))) {
+                    if (!lastRecordedSourceMapSpan || lastRecordedSourceMapSpan.emittedLine != emittedLine || lastRecordedSourceMapSpan.emittedColumn != emittedColumn || (lastRecordedSourceMapSpan.sourceIndex === sourceMapSourceIndex && (lastRecordedSourceMapSpan.sourceLine > sourceLinePos.line || (lastRecordedSourceMapSpan.sourceLine === sourceLinePos.line && lastRecordedSourceMapSpan.sourceColumn > sourceLinePos.character)))) {
                         encodeLastRecordedSourceMapSpan();
                         lastRecordedSourceMapSpan = {
                             emittedLine: emittedLine,
@@ -19189,20 +23859,10 @@ var ts;
                     if (scopeName) {
                         recordScopeNameStart(scopeName);
                     }
-                    else if (node.kind === 195 ||
-                        node.kind === 160 ||
-                        node.kind === 132 ||
-                        node.kind === 131 ||
-                        node.kind === 134 ||
-                        node.kind === 135 ||
-                        node.kind === 200 ||
-                        node.kind === 196 ||
-                        node.kind === 199) {
+                    else if (node.kind === 195 || node.kind === 160 || node.kind === 132 || node.kind === 131 || node.kind === 134 || node.kind === 135 || node.kind === 200 || node.kind === 196 || node.kind === 199) {
                         if (node.name) {
                             var name = node.name;
-                            scopeName = name.kind === 126
-                                ? ts.getTextOfNode(name)
-                                : node.name.text;
+                            scopeName = name.kind === 126 ? ts.getTextOfNode(name) : node.name.text;
                         }
                         recordScopeNameStart(scopeName);
                     }
@@ -19280,21 +23940,32 @@ var ts;
                 else {
                     sourceMapDir = ts.getDirectoryPath(ts.normalizePath(jsFilePath));
                 }
-                function emitNodeWithMap(node) {
+                function emitNodeWithSourceMap(node) {
                     if (node) {
-                        if (node.kind != 220) {
+                        if (ts.nodeIsSynthesized(node)) {
+                            return emitNodeWithoutSourceMap(node);
+                        }
+                        if (node.kind != 221) {
                             recordEmitNodeStartSpan(node);
-                            emitNode(node);
+                            emitNodeWithoutSourceMap(node);
                             recordEmitNodeEndSpan(node);
                         }
                         else {
                             recordNewSourceFileStart(node);
-                            emitNode(node);
+                            emitNodeWithoutSourceMap(node);
                         }
                     }
                 }
+                function emitNodeWithSourceMapWithoutComments(node) {
+                    if (node) {
+                        recordEmitNodeStartSpan(node);
+                        emitNodeWithoutSourceMapWithoutComments(node);
+                        recordEmitNodeEndSpan(node);
+                    }
+                }
                 writeEmittedFiles = writeJavaScriptAndSourceMapFile;
-                emit = emitNodeWithMap;
+                emit = emitNodeWithSourceMap;
+                emitWithoutComments = emitNodeWithSourceMapWithoutComments;
                 emitStart = recordEmitNodeStartSpan;
                 emitEnd = recordEmitNodeEndSpan;
                 emitToken = writeTextWithSpanRecord;
@@ -19314,6 +23985,7 @@ var ts;
                     name = "_" + (tempCount < 25 ? String.fromCharCode(tempCount + (tempCount < 8 ? 0 : 1) + 97) : tempCount - 25);
                     tempCount++;
                 }
+                recordNameInCurrentScope(name);
                 var result = ts.createSynthesizedNode(64);
                 result.text = name;
                 return result;
@@ -19375,7 +24047,7 @@ var ts;
             function emitLinePreservingList(parent, nodes, allowTrailingComma, spacesBetweenBraces) {
                 ts.Debug.assert(nodes.length > 0);
                 increaseIndent();
-                if (nodeStartPositionsAreOnSameLine(parent, nodes[0])) {
+                if (preserveNewLines && nodeStartPositionsAreOnSameLine(parent, nodes[0])) {
                     if (spacesBetweenBraces) {
                         write(" ");
                     }
@@ -19385,7 +24057,7 @@ var ts;
                 }
                 for (var i = 0, n = nodes.length; i < n; i++) {
                     if (i) {
-                        if (nodeEndIsOnSameLineAsNodeStart(nodes[i - 1], nodes[i])) {
+                        if (preserveNewLines && nodeEndIsOnSameLineAsNodeStart(nodes[i - 1], nodes[i])) {
                             write(", ");
                         }
                         else {
@@ -19395,12 +24067,11 @@ var ts;
                     }
                     emit(nodes[i]);
                 }
-                var closeTokenIsOnSameLineAsLastElement = nodeEndPositionsAreOnSameLine(parent, ts.lastOrUndefined(nodes));
                 if (nodes.hasTrailingComma && allowTrailingComma) {
                     write(",");
                 }
                 decreaseIndent();
-                if (closeTokenIsOnSameLineAsLastElement) {
+                if (preserveNewLines && nodeEndPositionsAreOnSameLine(parent, ts.lastOrUndefined(nodes))) {
                     if (spacesBetweenBraces) {
                         write(" ");
                     }
@@ -19534,8 +24205,7 @@ var ts;
                 if (node.template.kind === 169) {
                     ts.forEach(node.template.templateSpans, function (templateSpan) {
                         write(", ");
-                        var needsParens = templateSpan.expression.kind === 167
-                            && templateSpan.expression.operatorToken.kind === 23;
+                        var needsParens = templateSpan.expression.kind === 167 && templateSpan.expression.operatorToken.kind === 23;
                         emitParenthesizedIf(templateSpan.expression, needsParens);
                     });
                 }
@@ -19546,8 +24216,7 @@ var ts;
                     ts.forEachChild(node, emit);
                     return;
                 }
-                var emitOuterParens = ts.isExpression(node.parent)
-                    && templateNeedsParens(node, node.parent);
+                var emitOuterParens = ts.isExpression(node.parent) && templateNeedsParens(node, node.parent);
                 if (emitOuterParens) {
                     write("(");
                 }
@@ -19558,8 +24227,7 @@ var ts;
                 }
                 for (var i = 0; i < node.templateSpans.length; i++) {
                     var templateSpan = node.templateSpans[i];
-                    var needsParens = templateSpan.expression.kind !== 159
-                        && comparePrecedenceToBinaryPlus(templateSpan.expression) !== 1;
+                    var needsParens = templateSpan.expression.kind !== 159 && comparePrecedenceToBinaryPlus(templateSpan.expression) !== 1;
                     if (i > 0 || headEmitted) {
                         write(" + ");
                     }
@@ -19640,9 +24308,9 @@ var ts;
                     case 150:
                     case 130:
                     case 129:
-                    case 217:
                     case 218:
                     case 219:
+                    case 220:
                     case 132:
                     case 131:
                     case 195:
@@ -19653,11 +24321,11 @@ var ts;
                     case 197:
                     case 199:
                     case 200:
-                    case 202:
+                    case 203:
                         return parent.name === node;
                     case 185:
                     case 184:
-                    case 208:
+                    case 209:
                         return false;
                     case 189:
                         return node.parent.label === node;
@@ -19845,9 +24513,9 @@ var ts;
             }
             function tryGetRightHandSideOfPatchingPropertyAssignment(objectLiteral, property) {
                 switch (property.kind) {
-                    case 217:
-                        return property.initializer;
                     case 218:
+                        return property.initializer;
+                    case 219:
                         return createIdentifier(resolver.getExpressionNameSubstitution(property.name));
                     case 132:
                         return createFunctionExpression(property.parameters, property.body);
@@ -19901,6 +24569,11 @@ var ts;
                 result.right = right;
                 return result;
             }
+            function createExpressionStatement(expression) {
+                var result = ts.createSynthesizedNode(177);
+                result.expression = expression;
+                return result;
+            }
             function createMemberAccessForPropertyName(expression, memberName) {
                 if (memberName.kind === 64) {
                     return createPropertyAccessExpression(expression, memberName);
@@ -19916,7 +24589,7 @@ var ts;
                 }
             }
             function createPropertyAssignment(name, initializer) {
-                var result = ts.createSynthesizedNode(217);
+                var result = ts.createSynthesizedNode(218);
                 result.name = name;
                 result.initializer = initializer;
                 return result;
@@ -20011,29 +24684,31 @@ var ts;
                 }
                 return false;
             }
-            function indentIfOnDifferentLines(parent, node1, node2) {
-                var isSynthesized = ts.nodeIsSynthesized(parent);
-                var realNodesAreOnDifferentLines = !isSynthesized && !nodeEndIsOnSameLineAsNodeStart(node1, node2);
+            function indentIfOnDifferentLines(parent, node1, node2, valueToWriteWhenNotIndenting) {
+                var realNodesAreOnDifferentLines = preserveNewLines && !ts.nodeIsSynthesized(parent) && !nodeEndIsOnSameLineAsNodeStart(node1, node2);
                 var synthesizedNodeIsOnDifferentLine = synthesizedNodeStartsOnNewLine(node2);
                 if (realNodesAreOnDifferentLines || synthesizedNodeIsOnDifferentLine) {
                     increaseIndent();
                     writeLine();
                     return true;
                 }
-                return false;
+                else {
+                    if (valueToWriteWhenNotIndenting) {
+                        write(valueToWriteWhenNotIndenting);
+                    }
+                    return false;
+                }
             }
             function emitPropertyAccess(node) {
                 if (tryEmitConstantValue(node)) {
                     return;
                 }
                 emit(node.expression);
-                var indented = indentIfOnDifferentLines(node, node.expression, node.dotToken);
+                var indentedBeforeDot = indentIfOnDifferentLines(node, node.expression, node.dotToken);
                 write(".");
-                indented = indented || indentIfOnDifferentLines(node, node.dotToken, node.name);
+                var indentedAfterDot = indentIfOnDifferentLines(node, node.dotToken, node.name);
                 emit(node.name);
-                if (indented) {
-                    decreaseIndent();
-                }
+                decreaseIndentIf(indentedBeforeDot, indentedAfterDot);
             }
             function emitQualifiedName(node) {
                 emit(node.left);
@@ -20050,7 +24725,9 @@ var ts;
                 write("]");
             }
             function hasSpreadElement(elements) {
-                return ts.forEach(elements, function (e) { return e.kind === 171; });
+                return ts.forEach(elements, function (e) {
+                    return e.kind === 171;
+                });
             }
             function skipParentheses(node) {
                 while (node.kind === 159 || node.kind === 158) {
@@ -20163,14 +24840,7 @@ var ts;
                         while (operand.kind == 158) {
                             operand = operand.expression;
                         }
-                        if (operand.kind !== 165 &&
-                            operand.kind !== 164 &&
-                            operand.kind !== 163 &&
-                            operand.kind !== 162 &&
-                            operand.kind !== 166 &&
-                            operand.kind !== 156 &&
-                            !(operand.kind === 155 && node.parent.kind === 156) &&
-                            !(operand.kind === 160 && node.parent.kind === 155)) {
+                        if (operand.kind !== 165 && operand.kind !== 164 && operand.kind !== 163 && operand.kind !== 162 && operand.kind !== 166 && operand.kind !== 156 && !(operand.kind === 155 && node.parent.kind === 156) && !(operand.kind === 160 && node.parent.kind === 155)) {
                             emit(operand);
                             return;
                         }
@@ -20213,27 +24883,16 @@ var ts;
                 write(ts.tokenToString(node.operator));
             }
             function emitBinaryExpression(node) {
-                if (languageVersion < 2 && node.operatorToken.kind === 52 &&
-                    (node.left.kind === 152 || node.left.kind === 151)) {
-                    emitDestructuring(node);
+                if (languageVersion < 2 && node.operatorToken.kind === 52 && (node.left.kind === 152 || node.left.kind === 151)) {
+                    emitDestructuring(node, node.parent.kind === 177);
                 }
                 else {
                     emit(node.left);
-                    var indented1 = indentIfOnDifferentLines(node, node.left, node.operatorToken);
-                    if (!indented1 && node.operatorToken.kind !== 23) {
-                        write(" ");
-                    }
+                    var indentedBeforeOperator = indentIfOnDifferentLines(node, node.left, node.operatorToken, node.operatorToken.kind !== 23 ? " " : undefined);
                     write(ts.tokenToString(node.operatorToken.kind));
-                    if (!indented1) {
-                        var indented2 = indentIfOnDifferentLines(node, node.operatorToken, node.right);
-                    }
-                    if (!indented2) {
-                        write(" ");
-                    }
+                    var indentedAfterOperator = indentIfOnDifferentLines(node, node.operatorToken, node.right, " ");
                     emit(node.right);
-                    if (indented1 || indented2) {
-                        decreaseIndent();
-                    }
+                    decreaseIndentIf(indentedBeforeOperator, indentedAfterOperator);
                 }
             }
             function synthesizedNodeStartsOnNewLine(node) {
@@ -20241,34 +24900,22 @@ var ts;
             }
             function emitConditionalExpression(node) {
                 emit(node.condition);
-                var indent1 = indentIfOnDifferentLines(node, node.condition, node.questionToken);
-                if (!indent1) {
-                    write(" ");
-                }
+                var indentedBeforeQuestion = indentIfOnDifferentLines(node, node.condition, node.questionToken, " ");
                 write("?");
-                if (!indent1) {
-                    var indent2 = indentIfOnDifferentLines(node, node.questionToken, node.whenTrue);
-                }
-                if (!indent2) {
-                    write(" ");
-                }
+                var indentedAfterQuestion = indentIfOnDifferentLines(node, node.questionToken, node.whenTrue, " ");
                 emit(node.whenTrue);
-                if (indent1 || indent2) {
+                decreaseIndentIf(indentedBeforeQuestion, indentedAfterQuestion);
+                var indentedBeforeColon = indentIfOnDifferentLines(node, node.whenTrue, node.colonToken, " ");
+                write(":");
+                var indentedAfterColon = indentIfOnDifferentLines(node, node.colonToken, node.whenFalse, " ");
+                emit(node.whenFalse);
+                decreaseIndentIf(indentedBeforeColon, indentedAfterColon);
+            }
+            function decreaseIndentIf(value1, value2) {
+                if (value1) {
                     decreaseIndent();
                 }
-                var indent3 = indentIfOnDifferentLines(node, node.whenTrue, node.colonToken);
-                if (!indent3) {
-                    write(" ");
-                }
-                write(":");
-                if (!indent3) {
-                    var indent4 = indentIfOnDifferentLines(node, node.colonToken, node.whenFalse);
-                }
-                if (!indent4) {
-                    write(" ");
-                }
-                emit(node.whenFalse);
-                if (indent3 || indent4) {
+                if (value2) {
                     decreaseIndent();
                 }
             }
@@ -20279,7 +24926,7 @@ var ts;
                 }
             }
             function emitBlock(node) {
-                if (isSingleLineEmptyBlock(node)) {
+                if (preserveNewLines && isSingleLineEmptyBlock(node)) {
                     emitToken(14, node.pos);
                     write(" ");
                     emitToken(15, node.statements.end);
@@ -20401,6 +25048,9 @@ var ts;
                 emitEmbeddedStatement(node.statement);
             }
             function emitForInOrForOfStatement(node) {
+                if (languageVersion < 2 && node.kind === 183) {
+                    return emitDownLevelForOfStatement(node);
+                }
                 var endPos = emitToken(81, node.pos);
                 write(" ");
                 endPos = emitToken(16, endPos);
@@ -20426,6 +25076,86 @@ var ts;
                 emitToken(17, node.expression.end);
                 emitEmbeddedStatement(node.statement);
             }
+            function emitDownLevelForOfStatement(node) {
+                var endPos = emitToken(81, node.pos);
+                write(" ");
+                endPos = emitToken(16, endPos);
+                var rhsIsIdentifier = node.expression.kind === 64;
+                var counter = createTempVariable(node, true);
+                var rhsReference = rhsIsIdentifier ? node.expression : createTempVariable(node, false);
+                emitStart(node.expression);
+                write("var ");
+                emitNodeWithoutSourceMap(counter);
+                write(" = 0");
+                emitEnd(node.expression);
+                if (!rhsIsIdentifier) {
+                    write(", ");
+                    emitStart(node.expression);
+                    emitNodeWithoutSourceMap(rhsReference);
+                    write(" = ");
+                    emitNodeWithoutSourceMap(node.expression);
+                    emitEnd(node.expression);
+                }
+                write("; ");
+                emitStart(node.initializer);
+                emitNodeWithoutSourceMap(counter);
+                write(" < ");
+                emitNodeWithoutSourceMap(rhsReference);
+                write(".length");
+                emitEnd(node.initializer);
+                write("; ");
+                emitStart(node.initializer);
+                emitNodeWithoutSourceMap(counter);
+                write("++");
+                emitEnd(node.initializer);
+                emitToken(17, node.expression.end);
+                write(" {");
+                writeLine();
+                increaseIndent();
+                var rhsIterationValue = createElementAccessExpression(rhsReference, counter);
+                emitStart(node.initializer);
+                if (node.initializer.kind === 194) {
+                    write("var ");
+                    var variableDeclarationList = node.initializer;
+                    if (variableDeclarationList.declarations.length > 0) {
+                        var declaration = variableDeclarationList.declarations[0];
+                        if (ts.isBindingPattern(declaration.name)) {
+                            emitDestructuring(declaration, false, rhsIterationValue);
+                        }
+                        else {
+                            emitNodeWithoutSourceMap(declaration);
+                            write(" = ");
+                            emitNodeWithoutSourceMap(rhsIterationValue);
+                        }
+                    }
+                    else {
+                        emitNodeWithoutSourceMap(createTempVariable(node, false));
+                        write(" = ");
+                        emitNodeWithoutSourceMap(rhsIterationValue);
+                    }
+                }
+                else {
+                    var assignmentExpression = createBinaryExpression(node.initializer, 52, rhsIterationValue, false);
+                    if (node.initializer.kind === 151 || node.initializer.kind === 152) {
+                        emitDestructuring(assignmentExpression, true, undefined, node);
+                    }
+                    else {
+                        emitNodeWithoutSourceMap(assignmentExpression);
+                    }
+                }
+                emitEnd(node.initializer);
+                write(";");
+                if (node.statement.kind === 174) {
+                    emitLines(node.statement.statements);
+                }
+                else {
+                    writeLine();
+                    emit(node.statement);
+                }
+                writeLine();
+                decreaseIndent();
+                write("}");
+            }
             function emitBreakOrContinueStatement(node) {
                 emitToken(node.kind === 185 ? 65 : 70, node.pos);
                 emitOptional(" ", node.label);
@@ -20449,7 +25179,10 @@ var ts;
                 emit(node.expression);
                 endPos = emitToken(17, node.expression.end);
                 write(" ");
-                emitToken(14, endPos);
+                emitCaseBlock(node.caseBlock, endPos);
+            }
+            function emitCaseBlock(node, startPos) {
+                emitToken(14, startPos);
                 increaseIndent();
                 emitLines(node.clauses);
                 decreaseIndent();
@@ -20457,19 +25190,16 @@ var ts;
                 emitToken(15, node.clauses.end);
             }
             function nodeStartPositionsAreOnSameLine(node1, node2) {
-                return getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node1.pos)) ===
-                    getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node2.pos));
+                return getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node1.pos)) === getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node2.pos));
             }
             function nodeEndPositionsAreOnSameLine(node1, node2) {
-                return getLineOfLocalPosition(currentSourceFile, node1.end) ===
-                    getLineOfLocalPosition(currentSourceFile, node2.end);
+                return getLineOfLocalPosition(currentSourceFile, node1.end) === getLineOfLocalPosition(currentSourceFile, node2.end);
             }
             function nodeEndIsOnSameLineAsNodeStart(node1, node2) {
-                return getLineOfLocalPosition(currentSourceFile, node1.end) ===
-                    getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node2.pos));
+                return getLineOfLocalPosition(currentSourceFile, node1.end) === getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node2.pos));
             }
             function emitCaseOrDefaultClause(node) {
-                if (node.kind === 213) {
+                if (node.kind === 214) {
                     write("case ");
                     emit(node.expression);
                     write(":");
@@ -20477,7 +25207,7 @@ var ts;
                 else {
                     write("default:");
                 }
-                if (node.statements.length === 1 && nodeStartPositionsAreOnSameLine(node, node.statements[0])) {
+                if (preserveNewLines && node.statements.length === 1 && nodeStartPositionsAreOnSameLine(node, node.statements[0])) {
                     write(" ");
                     emit(node.statements[0]);
                 }
@@ -20537,7 +25267,7 @@ var ts;
                     emitContainingModuleName(node);
                     write(".");
                 }
-                emitNode(node.name);
+                emitNodeWithoutSourceMap(node.name);
                 emitEnd(node.name);
             }
             function createVoidZero() {
@@ -20554,21 +25284,22 @@ var ts;
                         emitStart(specifier.name);
                         emitContainingModuleName(specifier);
                         write(".");
-                        emitNode(specifier.name);
+                        emitNodeWithoutSourceMap(specifier.name);
                         emitEnd(specifier.name);
                         write(" = ");
-                        emitNode(name);
+                        emitNodeWithoutSourceMap(name);
                         write(";");
                     });
                 }
             }
-            function emitDestructuring(root, value) {
+            function emitDestructuring(root, isAssignmentExpressionStatement, value, lowestNonSynthesizedAncestor) {
                 var emitCount = 0;
                 var isDeclaration = (root.kind === 193 && !(ts.getCombinedNodeFlags(root) & 1)) || root.kind === 128;
                 if (root.kind === 167) {
                     emitAssignmentExpression(root);
                 }
                 else {
+                    ts.Debug.assert(!isAssignmentExpressionStatement);
                     emitBindingElement(root, value);
                 }
                 function emitAssignment(name, value) {
@@ -20587,7 +25318,7 @@ var ts;
                 }
                 function ensureIdentifier(expr) {
                     if (expr.kind !== 64) {
-                        var identifier = createTempVariable(root);
+                        var identifier = createTempVariable(lowestNonSynthesizedAncestor || root);
                         if (!isDeclaration) {
                             recordTempDeclaration(identifier);
                         }
@@ -20645,7 +25376,7 @@ var ts;
                     }
                     for (var i = 0; i < properties.length; i++) {
                         var p = properties[i];
-                        if (p.kind === 217 || p.kind === 218) {
+                        if (p.kind === 218 || p.kind === 219) {
                             var propName = (p.name);
                             emitDestructuringAssignment(p.initializer || propName, createPropertyAccess(value, propName));
                         }
@@ -20690,7 +25421,7 @@ var ts;
                 function emitAssignmentExpression(root) {
                     var target = root.left;
                     var value = root.right;
-                    if (root.parent.kind === 177) {
+                    if (isAssignmentExpressionStatement) {
                         emitDestructuringAssignment(target, value);
                     }
                     else {
@@ -20747,7 +25478,7 @@ var ts;
             function emitVariableDeclaration(node) {
                 if (ts.isBindingPattern(node.name)) {
                     if (languageVersion < 2) {
-                        emitDestructuring(node);
+                        emitDestructuring(node, false);
                     }
                     else {
                         emit(node.name);
@@ -20755,15 +25486,12 @@ var ts;
                     }
                 }
                 else {
-                    var isLet = renameNonTopLevelLetAndConst(node.name);
+                    renameNonTopLevelLetAndConst(node.name);
                     emitModuleMemberName(node);
                     var initializer = node.initializer;
                     if (!initializer && languageVersion < 2) {
-                        var isUninitializedLet = (resolver.getNodeCheckFlags(node) & 256) &&
-                            (getCombinedFlagsForIdentifier(node.name) & 4096);
-                        if (isUninitializedLet &&
-                            node.parent.parent.kind !== 182 &&
-                            node.parent.parent.kind !== 183) {
+                        var isUninitializedLet = (resolver.getNodeCheckFlags(node) & 256) && (getCombinedFlagsForIdentifier(node.name) & 4096);
+                        if (isUninitializedLet && node.parent.parent.kind !== 182 && node.parent.parent.kind !== 183) {
                             initializer = createVoidZero();
                         }
                     }
@@ -20779,29 +25507,6 @@ var ts;
                     ts.forEach(name.elements, emitExportVariableAssignments);
                 }
             }
-            function getEnclosingBlockScopeContainer(node) {
-                var current = node;
-                while (current) {
-                    if (ts.isFunctionLike(current)) {
-                        return current;
-                    }
-                    switch (current.kind) {
-                        case 220:
-                        case 91:
-                        case 216:
-                        case 200:
-                        case 181:
-                        case 182:
-                        case 183:
-                            return current;
-                        case 174:
-                            if (!ts.isFunctionLike(current.parent)) {
-                                return current;
-                            }
-                    }
-                    current = current.parent;
-                }
-            }
             function getCombinedFlagsForIdentifier(node) {
                 if (!node.parent || (node.parent.kind !== 193 && node.parent.kind !== 150)) {
                     return 0;
@@ -20809,10 +25514,7 @@ var ts;
                 return ts.getCombinedNodeFlags(node.parent);
             }
             function renameNonTopLevelLetAndConst(node) {
-                if (languageVersion >= 2 ||
-                    ts.nodeIsSynthesized(node) ||
-                    node.kind !== 64 ||
-                    (node.parent.kind !== 193 && node.parent.kind !== 150)) {
+                if (languageVersion >= 2 || ts.nodeIsSynthesized(node) || node.kind !== 64 || (node.parent.kind !== 193 && node.parent.kind !== 150)) {
                     return;
                 }
                 var combinedFlags = getCombinedFlagsForIdentifier(node);
@@ -20820,13 +25522,11 @@ var ts;
                     return;
                 }
                 var list = ts.getAncestor(node, 194);
-                if (list.parent.kind === 175 && list.parent.parent.kind === 220) {
+                if (list.parent.kind === 175 && list.parent.parent.kind === 221) {
                     return;
                 }
-                var blockScopeContainer = getEnclosingBlockScopeContainer(node);
-                var parent = blockScopeContainer.kind === 220
-                    ? blockScopeContainer
-                    : blockScopeContainer.parent;
+                var blockScopeContainer = ts.getEnclosingBlockScopeContainer(node);
+                var parent = blockScopeContainer.kind === 221 ? blockScopeContainer : blockScopeContainer.parent;
                 var generatedName = generateUniqueNameForLocation(parent, node.text);
                 var variableId = resolver.getBlockScopedVariableId(node);
                 if (!generatedBlockScopeNames) {
@@ -20873,7 +25573,7 @@ var ts;
                         if (ts.isBindingPattern(p.name)) {
                             writeLine();
                             write("var ");
-                            emitDestructuring(p, tempParameters[tempIndex]);
+                            emitDestructuring(p, false, tempParameters[tempIndex]);
                             write(";");
                             tempIndex++;
                         }
@@ -20881,14 +25581,14 @@ var ts;
                             writeLine();
                             emitStart(p);
                             write("if (");
-                            emitNode(p.name);
+                            emitNodeWithoutSourceMap(p.name);
                             write(" === void 0)");
                             emitEnd(p);
                             write(" { ");
                             emitStart(p);
-                            emitNode(p.name);
+                            emitNodeWithoutSourceMap(p.name);
                             write(" = ");
-                            emitNode(p.initializer);
+                            emitNodeWithoutSourceMap(p.initializer);
                             emitEnd(p);
                             write("; }");
                         }
@@ -20904,7 +25604,7 @@ var ts;
                     emitLeadingComments(restParam);
                     emitStart(restParam);
                     write("var ");
-                    emitNode(restParam.name);
+                    emitNodeWithoutSourceMap(restParam.name);
                     write(" = [];");
                     emitEnd(restParam);
                     emitTrailingComments(restParam);
@@ -20925,7 +25625,7 @@ var ts;
                     increaseIndent();
                     writeLine();
                     emitStart(restParam);
-                    emitNode(restParam.name);
+                    emitNodeWithoutSourceMap(restParam.name);
                     write("[" + tempName + " - " + restIndex + "] = arguments[" + tempName + "];");
                     emitEnd(restParam);
                     decreaseIndent();
@@ -20943,7 +25643,7 @@ var ts;
             }
             function emitDeclarationName(node) {
                 if (node.name) {
-                    emitNode(node.name);
+                    emitNodeWithoutSourceMap(node.name);
                 }
                 else {
                     write(resolver.getGeneratedNameForNode(node));
@@ -21060,11 +25760,11 @@ var ts;
                 emitFunctionBodyPreamble(node);
                 var preambleEmitted = writer.getTextPos() !== outPos;
                 decreaseIndent();
-                if (!preambleEmitted && nodeStartPositionsAreOnSameLine(node, body)) {
+                if (preserveNewLines && !preambleEmitted && nodeStartPositionsAreOnSameLine(node, body)) {
                     write(" ");
                     emitStart(body);
                     write("return ");
-                    emitNode(body, true);
+                    emitWithoutComments(body);
                     emitEnd(body);
                     write(";");
                     emitTempDeclarations(false);
@@ -21075,7 +25775,7 @@ var ts;
                     writeLine();
                     emitLeadingComments(node.body);
                     write("return ");
-                    emit(node.body, true);
+                    emitWithoutComments(node.body);
                     write(";");
                     emitTrailingComments(node.body);
                     emitTempDeclarations(true);
@@ -21097,7 +25797,7 @@ var ts;
                 emitFunctionBodyPreamble(node);
                 decreaseIndent();
                 var preambleEmitted = writer.getTextPos() !== initialTextPos;
-                if (!preambleEmitted && nodeEndIsOnSameLineAsNodeStart(body, body)) {
+                if (preserveNewLines && !preambleEmitted && nodeEndIsOnSameLineAsNodeStart(body, body)) {
                     for (var i = 0, n = body.statements.length; i < n; i++) {
                         write(" ");
                         emit(body.statements[i]);
@@ -21138,7 +25838,7 @@ var ts;
                         emitStart(param);
                         emitStart(param.name);
                         write("this.");
-                        emitNode(param.name);
+                        emitNodeWithoutSourceMap(param.name);
                         emitEnd(param.name);
                         write(" = ");
                         emit(param.name);
@@ -21150,7 +25850,7 @@ var ts;
             function emitMemberAccessForPropertyName(memberName) {
                 if (memberName.kind === 8 || memberName.kind === 7) {
                     write("[");
-                    emitNode(memberName);
+                    emitNodeWithoutSourceMap(memberName);
                     write("]");
                 }
                 else if (memberName.kind === 126) {
@@ -21158,7 +25858,7 @@ var ts;
                 }
                 else {
                     write(".");
-                    emitNode(memberName);
+                    emitNodeWithoutSourceMap(memberName);
                 }
             }
             function emitMemberAssignments(node, staticFlag) {
@@ -21587,8 +26287,7 @@ var ts;
                     emitImportDeclaration(node);
                     return;
                 }
-                if (resolver.isReferencedAliasDeclaration(node) ||
-                    (!ts.isExternalModule(currentSourceFile) && resolver.isTopLevelValueImportEqualsWithEntityName(node))) {
+                if (resolver.isReferencedAliasDeclaration(node) || (!ts.isExternalModule(currentSourceFile) && resolver.isTopLevelValueImportEqualsWithEntityName(node))) {
                     emitLeadingComments(node);
                     emitStart(node);
                     if (!(node.flags & 1))
@@ -21617,11 +26316,11 @@ var ts;
                             emitStart(specifier);
                             emitContainingModuleName(specifier);
                             write(".");
-                            emitNode(specifier.name);
+                            emitNodeWithoutSourceMap(specifier.name);
                             write(" = ");
                             write(generatedName);
                             write(".");
-                            emitNode(specifier.propertyName || specifier.name);
+                            emitNodeWithoutSourceMap(specifier.propertyName || specifier.name);
                             write(";");
                             emitEnd(specifier);
                         });
@@ -21639,15 +26338,15 @@ var ts;
                 }
             }
             function createExternalImportInfo(node) {
-                if (node.kind === 202) {
-                    if (node.moduleReference.kind === 212) {
+                if (node.kind === 203) {
+                    if (node.moduleReference.kind === 213) {
                         return {
                             rootNode: node,
                             declarationNode: node
                         };
                     }
                 }
-                else if (node.kind === 203) {
+                else if (node.kind === 204) {
                     var importClause = node.importClause;
                     if (importClause) {
                         if (importClause.name) {
@@ -21656,7 +26355,7 @@ var ts;
                                 declarationNode: importClause
                             };
                         }
-                        if (importClause.namedBindings.kind === 205) {
+                        if (importClause.namedBindings.kind === 206) {
                             return {
                                 rootNode: node,
                                 declarationNode: importClause.namedBindings
@@ -21672,7 +26371,7 @@ var ts;
                         rootNode: node
                     };
                 }
-                else if (node.kind === 209) {
+                else if (node.kind === 210) {
                     if (node.moduleSpecifier) {
                         return {
                             rootNode: node
@@ -21685,7 +26384,7 @@ var ts;
                 exportSpecifiers = {};
                 exportDefault = undefined;
                 ts.forEach(sourceFile.statements, function (node) {
-                    if (node.kind === 209 && !node.moduleSpecifier) {
+                    if (node.kind === 210 && !node.moduleSpecifier) {
                         ts.forEach(node.exportClause.elements, function (specifier) {
                             if (specifier.name.text === "default") {
                                 exportDefault = exportDefault || specifier;
@@ -21694,7 +26393,7 @@ var ts;
                             (exportSpecifiers[name] || (exportSpecifiers[name] = [])).push(specifier);
                         });
                     }
-                    else if (node.kind === 208) {
+                    else if (node.kind === 209) {
                         exportDefault = exportDefault || node;
                     }
                     else if (node.kind === 195 || node.kind === 196) {
@@ -21724,7 +26423,7 @@ var ts;
             }
             function getFirstExportAssignment(sourceFile) {
                 return ts.forEach(sourceFile.statements, function (node) {
-                    if (node.kind === 208) {
+                    if (node.kind === 209) {
                         return node;
                     }
                 });
@@ -21802,10 +26501,10 @@ var ts;
                     writeLine();
                     emitStart(exportDefault);
                     write(emitAsReturn ? "return " : "module.exports = ");
-                    if (exportDefault.kind === 208) {
+                    if (exportDefault.kind === 209) {
                         emit(exportDefault.expression);
                     }
-                    else if (exportDefault.kind === 211) {
+                    else if (exportDefault.kind === 212) {
                         emit(exportDefault.propertyName);
                     }
                     else {
@@ -21829,8 +26528,7 @@ var ts;
                 }
                 return statements.length;
             }
-            function emitSourceFile(node) {
-                currentSourceFile = node;
+            function emitSourceFileNode(node) {
                 writeLine();
                 emitDetachedComments(node);
                 var startIndex = emitDirectivePrologues(node.statements, false);
@@ -21870,14 +26568,14 @@ var ts;
                 }
                 emitLeadingComments(node.endOfFileToken);
             }
-            function emitNode(node, disableComments) {
+            function emitNodeWithoutSourceMapWithComments(node) {
                 if (!node) {
                     return;
                 }
                 if (node.flags & 2) {
                     return emitPinnedOrTripleSlashComments(node);
                 }
-                var emitComments = !disableComments && shouldEmitLeadingAndTrailingComments(node);
+                var emitComments = shouldEmitLeadingAndTrailingComments(node);
                 if (emitComments) {
                     emitLeadingComments(node);
                 }
@@ -21886,14 +26584,23 @@ var ts;
                     emitTrailingComments(node);
                 }
             }
+            function emitNodeWithoutSourceMapWithoutComments(node) {
+                if (!node) {
+                    return;
+                }
+                if (node.flags & 2) {
+                    return emitPinnedOrTripleSlashComments(node);
+                }
+                emitJavaScriptWorker(node);
+            }
             function shouldEmitLeadingAndTrailingComments(node) {
                 switch (node.kind) {
                     case 197:
                     case 195:
+                    case 204:
                     case 203:
-                    case 202:
                     case 198:
-                    case 208:
+                    case 209:
                         return false;
                     case 200:
                         return shouldEmitModuleDeclaration(node);
@@ -21948,9 +26655,9 @@ var ts;
                         return emitArrayLiteral(node);
                     case 152:
                         return emitObjectLiteral(node);
-                    case 217:
-                        return emitPropertyAssignment(node);
                     case 218:
+                        return emitPropertyAssignment(node);
+                    case 219:
                         return emitShorthandPropertyAssignment(node);
                     case 126:
                         return emitComputedPropertyName(node);
@@ -22019,8 +26726,8 @@ var ts;
                         return emitWithStatement(node);
                     case 188:
                         return emitSwitchStatement(node);
-                    case 213:
                     case 214:
+                    case 215:
                         return emitCaseOrDefaultClause(node);
                     case 189:
                         return emitLabelledStatement(node);
@@ -22028,7 +26735,7 @@ var ts;
                         return emitThrowStatement(node);
                     case 191:
                         return emitTryStatement(node);
-                    case 216:
+                    case 217:
                         return emitCatchClause(node);
                     case 192:
                         return emitDebuggerStatement(node);
@@ -22040,18 +26747,18 @@ var ts;
                         return emitInterfaceDeclaration(node);
                     case 199:
                         return emitEnumDeclaration(node);
-                    case 219:
+                    case 220:
                         return emitEnumMember(node);
                     case 200:
                         return emitModuleDeclaration(node);
-                    case 203:
+                    case 204:
                         return emitImportDeclaration(node);
-                    case 202:
+                    case 203:
                         return emitImportEqualsDeclaration(node);
-                    case 209:
+                    case 210:
                         return emitExportDeclaration(node);
-                    case 220:
-                        return emitSourceFile(node);
+                    case 221:
+                        return emitSourceFileNode(node);
                 }
             }
             function hasDetachedComments(pos) {
@@ -22069,7 +26776,7 @@ var ts;
             }
             function getLeadingCommentsToEmit(node) {
                 if (node.parent) {
-                    if (node.parent.kind === 220 || node.pos !== node.parent.pos) {
+                    if (node.parent.kind === 221 || node.pos !== node.parent.pos) {
                         var leadingComments;
                         if (hasDetachedComments(node.pos)) {
                             leadingComments = getLeadingCommentsWithoutDetachedComments();
@@ -22088,7 +26795,7 @@ var ts;
             }
             function emitTrailingDeclarationComments(node) {
                 if (node.parent) {
-                    if (node.parent.kind === 220 || node.end !== node.parent.end) {
+                    if (node.parent.kind === 221 || node.end !== node.parent.end) {
                         var trailingComments = ts.getTrailingCommentRanges(currentSourceFile.text, node.end);
                         emitComments(currentSourceFile, writer, trailingComments, false, newLine, writeComment);
                     }
@@ -22102,7 +26809,10 @@ var ts;
                 else {
                     leadingComments = ts.getLeadingCommentRanges(currentSourceFile.text, pos);
                 }
-                emitNewLineBeforeLeadingComments(currentSourceFile, writer, { pos: pos, end: pos }, leadingComments);
+                emitNewLineBeforeLeadingComments(currentSourceFile, writer, {
+                    pos: pos,
+                    end: pos
+                }, leadingComments);
                 emitComments(currentSourceFile, writer, leadingComments, true, newLine, writeComment);
             }
             function emitDetachedCommentsAtPosition(node) {
@@ -22127,27 +26837,29 @@ var ts;
                         if (nodeLine >= lastCommentLine + 2) {
                             emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments);
                             emitComments(currentSourceFile, writer, detachedComments, true, newLine, writeComment);
-                            var currentDetachedCommentInfo = { nodePos: node.pos, detachedCommentEndPos: detachedComments[detachedComments.length - 1].end };
+                            var currentDetachedCommentInfo = {
+                                nodePos: node.pos,
+                                detachedCommentEndPos: detachedComments[detachedComments.length - 1].end
+                            };
                             if (detachedCommentsInfo) {
                                 detachedCommentsInfo.push(currentDetachedCommentInfo);
                             }
                             else {
-                                detachedCommentsInfo = [currentDetachedCommentInfo];
+                                detachedCommentsInfo = [
+                                    currentDetachedCommentInfo
+                                ];
                             }
                         }
                     }
                 }
             }
-            function emitPinnedOrTripleSlashCommentsOfNode(node) {
+            function emitPinnedOrTripleSlashComments(node) {
                 var pinnedComments = ts.filter(getLeadingCommentsToEmit(node), isPinnedOrTripleSlashComment);
                 function isPinnedOrTripleSlashComment(comment) {
                     if (currentSourceFile.text.charCodeAt(comment.pos + 1) === 42) {
                         return currentSourceFile.text.charCodeAt(comment.pos + 2) === 33;
                     }
-                    else if (currentSourceFile.text.charCodeAt(comment.pos + 1) === 47 &&
-                        comment.pos + 2 < comment.end &&
-                        currentSourceFile.text.charCodeAt(comment.pos + 2) === 47 &&
-                        currentSourceFile.text.substring(comment.pos, comment.end).match(ts.fullTripleSlashReferencePathRegEx)) {
+                    else if (currentSourceFile.text.charCodeAt(comment.pos + 1) === 47 && comment.pos + 2 < comment.end && currentSourceFile.text.charCodeAt(comment.pos + 2) === 47 && currentSourceFile.text.substring(comment.pos, comment.end).match(ts.fullTripleSlashReferencePathRegEx)) {
                         return true;
                     }
                 }
@@ -22184,6 +26896,7 @@ var ts;
 (function (ts) {
     ts.emitTime = 0;
     ts.ioReadTime = 0;
+    ts.version = "1.5.0.0";
     function createCompilerHost(options) {
         var currentDirectory;
         var existingDirectories = {};
@@ -22199,9 +26912,7 @@ var ts;
             }
             catch (e) {
                 if (onError) {
-                    onError(e.number === unsupportedFileEncodingErrorCode
-                        ? ts.createCompilerDiagnostic(ts.Diagnostics.Unsupported_file_encoding).messageText
-                        : e.message);
+                    onError(e.number === unsupportedFileEncodingErrorCode ? ts.createCompilerDiagnostic(ts.Diagnostics.Unsupported_file_encoding).messageText : e.message);
                 }
                 text = "";
             }
@@ -22237,12 +26948,20 @@ var ts;
         }
         return {
             getSourceFile: getSourceFile,
-            getDefaultLibFileName: function (options) { return ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(ts.sys.getExecutingFilePath())), ts.getDefaultLibFileName(options)); },
+            getDefaultLibFileName: function (options) {
+                return ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(ts.sys.getExecutingFilePath())), ts.getDefaultLibFileName(options));
+            },
             writeFile: writeFile,
-            getCurrentDirectory: function () { return currentDirectory || (currentDirectory = ts.sys.getCurrentDirectory()); },
-            useCaseSensitiveFileNames: function () { return ts.sys.useCaseSensitiveFileNames; },
+            getCurrentDirectory: function () {
+                return currentDirectory || (currentDirectory = ts.sys.getCurrentDirectory());
+            },
+            useCaseSensitiveFileNames: function () {
+                return ts.sys.useCaseSensitiveFileNames;
+            },
             getCanonicalFileName: getCanonicalFileName,
-            getNewLine: function () { return ts.sys.newLine; }
+            getNewLine: function () {
+                return ts.sys.newLine;
+            }
         };
     }
     ts.createCompilerHost = createCompilerHost;
@@ -22282,7 +27001,9 @@ var ts;
         var seenNoDefaultLib = options.noLib;
         var commonSourceDirectory;
         host = host || createCompilerHost(options);
-        ts.forEach(rootNames, function (name) { return processRootFile(name, false); });
+        ts.forEach(rootNames, function (name) {
+            return processRootFile(name, false);
+        });
         if (!seenNoDefaultLib) {
             processRootFile(host.getDefaultLibFileName(options), true);
         }
@@ -22291,21 +27012,35 @@ var ts;
         var noDiagnosticsTypeChecker;
         program = {
             getSourceFile: getSourceFile,
-            getSourceFiles: function () { return files; },
-            getCompilerOptions: function () { return options; },
+            getSourceFiles: function () {
+                return files;
+            },
+            getCompilerOptions: function () {
+                return options;
+            },
             getSyntacticDiagnostics: getSyntacticDiagnostics,
             getGlobalDiagnostics: getGlobalDiagnostics,
             getSemanticDiagnostics: getSemanticDiagnostics,
             getDeclarationDiagnostics: getDeclarationDiagnostics,
             getTypeChecker: getTypeChecker,
             getDiagnosticsProducingTypeChecker: getDiagnosticsProducingTypeChecker,
-            getCommonSourceDirectory: function () { return commonSourceDirectory; },
+            getCommonSourceDirectory: function () {
+                return commonSourceDirectory;
+            },
             emit: emit,
             getCurrentDirectory: host.getCurrentDirectory,
-            getNodeCount: function () { return getDiagnosticsProducingTypeChecker().getNodeCount(); },
-            getIdentifierCount: function () { return getDiagnosticsProducingTypeChecker().getIdentifierCount(); },
-            getSymbolCount: function () { return getDiagnosticsProducingTypeChecker().getSymbolCount(); },
-            getTypeCount: function () { return getDiagnosticsProducingTypeChecker().getTypeCount(); }
+            getNodeCount: function () {
+                return getDiagnosticsProducingTypeChecker().getNodeCount();
+            },
+            getIdentifierCount: function () {
+                return getDiagnosticsProducingTypeChecker().getIdentifierCount();
+            },
+            getSymbolCount: function () {
+                return getDiagnosticsProducingTypeChecker().getSymbolCount();
+            },
+            getTypeCount: function () {
+                return getDiagnosticsProducingTypeChecker().getTypeCount();
+            }
         };
         return program;
         function getEmitHost(writeFileCallback) {
@@ -22332,7 +27067,11 @@ var ts;
         }
         function emit(sourceFile, writeFileCallback) {
             if (options.noEmitOnError && getPreEmitDiagnostics(this).length > 0) {
-                return { diagnostics: [], sourceMaps: undefined, emitSkipped: true };
+                return {
+                    diagnostics: [],
+                    sourceMaps: undefined,
+                    emitSkipped: true
+                };
             }
             var emitResolver = getDiagnosticsProducingTypeChecker().getEmitResolver(sourceFile);
             var start = new Date().getTime();
@@ -22474,7 +27213,7 @@ var ts;
         }
         function processImportedModules(file, basePath) {
             ts.forEach(file.statements, function (node) {
-                if (node.kind === 203 || node.kind === 202 || node.kind === 209) {
+                if (node.kind === 204 || node.kind === 203 || node.kind === 210) {
                     var moduleNameExpr = ts.getExternalModuleName(node);
                     if (moduleNameExpr && moduleNameExpr.kind === 8) {
                         var moduleNameText = moduleNameExpr.text;
@@ -22496,8 +27235,7 @@ var ts;
                 }
                 else if (node.kind === 200 && node.name.kind === 8 && (node.flags & 2 || ts.isDeclarationFile(file))) {
                     ts.forEachChild(node.body, function (node) {
-                        if (ts.isExternalModuleImportEqualsDeclaration(node) &&
-                            ts.getExternalModuleImportEqualsDeclarationExpression(node).kind === 8) {
+                        if (ts.isExternalModuleImportEqualsDeclaration(node) && ts.getExternalModuleImportEqualsDeclarationExpression(node).kind === 8) {
                             var nameLiteral = ts.getExternalModuleImportEqualsDeclarationExpression(node);
                             var moduleName = nameLiteral.text;
                             if (moduleName) {
@@ -22525,19 +27263,17 @@ var ts;
                 }
                 return;
             }
-            var firstExternalModuleSourceFile = ts.forEach(files, function (f) { return ts.isExternalModule(f) ? f : undefined; });
+            var firstExternalModuleSourceFile = ts.forEach(files, function (f) {
+                return ts.isExternalModule(f) ? f : undefined;
+            });
             if (firstExternalModuleSourceFile && !options.module) {
                 var span = ts.getErrorSpanForNode(firstExternalModuleSourceFile, firstExternalModuleSourceFile.externalModuleIndicator);
                 diagnostics.add(ts.createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_external_modules_unless_the_module_flag_is_provided));
             }
-            if (options.outDir ||
-                options.sourceRoot ||
-                (options.mapRoot &&
-                    (!options.out || firstExternalModuleSourceFile !== undefined))) {
+            if (options.outDir || options.sourceRoot || (options.mapRoot && (!options.out || firstExternalModuleSourceFile !== undefined))) {
                 var commonPathComponents;
                 ts.forEach(files, function (sourceFile) {
-                    if (!(sourceFile.flags & 2048)
-                        && !ts.fileExtensionIs(sourceFile.fileName, ".js")) {
+                    if (!(sourceFile.flags & 2048) && !ts.fileExtensionIs(sourceFile.fileName, ".js")) {
                         var sourcePathComponents = ts.getNormalizedPathComponents(sourceFile.fileName, host.getCurrentDirectory());
                         sourcePathComponents.pop();
                         if (commonPathComponents) {
@@ -22715,10 +27451,20 @@ var ts;
             description: ts.Diagnostics.Do_not_emit_declarations_for_code_that_has_an_internal_annotation,
             experimental: true
         },
+        {
+            name: "preserveNewLines",
+            type: "boolean",
+            description: ts.Diagnostics.Preserve_new_lines_when_emitting_code,
+            experimental: true
+        },
         {
             name: "target",
             shortName: "t",
-            type: { "es3": 0, "es5": 1, "es6": 2 },
+            type: {
+                "es3": 0,
+                "es5": 1,
+                "es6": 2
+            },
             description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES6_experimental,
             paramType: ts.Diagnostics.VERSION,
             error: ts.Diagnostics.Argument_for_target_option_must_be_es3_es5_or_es6
@@ -22898,7 +27644,9 @@ var ts;
             var files = [];
             if (ts.hasProperty(json, "files")) {
                 if (json["files"] instanceof Array) {
-                    var files = ts.map(json["files"], function (s) { return ts.combinePaths(basePath, s); });
+                    var files = ts.map(json["files"], function (s) {
+                        return ts.combinePaths(basePath, s);
+                    });
                 }
             }
             else {
@@ -22948,14 +27696,7 @@ var ts;
                             var parent = n.parent;
                             var openBrace = ts.findChildOfKind(n, 14, sourceFile);
                             var closeBrace = ts.findChildOfKind(n, 15, sourceFile);
-                            if (parent.kind === 179 ||
-                                parent.kind === 182 ||
-                                parent.kind === 183 ||
-                                parent.kind === 181 ||
-                                parent.kind === 178 ||
-                                parent.kind === 180 ||
-                                parent.kind === 187 ||
-                                parent.kind === 216) {
+                            if (parent.kind === 179 || parent.kind === 182 || parent.kind === 183 || parent.kind === 181 || parent.kind === 178 || parent.kind === 180 || parent.kind === 187 || parent.kind === 217) {
                                 addOutliningSpan(parent, openBrace, closeBrace, autoCollapse(n));
                                 break;
                             }
@@ -22991,7 +27732,7 @@ var ts;
                     case 197:
                     case 199:
                     case 152:
-                    case 188:
+                    case 202:
                         var openBrace = ts.findChildOfKind(n, 14, sourceFile);
                         var closeBrace = ts.findChildOfKind(n, 15, sourceFile);
                         addOutliningSpan(n, openBrace, closeBrace, autoCollapse(n));
@@ -23042,7 +27783,13 @@ var ts;
                         }
                         var fileName = sourceFile.fileName;
                         var matchKind = bestMatchKind(matches);
-                        rawItems.push({ name: name, fileName: fileName, matchKind: matchKind, isCaseSensitive: allMatchesAreCaseSensitive(matches), declaration: declaration });
+                        rawItems.push({
+                            name: name,
+                            fileName: fileName,
+                            matchKind: matchKind,
+                            isCaseSensitive: allMatchesAreCaseSensitive(matches),
+                            declaration: declaration
+                        });
                     }
                 }
             });
@@ -23076,9 +27823,7 @@ var ts;
                 return undefined;
             }
             function getTextOfIdentifierOrLiteral(node) {
-                if (node.kind === 64 ||
-                    node.kind === 8 ||
-                    node.kind === 7) {
+                if (node.kind === 64 || node.kind === 8 || node.kind === 7) {
                     return node.text;
                 }
                 return undefined;
@@ -23142,11 +27887,11 @@ var ts;
                 }
                 return bestMatchKind;
             }
-            var baseSensitivity = { sensitivity: "base" };
+            var baseSensitivity = {
+                sensitivity: "base"
+            };
             function compareNavigateToItems(i1, i2) {
-                return i1.matchKind - i2.matchKind ||
-                    i1.name.localeCompare(i2.name, undefined, baseSensitivity) ||
-                    i1.name.localeCompare(i2.name);
+                return i1.matchKind - i2.matchKind || i1.name.localeCompare(i2.name, undefined, baseSensitivity) || i1.name.localeCompare(i2.name);
             }
             function createNavigateToItem(rawItem) {
                 var declaration = rawItem.declaration;
@@ -23204,19 +27949,19 @@ var ts;
                         case 149:
                             ts.forEach(node.elements, visit);
                             break;
-                        case 209:
+                        case 210:
                             if (node.exportClause) {
                                 ts.forEach(node.exportClause.elements, visit);
                             }
                             break;
-                        case 203:
+                        case 204:
                             var importClause = node.importClause;
                             if (importClause) {
                                 if (importClause.name) {
                                     childNodes.push(importClause);
                                 }
                                 if (importClause.namedBindings) {
-                                    if (importClause.namedBindings.kind === 205) {
+                                    if (importClause.namedBindings.kind === 206) {
                                         childNodes.push(importClause.namedBindings);
                                     }
                                     else {
@@ -23236,9 +27981,9 @@ var ts;
                         case 197:
                         case 200:
                         case 195:
-                        case 202:
-                        case 207:
-                        case 211:
+                        case 203:
+                        case 208:
+                        case 212:
                             childNodes.push(node);
                             break;
                     }
@@ -23296,7 +28041,9 @@ var ts;
             function isTopLevelFunctionDeclaration(functionDeclaration) {
                 if (functionDeclaration.kind === 195) {
                     if (functionDeclaration.body && functionDeclaration.body.kind === 174) {
-                        if (ts.forEach(functionDeclaration.body.statements, function (s) { return s.kind === 195 && !isEmpty(s.name.text); })) {
+                        if (ts.forEach(functionDeclaration.body.statements, function (s) {
+                            return s.kind === 195 && !isEmpty(s.name.text);
+                        })) {
                             return true;
                         }
                         if (!ts.isFunctionBlock(functionDeclaration.parent)) {
@@ -23366,7 +28113,7 @@ var ts;
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberSetAccessorElement);
                     case 138:
                         return createItem(node, "[]", ts.ScriptElementKind.indexSignatureElement);
-                    case 219:
+                    case 220:
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberVariableElement);
                     case 136:
                         return createItem(node, "()", ts.ScriptElementKind.callSignatureElement);
@@ -23405,16 +28152,18 @@ var ts;
                         }
                     case 133:
                         return createItem(node, "constructor", ts.ScriptElementKind.constructorImplementationElement);
-                    case 211:
-                    case 207:
-                    case 202:
-                    case 204:
+                    case 212:
+                    case 208:
+                    case 203:
                     case 205:
+                    case 206:
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.alias);
                 }
                 return undefined;
                 function createItem(node, name, scriptElementKind) {
-                    return getNavigationBarItem(name, scriptElementKind, ts.getNodeModifiers(node), [getNodeSpan(node)]);
+                    return getNavigationBarItem(name, scriptElementKind, ts.getNodeModifiers(node), [
+                        getNodeSpan(node)
+                    ]);
                 }
             }
             function isEmpty(text) {
@@ -23439,7 +28188,7 @@ var ts;
             }
             function createTopLevelItem(node) {
                 switch (node.kind) {
-                    case 220:
+                    case 221:
                         return createSourceFileItem(node);
                     case 196:
                         return createClassItem(node);
@@ -23468,12 +28217,16 @@ var ts;
                 function createModuleItem(node) {
                     var moduleName = getModuleName(node);
                     var childItems = getItemsWorker(getChildNodes(getInnermostModule(node).body.statements), createChildItem);
-                    return getNavigationBarItem(moduleName, ts.ScriptElementKind.moduleElement, ts.getNodeModifiers(node), [getNodeSpan(node)], childItems, getIndent(node));
+                    return getNavigationBarItem(moduleName, ts.ScriptElementKind.moduleElement, ts.getNodeModifiers(node), [
+                        getNodeSpan(node)
+                    ], childItems, getIndent(node));
                 }
                 function createFunctionItem(node) {
                     if (node.name && node.body && node.body.kind === 174) {
                         var childItems = getItemsWorker(sortNodes(node.body.statements), createChildItem);
-                        return getNavigationBarItem(node.name.text, ts.ScriptElementKind.functionElement, ts.getNodeModifiers(node), [getNodeSpan(node)], childItems, getIndent(node));
+                        return getNavigationBarItem(node.name.text, ts.ScriptElementKind.functionElement, ts.getNodeModifiers(node), [
+                            getNodeSpan(node)
+                        ], childItems, getIndent(node));
                     }
                     return undefined;
                 }
@@ -23483,10 +28236,10 @@ var ts;
                         return undefined;
                     }
                     hasGlobalNode = true;
-                    var rootName = ts.isExternalModule(node)
-                        ? "\"" + ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(node.fileName)))) + "\""
-                        : "<global>";
-                    return getNavigationBarItem(rootName, ts.ScriptElementKind.moduleElement, ts.ScriptElementKindModifier.none, [getNodeSpan(node)], childItems);
+                    var rootName = ts.isExternalModule(node) ? "\"" + ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(node.fileName)))) + "\"" : "<global>";
+                    return getNavigationBarItem(rootName, ts.ScriptElementKind.moduleElement, ts.ScriptElementKindModifier.none, [
+                        getNodeSpan(node)
+                    ], childItems);
                 }
                 function createClassItem(node) {
                     if (!node.name) {
@@ -23499,26 +28252,38 @@ var ts;
                         });
                         var nodes = removeDynamicallyNamedProperties(node);
                         if (constructor) {
-                            nodes.push.apply(nodes, ts.filter(constructor.parameters, function (p) { return !ts.isBindingPattern(p.name); }));
+                            nodes.push.apply(nodes, ts.filter(constructor.parameters, function (p) {
+                                return !ts.isBindingPattern(p.name);
+                            }));
                         }
                         var childItems = getItemsWorker(sortNodes(nodes), createChildItem);
                     }
-                    return getNavigationBarItem(node.name.text, ts.ScriptElementKind.classElement, ts.getNodeModifiers(node), [getNodeSpan(node)], childItems, getIndent(node));
+                    return getNavigationBarItem(node.name.text, ts.ScriptElementKind.classElement, ts.getNodeModifiers(node), [
+                        getNodeSpan(node)
+                    ], childItems, getIndent(node));
                 }
                 function createEnumItem(node) {
                     var childItems = getItemsWorker(sortNodes(removeComputedProperties(node)), createChildItem);
-                    return getNavigationBarItem(node.name.text, ts.ScriptElementKind.enumElement, ts.getNodeModifiers(node), [getNodeSpan(node)], childItems, getIndent(node));
+                    return getNavigationBarItem(node.name.text, ts.ScriptElementKind.enumElement, ts.getNodeModifiers(node), [
+                        getNodeSpan(node)
+                    ], childItems, getIndent(node));
                 }
                 function createIterfaceItem(node) {
                     var childItems = getItemsWorker(sortNodes(removeDynamicallyNamedProperties(node)), createChildItem);
-                    return getNavigationBarItem(node.name.text, ts.ScriptElementKind.interfaceElement, ts.getNodeModifiers(node), [getNodeSpan(node)], childItems, getIndent(node));
+                    return getNavigationBarItem(node.name.text, ts.ScriptElementKind.interfaceElement, ts.getNodeModifiers(node), [
+                        getNodeSpan(node)
+                    ], childItems, getIndent(node));
                 }
             }
             function removeComputedProperties(node) {
-                return ts.filter(node.members, function (member) { return member.name === undefined || member.name.kind !== 126; });
+                return ts.filter(node.members, function (member) {
+                    return member.name === undefined || member.name.kind !== 126;
+                });
             }
             function removeDynamicallyNamedProperties(node) {
-                return ts.filter(node.members, function (member) { return !ts.hasDynamicName(member); });
+                return ts.filter(node.members, function (member) {
+                    return !ts.hasDynamicName(member);
+                });
             }
             function getInnermostModule(node) {
                 while (node.body.kind === 200) {
@@ -23527,9 +28292,7 @@ var ts;
                 return node;
             }
             function getNodeSpan(node) {
-                return node.kind === 220
-                    ? ts.createTextSpanFromBounds(node.getFullStart(), node.getEnd())
-                    : ts.createTextSpanFromBounds(node.getStart(), node.getEnd());
+                return node.kind === 221 ? ts.createTextSpanFromBounds(node.getFullStart(), node.getEnd()) : ts.createTextSpanFromBounds(node.getStart(), node.getEnd());
             }
             function getTextOfNode(node) {
                 return ts.getTextOfNodeFromSourceText(sourceFile.text, node);
@@ -23559,7 +28322,9 @@ var ts;
         var stringToWordSpans = {};
         pattern = pattern.trim();
         var fullPatternSegment = createSegment(pattern);
-        var dotSeparatedSegments = pattern.split(".").map(function (p) { return createSegment(p.trim()); });
+        var dotSeparatedSegments = pattern.split(".").map(function (p) {
+            return createSegment(p.trim());
+        });
         var invalidPattern = dotSeparatedSegments.length === 0 || ts.forEach(dotSeparatedSegments, segmentIsInvalid);
         return {
             getMatches: getMatches,
@@ -23667,7 +28432,9 @@ var ts;
             if (!containsSpaceOrAsterisk(segment.totalTextChunk.text)) {
                 var match = matchTextChunk(candidate, segment.totalTextChunk, false);
                 if (match) {
-                    return [match];
+                    return [
+                        match
+                    ];
                 }
             }
             var subWordTextChunks = segment.subWordTextChunks;
@@ -23734,8 +28501,7 @@ var ts;
                 for (; currentChunkSpan < chunkCharacterSpans.length; currentChunkSpan++) {
                     var chunkCharacterSpan = chunkCharacterSpans[currentChunkSpan];
                     if (gotOneMatchThisCandidate) {
-                        if (!isUpperCaseLetter(chunk.text.charCodeAt(chunkCharacterSpans[currentChunkSpan - 1].start)) ||
-                            !isUpperCaseLetter(chunk.text.charCodeAt(chunkCharacterSpans[currentChunkSpan].start))) {
+                        if (!isUpperCaseLetter(chunk.text.charCodeAt(chunkCharacterSpans[currentChunkSpan - 1].start)) || !isUpperCaseLetter(chunk.text.charCodeAt(chunkCharacterSpans[currentChunkSpan].start))) {
                             break;
                         }
                     }
@@ -23756,10 +28522,7 @@ var ts;
     }
     ts.createPatternMatcher = createPatternMatcher;
     function patternMatchCompareTo(match1, match2) {
-        return compareType(match1, match2) ||
-            compareCamelCase(match1, match2) ||
-            compareCase(match1, match2) ||
-            comparePunctuation(match1, match2);
+        return compareType(match1, match2) || compareCamelCase(match1, match2) || compareCase(match1, match2) || comparePunctuation(match1, match2);
     }
     function comparePunctuation(result1, result2) {
         if (result1.punctuationStripped !== result2.punctuationStripped) {
@@ -23908,11 +28671,7 @@ var ts;
             var currentIsDigit = isDigit(identifier.charCodeAt(i));
             var hasTransitionFromLowerToUpper = transitionFromLowerToUpper(identifier, word, i);
             var hasTransitionFromUpperToLower = transitionFromUpperToLower(identifier, word, i, wordStart);
-            if (charIsPunctuation(identifier.charCodeAt(i - 1)) ||
-                charIsPunctuation(identifier.charCodeAt(i)) ||
-                lastIsDigit != currentIsDigit ||
-                hasTransitionFromLowerToUpper ||
-                hasTransitionFromUpperToLower) {
+            if (charIsPunctuation(identifier.charCodeAt(i - 1)) || charIsPunctuation(identifier.charCodeAt(i)) || lastIsDigit != currentIsDigit || hasTransitionFromLowerToUpper || hasTransitionFromUpperToLower) {
                 if (!isAllPunctuation(identifier, wordStart, i)) {
                     result.push(ts.createTextSpan(wordStart, i - wordStart));
                 }
@@ -23964,8 +28723,7 @@ var ts;
     }
     function transitionFromUpperToLower(identifier, word, index, wordStart) {
         if (word) {
-            if (index != wordStart &&
-                index + 1 < identifier.length) {
+            if (index != wordStart && index + 1 < identifier.length) {
                 var currentIsUpper = isUpperCaseLetter(identifier.charCodeAt(index));
                 var nextIsLower = isLowerCaseLetter(identifier.charCodeAt(index + 1));
                 if (currentIsUpper && nextIsLower) {
@@ -23983,9 +28741,7 @@ var ts;
     function transitionFromLowerToUpper(identifier, word, index) {
         var lastIsUpper = isUpperCaseLetter(identifier.charCodeAt(index - 1));
         var currentIsUpper = isUpperCaseLetter(identifier.charCodeAt(index));
-        var transition = word
-            ? (currentIsUpper && !lastIsUpper)
-            : currentIsUpper;
+        var transition = word ? (currentIsUpper && !lastIsUpper) : currentIsUpper;
         return transition;
     }
 })(ts || (ts = {}));
@@ -24021,8 +28777,7 @@ var ts;
             function getImmediatelyContainingArgumentInfo(node) {
                 if (node.parent.kind === 155 || node.parent.kind === 156) {
                     var callExpression = node.parent;
-                    if (node.kind === 24 ||
-                        node.kind === 16) {
+                    if (node.kind === 24 || node.kind === 16) {
                         var list = getChildListThatStartsWithOpenerToken(callExpression, node, sourceFile);
                         var isTypeArgList = callExpression.typeArguments && callExpression.typeArguments.pos === list.pos;
                         ts.Debug.assert(list !== undefined);
@@ -24031,15 +28786,15 @@ var ts;
                             invocation: callExpression,
                             argumentsSpan: getApplicableSpanForArguments(list),
                             argumentIndex: 0,
-                            argumentCount: getCommaBasedArgCount(list)
+                            argumentCount: getArgumentCount(list)
                         };
                     }
                     var listItemInfo = ts.findListItemInfo(node);
                     if (listItemInfo) {
                         var list = listItemInfo.list;
                         var isTypeArgList = callExpression.typeArguments && callExpression.typeArguments.pos === list.pos;
-                        var argumentIndex = (listItemInfo.listItemIndex + 1) >> 1;
-                        var argumentCount = getCommaBasedArgCount(list);
+                        var argumentIndex = getArgumentIndex(list, node);
+                        var argumentCount = getArgumentCount(list);
                         ts.Debug.assert(argumentIndex === 0 || argumentIndex < argumentCount, "argumentCount < argumentIndex, " + argumentCount + " < " + argumentIndex);
                         return {
                             kind: isTypeArgList ? 0 : 1,
@@ -24076,10 +28831,29 @@ var ts;
                 }
                 return undefined;
             }
-            function getCommaBasedArgCount(argumentsList) {
-                return argumentsList.getChildCount() === 0
-                    ? 0
-                    : 1 + ts.countWhere(argumentsList.getChildren(), function (arg) { return arg.kind === 23; });
+            function getArgumentIndex(argumentsList, node) {
+                var argumentIndex = 0;
+                var listChildren = argumentsList.getChildren();
+                for (var i = 0, n = listChildren.length; i < n; i++) {
+                    var child = listChildren[i];
+                    if (child === node) {
+                        break;
+                    }
+                    if (child.kind !== 23) {
+                        argumentIndex++;
+                    }
+                }
+                return argumentIndex;
+            }
+            function getArgumentCount(argumentsList) {
+                var listChildren = argumentsList.getChildren();
+                var argumentCount = ts.countWhere(listChildren, function (arg) {
+                    return arg.kind !== 23;
+                });
+                if (listChildren.length > 0 && ts.lastOrUndefined(listChildren).kind === 23) {
+                    argumentCount++;
+                }
+                return argumentCount;
             }
             function getArgumentIndexForTemplatePiece(spanIndex, node) {
                 ts.Debug.assert(position >= node.getStart(), "Assumed 'position' could not occur before node.");
@@ -24092,9 +28866,7 @@ var ts;
                 return spanIndex + 1;
             }
             function getArgumentListInfoForTemplate(tagExpression, argumentIndex) {
-                var argumentCount = tagExpression.template.kind === 10
-                    ? 1
-                    : tagExpression.template.templateSpans.length + 1;
+                var argumentCount = tagExpression.template.kind === 10 ? 1 : tagExpression.template.templateSpans.length + 1;
                 ts.Debug.assert(argumentIndex === 0 || argumentIndex < argumentCount, "argumentCount < argumentIndex, " + argumentCount + " < " + argumentIndex);
                 return {
                     kind: 2,
@@ -24122,7 +28894,7 @@ var ts;
                 return ts.createTextSpan(applicableSpanStart, applicableSpanEnd - applicableSpanStart);
             }
             function getContainingArgumentInfo(node) {
-                for (var n = node; n.kind !== 220; n = n.parent) {
+                for (var n = node; n.kind !== 221; n = n.parent) {
                     if (ts.isFunctionBlock(n)) {
                         return undefined;
                     }
@@ -24199,7 +28971,10 @@ var ts;
                         isVariadic: candidateSignature.hasRestParameter,
                         prefixDisplayParts: prefixDisplayParts,
                         suffixDisplayParts: suffixDisplayParts,
-                        separatorDisplayParts: [ts.punctuationPart(23), ts.spacePart()],
+                        separatorDisplayParts: [
+                            ts.punctuationPart(23),
+                            ts.spacePart()
+                        ],
                         parameters: signatureHelpParameters,
                         documentation: candidateSignature.getDocumentationComment()
                     };
@@ -24308,24 +29083,31 @@ var ts;
     }
     ts.findListItemInfo = findListItemInfo;
     function findChildOfKind(n, kind, sourceFile) {
-        return ts.forEach(n.getChildren(sourceFile), function (c) { return c.kind === kind && c; });
+        return ts.forEach(n.getChildren(sourceFile), function (c) {
+            return c.kind === kind && c;
+        });
     }
     ts.findChildOfKind = findChildOfKind;
     function findContainingList(node) {
         var syntaxList = ts.forEach(node.parent.getChildren(), function (c) {
-            if (c.kind === 221 && c.pos <= node.pos && c.end >= node.end) {
+            if (c.kind === 222 && c.pos <= node.pos && c.end >= node.end) {
                 return c;
             }
         });
+        ts.Debug.assert(!syntaxList || ts.contains(syntaxList.getChildren(), node));
         return syntaxList;
     }
     ts.findContainingList = findContainingList;
     function getTouchingWord(sourceFile, position) {
-        return getTouchingToken(sourceFile, position, function (n) { return isWord(n.kind); });
+        return getTouchingToken(sourceFile, position, function (n) {
+            return isWord(n.kind);
+        });
     }
     ts.getTouchingWord = getTouchingWord;
     function getTouchingPropertyName(sourceFile, position) {
-        return getTouchingToken(sourceFile, position, function (n) { return isPropertyName(n.kind); });
+        return getTouchingToken(sourceFile, position, function (n) {
+            return isPropertyName(n.kind);
+        });
     }
     ts.getTouchingPropertyName = getTouchingPropertyName;
     function getTouchingToken(sourceFile, position, includeItemAtEndPosition) {
@@ -24379,8 +29161,7 @@ var ts;
             var children = n.getChildren();
             for (var i = 0, len = children.length; i < len; ++i) {
                 var child = children[i];
-                var shouldDiveInChildNode = (child.pos <= previousToken.pos && child.end > previousToken.end) ||
-                    (child.pos === previousToken.end);
+                var shouldDiveInChildNode = (child.pos <= previousToken.pos && child.end > previousToken.end) || (child.pos === previousToken.end);
                 if (shouldDiveInChildNode && nodeHasTokens(child)) {
                     return find(child);
                 }
@@ -24418,7 +29199,7 @@ var ts;
                     }
                 }
             }
-            ts.Debug.assert(startNode !== undefined || n.kind === 220);
+            ts.Debug.assert(startNode !== undefined || n.kind === 221);
             if (children.length) {
                 var candidate = findRightmostChildNodeWithTokens(children, children.length);
                 return candidate && findRightmostToken(candidate);
@@ -24483,8 +29264,7 @@ var ts;
     }
     ts.isPunctuation = isPunctuation;
     function isInsideTemplateLiteral(node, position) {
-        return ts.isTemplateLiteralKind(node.kind)
-            && (node.getStart() < position && position < node.getEnd()) || (!!node.isUnterminated && position === node.getEnd());
+        return ts.isTemplateLiteralKind(node.kind) && (node.getStart() < position && position < node.getEnd()) || (!!node.isUnterminated && position === node.getEnd());
     }
     ts.isInsideTemplateLiteral = isInsideTemplateLiteral;
     function compareDataObjects(dst, src) {
@@ -24517,19 +29297,38 @@ var ts;
         var indent;
         resetWriter();
         return {
-            displayParts: function () { return displayParts; },
-            writeKeyword: function (text) { return writeKind(text, 5); },
-            writeOperator: function (text) { return writeKind(text, 12); },
-            writePunctuation: function (text) { return writeKind(text, 15); },
-            writeSpace: function (text) { return writeKind(text, 16); },
-            writeStringLiteral: function (text) { return writeKind(text, 8); },
-            writeParameter: function (text) { return writeKind(text, 13); },
+            displayParts: function () {
+                return displayParts;
+            },
+            writeKeyword: function (text) {
+                return writeKind(text, 5);
+            },
+            writeOperator: function (text) {
+                return writeKind(text, 12);
+            },
+            writePunctuation: function (text) {
+                return writeKind(text, 15);
+            },
+            writeSpace: function (text) {
+                return writeKind(text, 16);
+            },
+            writeStringLiteral: function (text) {
+                return writeKind(text, 8);
+            },
+            writeParameter: function (text) {
+                return writeKind(text, 13);
+            },
             writeSymbol: writeSymbol,
             writeLine: writeLine,
-            increaseIndent: function () { indent++; },
-            decreaseIndent: function () { indent--; },
+            increaseIndent: function () {
+                indent++;
+            },
+            decreaseIndent: function () {
+                indent--;
+            },
             clear: resetWriter,
-            trackSymbol: function () { }
+            trackSymbol: function () {
+            }
         };
         function writeIndent() {
             if (lineStart) {
@@ -24690,7 +29489,9 @@ var ts;
                 advance: advance,
                 readTokenInfo: readTokenInfo,
                 isOnToken: isOnToken,
-                lastTrailingTriviaWasNewLine: function () { return wasNewLine; },
+                lastTrailingTriviaWasNewLine: function () {
+                    return wasNewLine;
+                },
                 close: function () {
                     lastTokenInfo = undefined;
                     scanner.setText(undefined);
@@ -24751,8 +29552,7 @@ var ts;
                 return container.kind === 9;
             }
             function shouldRescanTemplateToken(container) {
-                return container.kind === 12 ||
-                    container.kind === 13;
+                return container.kind === 12 || container.kind === 13;
             }
             function startsWithSlashToken(t) {
                 return t === 36 || t === 56;
@@ -24765,13 +29565,7 @@ var ts;
                         token: undefined
                     };
                 }
-                var expectedScanAction = shouldRescanGreaterThanToken(n)
-                    ? 1
-                    : shouldRescanSlashToken(n)
-                        ? 2
-                        : shouldRescanTemplateToken(n)
-                            ? 3
-                            : 0;
+                var expectedScanAction = shouldRescanGreaterThanToken(n) ? 1 : shouldRescanSlashToken(n) ? 2 : shouldRescanTemplateToken(n) ? 3 : 0;
                 if (lastTokenInfo && expectedScanAction === lastScanAction) {
                     return fixTokenKind(lastTokenInfo, n);
                 }
@@ -24951,9 +29745,7 @@ var ts;
                 this.Flag = Flag;
             }
             Rule.prototype.toString = function () {
-                return "[desc=" + this.Descriptor + "," +
-                    "operation=" + this.Operation + "," +
-                    "flag=" + this.Flag + "]";
+                return "[desc=" + this.Descriptor + "," + "operation=" + this.Operation + "," + "flag=" + this.Flag + "]";
             };
             return Rule;
         })();
@@ -24983,8 +29775,7 @@ var ts;
                 this.RightTokenRange = RightTokenRange;
             }
             RuleDescriptor.prototype.toString = function () {
-                return "[leftRange=" + this.LeftTokenRange + "," +
-                    "rightRange=" + this.RightTokenRange + "]";
+                return "[leftRange=" + this.LeftTokenRange + "," + "rightRange=" + this.RightTokenRange + "]";
             };
             RuleDescriptor.create1 = function (left, right) {
                 return RuleDescriptor.create4(formatting.Shared.TokenRange.FromToken(left), formatting.Shared.TokenRange.FromToken(right));
@@ -25024,8 +29815,7 @@ var ts;
                 this.Action = null;
             }
             RuleOperation.prototype.toString = function () {
-                return "[context=" + this.Context + "," +
-                    "action=" + this.Action + "]";
+                return "[context=" + this.Context + "," + "action=" + this.Action + "]";
             };
             RuleOperation.create1 = function (action) {
                 return RuleOperation.create2(formatting.RuleOperationContext.Any, action);
@@ -25091,7 +29881,12 @@ var ts;
                 this.SpaceAfterCloseBrace = new formatting.Rule(formatting.RuleDescriptor.create3(15, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsAfterCodeBlockContext), 2));
                 this.SpaceBetweenCloseBraceAndElse = new formatting.Rule(formatting.RuleDescriptor.create1(15, 75), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
                 this.SpaceBetweenCloseBraceAndWhile = new formatting.Rule(formatting.RuleDescriptor.create1(15, 99), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
-                this.NoSpaceAfterCloseBrace = new formatting.Rule(formatting.RuleDescriptor.create3(15, formatting.Shared.TokenRange.FromTokens([17, 19, 23, 22])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
+                this.NoSpaceAfterCloseBrace = new formatting.Rule(formatting.RuleDescriptor.create3(15, formatting.Shared.TokenRange.FromTokens([
+                    17,
+                    19,
+                    23,
+                    22
+                ])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
                 this.NoSpaceBeforeDot = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 20), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
                 this.NoSpaceAfterDot = new formatting.Rule(formatting.RuleDescriptor.create3(20, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
                 this.NoSpaceBeforeOpenBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 18), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
@@ -25100,9 +29895,19 @@ var ts;
                 this.NoSpaceAfterCloseBracket = new formatting.Rule(formatting.RuleDescriptor.create3(19, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
                 this.FunctionOpenBraceLeftTokenRange = formatting.Shared.TokenRange.AnyIncludingMultilineComments;
                 this.SpaceBeforeOpenBraceInFunction = new formatting.Rule(formatting.RuleDescriptor.create2(this.FunctionOpenBraceLeftTokenRange, 14), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext, Rules.IsBeforeBlockContext, Rules.IsNotFormatOnEnter, Rules.IsSameLineTokenOrBeforeMultilineBlockContext), 2), 1);
-                this.TypeScriptOpenBraceLeftTokenRange = formatting.Shared.TokenRange.FromTokens([64, 3]);
+                this.TypeScriptOpenBraceLeftTokenRange = formatting.Shared.TokenRange.FromTokens([
+                    64,
+                    3
+                ]);
                 this.SpaceBeforeOpenBraceInTypeScriptDeclWithBlock = new formatting.Rule(formatting.RuleDescriptor.create2(this.TypeScriptOpenBraceLeftTokenRange, 14), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsTypeScriptDeclWithBlockContext, Rules.IsNotFormatOnEnter, Rules.IsSameLineTokenOrBeforeMultilineBlockContext), 2), 1);
-                this.ControlOpenBraceLeftTokenRange = formatting.Shared.TokenRange.FromTokens([17, 3, 74, 95, 80, 75]);
+                this.ControlOpenBraceLeftTokenRange = formatting.Shared.TokenRange.FromTokens([
+                    17,
+                    3,
+                    74,
+                    95,
+                    80,
+                    75
+                ]);
                 this.SpaceBeforeOpenBraceInControl = new formatting.Rule(formatting.RuleDescriptor.create2(this.ControlOpenBraceLeftTokenRange, 14), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsControlDeclContext, Rules.IsNotFormatOnEnter, Rules.IsSameLineTokenOrBeforeMultilineBlockContext), 2), 1);
                 this.SpaceAfterOpenBrace = new formatting.Rule(formatting.RuleDescriptor.create3(14, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSingleLineBlockContext), 2));
                 this.SpaceBeforeCloseBrace = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 15), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSingleLineBlockContext), 2));
@@ -25121,79 +29926,151 @@ var ts;
                 this.SpaceAfterSubtractWhenFollowedByUnaryMinus = new formatting.Rule(formatting.RuleDescriptor.create1(34, 34), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2));
                 this.SpaceAfterSubtractWhenFollowedByPredecrement = new formatting.Rule(formatting.RuleDescriptor.create1(34, 39), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2));
                 this.NoSpaceBeforeComma = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 23), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.SpaceAfterCertainKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([97, 93, 87, 73, 89, 96]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
-                this.SpaceAfterLetConstInVariableDeclaration = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([104, 69]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsStartOfVariableDeclarationList), 2));
+                this.SpaceAfterCertainKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([
+                    97,
+                    93,
+                    87,
+                    73,
+                    89,
+                    96
+                ]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
+                this.SpaceAfterLetConstInVariableDeclaration = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([
+                    104,
+                    69
+                ]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsStartOfVariableDeclarationList), 2));
                 this.NoSpaceBeforeOpenParenInFuncCall = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsFunctionCallOrNewContext, Rules.IsPreviousTokenNotComma), 8));
                 this.SpaceAfterFunctionInFuncDecl = new formatting.Rule(formatting.RuleDescriptor.create3(82, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2));
                 this.NoSpaceBeforeOpenParenInFuncDecl = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsFunctionDeclContext), 8));
                 this.SpaceAfterVoidOperator = new formatting.Rule(formatting.RuleDescriptor.create3(98, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsVoidOpContext), 2));
                 this.NoSpaceBetweenReturnAndSemicolon = new formatting.Rule(formatting.RuleDescriptor.create1(89, 22), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.SpaceBetweenStatements = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([17, 74, 75, 66]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotForContext), 2));
-                this.SpaceAfterTryFinally = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([95, 80]), 14), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
-                this.SpaceAfterGetSetInMember = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([115, 119]), 64), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2));
+                this.SpaceBetweenStatements = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([
+                    17,
+                    74,
+                    75,
+                    66
+                ]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotForContext), 2));
+                this.SpaceAfterTryFinally = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([
+                    95,
+                    80
+                ]), 14), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
+                this.SpaceAfterGetSetInMember = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([
+                    115,
+                    119
+                ]), 64), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2));
                 this.SpaceBeforeBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryKeywordOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2));
                 this.SpaceAfterBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.BinaryKeywordOperators, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2));
                 this.NoSpaceAfterConstructor = new formatting.Rule(formatting.RuleDescriptor.create1(113, 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.NoSpaceAfterModuleImport = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([116, 117]), 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.SpaceAfterCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([68, 114, 76, 77, 78, 115, 102, 84, 103, 116, 106, 108, 119, 109]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
-                this.SpaceBeforeCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([78, 102])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
+                this.NoSpaceAfterModuleImport = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([
+                    116,
+                    117
+                ]), 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
+                this.SpaceAfterCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([
+                    68,
+                    114,
+                    76,
+                    77,
+                    78,
+                    115,
+                    102,
+                    84,
+                    103,
+                    116,
+                    106,
+                    108,
+                    119,
+                    109
+                ]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
+                this.SpaceBeforeCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([
+                    78,
+                    102
+                ])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
                 this.SpaceAfterModuleName = new formatting.Rule(formatting.RuleDescriptor.create1(8, 14), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsModuleDeclContext), 2));
                 this.SpaceAfterArrow = new formatting.Rule(formatting.RuleDescriptor.create3(32, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
                 this.NoSpaceAfterEllipsis = new formatting.Rule(formatting.RuleDescriptor.create1(21, 64), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.NoSpaceAfterOptionalParameters = new formatting.Rule(formatting.RuleDescriptor.create3(50, formatting.Shared.TokenRange.FromTokens([17, 23])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBinaryOpContext), 8));
+                this.NoSpaceAfterOptionalParameters = new formatting.Rule(formatting.RuleDescriptor.create3(50, formatting.Shared.TokenRange.FromTokens([
+                    17,
+                    23
+                ])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBinaryOpContext), 8));
                 this.NoSpaceBeforeOpenAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.TypeNames, 24), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterContext), 8));
                 this.NoSpaceBetweenCloseParenAndAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create1(17, 24), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterContext), 8));
                 this.NoSpaceAfterOpenAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create3(24, formatting.Shared.TokenRange.TypeNames), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterContext), 8));
                 this.NoSpaceBeforeCloseAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 25), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterContext), 8));
-                this.NoSpaceAfterCloseAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create3(25, formatting.Shared.TokenRange.FromTokens([16, 18, 25, 23])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterContext), 8));
+                this.NoSpaceAfterCloseAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create3(25, formatting.Shared.TokenRange.FromTokens([
+                    16,
+                    18,
+                    25,
+                    23
+                ])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterContext), 8));
                 this.NoSpaceBetweenEmptyInterfaceBraceBrackets = new formatting.Rule(formatting.RuleDescriptor.create1(14, 15), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsObjectTypeContext), 8));
-                this.HighPriorityCommonRules =
-                    [
-                        this.IgnoreBeforeComment, this.IgnoreAfterLineComment,
-                        this.NoSpaceBeforeColon, this.SpaceAfterColon, this.NoSpaceBeforeQuestionMark, this.SpaceAfterQuestionMarkInConditionalOperator,
-                        this.NoSpaceAfterQuestionMark,
-                        this.NoSpaceBeforeDot, this.NoSpaceAfterDot,
-                        this.NoSpaceAfterUnaryPrefixOperator,
-                        this.NoSpaceAfterUnaryPreincrementOperator, this.NoSpaceAfterUnaryPredecrementOperator,
-                        this.NoSpaceBeforeUnaryPostincrementOperator, this.NoSpaceBeforeUnaryPostdecrementOperator,
-                        this.SpaceAfterPostincrementWhenFollowedByAdd,
-                        this.SpaceAfterAddWhenFollowedByUnaryPlus, this.SpaceAfterAddWhenFollowedByPreincrement,
-                        this.SpaceAfterPostdecrementWhenFollowedBySubtract,
-                        this.SpaceAfterSubtractWhenFollowedByUnaryMinus, this.SpaceAfterSubtractWhenFollowedByPredecrement,
-                        this.NoSpaceAfterCloseBrace,
-                        this.SpaceAfterOpenBrace, this.SpaceBeforeCloseBrace, this.NewLineBeforeCloseBraceInBlockContext,
-                        this.SpaceAfterCloseBrace, this.SpaceBetweenCloseBraceAndElse, this.SpaceBetweenCloseBraceAndWhile, this.NoSpaceBetweenEmptyBraceBrackets,
-                        this.SpaceAfterFunctionInFuncDecl, this.NewLineAfterOpenBraceInBlockContext, this.SpaceAfterGetSetInMember,
-                        this.NoSpaceBetweenReturnAndSemicolon,
-                        this.SpaceAfterCertainKeywords,
-                        this.SpaceAfterLetConstInVariableDeclaration,
-                        this.NoSpaceBeforeOpenParenInFuncCall,
-                        this.SpaceBeforeBinaryKeywordOperator, this.SpaceAfterBinaryKeywordOperator,
-                        this.SpaceAfterVoidOperator,
-                        this.NoSpaceAfterConstructor, this.NoSpaceAfterModuleImport,
-                        this.SpaceAfterCertainTypeScriptKeywords, this.SpaceBeforeCertainTypeScriptKeywords,
-                        this.SpaceAfterModuleName,
-                        this.SpaceAfterArrow,
-                        this.NoSpaceAfterEllipsis,
-                        this.NoSpaceAfterOptionalParameters,
-                        this.NoSpaceBetweenEmptyInterfaceBraceBrackets,
-                        this.NoSpaceBeforeOpenAngularBracket,
-                        this.NoSpaceBetweenCloseParenAndAngularBracket,
-                        this.NoSpaceAfterOpenAngularBracket,
-                        this.NoSpaceBeforeCloseAngularBracket,
-                        this.NoSpaceAfterCloseAngularBracket
-                    ];
-                this.LowPriorityCommonRules =
-                    [
-                        this.NoSpaceBeforeSemicolon,
-                        this.SpaceBeforeOpenBraceInControl, this.SpaceBeforeOpenBraceInFunction, this.SpaceBeforeOpenBraceInTypeScriptDeclWithBlock,
-                        this.NoSpaceBeforeComma,
-                        this.NoSpaceBeforeOpenBracket, this.NoSpaceAfterOpenBracket,
-                        this.NoSpaceBeforeCloseBracket, this.NoSpaceAfterCloseBracket,
-                        this.SpaceAfterSemicolon,
-                        this.NoSpaceBeforeOpenParenInFuncDecl,
-                        this.SpaceBetweenStatements, this.SpaceAfterTryFinally
-                    ];
+                this.HighPriorityCommonRules = [
+                    this.IgnoreBeforeComment,
+                    this.IgnoreAfterLineComment,
+                    this.NoSpaceBeforeColon,
+                    this.SpaceAfterColon,
+                    this.NoSpaceBeforeQuestionMark,
+                    this.SpaceAfterQuestionMarkInConditionalOperator,
+                    this.NoSpaceAfterQuestionMark,
+                    this.NoSpaceBeforeDot,
+                    this.NoSpaceAfterDot,
+                    this.NoSpaceAfterUnaryPrefixOperator,
+                    this.NoSpaceAfterUnaryPreincrementOperator,
+                    this.NoSpaceAfterUnaryPredecrementOperator,
+                    this.NoSpaceBeforeUnaryPostincrementOperator,
+                    this.NoSpaceBeforeUnaryPostdecrementOperator,
+                    this.SpaceAfterPostincrementWhenFollowedByAdd,
+                    this.SpaceAfterAddWhenFollowedByUnaryPlus,
+                    this.SpaceAfterAddWhenFollowedByPreincrement,
+                    this.SpaceAfterPostdecrementWhenFollowedBySubtract,
+                    this.SpaceAfterSubtractWhenFollowedByUnaryMinus,
+                    this.SpaceAfterSubtractWhenFollowedByPredecrement,
+                    this.NoSpaceAfterCloseBrace,
+                    this.SpaceAfterOpenBrace,
+                    this.SpaceBeforeCloseBrace,
+                    this.NewLineBeforeCloseBraceInBlockContext,
+                    this.SpaceAfterCloseBrace,
+                    this.SpaceBetweenCloseBraceAndElse,
+                    this.SpaceBetweenCloseBraceAndWhile,
+                    this.NoSpaceBetweenEmptyBraceBrackets,
+                    this.SpaceAfterFunctionInFuncDecl,
+                    this.NewLineAfterOpenBraceInBlockContext,
+                    this.SpaceAfterGetSetInMember,
+                    this.NoSpaceBetweenReturnAndSemicolon,
+                    this.SpaceAfterCertainKeywords,
+                    this.SpaceAfterLetConstInVariableDeclaration,
+                    this.NoSpaceBeforeOpenParenInFuncCall,
+                    this.SpaceBeforeBinaryKeywordOperator,
+                    this.SpaceAfterBinaryKeywordOperator,
+                    this.SpaceAfterVoidOperator,
+                    this.NoSpaceAfterConstructor,
+                    this.NoSpaceAfterModuleImport,
+                    this.SpaceAfterCertainTypeScriptKeywords,
+                    this.SpaceBeforeCertainTypeScriptKeywords,
+                    this.SpaceAfterModuleName,
+                    this.SpaceAfterArrow,
+                    this.NoSpaceAfterEllipsis,
+                    this.NoSpaceAfterOptionalParameters,
+                    this.NoSpaceBetweenEmptyInterfaceBraceBrackets,
+                    this.NoSpaceBeforeOpenAngularBracket,
+                    this.NoSpaceBetweenCloseParenAndAngularBracket,
+                    this.NoSpaceAfterOpenAngularBracket,
+                    this.NoSpaceBeforeCloseAngularBracket,
+                    this.NoSpaceAfterCloseAngularBracket
+                ];
+                this.LowPriorityCommonRules = [
+                    this.NoSpaceBeforeSemicolon,
+                    this.SpaceBeforeOpenBraceInControl,
+                    this.SpaceBeforeOpenBraceInFunction,
+                    this.SpaceBeforeOpenBraceInTypeScriptDeclWithBlock,
+                    this.NoSpaceBeforeComma,
+                    this.NoSpaceBeforeOpenBracket,
+                    this.NoSpaceAfterOpenBracket,
+                    this.NoSpaceBeforeCloseBracket,
+                    this.NoSpaceAfterCloseBracket,
+                    this.SpaceAfterSemicolon,
+                    this.NoSpaceBeforeOpenParenInFuncDecl,
+                    this.SpaceBetweenStatements,
+                    this.SpaceAfterTryFinally
+                ];
                 this.SpaceAfterComma = new formatting.Rule(formatting.RuleDescriptor.create3(23, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
                 this.NoSpaceAfterComma = new formatting.Rule(formatting.RuleDescriptor.create3(23, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
                 this.SpaceBeforeBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2));
@@ -25235,10 +30112,10 @@ var ts;
                     case 167:
                     case 168:
                         return true;
-                    case 202:
+                    case 203:
                     case 193:
                     case 128:
-                    case 219:
+                    case 220:
                     case 130:
                     case 129:
                         return context.currentTokenSpan.kind === 52 || context.nextTokenSpan.kind === 52;
@@ -25281,7 +30158,7 @@ var ts;
                 }
                 switch (node.kind) {
                     case 174:
-                    case 188:
+                    case 202:
                     case 152:
                     case 201:
                         return true;
@@ -25324,7 +30201,7 @@ var ts;
                     case 200:
                     case 199:
                     case 174:
-                    case 216:
+                    case 217:
                     case 201:
                     case 188:
                         return true;
@@ -25342,7 +30219,7 @@ var ts;
                     case 191:
                     case 179:
                     case 187:
-                    case 216:
+                    case 217:
                         return true;
                     default:
                         return false;
@@ -25367,8 +30244,7 @@ var ts;
                 return context.TokensAreOnSameLine();
             };
             Rules.IsStartOfVariableDeclarationList = function (context) {
-                return context.currentTokenParent.kind === 194 &&
-                    context.currentTokenParent.getStart(context.sourceFile) === context.currentTokenSpan.pos;
+                return context.currentTokenParent.kind === 194 && context.currentTokenParent.getStart(context.sourceFile) === context.currentTokenSpan.pos;
             };
             Rules.IsNotFormatOnEnter = function (context) {
                 return context.formattingRequestKind != 2;
@@ -25402,8 +30278,7 @@ var ts;
                 }
             };
             Rules.IsTypeArgumentOrParameterContext = function (context) {
-                return Rules.IsTypeArgumentOrParameter(context.currentTokenSpan, context.currentTokenParent) ||
-                    Rules.IsTypeArgumentOrParameter(context.nextTokenSpan, context.nextTokenParent);
+                return Rules.IsTypeArgumentOrParameter(context.currentTokenSpan, context.currentTokenParent) || Rules.IsTypeArgumentOrParameter(context.nextTokenSpan, context.nextTokenParent);
             };
             Rules.IsVoidOpContext = function (context) {
                 return context.currentTokenSpan.kind === 98 && context.currentTokenParent.kind === 164;
@@ -25446,8 +30321,7 @@ var ts;
             };
             RulesMap.prototype.FillRule = function (rule, rulesBucketConstructionStateList) {
                 var _this = this;
-                var specificRule = rule.Descriptor.LeftTokenRange != formatting.Shared.TokenRange.Any &&
-                    rule.Descriptor.RightTokenRange != formatting.Shared.TokenRange.Any;
+                var specificRule = rule.Descriptor.LeftTokenRange != formatting.Shared.TokenRange.Any && rule.Descriptor.RightTokenRange != formatting.Shared.TokenRange.Any;
                 rule.Descriptor.LeftTokenRange.GetTokens().forEach(function (left) {
                     rule.Descriptor.RightTokenRange.GetTokens().forEach(function (right) {
                         var rulesBucketIndex = _this.GetRuleBucketIndex(left, right);
@@ -25521,19 +30395,13 @@ var ts;
             RulesBucket.prototype.AddRule = function (rule, specificTokens, constructionState, rulesBucketIndex) {
                 var position;
                 if (rule.Operation.Action == 1) {
-                    position = specificTokens ?
-                        0 :
-                        RulesPosition.IgnoreRulesAny;
+                    position = specificTokens ? 0 : RulesPosition.IgnoreRulesAny;
                 }
                 else if (!rule.Operation.Context.IsAny()) {
-                    position = specificTokens ?
-                        RulesPosition.ContextRulesSpecific :
-                        RulesPosition.ContextRulesAny;
+                    position = specificTokens ? RulesPosition.ContextRulesSpecific : RulesPosition.ContextRulesAny;
                 }
                 else {
-                    position = specificTokens ?
-                        RulesPosition.NoContextRulesSpecific :
-                        RulesPosition.NoContextRulesAny;
+                    position = specificTokens ? RulesPosition.NoContextRulesSpecific : RulesPosition.NoContextRulesAny;
                 }
                 var state = constructionState[rulesBucketIndex];
                 if (state === undefined) {
@@ -25590,7 +30458,9 @@ var ts;
                     this.token = token;
                 }
                 TokenSingleValueAccess.prototype.GetTokens = function () {
-                    return [this.token];
+                    return [
+                        this.token
+                    ];
                 };
                 TokenSingleValueAccess.prototype.Contains = function (tokenValue) {
                     return tokenValue == this.token;
@@ -25644,18 +30514,68 @@ var ts;
                     return this.tokenAccess.toString();
                 };
                 TokenRange.Any = TokenRange.AllTokens();
-                TokenRange.AnyIncludingMultilineComments = TokenRange.FromTokens(TokenRange.Any.GetTokens().concat([3]));
+                TokenRange.AnyIncludingMultilineComments = TokenRange.FromTokens(TokenRange.Any.GetTokens().concat([
+                    3
+                ]));
                 TokenRange.Keywords = TokenRange.FromRange(65, 124);
                 TokenRange.BinaryOperators = TokenRange.FromRange(24, 63);
-                TokenRange.BinaryKeywordOperators = TokenRange.FromTokens([85, 86, 124]);
-                TokenRange.UnaryPrefixOperators = TokenRange.FromTokens([38, 39, 47, 46]);
-                TokenRange.UnaryPrefixExpressions = TokenRange.FromTokens([7, 64, 16, 18, 14, 92, 87]);
-                TokenRange.UnaryPreincrementExpressions = TokenRange.FromTokens([64, 16, 92, 87]);
-                TokenRange.UnaryPostincrementExpressions = TokenRange.FromTokens([64, 17, 19, 87]);
-                TokenRange.UnaryPredecrementExpressions = TokenRange.FromTokens([64, 16, 92, 87]);
-                TokenRange.UnaryPostdecrementExpressions = TokenRange.FromTokens([64, 17, 19, 87]);
-                TokenRange.Comments = TokenRange.FromTokens([2, 3]);
-                TokenRange.TypeNames = TokenRange.FromTokens([64, 118, 120, 112, 121, 98, 111]);
+                TokenRange.BinaryKeywordOperators = TokenRange.FromTokens([
+                    85,
+                    86,
+                    124
+                ]);
+                TokenRange.UnaryPrefixOperators = TokenRange.FromTokens([
+                    38,
+                    39,
+                    47,
+                    46
+                ]);
+                TokenRange.UnaryPrefixExpressions = TokenRange.FromTokens([
+                    7,
+                    64,
+                    16,
+                    18,
+                    14,
+                    92,
+                    87
+                ]);
+                TokenRange.UnaryPreincrementExpressions = TokenRange.FromTokens([
+                    64,
+                    16,
+                    92,
+                    87
+                ]);
+                TokenRange.UnaryPostincrementExpressions = TokenRange.FromTokens([
+                    64,
+                    17,
+                    19,
+                    87
+                ]);
+                TokenRange.UnaryPredecrementExpressions = TokenRange.FromTokens([
+                    64,
+                    16,
+                    92,
+                    87
+                ]);
+                TokenRange.UnaryPostdecrementExpressions = TokenRange.FromTokens([
+                    64,
+                    17,
+                    19,
+                    87
+                ]);
+                TokenRange.Comments = TokenRange.FromTokens([
+                    2,
+                    3
+                ]);
+                TokenRange.TypeNames = TokenRange.FromTokens([
+                    64,
+                    118,
+                    120,
+                    112,
+                    121,
+                    98,
+                    111
+                ]);
                 return TokenRange;
             })();
             Shared.TokenRange = TokenRange;
@@ -25804,16 +30724,11 @@ var ts;
         }
         function findOutermostParent(position, expectedTokenKind, sourceFile) {
             var precedingToken = ts.findPrecedingToken(position, sourceFile);
-            if (!precedingToken ||
-                precedingToken.kind !== expectedTokenKind ||
-                position !== precedingToken.getEnd()) {
+            if (!precedingToken || precedingToken.kind !== expectedTokenKind || position !== precedingToken.getEnd()) {
                 return undefined;
             }
             var current = precedingToken;
-            while (current &&
-                current.parent &&
-                current.parent.end === precedingToken.end &&
-                !isListElement(current.parent, current)) {
+            while (current && current.parent && current.parent.end === precedingToken.end && !isListElement(current.parent, current)) {
                 current = current.parent;
             }
             return current;
@@ -25826,11 +30741,11 @@ var ts;
                 case 200:
                     var body = parent.body;
                     return body && body.kind === 174 && ts.rangeContainsRange(body.statements, node);
-                case 220:
+                case 221:
                 case 174:
                 case 201:
                     return ts.rangeContainsRange(parent.statements, node);
-                case 216:
+                case 217:
                     return ts.rangeContainsRange(parent.block.statements, node);
             }
             return false;
@@ -25838,7 +30753,9 @@ var ts;
         function findEnclosingNode(range, sourceFile) {
             return find(sourceFile);
             function find(n) {
-                var candidate = ts.forEachChild(n, function (c) { return ts.startEndContainsRange(c.getStart(sourceFile), c.end, range) && c; });
+                var candidate = ts.forEachChild(n, function (c) {
+                    return ts.startEndContainsRange(c.getStart(sourceFile), c.end, range) && c;
+                });
                 if (candidate) {
                     var result = find(candidate);
                     if (result) {
@@ -25852,9 +30769,11 @@ var ts;
             if (!errors.length) {
                 return rangeHasNoErrors;
             }
-            var sorted = errors
-                .filter(function (d) { return ts.rangeOverlapsWithStartEnd(originalRange, d.start, d.start + d.length); })
-                .sort(function (e1, e2) { return e1.start - e2.start; });
+            var sorted = errors.filter(function (d) {
+                return ts.rangeOverlapsWithStartEnd(originalRange, d.start, d.start + d.length);
+            }).sort(function (e1, e2) {
+                return e1.start - e2.start;
+            });
             if (!sorted.length) {
                 return rangeHasNoErrors;
             }
@@ -25948,10 +30867,7 @@ var ts;
                 var indentation = inheritedIndentation;
                 if (indentation === -1) {
                     if (isSomeBlock(node.kind)) {
-                        if (isSomeBlock(parent.kind) ||
-                            parent.kind === 220 ||
-                            parent.kind === 213 ||
-                            parent.kind === 214) {
+                        if (isSomeBlock(parent.kind) || parent.kind === 221 || parent.kind === 214 || parent.kind === 215) {
                             indentation = parentDynamicIndentation.getIndentation() + parentDynamicIndentation.getDelta();
                         }
                         else {
@@ -26000,8 +30916,12 @@ var ts;
                                 return nodeStartLine !== line ? indentation + delta : indentation;
                         }
                     },
-                    getIndentation: function () { return indentation; },
-                    getDelta: function () { return delta; },
+                    getIndentation: function () {
+                        return indentation;
+                    },
+                    getDelta: function () {
+                        return delta;
+                    },
                     recomputeIndentation: function (lineAdded) {
                         if (node.parent && formatting.SmartIndenter.shouldIndentChildNode(node.parent.kind, node.kind)) {
                             if (lineAdded) {
@@ -26194,8 +31114,7 @@ var ts;
                         trimTrailingWhitespacesForLines(originalStart.line, rangeStart.line);
                     }
                     else {
-                        lineAdded =
-                            processPair(range, rangeStart.line, parent, previousRange, previousRangeStartLine, previousParent, contextNode, dynamicIndentation);
+                        lineAdded = processPair(range, rangeStart.line, parent, previousRange, previousRangeStartLine, previousParent, contextNode, dynamicIndentation);
                     }
                 }
                 previousRange = range;
@@ -26223,9 +31142,7 @@ var ts;
                             dynamicIndentation.recomputeIndentation(true);
                         }
                     }
-                    trimTrailingWhitespaces =
-                        (rule.Operation.Action & (4 | 2)) &&
-                            rule.Flag !== 1;
+                    trimTrailingWhitespaces = (rule.Operation.Action & (4 | 2)) && rule.Flag !== 1;
                 }
                 else {
                     trimTrailingWhitespaces = true;
@@ -26262,10 +31179,16 @@ var ts;
                     var startPos = commentRange.pos;
                     for (var line = startLine; line < endLine; ++line) {
                         var endOfLine = ts.getEndLinePosition(line, sourceFile);
-                        parts.push({ pos: startPos, end: endOfLine });
+                        parts.push({
+                            pos: startPos,
+                            end: endOfLine
+                        });
                         startPos = ts.getStartPositionOfLine(line + 1, sourceFile);
                     }
-                    parts.push({ pos: startPos, end: commentRange.end });
+                    parts.push({
+                        pos: startPos,
+                        end: commentRange.end
+                    });
                 }
                 var startLinePos = ts.getStartPositionOfLine(startLine, sourceFile);
                 var nonWhitespaceColumnInFirstPart = formatting.SmartIndenter.findFirstNonWhitespaceCharacterAndColumn(startLinePos, parts[0].pos, sourceFile, options);
@@ -26280,9 +31203,7 @@ var ts;
                 var delta = indentation - nonWhitespaceColumnInFirstPart.column;
                 for (var i = startIndex, len = parts.length; i < len; ++i, ++startLine) {
                     var startLinePos = ts.getStartPositionOfLine(startLine, sourceFile);
-                    var nonWhitespaceCharacterAndColumn = i === 0
-                        ? nonWhitespaceColumnInFirstPart
-                        : formatting.SmartIndenter.findFirstNonWhitespaceCharacterAndColumn(parts[i].pos, parts[i].end, sourceFile, options);
+                    var nonWhitespaceCharacterAndColumn = i === 0 ? nonWhitespaceColumnInFirstPart : formatting.SmartIndenter.findFirstNonWhitespaceCharacterAndColumn(parts[i].pos, parts[i].end, sourceFile, options);
                     var newIndentation = nonWhitespaceCharacterAndColumn.column + delta;
                     if (newIndentation > 0) {
                         var indentationString = getIndentationString(newIndentation, options);
@@ -26311,7 +31232,10 @@ var ts;
                 }
             }
             function newTextChange(start, len, newText) {
-                return { span: ts.createTextSpan(start, len), newText: newText };
+                return {
+                    span: ts.createTextSpan(start, len),
+                    newText: newText
+                };
             }
             function recordDelete(start, len) {
                 if (len) {
@@ -26465,12 +31389,7 @@ var ts;
                 if (!precedingToken) {
                     return 0;
                 }
-                var precedingTokenIsLiteral = precedingToken.kind === 8 ||
-                    precedingToken.kind === 9 ||
-                    precedingToken.kind === 10 ||
-                    precedingToken.kind === 11 ||
-                    precedingToken.kind === 12 ||
-                    precedingToken.kind === 13;
+                var precedingTokenIsLiteral = precedingToken.kind === 8 || precedingToken.kind === 9 || precedingToken.kind === 10 || precedingToken.kind === 11 || precedingToken.kind === 12 || precedingToken.kind === 13;
                 if (precedingTokenIsLiteral && precedingToken.getStart(sourceFile) <= position && precedingToken.end > position) {
                     return 0;
                 }
@@ -26530,8 +31449,7 @@ var ts;
                         }
                     }
                     parentStart = getParentStart(parent, current, sourceFile);
-                    var parentAndChildShareLine = parentStart.line === currentStart.line ||
-                        childStartsOnTheSameLineWithElseInIfStatement(parent, current, currentStart.line, sourceFile);
+                    var parentAndChildShareLine = parentStart.line === currentStart.line || childStartsOnTheSameLineWithElseInIfStatement(parent, current, currentStart.line, sourceFile);
                     if (useActualIndentation) {
                         var actualIndentation = getActualIndentationForNode(current, parent, currentStart, parentAndChildShareLine, sourceFile, options);
                         if (actualIndentation !== -1) {
@@ -26564,8 +31482,7 @@ var ts;
                 }
             }
             function getActualIndentationForNode(current, parent, currentLineAndChar, parentAndChildShareLine, sourceFile, options) {
-                var useActualIndentation = (ts.isDeclaration(current) || ts.isStatement(current)) &&
-                    (parent.kind === 220 || !parentAndChildShareLine);
+                var useActualIndentation = (ts.isDeclaration(current) || ts.isStatement(current)) && (parent.kind === 221 || !parentAndChildShareLine);
                 if (!useActualIndentation) {
                     return -1;
                 }
@@ -26605,8 +31522,7 @@ var ts;
                 if (node.parent) {
                     switch (node.parent.kind) {
                         case 139:
-                            if (node.parent.typeArguments &&
-                                ts.rangeContainsStartEnd(node.parent.typeArguments, node.getStart(sourceFile), node.getEnd())) {
+                            if (node.parent.typeArguments && ts.rangeContainsStartEnd(node.parent.typeArguments, node.getStart(sourceFile), node.getEnd())) {
                                 return node.parent.typeArguments;
                             }
                             break;
@@ -26622,8 +31538,7 @@ var ts;
                         case 136:
                         case 137:
                             var start = node.getStart(sourceFile);
-                            if (node.parent.typeParameters &&
-                                ts.rangeContainsStartEnd(node.parent.typeParameters, start, node.getEnd())) {
+                            if (node.parent.typeParameters && ts.rangeContainsStartEnd(node.parent.typeParameters, start, node.getEnd())) {
                                 return node.parent.typeParameters;
                             }
                             if (ts.rangeContainsStartEnd(node.parent.parameters, start, node.getEnd())) {
@@ -26633,12 +31548,10 @@ var ts;
                         case 156:
                         case 155:
                             var start = node.getStart(sourceFile);
-                            if (node.parent.typeArguments &&
-                                ts.rangeContainsStartEnd(node.parent.typeArguments, start, node.getEnd())) {
+                            if (node.parent.typeArguments && ts.rangeContainsStartEnd(node.parent.typeArguments, start, node.getEnd())) {
                                 return node.parent.typeArguments;
                             }
-                            if (node.parent.arguments &&
-                                ts.rangeContainsStartEnd(node.parent.arguments, start, node.getEnd())) {
+                            if (node.parent.arguments && ts.rangeContainsStartEnd(node.parent.arguments, start, node.getEnd())) {
                                 return node.parent.arguments;
                             }
                             break;
@@ -26690,7 +31603,10 @@ var ts;
                     }
                     character++;
                 }
-                return { column: column, character: character };
+                return {
+                    column: column,
+                    character: character
+                };
             }
             SmartIndenter.findFirstNonWhitespaceCharacterAndColumn = findFirstNonWhitespaceCharacterAndColumn;
             function findFirstNonWhitespaceColumn(startPos, endPos, sourceFile, options) {
@@ -26707,15 +31623,15 @@ var ts;
                     case 201:
                     case 152:
                     case 143:
-                    case 188:
+                    case 202:
+                    case 215:
                     case 214:
-                    case 213:
                     case 159:
                     case 155:
                     case 156:
                     case 175:
                     case 193:
-                    case 208:
+                    case 209:
                     case 186:
                     case 168:
                         return true;
@@ -26771,9 +31687,9 @@ var ts;
                     case 152:
                     case 174:
                     case 201:
-                    case 188:
+                    case 202:
                         return nodeEndsWith(n, 15, sourceFile);
-                    case 216:
+                    case 217:
                         return isCompletedNode(n.block, sourceFile);
                     case 159:
                     case 136:
@@ -26797,9 +31713,15 @@ var ts;
                         return isCompletedNode(n.expression, sourceFile);
                     case 151:
                         return nodeEndsWith(n, 19, sourceFile);
-                    case 213:
                     case 214:
+                    case 215:
                         return false;
+                    case 181:
+                        return isCompletedNode(n.statement, sourceFile);
+                    case 182:
+                        return isCompletedNode(n.statement, sourceFile);
+                    case 183:
+                        return isCompletedNode(n.statement, sourceFile);
                     case 180:
                         return isCompletedNode(n.statement, sourceFile);
                     case 179:
@@ -26898,7 +31820,7 @@ var ts;
             return pos;
         };
         NodeObject.prototype.createSyntaxList = function (nodes) {
-            var list = createNode(221, nodes.pos, nodes.end, 1024, this);
+            var list = createNode(222, nodes.pos, nodes.end, 1024, this);
             list._children = [];
             var pos = nodes.pos;
             for (var i = 0, len = nodes.length; i < len; i++) {
@@ -27067,10 +31989,7 @@ var ts;
                 return pos;
             }
             function isName(pos, end, sourceFile, name) {
-                return pos + name.length < end &&
-                    sourceFile.text.substr(pos, name.length) === name &&
-                    (ts.isWhiteSpace(sourceFile.text.charCodeAt(pos + name.length)) ||
-                        ts.isLineBreak(sourceFile.text.charCodeAt(pos + name.length)));
+                return pos + name.length < end && sourceFile.text.substr(pos, name.length) === name && (ts.isWhiteSpace(sourceFile.text.charCodeAt(pos + name.length)) || ts.isLineBreak(sourceFile.text.charCodeAt(pos + name.length)));
             }
             function isParamTag(pos, end, sourceFile) {
                 return isName(pos, end, sourceFile, paramTag);
@@ -27286,7 +32205,9 @@ var ts;
         };
         SignatureObject.prototype.getDocumentationComment = function () {
             if (this.documentationComment === undefined) {
-                this.documentationComment = this.declaration ? getJsDocCommentsFromDeclarations([this.declaration], undefined, false) : [];
+                this.documentationComment = this.declaration ? getJsDocCommentsFromDeclarations([
+                    this.declaration
+                ], undefined, false) : [];
             }
             return this.documentationComment;
         };
@@ -27320,9 +32241,7 @@ var ts;
                         case 131:
                             var functionDeclaration = node;
                             if (functionDeclaration.name && functionDeclaration.name.getFullWidth() > 0) {
-                                var lastDeclaration = namedDeclarations.length > 0 ?
-                                    namedDeclarations[namedDeclarations.length - 1] :
-                                    undefined;
+                                var lastDeclaration = namedDeclarations.length > 0 ? namedDeclarations[namedDeclarations.length - 1] : undefined;
                                 if (lastDeclaration && functionDeclaration.symbol === lastDeclaration.symbol) {
                                     if (functionDeclaration.body && !lastDeclaration.body) {
                                         namedDeclarations[namedDeclarations.length - 1] = functionDeclaration;
@@ -27339,12 +32258,12 @@ var ts;
                         case 198:
                         case 199:
                         case 200:
-                        case 202:
-                        case 211:
-                        case 207:
-                        case 202:
-                        case 204:
+                        case 203:
+                        case 212:
+                        case 208:
+                        case 203:
                         case 205:
+                        case 206:
                         case 134:
                         case 135:
                         case 143:
@@ -27374,24 +32293,24 @@ var ts;
                                 ts.forEachChild(node.name, visit);
                                 break;
                             }
-                        case 219:
+                        case 220:
                         case 130:
                         case 129:
                             namedDeclarations.push(node);
                             break;
-                        case 209:
+                        case 210:
                             if (node.exportClause) {
                                 ts.forEach(node.exportClause.elements, visit);
                             }
                             break;
-                        case 203:
+                        case 204:
                             var importClause = node.importClause;
                             if (importClause) {
                                 if (importClause.name) {
                                     namedDeclarations.push(importClause);
                                 }
                                 if (importClause.namedBindings) {
-                                    if (importClause.namedBindings.kind === 205) {
+                                    if (importClause.namedBindings.kind === 206) {
                                         namedDeclarations.push(importClause.namedBindings);
                                     }
                                     else {
@@ -27536,7 +32455,9 @@ var ts;
     ts.ClassificationTypeNames = ClassificationTypeNames;
     function displayPartsToString(displayParts) {
         if (displayParts) {
-            return ts.map(displayParts, function (displayPart) { return displayPart.text; }).join("");
+            return ts.map(displayParts, function (displayPart) {
+                return displayPart.text;
+            }).join("");
         }
         return "";
     }
@@ -27553,7 +32474,7 @@ var ts;
                 return false;
             }
             for (var parent = declaration.parent; !ts.isFunctionBlock(parent); parent = parent.parent) {
-                if (parent.kind === 220 || parent.kind === 201) {
+                if (parent.kind === 221 || parent.kind === 201) {
                     return false;
                 }
             }
@@ -27713,7 +32634,9 @@ var ts;
             return bucket;
         }
         function reportStats() {
-            var bucketInfoArray = Object.keys(buckets).filter(function (name) { return name && name.charAt(0) === '_'; }).map(function (name) {
+            var bucketInfoArray = Object.keys(buckets).filter(function (name) {
+                return name && name.charAt(0) === '_';
+            }).map(function (name) {
                 var entries = ts.lookUp(buckets, name);
                 var sourceFiles = [];
                 for (var i in entries) {
@@ -27724,7 +32647,9 @@ var ts;
                         references: entry.owners.slice(0)
                     });
                 }
-                sourceFiles.sort(function (x, y) { return y.refCount - x.refCount; });
+                sourceFiles.sort(function (x, y) {
+                    return y.refCount - x.refCount;
+                });
                 return {
                     bucket: name,
                     sourceFiles: sourceFiles
@@ -27913,7 +32838,11 @@ var ts;
             processImport();
         }
         processTripleSlashDirectives();
-        return { referencedFiles: referencedFiles, importedFiles: importedFiles, isLibFile: isNoDefaultLib };
+        return {
+            referencedFiles: referencedFiles,
+            importedFiles: importedFiles,
+            isLibFile: isNoDefaultLib
+        };
     }
     ts.preProcessFile = preProcessFile;
     function getTargetLabel(referenceNode, labelName) {
@@ -27926,14 +32855,10 @@ var ts;
         return undefined;
     }
     function isJumpStatementTarget(node) {
-        return node.kind === 64 &&
-            (node.parent.kind === 185 || node.parent.kind === 184) &&
-            node.parent.label === node;
+        return node.kind === 64 && (node.parent.kind === 185 || node.parent.kind === 184) && node.parent.label === node;
     }
     function isLabelOfLabeledStatement(node) {
-        return node.kind === 64 &&
-            node.parent.kind === 189 &&
-            node.parent.label === node;
+        return node.kind === 64 && node.parent.kind === 189 && node.parent.label === node;
     }
     function isLabeledBy(node, labelName) {
         for (var owner = node.parent; owner.kind === 189; owner = owner.parent) {
@@ -27968,20 +32893,18 @@ var ts;
         return node.parent.kind === 200 && node.parent.name === node;
     }
     function isNameOfFunctionDeclaration(node) {
-        return node.kind === 64 &&
-            ts.isFunctionLike(node.parent) && node.parent.name === node;
+        return node.kind === 64 && ts.isFunctionLike(node.parent) && node.parent.name === node;
     }
     function isNameOfPropertyAssignment(node) {
-        return (node.kind === 64 || node.kind === 8 || node.kind === 7) &&
-            (node.parent.kind === 217 || node.parent.kind === 218) && node.parent.name === node;
+        return (node.kind === 64 || node.kind === 8 || node.kind === 7) && (node.parent.kind === 218 || node.parent.kind === 219) && node.parent.name === node;
     }
     function isLiteralNameOfPropertyDeclarationOrIndexAccess(node) {
         if (node.kind === 8 || node.kind === 7) {
             switch (node.parent.kind) {
                 case 130:
                 case 129:
-                case 217:
-                case 219:
+                case 218:
+                case 220:
                 case 132:
                 case 131:
                 case 134:
@@ -27996,15 +32919,12 @@ var ts;
     }
     function isNameOfExternalModuleImportOrDeclaration(node) {
         if (node.kind === 8) {
-            return isNameOfModuleDeclaration(node) ||
-                (ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) && ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node);
+            return isNameOfModuleDeclaration(node) || (ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) && ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node);
         }
         return false;
     }
     function isInsideComment(sourceFile, token, position) {
-        return position <= token.getStart(sourceFile) &&
-            (isInsideCommentRange(ts.getTrailingCommentRanges(sourceFile.text, token.getFullStart())) ||
-                isInsideCommentRange(ts.getLeadingCommentRanges(sourceFile.text, token.getFullStart())));
+        return position <= token.getStart(sourceFile) && (isInsideCommentRange(ts.getTrailingCommentRanges(sourceFile.text, token.getFullStart())) || isInsideCommentRange(ts.getLeadingCommentRanges(sourceFile.text, token.getFullStart())));
         function isInsideCommentRange(comments) {
             return ts.forEach(comments, function (comment) {
                 if (comment.pos < position && position < comment.end) {
@@ -28017,8 +32937,7 @@ var ts;
                         return true;
                     }
                     else {
-                        return !(text.charCodeAt(comment.end - 1) === 47 &&
-                            text.charCodeAt(comment.end - 2) === 42);
+                        return !(text.charCodeAt(comment.end - 1) === 47 && text.charCodeAt(comment.end - 2) === 42);
                     }
                 }
                 return false;
@@ -28055,7 +32974,7 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                case 220:
+                case 221:
                 case 132:
                 case 131:
                 case 195:
@@ -28073,38 +32992,49 @@ var ts;
     ts.getContainerNode = getContainerNode;
     function getNodeKind(node) {
         switch (node.kind) {
-            case 200: return ScriptElementKind.moduleElement;
-            case 196: return ScriptElementKind.classElement;
-            case 197: return ScriptElementKind.interfaceElement;
-            case 198: return ScriptElementKind.typeElement;
-            case 199: return ScriptElementKind.enumElement;
+            case 200:
+                return ScriptElementKind.moduleElement;
+            case 196:
+                return ScriptElementKind.classElement;
+            case 197:
+                return ScriptElementKind.interfaceElement;
+            case 198:
+                return ScriptElementKind.typeElement;
+            case 199:
+                return ScriptElementKind.enumElement;
             case 193:
-                return ts.isConst(node)
-                    ? ScriptElementKind.constElement
-                    : ts.isLet(node)
-                        ? ScriptElementKind.letElement
-                        : ScriptElementKind.variableElement;
-            case 195: return ScriptElementKind.functionElement;
-            case 134: return ScriptElementKind.memberGetAccessorElement;
-            case 135: return ScriptElementKind.memberSetAccessorElement;
+                return ts.isConst(node) ? ScriptElementKind.constElement : ts.isLet(node) ? ScriptElementKind.letElement : ScriptElementKind.variableElement;
+            case 195:
+                return ScriptElementKind.functionElement;
+            case 134:
+                return ScriptElementKind.memberGetAccessorElement;
+            case 135:
+                return ScriptElementKind.memberSetAccessorElement;
             case 132:
             case 131:
                 return ScriptElementKind.memberFunctionElement;
             case 130:
             case 129:
                 return ScriptElementKind.memberVariableElement;
-            case 138: return ScriptElementKind.indexSignatureElement;
-            case 137: return ScriptElementKind.constructSignatureElement;
-            case 136: return ScriptElementKind.callSignatureElement;
-            case 133: return ScriptElementKind.constructorImplementationElement;
-            case 127: return ScriptElementKind.typeParameterElement;
-            case 219: return ScriptElementKind.variableElement;
-            case 128: return (node.flags & 112) ? ScriptElementKind.memberVariableElement : ScriptElementKind.parameterElement;
-            case 202:
-            case 207:
-            case 204:
-            case 211:
+            case 138:
+                return ScriptElementKind.indexSignatureElement;
+            case 137:
+                return ScriptElementKind.constructSignatureElement;
+            case 136:
+                return ScriptElementKind.callSignatureElement;
+            case 133:
+                return ScriptElementKind.constructorImplementationElement;
+            case 127:
+                return ScriptElementKind.typeParameterElement;
+            case 220:
+                return ScriptElementKind.variableElement;
+            case 128:
+                return (node.flags & 112) ? ScriptElementKind.memberVariableElement : ScriptElementKind.parameterElement;
+            case 203:
+            case 208:
             case 205:
+            case 212:
+            case 206:
                 return ScriptElementKind.alias;
         }
         return ScriptElementKind.unknown;
@@ -28155,13 +33085,26 @@ var ts;
             var changesInCompilationSettingsAffectSyntax = oldSettings && oldSettings.target !== newSettings.target;
             var newProgram = ts.createProgram(hostCache.getRootFileNames(), newSettings, {
                 getSourceFile: getOrCreateSourceFile,
-                getCancellationToken: function () { return cancellationToken; },
-                getCanonicalFileName: function (fileName) { return useCaseSensitivefileNames ? fileName : fileName.toLowerCase(); },
-                useCaseSensitiveFileNames: function () { return useCaseSensitivefileNames; },
-                getNewLine: function () { return host.getNewLine ? host.getNewLine() : "\r\n"; },
-                getDefaultLibFileName: function (options) { return host.getDefaultLibFileName(options); },
-                writeFile: function (fileName, data, writeByteOrderMark) { },
-                getCurrentDirectory: function () { return host.getCurrentDirectory(); }
+                getCancellationToken: function () {
+                    return cancellationToken;
+                },
+                getCanonicalFileName: function (fileName) {
+                    return useCaseSensitivefileNames ? fileName : fileName.toLowerCase();
+                },
+                useCaseSensitiveFileNames: function () {
+                    return useCaseSensitivefileNames;
+                },
+                getNewLine: function () {
+                    return host.getNewLine ? host.getNewLine() : "\r\n";
+                },
+                getDefaultLibFileName: function (options) {
+                    return host.getDefaultLibFileName(options);
+                },
+                writeFile: function (fileName, data, writeByteOrderMark) {
+                },
+                getCurrentDirectory: function () {
+                    return host.getCurrentDirectory();
+                }
             });
             if (program) {
                 var oldSourceFiles = program.getSourceFiles();
@@ -28248,8 +33191,7 @@ var ts;
                 if ((symbol.flags & 1536) && (firstCharCode === 39 || firstCharCode === 34)) {
                     return undefined;
                 }
-                if (displayName && displayName.length >= 2 && firstCharCode === displayName.charCodeAt(displayName.length - 1) &&
-                    (firstCharCode === 39 || firstCharCode === 34)) {
+                if (displayName && displayName.length >= 2 && firstCharCode === displayName.charCodeAt(displayName.length - 1) && (firstCharCode === 39 || firstCharCode === 34)) {
                     displayName = displayName.substring(1, displayName.length - 1);
                 }
                 var isValid = ts.isIdentifierStart(displayName.charCodeAt(0), target);
@@ -28365,11 +33307,11 @@ var ts;
                         getCompletionEntriesFromSymbols(filteredMembers, activeCompletionSession);
                     }
                 }
-                else if (ts.getAncestor(previousToken, 204)) {
+                else if (ts.getAncestor(previousToken, 205)) {
                     isMemberCompletion = true;
                     isNewIdentifierLocation = true;
                     if (showCompletionsInImportsClause(previousToken)) {
-                        var importDeclaration = ts.getAncestor(previousToken, 203);
+                        var importDeclaration = ts.getAncestor(previousToken, 204);
                         ts.Debug.assert(importDeclaration !== undefined);
                         var exports = typeInfoResolver.getExportsOfExternalModule(importDeclaration);
                         var filteredExports = filterModuleExports(exports, importDeclaration);
@@ -28410,16 +33352,14 @@ var ts;
             }
             function isCompletionListBlocker(previousToken) {
                 var start = new Date().getTime();
-                var result = isInStringOrRegularExpressionOrTemplateLiteral(previousToken) ||
-                    isIdentifierDefinitionLocation(previousToken) ||
-                    isRightOfIllegalDot(previousToken);
+                var result = isInStringOrRegularExpressionOrTemplateLiteral(previousToken) || isIdentifierDefinitionLocation(previousToken) || isRightOfIllegalDot(previousToken);
                 log("getCompletionsAtPosition: isCompletionListBlocker: " + (new Date().getTime() - start));
                 return result;
             }
             function showCompletionsInImportsClause(node) {
                 if (node) {
                     if (node.kind === 14 || node.kind === 23) {
-                        return node.parent.kind === 206;
+                        return node.parent.kind === 207;
                     }
                 }
                 return false;
@@ -28429,16 +33369,9 @@ var ts;
                     var containingNodeKind = previousToken.parent.kind;
                     switch (previousToken.kind) {
                         case 23:
-                            return containingNodeKind === 155
-                                || containingNodeKind === 133
-                                || containingNodeKind === 156
-                                || containingNodeKind === 151
-                                || containingNodeKind === 167;
+                            return containingNodeKind === 155 || containingNodeKind === 133 || containingNodeKind === 156 || containingNodeKind === 151 || containingNodeKind === 167;
                         case 16:
-                            return containingNodeKind === 155
-                                || containingNodeKind === 133
-                                || containingNodeKind === 156
-                                || containingNodeKind === 159;
+                            return containingNodeKind === 155 || containingNodeKind === 133 || containingNodeKind === 156 || containingNodeKind === 159;
                         case 18:
                             return containingNodeKind === 151;
                         case 116:
@@ -28448,8 +33381,7 @@ var ts;
                         case 14:
                             return containingNodeKind === 196;
                         case 52:
-                            return containingNodeKind === 193
-                                || containingNodeKind === 167;
+                            return containingNodeKind === 193 || containingNodeKind === 167;
                         case 11:
                             return containingNodeKind === 169;
                         case 12:
@@ -28469,9 +33401,7 @@ var ts;
                 return false;
             }
             function isInStringOrRegularExpressionOrTemplateLiteral(previousToken) {
-                if (previousToken.kind === 8
-                    || previousToken.kind === 9
-                    || ts.isTemplateLiteralKind(previousToken.kind)) {
+                if (previousToken.kind === 8 || previousToken.kind === 9 || ts.isTemplateLiteralKind(previousToken.kind)) {
                     var start = previousToken.getStart();
                     var end = previousToken.getEnd();
                     if (start < position && position < end) {
@@ -28518,43 +33448,23 @@ var ts;
                     var containingNodeKind = previousToken.parent.kind;
                     switch (previousToken.kind) {
                         case 23:
-                            return containingNodeKind === 193 ||
-                                containingNodeKind === 194 ||
-                                containingNodeKind === 175 ||
-                                containingNodeKind === 199 ||
-                                isFunction(containingNodeKind) ||
-                                containingNodeKind === 196 ||
-                                containingNodeKind === 195 ||
-                                containingNodeKind === 197 ||
-                                containingNodeKind === 149 ||
-                                containingNodeKind === 148;
+                            return containingNodeKind === 193 || containingNodeKind === 194 || containingNodeKind === 175 || containingNodeKind === 199 || isFunction(containingNodeKind) || containingNodeKind === 196 || containingNodeKind === 195 || containingNodeKind === 197 || containingNodeKind === 149 || containingNodeKind === 148;
                         case 20:
                             return containingNodeKind === 149;
                         case 18:
                             return containingNodeKind === 149;
                         case 16:
-                            return containingNodeKind === 216 ||
-                                isFunction(containingNodeKind);
+                            return containingNodeKind === 217 || isFunction(containingNodeKind);
                         case 14:
-                            return containingNodeKind === 199 ||
-                                containingNodeKind === 197 ||
-                                containingNodeKind === 143 ||
-                                containingNodeKind === 148;
+                            return containingNodeKind === 199 || containingNodeKind === 197 || containingNodeKind === 143 || containingNodeKind === 148;
                         case 22:
-                            return containingNodeKind === 129 &&
-                                (previousToken.parent.parent.kind === 197 ||
-                                    previousToken.parent.parent.kind === 143);
+                            return containingNodeKind === 129 && (previousToken.parent.parent.kind === 197 || previousToken.parent.parent.kind === 143);
                         case 24:
-                            return containingNodeKind === 196 ||
-                                containingNodeKind === 195 ||
-                                containingNodeKind === 197 ||
-                                isFunction(containingNodeKind);
+                            return containingNodeKind === 196 || containingNodeKind === 195 || containingNodeKind === 197 || isFunction(containingNodeKind);
                         case 109:
                             return containingNodeKind === 130;
                         case 21:
-                            return containingNodeKind === 128 ||
-                                containingNodeKind === 133 ||
-                                (previousToken.parent.parent.kind === 149);
+                            return containingNodeKind === 128 || containingNodeKind === 133 || (previousToken.parent.parent.kind === 149);
                         case 108:
                         case 106:
                         case 107:
@@ -28599,8 +33509,7 @@ var ts;
                 if (!importDeclaration.importClause) {
                     return exports;
                 }
-                if (importDeclaration.importClause.namedBindings &&
-                    importDeclaration.importClause.namedBindings.kind === 206) {
+                if (importDeclaration.importClause.namedBindings && importDeclaration.importClause.namedBindings.kind === 207) {
                     ts.forEach(importDeclaration.importClause.namedBindings.elements, function (el) {
                         var name = el.propertyName || el.name;
                         exisingImports[name.text] = true;
@@ -28609,7 +33518,9 @@ var ts;
                 if (ts.isEmpty(exisingImports)) {
                     return exports;
                 }
-                return ts.filter(exports, function (e) { return !ts.lookUp(exisingImports, e.name); });
+                return ts.filter(exports, function (e) {
+                    return !ts.lookUp(exisingImports, e.name);
+                });
             }
             function filterContextualMembersList(contextualMemberSymbols, existingMembers) {
                 if (!existingMembers || existingMembers.length === 0) {
@@ -28617,7 +33528,7 @@ var ts;
                 }
                 var existingMemberNames = {};
                 ts.forEach(existingMembers, function (m) {
-                    if (m.kind !== 217 && m.kind !== 218) {
+                    if (m.kind !== 218 && m.kind !== 219) {
                         return;
                     }
                     if (m.getStart() <= position && position <= m.getEnd()) {
@@ -28659,7 +33570,9 @@ var ts;
                     name: entryName,
                     kind: ScriptElementKind.keyword,
                     kindModifiers: ScriptElementKindModifier.none,
-                    displayParts: [ts.displayPart(entryName, 5)],
+                    displayParts: [
+                        ts.displayPart(entryName, 5)
+                    ],
                     documentation: undefined
                 };
             }
@@ -28757,9 +33670,7 @@ var ts;
             return ScriptElementKind.unknown;
         }
         function getSymbolModifiers(symbol) {
-            return symbol && symbol.declarations && symbol.declarations.length > 0
-                ? ts.getNodeModifiers(symbol.declarations[0])
-                : ScriptElementKindModifier.none;
+            return symbol && symbol.declarations && symbol.declarations.length > 0 ? ts.getNodeModifiers(symbol.declarations[0]) : ScriptElementKindModifier.none;
         }
         function getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, sourceFile, enclosingDeclaration, typeResolver, location, semanticMeaning) {
             if (semanticMeaning === void 0) { semanticMeaning = getMeaningFromLocation(location); }
@@ -28842,8 +33753,7 @@ var ts;
                             hasAddedSymbolInfo = true;
                         }
                     }
-                    else if ((isNameOfFunctionDeclaration(location) && !(symbol.flags & 98304)) ||
-                        (location.kind === 113 && location.parent.kind === 133)) {
+                    else if ((isNameOfFunctionDeclaration(location) && !(symbol.flags & 98304)) || (location.kind === 113 && location.parent.kind === 133)) {
                         var signature;
                         var functionDeclaration = location.parent;
                         var allSignatures = functionDeclaration.kind === 133 ? type.getConstructSignatures() : type.getCallSignatures();
@@ -28858,8 +33768,7 @@ var ts;
                             addPrefixForAnyFunctionOrVar(type.symbol, symbolKind);
                         }
                         else {
-                            addPrefixForAnyFunctionOrVar(functionDeclaration.kind === 136 &&
-                                !(type.symbol.flags & 2048 || type.symbol.flags & 4096) ? type.symbol : symbol, symbolKind);
+                            addPrefixForAnyFunctionOrVar(functionDeclaration.kind === 136 && !(type.symbol.flags & 2048 || type.symbol.flags & 4096) ? type.symbol : symbol, symbolKind);
                         }
                         addSignatureDisplayParts(signature, allSignatures);
                         hasAddedSymbolInfo = true;
@@ -28935,7 +33844,7 @@ var ts;
             if (symbolFlags & 8) {
                 addPrefixForAnyFunctionOrVar(symbol, "enum member");
                 var declaration = symbol.declarations[0];
-                if (declaration.kind === 219) {
+                if (declaration.kind === 220) {
                     var constantValue = typeResolver.getConstantValue(declaration);
                     if (constantValue !== undefined) {
                         displayParts.push(ts.spacePart());
@@ -28951,7 +33860,7 @@ var ts;
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 ts.forEach(symbol.declarations, function (declaration) {
-                    if (declaration.kind === 202) {
+                    if (declaration.kind === 203) {
                         var importEqualsDeclaration = declaration;
                         if (ts.isExternalModuleImportEqualsDeclaration(importEqualsDeclaration)) {
                             displayParts.push(ts.spacePart());
@@ -28979,9 +33888,7 @@ var ts;
                 if (symbolKind !== ScriptElementKind.unknown) {
                     if (type) {
                         addPrefixForAnyFunctionOrVar(symbol, symbolKind);
-                        if (symbolKind === ScriptElementKind.memberVariableElement ||
-                            symbolFlags & 3 ||
-                            symbolKind === ScriptElementKind.localVariableElement) {
+                        if (symbolKind === ScriptElementKind.memberVariableElement || symbolFlags & 3 || symbolKind === ScriptElementKind.localVariableElement) {
                             displayParts.push(ts.punctuationPart(51));
                             displayParts.push(ts.spacePart());
                             if (type.symbol && type.symbol.flags & 262144) {
@@ -28994,12 +33901,7 @@ var ts;
                                 displayParts.push.apply(displayParts, ts.typeToDisplayParts(typeResolver, type, enclosingDeclaration));
                             }
                         }
-                        else if (symbolFlags & 16 ||
-                            symbolFlags & 8192 ||
-                            symbolFlags & 16384 ||
-                            symbolFlags & 131072 ||
-                            symbolFlags & 98304 ||
-                            symbolKind === ScriptElementKind.memberFunctionElement) {
+                        else if (symbolFlags & 16 || symbolFlags & 8192 || symbolFlags & 16384 || symbolFlags & 131072 || symbolFlags & 98304 || symbolKind === ScriptElementKind.memberFunctionElement) {
                             var allSignatures = type.getCallSignatures();
                             addSignatureDisplayParts(allSignatures[0], allSignatures);
                         }
@@ -29012,7 +33914,11 @@ var ts;
             if (!documentation) {
                 documentation = symbol.getDocumentationComment();
             }
-            return { displayParts: displayParts, documentation: documentation, symbolKind: symbolKind };
+            return {
+                displayParts: displayParts,
+                documentation: documentation,
+                symbolKind: symbolKind
+            };
             function addNewLineIfDisplayPartsExist() {
                 if (displayParts.length) {
                     displayParts.push(ts.lineBreakPart());
@@ -29099,20 +34005,26 @@ var ts;
             if (isJumpStatementTarget(node)) {
                 var labelName = node.text;
                 var label = getTargetLabel(node.parent, node.text);
-                return label ? [getDefinitionInfo(label, ScriptElementKind.label, labelName, undefined)] : undefined;
+                return label ? [
+                    getDefinitionInfo(label, ScriptElementKind.label, labelName, undefined)
+                ] : undefined;
             }
-            var comment = ts.forEach(sourceFile.referencedFiles, function (r) { return (r.pos <= position && position < r.end) ? r : undefined; });
+            var comment = ts.forEach(sourceFile.referencedFiles, function (r) {
+                return (r.pos <= position && position < r.end) ? r : undefined;
+            });
             if (comment) {
                 var referenceFile = ts.tryResolveScriptReference(program, sourceFile, comment);
                 if (referenceFile) {
-                    return [{
+                    return [
+                        {
                             fileName: referenceFile.fileName,
                             textSpan: ts.createTextSpanFromBounds(0, 0),
                             kind: ScriptElementKind.scriptElement,
                             name: comment.fileName,
                             containerName: undefined,
                             containerKind: undefined
-                        }];
+                        }
+                    ];
                 }
                 return undefined;
             }
@@ -29127,7 +34039,7 @@ var ts;
                 }
             }
             var result = [];
-            if (node.parent.kind === 218) {
+            if (node.parent.kind === 219) {
                 var shorthandSymbol = typeInfoResolver.getShorthandAssignmentValueSymbol(symbol.valueDeclaration);
                 var shorthandDeclarations = shorthandSymbol.getDeclarations();
                 var shorthandSymbolKind = getSymbolKind(shorthandSymbol, typeInfoResolver, node);
@@ -29143,8 +34055,7 @@ var ts;
             var symbolKind = getSymbolKind(symbol, typeInfoResolver, node);
             var containerSymbol = symbol.parent;
             var containerName = containerSymbol ? typeInfoResolver.symbolToString(containerSymbol, node) : "";
-            if (!tryAddConstructSignature(symbol, node, symbolKind, symbolName, containerName, result) &&
-                !tryAddCallSignature(symbol, node, symbolKind, symbolName, containerName, result)) {
+            if (!tryAddConstructSignature(symbol, node, symbolKind, symbolName, containerName, result) && !tryAddCallSignature(symbol, node, symbolKind, symbolName, containerName, result)) {
                 ts.forEach(declarations, function (declaration) {
                     result.push(getDefinitionInfo(declaration, symbolKind, symbolName, containerName));
                 });
@@ -29164,8 +34075,7 @@ var ts;
                 var declarations = [];
                 var definition;
                 ts.forEach(signatureDeclarations, function (d) {
-                    if ((selectConstructors && d.kind === 133) ||
-                        (!selectConstructors && (d.kind === 195 || d.kind === 132 || d.kind === 131))) {
+                    if ((selectConstructors && d.kind === 133) || (!selectConstructors && (d.kind === 195 || d.kind === 132 || d.kind === 131))) {
                         declarations.push(d);
                         if (d.body)
                             definition = d;
@@ -29205,9 +34115,10 @@ var ts;
             if (!node) {
                 return undefined;
             }
-            if (node.kind === 64 || node.kind === 92 || node.kind === 90 ||
-                isLiteralNameOfPropertyDeclarationOrIndexAccess(node) || isNameOfExternalModuleImportOrDeclaration(node)) {
-                return getReferencesForNode(node, [sourceFile], true, false, false);
+            if (node.kind === 64 || node.kind === 92 || node.kind === 90 || isLiteralNameOfPropertyDeclarationOrIndexAccess(node) || isNameOfExternalModuleImportOrDeclaration(node)) {
+                return getReferencesForNode(node, [
+                    sourceFile
+                ], true, false, false);
             }
             switch (node.kind) {
                 case 83:
@@ -29244,8 +34155,8 @@ var ts;
                     break;
                 case 66:
                 case 72:
-                    if (hasKind(parent(parent(node)), 188)) {
-                        return getSwitchCaseDefaultOccurrences(node.parent.parent);
+                    if (hasKind(parent(parent(parent(node))), 188)) {
+                        return getSwitchCaseDefaultOccurrences(node.parent.parent.parent);
                     }
                     break;
                 case 65:
@@ -29255,9 +34166,7 @@ var ts;
                     }
                     break;
                 case 81:
-                    if (hasKind(node.parent, 181) ||
-                        hasKind(node.parent, 182) ||
-                        hasKind(node.parent, 183)) {
+                    if (hasKind(node.parent, 181) || hasKind(node.parent, 182) || hasKind(node.parent, 183)) {
                         return getLoopBreakContinueOccurrences(node.parent);
                     }
                     break;
@@ -29278,8 +34187,7 @@ var ts;
                         return getGetAndSetOccurrences(node.parent);
                     }
                 default:
-                    if (ts.isModifier(node.kind) && node.parent &&
-                        (ts.isDeclaration(node.parent) || node.parent.kind === 175)) {
+                    if (ts.isModifier(node.kind) && node.parent && (ts.isDeclaration(node.parent) || node.parent.kind === 175)) {
                         return getModifierOccurrences(node.kind, node.parent);
                     }
             }
@@ -29388,7 +34296,7 @@ var ts;
                 var child = throwStatement;
                 while (child.parent) {
                     var parent = child.parent;
-                    if (ts.isFunctionBlock(parent) || parent.kind === 220) {
+                    if (ts.isFunctionBlock(parent) || parent.kind === 221) {
                         return parent;
                     }
                     if (parent.kind === 191) {
@@ -29436,7 +34344,7 @@ var ts;
             function getSwitchCaseDefaultOccurrences(switchStatement) {
                 var keywords = [];
                 pushKeywordIf(keywords, switchStatement.getFirstToken(), 91);
-                ts.forEach(switchStatement.clauses, function (clause) {
+                ts.forEach(switchStatement.caseBlock.clauses, function (clause) {
                     pushKeywordIf(keywords, clause.getFirstToken(), 66, 72);
                     var breaksAndContinues = aggregateAllBreakAndContinueStatements(clause);
                     ts.forEach(breaksAndContinues, function (statement) {
@@ -29524,15 +34432,16 @@ var ts;
                 function tryPushAccessorKeyword(accessorSymbol, accessorKind) {
                     var accessor = ts.getDeclarationOfKind(accessorSymbol, accessorKind);
                     if (accessor) {
-                        ts.forEach(accessor.getChildren(), function (child) { return pushKeywordIf(keywords, child, 115, 119); });
+                        ts.forEach(accessor.getChildren(), function (child) {
+                            return pushKeywordIf(keywords, child, 115, 119);
+                        });
                     }
                 }
             }
             function getModifierOccurrences(modifier, declaration) {
                 var container = declaration.parent;
                 if (declaration.flags & 112) {
-                    if (!(container.kind === 196 ||
-                        (declaration.kind === 128 && hasKind(container, 133)))) {
+                    if (!(container.kind === 196 || (declaration.kind === 128 && hasKind(container, 133)))) {
                         return undefined;
                     }
                 }
@@ -29542,7 +34451,7 @@ var ts;
                     }
                 }
                 else if (declaration.flags & (1 | 2)) {
-                    if (!(container.kind === 201 || container.kind === 220)) {
+                    if (!(container.kind === 201 || container.kind === 221)) {
                         return undefined;
                     }
                 }
@@ -29554,7 +34463,7 @@ var ts;
                 var nodes;
                 switch (container.kind) {
                     case 201:
-                    case 220:
+                    case 221:
                         nodes = container.statements;
                         break;
                     case 133:
@@ -29576,7 +34485,9 @@ var ts;
                 }
                 ts.forEach(nodes, function (node) {
                     if (node.modifiers && node.flags & modifierFlag) {
-                        ts.forEach(node.modifiers, function (child) { return pushKeywordIf(keywords, child, modifier); });
+                        ts.forEach(node.modifiers, function (child) {
+                            return pushKeywordIf(keywords, child, modifier);
+                        });
                     }
                 });
                 return ts.map(keywords, getReferenceEntryFromNode);
@@ -29630,9 +34541,7 @@ var ts;
             if (!node) {
                 return undefined;
             }
-            if (node.kind !== 64 &&
-                !isLiteralNameOfPropertyDeclarationOrIndexAccess(node) &&
-                !isNameOfExternalModuleImportOrDeclaration(node)) {
+            if (node.kind !== 64 && !isLiteralNameOfPropertyDeclarationOrIndexAccess(node) && !isNameOfExternalModuleImportOrDeclaration(node)) {
                 return undefined;
             }
             ts.Debug.assert(node.kind === 64 || node.kind === 7 || node.kind === 8);
@@ -29642,7 +34551,9 @@ var ts;
             if (isLabelName(node)) {
                 if (isJumpStatementTarget(node)) {
                     var labelDefinition = getTargetLabel(node.parent, node.text);
-                    return labelDefinition ? getLabelReferencesInNode(labelDefinition.parent, labelDefinition) : [getReferenceEntryFromNode(node)];
+                    return labelDefinition ? getLabelReferencesInNode(labelDefinition.parent, labelDefinition) : [
+                        getReferenceEntryFromNode(node)
+                    ];
                 }
                 else {
                     return getLabelReferencesInNode(node.parent, node);
@@ -29656,7 +34567,9 @@ var ts;
             }
             var symbol = typeInfoResolver.getSymbolAtLocation(node);
             if (!symbol) {
-                return [getReferenceEntryFromNode(node)];
+                return [
+                    getReferenceEntryFromNode(node)
+                ];
             }
             var declarations = symbol.declarations;
             if (!declarations || !declarations.length) {
@@ -29690,17 +34603,17 @@ var ts;
             }
             return result;
             function isImportOrExportSpecifierName(location) {
-                return location.parent &&
-                    (location.parent.kind === 207 || location.parent.kind === 211) &&
-                    location.parent.propertyName === location;
+                return location.parent && (location.parent.kind === 208 || location.parent.kind === 212) && location.parent.propertyName === location;
             }
             function isImportOrExportSpecifierImportSymbol(symbol) {
                 return (symbol.flags & 8388608) && ts.forEach(symbol.declarations, function (declaration) {
-                    return declaration.kind === 207 || declaration.kind === 211;
+                    return declaration.kind === 208 || declaration.kind === 212;
                 });
             }
             function getDeclaredName(symbol, location) {
-                var functionExpression = ts.forEach(symbol.declarations, function (d) { return d.kind === 160 ? d : undefined; });
+                var functionExpression = ts.forEach(symbol.declarations, function (d) {
+                    return d.kind === 160 ? d : undefined;
+                });
                 if (functionExpression && functionExpression.name) {
                     var name = functionExpression.name.text;
                 }
@@ -29714,7 +34627,9 @@ var ts;
                 if (isImportOrExportSpecifierName(location)) {
                     return location.getText();
                 }
-                var functionExpression = ts.forEach(declarations, function (d) { return d.kind === 160 ? d : undefined; });
+                var functionExpression = ts.forEach(declarations, function (d) {
+                    return d.kind === 160 ? d : undefined;
+                });
                 if (functionExpression && functionExpression.name) {
                     var name = functionExpression.name.text;
                 }
@@ -29733,7 +34648,9 @@ var ts;
             }
             function getSymbolScope(symbol) {
                 if (symbol.flags & (4 | 8192)) {
-                    var privateDeclaration = ts.forEach(symbol.getDeclarations(), function (d) { return (d.flags & 32) ? d : undefined; });
+                    var privateDeclaration = ts.forEach(symbol.getDeclarations(), function (d) {
+                        return (d.flags & 32) ? d : undefined;
+                    });
                     if (privateDeclaration) {
                         return ts.getAncestor(privateDeclaration, 196);
                     }
@@ -29755,7 +34672,7 @@ var ts;
                         if (scope && scope !== container) {
                             return undefined;
                         }
-                        if (container.kind === 220 && !ts.isExternalModule(container)) {
+                        if (container.kind === 221 && !ts.isExternalModule(container)) {
                             return undefined;
                         }
                         scope = container;
@@ -29777,8 +34694,7 @@ var ts;
                     if (position > end)
                         break;
                     var endPosition = position + symbolNameLength;
-                    if ((position === 0 || !ts.isIdentifierPart(text.charCodeAt(position - 1), 2)) &&
-                        (endPosition === sourceLength || !ts.isIdentifierPart(text.charCodeAt(endPosition), 2))) {
+                    if ((position === 0 || !ts.isIdentifierPart(text.charCodeAt(position - 1), 2)) && (endPosition === sourceLength || !ts.isIdentifierPart(text.charCodeAt(endPosition), 2))) {
                         positions.push(position);
                     }
                     position = text.indexOf(symbolName, position + symbolNameLength + 1);
@@ -29796,8 +34712,7 @@ var ts;
                     if (!node || node.getWidth() !== labelName.length) {
                         return;
                     }
-                    if (node === targetLabel ||
-                        (isJumpStatementTarget(node) && getTargetLabel(node, labelName) === targetLabel)) {
+                    if (node === targetLabel || (isJumpStatementTarget(node) && getTargetLabel(node, labelName) === targetLabel)) {
                         result.push(getReferenceEntryFromNode(node));
                     }
                 });
@@ -29809,8 +34724,7 @@ var ts;
                         case 64:
                             return node.getWidth() === searchSymbolName.length;
                         case 8:
-                            if (isLiteralNameOfPropertyDeclarationOrIndexAccess(node) ||
-                                isNameOfExternalModuleImportOrDeclaration(node)) {
+                            if (isLiteralNameOfPropertyDeclarationOrIndexAccess(node) || isNameOfExternalModuleImportOrDeclaration(node)) {
                                 return node.getWidth() === searchSymbolName.length + 2;
                             }
                             break;
@@ -29833,8 +34747,7 @@ var ts;
                         cancellationToken.throwIfCancellationRequested();
                         var referenceLocation = ts.getTouchingPropertyName(sourceFile, position);
                         if (!isValidReferencePosition(referenceLocation, searchText)) {
-                            if ((findInStrings && isInString(position)) ||
-                                (findInComments && isInComment(position))) {
+                            if ((findInStrings && isInString(position)) || (findInComments && isInComment(position))) {
                                 result.push({
                                     fileName: sourceFile.fileName,
                                     textSpan: ts.createTextSpan(position, searchText.length),
@@ -29932,7 +34845,7 @@ var ts;
                         staticFlag &= searchSpaceNode.flags;
                         searchSpaceNode = searchSpaceNode.parent;
                         break;
-                    case 220:
+                    case 221:
                         if (ts.isExternalModule(searchSpaceNode)) {
                             return undefined;
                         }
@@ -29943,7 +34856,7 @@ var ts;
                         return undefined;
                 }
                 var result = [];
-                if (searchSpaceNode.kind === 220) {
+                if (searchSpaceNode.kind === 221) {
                     ts.forEach(sourceFiles, function (sourceFile) {
                         var possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "this", sourceFile.getStart(), sourceFile.getEnd());
                         getThisReferencesInFile(sourceFile, sourceFile, possiblePositions, result);
@@ -29981,8 +34894,8 @@ var ts;
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
-                            case 220:
-                                if (container.kind === 220 && !ts.isExternalModule(container)) {
+                            case 221:
+                                if (container.kind === 221 && !ts.isExternalModule(container)) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
@@ -29991,7 +34904,9 @@ var ts;
                 }
             }
             function populateSearchSymbolSet(symbol, location) {
-                var result = [symbol];
+                var result = [
+                    symbol
+                ];
                 if (isImportOrExportSpecifierImportSymbol(symbol)) {
                     result.push(typeInfoResolver.getAliasedSymbol(symbol));
                 }
@@ -30044,13 +34959,14 @@ var ts;
                 if (searchSymbols.indexOf(referenceSymbol) >= 0) {
                     return true;
                 }
-                if (isImportOrExportSpecifierImportSymbol(referenceSymbol) &&
-                    searchSymbols.indexOf(typeInfoResolver.getAliasedSymbol(referenceSymbol)) >= 0) {
+                if (isImportOrExportSpecifierImportSymbol(referenceSymbol) && searchSymbols.indexOf(typeInfoResolver.getAliasedSymbol(referenceSymbol)) >= 0) {
                     return true;
                 }
                 if (isNameOfPropertyAssignment(referenceLocation)) {
                     return ts.forEach(getPropertySymbolsFromContextualType(referenceLocation), function (contextualSymbol) {
-                        return ts.forEach(typeInfoResolver.getRootSymbols(contextualSymbol), function (s) { return searchSymbols.indexOf(s) >= 0; });
+                        return ts.forEach(typeInfoResolver.getRootSymbols(contextualSymbol), function (s) {
+                            return searchSymbols.indexOf(s) >= 0;
+                        });
                     });
                 }
                 return ts.forEach(typeInfoResolver.getRootSymbols(referenceSymbol), function (rootSymbol) {
@@ -30060,7 +34976,9 @@ var ts;
                     if (rootSymbol.parent && rootSymbol.parent.flags & (32 | 64)) {
                         var result = [];
                         getPropertySymbolsFromBaseTypes(rootSymbol.parent, rootSymbol.getName(), result);
-                        return ts.forEach(result, function (s) { return searchSymbols.indexOf(s) >= 0; });
+                        return ts.forEach(result, function (s) {
+                            return searchSymbols.indexOf(s) >= 0;
+                        });
                     }
                     return false;
                 });
@@ -30074,7 +34992,9 @@ var ts;
                         if (contextualType.flags & 16384) {
                             var unionProperty = contextualType.getProperty(name);
                             if (unionProperty) {
-                                return [unionProperty];
+                                return [
+                                    unionProperty
+                                ];
                             }
                             else {
                                 var result = [];
@@ -30090,7 +35010,9 @@ var ts;
                         else {
                             var symbol = contextualType.getProperty(name);
                             if (symbol) {
-                                return [symbol];
+                                return [
+                                    symbol
+                                ];
                             }
                         }
                     }
@@ -30146,7 +35068,9 @@ var ts;
             return ts.NavigateTo.getNavigateToItems(program, cancellationToken, searchValue, maxResultCount);
         }
         function containErrors(diagnostics) {
-            return ts.forEach(diagnostics, function (diagnostic) { return diagnostic.category === 1; });
+            return ts.forEach(diagnostics, function (diagnostic) {
+                return diagnostic.category === 1;
+            });
         }
         function getEmitOutput(fileName) {
             synchronizeHostData();
@@ -30172,9 +35096,9 @@ var ts;
                 case 150:
                 case 130:
                 case 129:
-                case 217:
                 case 218:
                 case 219:
+                case 220:
                 case 132:
                 case 131:
                 case 133:
@@ -30183,7 +35107,7 @@ var ts;
                 case 195:
                 case 160:
                 case 161:
-                case 216:
+                case 217:
                     return 1;
                 case 127:
                 case 197:
@@ -30203,14 +35127,14 @@ var ts;
                     else {
                         return 4;
                     }
-                case 206:
                 case 207:
-                case 202:
-                case 203:
                 case 208:
+                case 203:
+                case 204:
                 case 209:
+                case 210:
                     return 1 | 2 | 4;
-                case 220:
+                case 221:
                     return 4 | 1;
             }
             return 1 | 2 | 4;
@@ -30240,15 +35164,13 @@ var ts;
         }
         function getMeaningFromRightHandSideOfImportEquals(node) {
             ts.Debug.assert(node.kind === 64);
-            if (node.parent.kind === 125 &&
-                node.parent.right === node &&
-                node.parent.parent.kind === 202) {
+            if (node.parent.kind === 125 && node.parent.right === node && node.parent.parent.kind === 203) {
                 return 1 | 2 | 4;
             }
             return 4;
         }
         function getMeaningFromLocation(node) {
-            if (node.parent.kind === 208) {
+            if (node.parent.kind === 209) {
                 return 1 | 2 | 4;
             }
             else if (isInRightSideOfImport(node)) {
@@ -30301,8 +35223,7 @@ var ts;
                     nodeForStartPos = nodeForStartPos.parent;
                 }
                 else if (isNameOfModuleDeclaration(nodeForStartPos)) {
-                    if (nodeForStartPos.parent.parent.kind === 200 &&
-                        nodeForStartPos.parent.parent.body === nodeForStartPos.parent) {
+                    if (nodeForStartPos.parent.parent.kind === 200 && nodeForStartPos.parent.parent.body === nodeForStartPos.parent) {
                         nodeForStartPos = nodeForStartPos.parent.parent.name;
                     }
                     else {
@@ -30349,8 +35270,7 @@ var ts;
                     }
                 }
                 else if (flags & 1536) {
-                    if (meaningAtPosition & 4 ||
-                        (meaningAtPosition & 1 && hasValueSideModule(symbol))) {
+                    if (meaningAtPosition & 4 || (meaningAtPosition & 1 && hasValueSideModule(symbol))) {
                         return ClassificationTypeNames.moduleName;
                     }
                 }
@@ -30475,16 +35395,11 @@ var ts;
                 if (ts.isPunctuation(tokenKind)) {
                     if (token) {
                         if (tokenKind === 52) {
-                            if (token.parent.kind === 193 ||
-                                token.parent.kind === 130 ||
-                                token.parent.kind === 128) {
+                            if (token.parent.kind === 193 || token.parent.kind === 130 || token.parent.kind === 128) {
                                 return ClassificationTypeNames.operator;
                             }
                         }
-                        if (token.parent.kind === 167 ||
-                            token.parent.kind === 165 ||
-                            token.parent.kind === 166 ||
-                            token.parent.kind === 168) {
+                        if (token.parent.kind === 167 || token.parent.kind === 165 || token.parent.kind === 166 || token.parent.kind === 168) {
                             return ClassificationTypeNames.operator;
                         }
                     }
@@ -30582,14 +35497,22 @@ var ts;
             return result;
             function getMatchingTokenKind(token) {
                 switch (token.kind) {
-                    case 14: return 15;
-                    case 16: return 17;
-                    case 18: return 19;
-                    case 24: return 25;
-                    case 15: return 14;
-                    case 17: return 16;
-                    case 19: return 18;
-                    case 25: return 24;
+                    case 14:
+                        return 15;
+                    case 16:
+                        return 17;
+                    case 18:
+                        return 19;
+                    case 24:
+                        return 25;
+                    case 15:
+                        return 14;
+                    case 17:
+                        return 16;
+                    case 19:
+                        return 18;
+                    case 25:
+                        return 24;
                 }
                 return undefined;
             }
@@ -30670,7 +35593,9 @@ var ts;
                 var multiLineCommentStart = /(?:\/\*+\s*)/.source;
                 var anyNumberOfSpacesAndAsterixesAtStartOfLine = /(?:^(?:\s|\*)*)/.source;
                 var preamble = "(" + anyNumberOfSpacesAndAsterixesAtStartOfLine + "|" + singleLineCommentStart + "|" + multiLineCommentStart + ")";
-                var literals = "(?:" + ts.map(descriptors, function (d) { return "(" + escapeRegExp(d.text) + ")"; }).join("|") + ")";
+                var literals = "(?:" + ts.map(descriptors, function (d) {
+                    return "(" + escapeRegExp(d.text) + ")";
+                }).join("|") + ")";
                 var endOfLineOrEndOfComment = /(?:$|\*\/)/.source;
                 var messageRemainder = /(?:.*?)/.source;
                 var messagePortion = "(" + literals + messageRemainder + ")";
@@ -30678,9 +35603,7 @@ var ts;
                 return new RegExp(regExpString, "gim");
             }
             function isLetterOrDigit(char) {
-                return (char >= 97 && char <= 122) ||
-                    (char >= 65 && char <= 90) ||
-                    (char >= 48 && char <= 57);
+                return (char >= 97 && char <= 122) || (char >= 65 && char <= 90) || (char >= 48 && char <= 57);
             }
         }
         function getRenameInfo(fileName, position) {
@@ -30781,9 +35704,7 @@ var ts;
                     break;
                 case 8:
                 case 7:
-                    if (ts.isDeclarationName(node) ||
-                        node.parent.kind === 212 ||
-                        isArgumentOfElementAccessExpression(node)) {
+                    if (ts.isDeclarationName(node) || node.parent.kind === 213 || isArgumentOfElementAccessExpression(node)) {
                         nameTable[node.text] = node.text;
                     }
                     break;
@@ -30793,10 +35714,7 @@ var ts;
         }
     }
     function isArgumentOfElementAccessExpression(node) {
-        return node &&
-            node.parent &&
-            node.parent.kind === 154 &&
-            node.parent.argumentExpression === node;
+        return node && node.parent && node.parent.kind === 154 && node.parent.argumentExpression === node;
     }
     function createClassifier() {
         var scanner = ts.createScanner(2, false);
@@ -30825,10 +35743,7 @@ var ts;
         }
         function canFollow(keyword1, keyword2) {
             if (isAccessibilityModifier(keyword1)) {
-                if (keyword2 === 115 ||
-                    keyword2 === 119 ||
-                    keyword2 === 113 ||
-                    keyword2 === 109) {
+                if (keyword2 === 115 || keyword2 === 119 || keyword2 === 113 || keyword2 === 109) {
                     return true;
                 }
                 return false;
@@ -30886,18 +35801,13 @@ var ts;
                     else if (isKeyword(lastNonTriviaToken) && isKeyword(token) && !canFollow(lastNonTriviaToken, token)) {
                         token = 64;
                     }
-                    else if (lastNonTriviaToken === 64 &&
-                        token === 24) {
+                    else if (lastNonTriviaToken === 64 && token === 24) {
                         angleBracketStack++;
                     }
                     else if (token === 25 && angleBracketStack > 0) {
                         angleBracketStack--;
                     }
-                    else if (token === 111 ||
-                        token === 120 ||
-                        token === 118 ||
-                        token === 112 ||
-                        token === 121) {
+                    else if (token === 111 || token === 120 || token === 118 || token === 112 || token === 121) {
                         if (angleBracketStack > 0 && !syntacticClassifierAbsent) {
                             token = 64;
                         }
@@ -30948,9 +35858,7 @@ var ts;
                             }
                             if (numBackslashes & 1) {
                                 var quoteChar = tokenText.charCodeAt(0);
-                                result.finalLexState = quoteChar === 34
-                                    ? 3
-                                    : 2;
+                                result.finalLexState = quoteChar === 34 ? 3 : 2;
                             }
                         }
                     }
@@ -30982,7 +35890,10 @@ var ts;
                     if (result.entries.length === 0) {
                         length -= offset;
                     }
-                    result.entries.push({ length: length, classification: classification });
+                    result.entries.push({
+                        length: length,
+                        classification: classification
+                    });
                 }
             }
         }
@@ -31077,7 +35988,9 @@ var ts;
                     return 5;
             }
         }
-        return { getClassificationsForLine: getClassificationsForLine };
+        return {
+            getClassificationsForLine: getClassificationsForLine
+        };
     }
     ts.createClassifier = createClassifier;
     function getDefaultLibFilePath(options) {
@@ -31092,7 +36005,7 @@ var ts;
             getNodeConstructor: function (kind) {
                 function Node() {
                 }
-                var proto = kind === 220 ? new SourceFileObject() : new NodeObject();
+                var proto = kind === 221 ? new SourceFileObject() : new NodeObject();
                 proto.kind = kind;
                 proto.pos = 0;
                 proto.end = 0;
@@ -31101,9 +36014,15 @@ var ts;
                 Node.prototype = proto;
                 return Node;
             },
-            getSymbolConstructor: function () { return SymbolObject; },
-            getTypeConstructor: function () { return TypeObject; },
-            getSignatureConstructor: function () { return SignatureObject; }
+            getSymbolConstructor: function () {
+                return SymbolObject;
+            },
+            getTypeConstructor: function () {
+                return TypeObject;
+            },
+            getSignatureConstructor: function () {
+                return SignatureObject;
+            }
         };
     }
     initializeServices();
@@ -31183,7 +36102,7 @@ var ts;
                             }
                         case 201:
                             return spanInBlock(node);
-                        case 216:
+                        case 217:
                             return spanInBlock(node.block);
                         case 177:
                             return textSpan(node.expression);
@@ -31209,20 +36128,20 @@ var ts;
                             return textSpan(node, ts.findNextToken(node.expression, node));
                         case 188:
                             return textSpan(node, ts.findNextToken(node.expression, node));
-                        case 213:
                         case 214:
+                        case 215:
                             return spanInNode(node.statements[0]);
                         case 191:
                             return spanInBlock(node.tryBlock);
                         case 190:
                             return textSpan(node, node.expression);
-                        case 208:
-                            return textSpan(node, node.expression);
-                        case 202:
-                            return textSpan(node, node.moduleReference);
-                        case 203:
-                            return textSpan(node, node.moduleSpecifier);
                         case 209:
+                            return textSpan(node, node.expression);
+                        case 203:
+                            return textSpan(node, node.moduleReference);
+                        case 204:
+                            return textSpan(node, node.moduleSpecifier);
+                        case 210:
                             return textSpan(node, node.moduleSpecifier);
                         case 200:
                             if (ts.getModuleInstanceState(node) !== 1) {
@@ -31230,7 +36149,7 @@ var ts;
                             }
                         case 196:
                         case 199:
-                        case 219:
+                        case 220:
                         case 155:
                         case 156:
                             return textSpan(node);
@@ -31264,7 +36183,7 @@ var ts;
                         case 80:
                             return spanInNextNode(node);
                         default:
-                            if (node.parent.kind === 217 && node.parent.name === node) {
+                            if (node.parent.kind === 218 && node.parent.name === node) {
                                 return spanInNode(node.parent.initializer);
                             }
                             if (node.parent.kind === 158 && node.parent.type === node) {
@@ -31277,17 +36196,12 @@ var ts;
                     }
                 }
                 function spanInVariableDeclaration(variableDeclaration) {
-                    if (variableDeclaration.parent.parent.kind === 182 ||
-                        variableDeclaration.parent.parent.kind === 183) {
+                    if (variableDeclaration.parent.parent.kind === 182 || variableDeclaration.parent.parent.kind === 183) {
                         return spanInNode(variableDeclaration.parent.parent);
                     }
                     var isParentVariableStatement = variableDeclaration.parent.parent.kind === 175;
                     var isDeclarationOfForStatement = variableDeclaration.parent.parent.kind === 181 && ts.contains(variableDeclaration.parent.parent.initializer.declarations, variableDeclaration);
-                    var declarations = isParentVariableStatement
-                        ? variableDeclaration.parent.parent.declarationList.declarations
-                        : isDeclarationOfForStatement
-                            ? variableDeclaration.parent.parent.initializer.declarations
-                            : undefined;
+                    var declarations = isParentVariableStatement ? variableDeclaration.parent.parent.declarationList.declarations : isDeclarationOfForStatement ? variableDeclaration.parent.parent.initializer.declarations : undefined;
                     if (variableDeclaration.initializer || (variableDeclaration.flags & 1)) {
                         if (declarations && declarations[0] === variableDeclaration) {
                             if (isParentVariableStatement) {
@@ -31308,8 +36222,7 @@ var ts;
                     }
                 }
                 function canHaveSpanInParameterDeclaration(parameter) {
-                    return !!parameter.initializer || parameter.dotDotDotToken !== undefined ||
-                        !!(parameter.flags & 16) || !!(parameter.flags & 32);
+                    return !!parameter.initializer || parameter.dotDotDotToken !== undefined || !!(parameter.flags & 16) || !!(parameter.flags & 32);
                 }
                 function spanInParameterDeclaration(parameter) {
                     if (canHaveSpanInParameterDeclaration(parameter)) {
@@ -31327,8 +36240,7 @@ var ts;
                     }
                 }
                 function canFunctionHaveSpanInWholeDeclaration(functionDeclaration) {
-                    return !!(functionDeclaration.flags & 1) ||
-                        (functionDeclaration.parent.kind === 196 && functionDeclaration.kind !== 133);
+                    return !!(functionDeclaration.flags & 1) || (functionDeclaration.parent.kind === 196 && functionDeclaration.kind !== 133);
                 }
                 function spanInFunctionDeclaration(functionDeclaration) {
                     if (!functionDeclaration.body) {
@@ -31389,8 +36301,8 @@ var ts;
                         case 196:
                             var classDeclaration = node.parent;
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), classDeclaration.members.length ? classDeclaration.members[0] : classDeclaration.getLastToken(sourceFile));
-                        case 188:
-                            return spanInNodeIfStartsOnSameLine(node.parent, node.parent.clauses[0]);
+                        case 202:
+                            return spanInNodeIfStartsOnSameLine(node.parent.parent, node.parent.clauses[0]);
                     }
                     return spanInNode(node.parent);
                 }
@@ -31407,12 +36319,12 @@ var ts;
                             if (ts.isFunctionBlock(node.parent)) {
                                 return textSpan(node);
                             }
-                        case 216:
+                        case 217:
                             return spanInNode(node.parent.statements[node.parent.statements.length - 1]);
                             ;
-                        case 188:
-                            var switchStatement = node.parent;
-                            var lastClause = switchStatement.clauses[switchStatement.clauses.length - 1];
+                        case 202:
+                            var caseBlock = node.parent;
+                            var lastClause = caseBlock.clauses[caseBlock.clauses.length - 1];
                             if (lastClause) {
                                 return spanInNode(lastClause.statements[lastClause.statements.length - 1]);
                             }
@@ -31447,7 +36359,7 @@ var ts;
                     return spanInNode(node.parent);
                 }
                 function spanInColonToken(node) {
-                    if (ts.isFunctionLike(node.parent) || node.parent.kind === 217) {
+                    if (ts.isFunctionLike(node.parent) || node.parent.kind === 218) {
                         return spanInPreviousNode(node);
                     }
                     return spanInNode(node.parent);
@@ -31580,15 +36492,21 @@ var ts;
     function forwardJSONCall(logger, actionDescription, action) {
         try {
             var result = simpleForwardCall(logger, actionDescription, action);
-            return JSON.stringify({ result: result });
+            return JSON.stringify({
+                result: result
+            });
         }
         catch (err) {
             if (err instanceof ts.OperationCanceledException) {
-                return JSON.stringify({ canceled: true });
+                return JSON.stringify({
+                    canceled: true
+                });
             }
             logInternalError(logger, err);
             err.description = actionDescription;
-            return JSON.stringify({ error: err });
+            return JSON.stringify({
+                error: err
+            });
         }
     }
     var ShimBase = (function () {
@@ -31638,7 +36556,9 @@ var ts;
         LanguageServiceShimObject.prototype.realizeDiagnostics = function (diagnostics) {
             var _this = this;
             var newLine = this.getNewLine();
-            return diagnostics.map(function (d) { return _this.realizeDiagnostic(d, newLine); });
+            return diagnostics.map(function (d) {
+                return _this.realizeDiagnostic(d, newLine);
+            });
         };
         LanguageServiceShimObject.prototype.realizeDiagnostic = function (diagnostic, newLine) {
             return {
diff --git a/bin/typescriptServices.d.ts b/bin/typescriptServices.d.ts
index bffa14b5875..c0800ecbd77 100644
--- a/bin/typescriptServices.d.ts
+++ b/bin/typescriptServices.d.ts
@@ -224,27 +224,28 @@ declare module ts {
         EnumDeclaration = 199,
         ModuleDeclaration = 200,
         ModuleBlock = 201,
-        ImportEqualsDeclaration = 202,
-        ImportDeclaration = 203,
-        ImportClause = 204,
-        NamespaceImport = 205,
-        NamedImports = 206,
-        ImportSpecifier = 207,
-        ExportAssignment = 208,
-        ExportDeclaration = 209,
-        NamedExports = 210,
-        ExportSpecifier = 211,
-        ExternalModuleReference = 212,
-        CaseClause = 213,
-        DefaultClause = 214,
-        HeritageClause = 215,
-        CatchClause = 216,
-        PropertyAssignment = 217,
-        ShorthandPropertyAssignment = 218,
-        EnumMember = 219,
-        SourceFile = 220,
-        SyntaxList = 221,
-        Count = 222,
+        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,
@@ -619,6 +620,9 @@ declare module ts {
     }
     interface SwitchStatement extends Statement {
         expression: Expression;
+        caseBlock: CaseBlock;
+    }
+    interface CaseBlock extends Node {
         clauses: NodeArray<CaseOrDefaultClause>;
     }
     interface CaseClause extends Node {
@@ -1197,6 +1201,7 @@ declare module ts {
         version?: boolean;
         watch?: boolean;
         stripInternal?: boolean;
+        preserveNewLines?: boolean;
         [option: string]: string | number | boolean;
     }
     const enum ModuleKind {
@@ -1437,12 +1442,15 @@ declare module ts {
     function createTypeChecker(host: TypeCheckerHost, produceDiagnostics: boolean): TypeChecker;
 }
 declare module ts {
+    /** The version of the TypeScript compiler release */
+    var version: string;
     function createCompilerHost(options: CompilerOptions): CompilerHost;
     function getPreEmitDiagnostics(program: Program): Diagnostic[];
     function flattenDiagnosticMessageText(messageText: string | DiagnosticMessageChain, newLine: string): string;
     function createProgram(rootNames: string[], options: CompilerOptions, host?: CompilerHost): Program;
 }
 declare module ts {
+    /** The version of the language service API */
     var servicesVersion: string;
     interface Node {
         getSourceFile(): SourceFile;
diff --git a/bin/typescriptServices.js b/bin/typescriptServices.js
index f3c487b2079..0fb345eea1b 100644
--- a/bin/typescriptServices.js
+++ b/bin/typescriptServices.js
@@ -218,27 +218,28 @@ var ts;
         SyntaxKind[SyntaxKind["EnumDeclaration"] = 199] = "EnumDeclaration";
         SyntaxKind[SyntaxKind["ModuleDeclaration"] = 200] = "ModuleDeclaration";
         SyntaxKind[SyntaxKind["ModuleBlock"] = 201] = "ModuleBlock";
-        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 202] = "ImportEqualsDeclaration";
-        SyntaxKind[SyntaxKind["ImportDeclaration"] = 203] = "ImportDeclaration";
-        SyntaxKind[SyntaxKind["ImportClause"] = 204] = "ImportClause";
-        SyntaxKind[SyntaxKind["NamespaceImport"] = 205] = "NamespaceImport";
-        SyntaxKind[SyntaxKind["NamedImports"] = 206] = "NamedImports";
-        SyntaxKind[SyntaxKind["ImportSpecifier"] = 207] = "ImportSpecifier";
-        SyntaxKind[SyntaxKind["ExportAssignment"] = 208] = "ExportAssignment";
-        SyntaxKind[SyntaxKind["ExportDeclaration"] = 209] = "ExportDeclaration";
-        SyntaxKind[SyntaxKind["NamedExports"] = 210] = "NamedExports";
-        SyntaxKind[SyntaxKind["ExportSpecifier"] = 211] = "ExportSpecifier";
-        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 212] = "ExternalModuleReference";
-        SyntaxKind[SyntaxKind["CaseClause"] = 213] = "CaseClause";
-        SyntaxKind[SyntaxKind["DefaultClause"] = 214] = "DefaultClause";
-        SyntaxKind[SyntaxKind["HeritageClause"] = 215] = "HeritageClause";
-        SyntaxKind[SyntaxKind["CatchClause"] = 216] = "CatchClause";
-        SyntaxKind[SyntaxKind["PropertyAssignment"] = 217] = "PropertyAssignment";
-        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 218] = "ShorthandPropertyAssignment";
-        SyntaxKind[SyntaxKind["EnumMember"] = 219] = "EnumMember";
-        SyntaxKind[SyntaxKind["SourceFile"] = 220] = "SourceFile";
-        SyntaxKind[SyntaxKind["SyntaxList"] = 221] = "SyntaxList";
-        SyntaxKind[SyntaxKind["Count"] = 222] = "Count";
+        SyntaxKind[SyntaxKind["CaseBlock"] = 202] = "CaseBlock";
+        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 203] = "ImportEqualsDeclaration";
+        SyntaxKind[SyntaxKind["ImportDeclaration"] = 204] = "ImportDeclaration";
+        SyntaxKind[SyntaxKind["ImportClause"] = 205] = "ImportClause";
+        SyntaxKind[SyntaxKind["NamespaceImport"] = 206] = "NamespaceImport";
+        SyntaxKind[SyntaxKind["NamedImports"] = 207] = "NamedImports";
+        SyntaxKind[SyntaxKind["ImportSpecifier"] = 208] = "ImportSpecifier";
+        SyntaxKind[SyntaxKind["ExportAssignment"] = 209] = "ExportAssignment";
+        SyntaxKind[SyntaxKind["ExportDeclaration"] = 210] = "ExportDeclaration";
+        SyntaxKind[SyntaxKind["NamedExports"] = 211] = "NamedExports";
+        SyntaxKind[SyntaxKind["ExportSpecifier"] = 212] = "ExportSpecifier";
+        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 213] = "ExternalModuleReference";
+        SyntaxKind[SyntaxKind["CaseClause"] = 214] = "CaseClause";
+        SyntaxKind[SyntaxKind["DefaultClause"] = 215] = "DefaultClause";
+        SyntaxKind[SyntaxKind["HeritageClause"] = 216] = "HeritageClause";
+        SyntaxKind[SyntaxKind["CatchClause"] = 217] = "CatchClause";
+        SyntaxKind[SyntaxKind["PropertyAssignment"] = 218] = "PropertyAssignment";
+        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 219] = "ShorthandPropertyAssignment";
+        SyntaxKind[SyntaxKind["EnumMember"] = 220] = "EnumMember";
+        SyntaxKind[SyntaxKind["SourceFile"] = 221] = "SourceFile";
+        SyntaxKind[SyntaxKind["SyntaxList"] = 222] = "SyntaxList";
+        SyntaxKind[SyntaxKind["Count"] = 223] = "Count";
         SyntaxKind[SyntaxKind["FirstAssignment"] = 52] = "FirstAssignment";
         SyntaxKind[SyntaxKind["LastAssignment"] = 63] = "LastAssignment";
         SyntaxKind[SyntaxKind["FirstReservedWord"] = 65] = "FirstReservedWord";
@@ -824,18 +825,21 @@ var ts;
     ts.arrayToMap = arrayToMap;
     function formatStringFromArgs(text, args, baseIndex) {
         baseIndex = baseIndex || 0;
-        return text.replace(/{(\d+)}/g, function (match, index) { return args[+index + baseIndex]; });
+        return text.replace(/{(\d+)}/g, function (match, index) {
+            return args[+index + baseIndex];
+        });
     }
     ts.localizedDiagnosticMessages = undefined;
     function getLocaleSpecificMessage(message) {
-        return ts.localizedDiagnosticMessages && ts.localizedDiagnosticMessages[message]
-            ? ts.localizedDiagnosticMessages[message]
-            : message;
+        return ts.localizedDiagnosticMessages && ts.localizedDiagnosticMessages[message] ? ts.localizedDiagnosticMessages[message] : message;
     }
     ts.getLocaleSpecificMessage = getLocaleSpecificMessage;
     function createFileDiagnostic(file, start, length, message) {
+        var end = start + length;
         Debug.assert(start >= 0, "start must be non-negative, is " + start);
         Debug.assert(length >= 0, "length must be non-negative, is " + length);
+        Debug.assert(start <= file.text.length, "start must be within the bounds of the file. " + start + " > " + file.text.length);
+        Debug.assert(end <= file.text.length, "end must be the bounds of the file. " + end + " > " + file.text.length);
         var text = getLocaleSpecificMessage(message.key);
         if (arguments.length > 4) {
             text = formatStringFromArgs(text, arguments, 4);
@@ -898,12 +902,7 @@ var ts;
         return diagnostic.file ? diagnostic.file.fileName : undefined;
     }
     function compareDiagnostics(d1, d2) {
-        return compareValues(getDiagnosticFileName(d1), getDiagnosticFileName(d2)) ||
-            compareValues(d1.start, d2.start) ||
-            compareValues(d1.length, d2.length) ||
-            compareValues(d1.code, d2.code) ||
-            compareMessageText(d1.messageText, d2.messageText) ||
-            0;
+        return compareValues(getDiagnosticFileName(d1), getDiagnosticFileName(d2)) || compareValues(d1.start, d2.start) || compareValues(d1.length, d2.length) || compareValues(d1.code, d2.code) || compareMessageText(d1.messageText, d2.messageText) || 0;
     }
     ts.compareDiagnostics = compareDiagnostics;
     function compareMessageText(text1, text2) {
@@ -930,7 +929,9 @@ var ts;
         if (diagnostics.length < 2) {
             return diagnostics;
         }
-        var newDiagnostics = [diagnostics[0]];
+        var newDiagnostics = [
+            diagnostics[0]
+        ];
         var previousDiagnostic = diagnostics[0];
         for (var i = 1; i < diagnostics.length; i++) {
             var currentDiagnostic = diagnostics[i];
@@ -1007,7 +1008,9 @@ var ts;
     ts.isRootedDiskPath = isRootedDiskPath;
     function normalizedPathComponents(path, rootLength) {
         var normalizedParts = getNormalizedParts(path, rootLength);
-        return [path.substr(0, rootLength)].concat(normalizedParts);
+        return [
+            path.substr(0, rootLength)
+        ].concat(normalizedParts);
     }
     function getNormalizedPathComponents(path, currentDirectory) {
         var path = normalizeSlashes(path);
@@ -1041,7 +1044,9 @@ var ts;
             }
         }
         if (rootLength === urlLength) {
-            return [url];
+            return [
+                url
+            ];
         }
         var indexOfNextSlash = url.indexOf(ts.directorySeparator, rootLength);
         if (indexOfNextSlash !== -1) {
@@ -1049,7 +1054,9 @@ var ts;
             return normalizedPathComponents(url, rootLength);
         }
         else {
-            return [url + ts.directorySeparator];
+            return [
+                url + ts.directorySeparator
+            ];
         }
     }
     function getNormalizedPathOrUrlComponents(pathOrUrl, currentDirectory) {
@@ -1111,7 +1118,11 @@ var ts;
         return pathLen > extLen && path.substr(pathLen - extLen, extLen) === extension;
     }
     ts.fileExtensionIs = fileExtensionIs;
-    var supportedExtensions = [".d.ts", ".ts", ".js"];
+    var supportedExtensions = [
+        ".d.ts",
+        ".ts",
+        ".js"
+    ];
     function removeFileExtension(path) {
         for (var i = 0; i < supportedExtensions.length; i++) {
             var ext = supportedExtensions[i];
@@ -1165,9 +1176,15 @@ var ts;
             };
             return Node;
         },
-        getSymbolConstructor: function () { return Symbol; },
-        getTypeConstructor: function () { return Type; },
-        getSignatureConstructor: function () { return Signature; }
+        getSymbolConstructor: function () {
+            return Symbol;
+        },
+        getTypeConstructor: function () {
+            return Type;
+        },
+        getSignatureConstructor: function () {
+            return Signature;
+        }
     };
     (function (AssertionLevel) {
         AssertionLevel[AssertionLevel["None"] = 0] = "None";
@@ -1392,9 +1409,14 @@ var ts;
                 readFile: readFile,
                 writeFile: writeFile,
                 watchFile: function (fileName, callback) {
-                    _fs.watchFile(fileName, { persistent: true, interval: 250 }, fileChanged);
+                    _fs.watchFile(fileName, {
+                        persistent: true,
+                        interval: 250
+                    }, fileChanged);
                     return {
-                        close: function () { _fs.unwatchFile(fileName, fileChanged); }
+                        close: function () {
+                            _fs.unwatchFile(fileName, fileChanged);
+                        }
                     };
                     function fileChanged(curr, prev) {
                         if (+curr.mtime <= +prev.mtime) {
@@ -1450,488 +1472,2431 @@ var ts;
 var ts;
 (function (ts) {
     ts.Diagnostics = {
-        Unterminated_string_literal: { code: 1002, category: 1, key: "Unterminated string literal." },
-        Identifier_expected: { code: 1003, category: 1, key: "Identifier expected." },
-        _0_expected: { code: 1005, category: 1, key: "'{0}' expected." },
-        A_file_cannot_have_a_reference_to_itself: { code: 1006, category: 1, key: "A file cannot have a reference to itself." },
-        Trailing_comma_not_allowed: { code: 1009, category: 1, key: "Trailing comma not allowed." },
-        Asterisk_Slash_expected: { code: 1010, category: 1, key: "'*/' expected." },
-        Unexpected_token: { code: 1012, category: 1, key: "Unexpected token." },
-        A_rest_parameter_must_be_last_in_a_parameter_list: { code: 1014, category: 1, key: "A rest parameter must be last in a parameter list." },
-        Parameter_cannot_have_question_mark_and_initializer: { code: 1015, category: 1, key: "Parameter cannot have question mark and initializer." },
-        A_required_parameter_cannot_follow_an_optional_parameter: { code: 1016, category: 1, key: "A required parameter cannot follow an optional parameter." },
-        An_index_signature_cannot_have_a_rest_parameter: { code: 1017, category: 1, key: "An index signature cannot have a rest parameter." },
-        An_index_signature_parameter_cannot_have_an_accessibility_modifier: { code: 1018, category: 1, key: "An index signature parameter cannot have an accessibility modifier." },
-        An_index_signature_parameter_cannot_have_a_question_mark: { code: 1019, category: 1, key: "An index signature parameter cannot have a question mark." },
-        An_index_signature_parameter_cannot_have_an_initializer: { code: 1020, category: 1, key: "An index signature parameter cannot have an initializer." },
-        An_index_signature_must_have_a_type_annotation: { code: 1021, category: 1, key: "An index signature must have a type annotation." },
-        An_index_signature_parameter_must_have_a_type_annotation: { code: 1022, category: 1, key: "An index signature parameter must have a type annotation." },
-        An_index_signature_parameter_type_must_be_string_or_number: { code: 1023, category: 1, key: "An index signature parameter type must be 'string' or 'number'." },
-        A_class_or_interface_declaration_can_only_have_one_extends_clause: { code: 1024, category: 1, key: "A class or interface declaration can only have one 'extends' clause." },
-        An_extends_clause_must_precede_an_implements_clause: { code: 1025, category: 1, key: "An 'extends' clause must precede an 'implements' clause." },
-        A_class_can_only_extend_a_single_class: { code: 1026, category: 1, key: "A class can only extend a single class." },
-        A_class_declaration_can_only_have_one_implements_clause: { code: 1027, category: 1, key: "A class declaration can only have one 'implements' clause." },
-        Accessibility_modifier_already_seen: { code: 1028, category: 1, key: "Accessibility modifier already seen." },
-        _0_modifier_must_precede_1_modifier: { code: 1029, category: 1, key: "'{0}' modifier must precede '{1}' modifier." },
-        _0_modifier_already_seen: { code: 1030, category: 1, key: "'{0}' modifier already seen." },
-        _0_modifier_cannot_appear_on_a_class_element: { code: 1031, category: 1, key: "'{0}' modifier cannot appear on a class element." },
-        An_interface_declaration_cannot_have_an_implements_clause: { code: 1032, category: 1, key: "An interface declaration cannot have an 'implements' clause." },
-        super_must_be_followed_by_an_argument_list_or_member_access: { code: 1034, category: 1, key: "'super' must be followed by an argument list or member access." },
-        Only_ambient_modules_can_use_quoted_names: { code: 1035, category: 1, key: "Only ambient modules can use quoted names." },
-        Statements_are_not_allowed_in_ambient_contexts: { code: 1036, category: 1, key: "Statements are not allowed in ambient contexts." },
-        A_declare_modifier_cannot_be_used_in_an_already_ambient_context: { code: 1038, category: 1, key: "A 'declare' modifier cannot be used in an already ambient context." },
-        Initializers_are_not_allowed_in_ambient_contexts: { code: 1039, category: 1, key: "Initializers are not allowed in ambient contexts." },
-        _0_modifier_cannot_appear_on_a_module_element: { code: 1044, category: 1, key: "'{0}' modifier cannot appear on a module element." },
-        A_declare_modifier_cannot_be_used_with_an_interface_declaration: { code: 1045, category: 1, key: "A 'declare' modifier cannot be used with an interface declaration." },
-        A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file: { code: 1046, category: 1, key: "A 'declare' modifier is required for a top level declaration in a .d.ts file." },
-        A_rest_parameter_cannot_be_optional: { code: 1047, category: 1, key: "A rest parameter cannot be optional." },
-        A_rest_parameter_cannot_have_an_initializer: { code: 1048, category: 1, key: "A rest parameter cannot have an initializer." },
-        A_set_accessor_must_have_exactly_one_parameter: { code: 1049, category: 1, key: "A 'set' accessor must have exactly one parameter." },
-        A_set_accessor_cannot_have_an_optional_parameter: { code: 1051, category: 1, key: "A 'set' accessor cannot have an optional parameter." },
-        A_set_accessor_parameter_cannot_have_an_initializer: { code: 1052, category: 1, key: "A 'set' accessor parameter cannot have an initializer." },
-        A_set_accessor_cannot_have_rest_parameter: { code: 1053, category: 1, key: "A 'set' accessor cannot have rest parameter." },
-        A_get_accessor_cannot_have_parameters: { code: 1054, category: 1, key: "A 'get' accessor cannot have parameters." },
-        Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher: { code: 1056, category: 1, key: "Accessors are only available when targeting ECMAScript 5 and higher." },
-        Enum_member_must_have_initializer: { code: 1061, category: 1, key: "Enum member must have initializer." },
-        An_export_assignment_cannot_be_used_in_an_internal_module: { code: 1063, category: 1, key: "An export assignment cannot be used in an internal module." },
-        Ambient_enum_elements_can_only_have_integer_literal_initializers: { code: 1066, category: 1, key: "Ambient enum elements can only have integer literal initializers." },
-        Unexpected_token_A_constructor_method_accessor_or_property_was_expected: { code: 1068, category: 1, key: "Unexpected token. A constructor, method, accessor, or property was expected." },
-        A_declare_modifier_cannot_be_used_with_an_import_declaration: { code: 1079, category: 1, key: "A 'declare' modifier cannot be used with an import declaration." },
-        Invalid_reference_directive_syntax: { code: 1084, category: 1, key: "Invalid 'reference' directive syntax." },
-        Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher: { code: 1085, category: 1, key: "Octal literals are not available when targeting ECMAScript 5 and higher." },
-        An_accessor_cannot_be_declared_in_an_ambient_context: { code: 1086, category: 1, key: "An accessor cannot be declared in an ambient context." },
-        _0_modifier_cannot_appear_on_a_constructor_declaration: { code: 1089, category: 1, key: "'{0}' modifier cannot appear on a constructor declaration." },
-        _0_modifier_cannot_appear_on_a_parameter: { code: 1090, category: 1, key: "'{0}' modifier cannot appear on a parameter." },
-        Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement: { code: 1091, category: 1, key: "Only a single variable declaration is allowed in a 'for...in' statement." },
-        Type_parameters_cannot_appear_on_a_constructor_declaration: { code: 1092, category: 1, key: "Type parameters cannot appear on a constructor declaration." },
-        Type_annotation_cannot_appear_on_a_constructor_declaration: { code: 1093, category: 1, key: "Type annotation cannot appear on a constructor declaration." },
-        An_accessor_cannot_have_type_parameters: { code: 1094, category: 1, key: "An accessor cannot have type parameters." },
-        A_set_accessor_cannot_have_a_return_type_annotation: { code: 1095, category: 1, key: "A 'set' accessor cannot have a return type annotation." },
-        An_index_signature_must_have_exactly_one_parameter: { code: 1096, category: 1, key: "An index signature must have exactly one parameter." },
-        _0_list_cannot_be_empty: { code: 1097, category: 1, key: "'{0}' list cannot be empty." },
-        Type_parameter_list_cannot_be_empty: { code: 1098, category: 1, key: "Type parameter list cannot be empty." },
-        Type_argument_list_cannot_be_empty: { code: 1099, category: 1, key: "Type argument list cannot be empty." },
-        Invalid_use_of_0_in_strict_mode: { code: 1100, category: 1, key: "Invalid use of '{0}' in strict mode." },
-        with_statements_are_not_allowed_in_strict_mode: { code: 1101, category: 1, key: "'with' statements are not allowed in strict mode." },
-        delete_cannot_be_called_on_an_identifier_in_strict_mode: { code: 1102, category: 1, key: "'delete' cannot be called on an identifier in strict mode." },
-        A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement: { code: 1104, category: 1, key: "A 'continue' statement can only be used within an enclosing iteration statement." },
-        A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement: { code: 1105, category: 1, key: "A 'break' statement can only be used within an enclosing iteration or switch statement." },
-        Jump_target_cannot_cross_function_boundary: { code: 1107, category: 1, key: "Jump target cannot cross function boundary." },
-        A_return_statement_can_only_be_used_within_a_function_body: { code: 1108, category: 1, key: "A 'return' statement can only be used within a function body." },
-        Expression_expected: { code: 1109, category: 1, key: "Expression expected." },
-        Type_expected: { code: 1110, category: 1, key: "Type expected." },
-        A_class_member_cannot_be_declared_optional: { code: 1112, category: 1, key: "A class member cannot be declared optional." },
-        A_default_clause_cannot_appear_more_than_once_in_a_switch_statement: { code: 1113, category: 1, key: "A 'default' clause cannot appear more than once in a 'switch' statement." },
-        Duplicate_label_0: { code: 1114, category: 1, key: "Duplicate label '{0}'" },
-        A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement: { code: 1115, category: 1, key: "A 'continue' statement can only jump to a label of an enclosing iteration statement." },
-        A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement: { code: 1116, category: 1, key: "A 'break' statement can only jump to a label of an enclosing statement." },
-        An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode: { code: 1117, category: 1, key: "An object literal cannot have multiple properties with the same name in strict mode." },
-        An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name: { code: 1118, category: 1, key: "An object literal cannot have multiple get/set accessors with the same name." },
-        An_object_literal_cannot_have_property_and_accessor_with_the_same_name: { code: 1119, category: 1, key: "An object literal cannot have property and accessor with the same name." },
-        An_export_assignment_cannot_have_modifiers: { code: 1120, category: 1, key: "An export assignment cannot have modifiers." },
-        Octal_literals_are_not_allowed_in_strict_mode: { code: 1121, category: 1, key: "Octal literals are not allowed in strict mode." },
-        A_tuple_type_element_list_cannot_be_empty: { code: 1122, category: 1, key: "A tuple type element list cannot be empty." },
-        Variable_declaration_list_cannot_be_empty: { code: 1123, category: 1, key: "Variable declaration list cannot be empty." },
-        Digit_expected: { code: 1124, category: 1, key: "Digit expected." },
-        Hexadecimal_digit_expected: { code: 1125, category: 1, key: "Hexadecimal digit expected." },
-        Unexpected_end_of_text: { code: 1126, category: 1, key: "Unexpected end of text." },
-        Invalid_character: { code: 1127, category: 1, key: "Invalid character." },
-        Declaration_or_statement_expected: { code: 1128, category: 1, key: "Declaration or statement expected." },
-        Statement_expected: { code: 1129, category: 1, key: "Statement expected." },
-        case_or_default_expected: { code: 1130, category: 1, key: "'case' or 'default' expected." },
-        Property_or_signature_expected: { code: 1131, category: 1, key: "Property or signature expected." },
-        Enum_member_expected: { code: 1132, category: 1, key: "Enum member expected." },
-        Type_reference_expected: { code: 1133, category: 1, key: "Type reference expected." },
-        Variable_declaration_expected: { code: 1134, category: 1, key: "Variable declaration expected." },
-        Argument_expression_expected: { code: 1135, category: 1, key: "Argument expression expected." },
-        Property_assignment_expected: { code: 1136, category: 1, key: "Property assignment expected." },
-        Expression_or_comma_expected: { code: 1137, category: 1, key: "Expression or comma expected." },
-        Parameter_declaration_expected: { code: 1138, category: 1, key: "Parameter declaration expected." },
-        Type_parameter_declaration_expected: { code: 1139, category: 1, key: "Type parameter declaration expected." },
-        Type_argument_expected: { code: 1140, category: 1, key: "Type argument expected." },
-        String_literal_expected: { code: 1141, category: 1, key: "String literal expected." },
-        Line_break_not_permitted_here: { code: 1142, category: 1, key: "Line break not permitted here." },
-        or_expected: { code: 1144, category: 1, key: "'{' or ';' expected." },
-        Modifiers_not_permitted_on_index_signature_members: { code: 1145, category: 1, key: "Modifiers not permitted on index signature members." },
-        Declaration_expected: { code: 1146, category: 1, key: "Declaration expected." },
-        Import_declarations_in_an_internal_module_cannot_reference_an_external_module: { code: 1147, category: 1, key: "Import declarations in an internal module cannot reference an external module." },
-        Cannot_compile_external_modules_unless_the_module_flag_is_provided: { code: 1148, category: 1, key: "Cannot compile external modules unless the '--module' flag is provided." },
-        File_name_0_differs_from_already_included_file_name_1_only_in_casing: { code: 1149, category: 1, key: "File name '{0}' differs from already included file name '{1}' only in casing" },
-        new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead: { code: 1150, category: 1, key: "'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead." },
-        var_let_or_const_expected: { code: 1152, category: 1, key: "'var', 'let' or 'const' expected." },
-        let_declarations_are_only_available_when_targeting_ECMAScript_6_and_higher: { code: 1153, category: 1, key: "'let' declarations are only available when targeting ECMAScript 6 and higher." },
-        const_declarations_are_only_available_when_targeting_ECMAScript_6_and_higher: { code: 1154, category: 1, key: "'const' declarations are only available when targeting ECMAScript 6 and higher." },
-        const_declarations_must_be_initialized: { code: 1155, category: 1, key: "'const' declarations must be initialized" },
-        const_declarations_can_only_be_declared_inside_a_block: { code: 1156, category: 1, key: "'const' declarations can only be declared inside a block." },
-        let_declarations_can_only_be_declared_inside_a_block: { code: 1157, category: 1, key: "'let' declarations can only be declared inside a block." },
-        Unterminated_template_literal: { code: 1160, category: 1, key: "Unterminated template literal." },
-        Unterminated_regular_expression_literal: { code: 1161, category: 1, key: "Unterminated regular expression literal." },
-        An_object_member_cannot_be_declared_optional: { code: 1162, category: 1, key: "An object member cannot be declared optional." },
-        yield_expression_must_be_contained_within_a_generator_declaration: { code: 1163, category: 1, key: "'yield' expression must be contained_within a generator declaration." },
-        Computed_property_names_are_not_allowed_in_enums: { code: 1164, category: 1, key: "Computed property names are not allowed in enums." },
-        A_computed_property_name_in_an_ambient_context_must_directly_refer_to_a_built_in_symbol: { code: 1165, category: 1, key: "A computed property name in an ambient context must directly refer to a built-in symbol." },
-        A_computed_property_name_in_a_class_property_declaration_must_directly_refer_to_a_built_in_symbol: { code: 1166, category: 1, key: "A computed property name in a class property declaration must directly refer to a built-in symbol." },
-        Computed_property_names_are_only_available_when_targeting_ECMAScript_6_and_higher: { code: 1167, category: 1, key: "Computed property names are only available when targeting ECMAScript 6 and higher." },
-        A_computed_property_name_in_a_method_overload_must_directly_refer_to_a_built_in_symbol: { code: 1168, category: 1, key: "A computed property name in a method overload must directly refer to a built-in symbol." },
-        A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol: { code: 1169, category: 1, key: "A computed property name in an interface must directly refer to a built-in symbol." },
-        A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol: { code: 1170, category: 1, key: "A computed property name in a type literal must directly refer to a built-in symbol." },
-        A_comma_expression_is_not_allowed_in_a_computed_property_name: { code: 1171, category: 1, key: "A comma expression is not allowed in a computed property name." },
-        extends_clause_already_seen: { code: 1172, category: 1, key: "'extends' clause already seen." },
-        extends_clause_must_precede_implements_clause: { code: 1173, category: 1, key: "'extends' clause must precede 'implements' clause." },
-        Classes_can_only_extend_a_single_class: { code: 1174, category: 1, key: "Classes can only extend a single class." },
-        implements_clause_already_seen: { code: 1175, category: 1, key: "'implements' clause already seen." },
-        Interface_declaration_cannot_have_implements_clause: { code: 1176, category: 1, key: "Interface declaration cannot have 'implements' clause." },
-        Binary_digit_expected: { code: 1177, category: 1, key: "Binary digit expected." },
-        Octal_digit_expected: { code: 1178, category: 1, key: "Octal digit expected." },
-        Unexpected_token_expected: { code: 1179, category: 1, key: "Unexpected token. '{' expected." },
-        Property_destructuring_pattern_expected: { code: 1180, category: 1, key: "Property destructuring pattern expected." },
-        Array_element_destructuring_pattern_expected: { code: 1181, category: 1, key: "Array element destructuring pattern expected." },
-        A_destructuring_declaration_must_have_an_initializer: { code: 1182, category: 1, key: "A destructuring declaration must have an initializer." },
-        Destructuring_declarations_are_not_allowed_in_ambient_contexts: { code: 1183, category: 1, key: "Destructuring declarations are not allowed in ambient contexts." },
-        An_implementation_cannot_be_declared_in_ambient_contexts: { code: 1184, category: 1, key: "An implementation cannot be declared in ambient contexts." },
-        Modifiers_cannot_appear_here: { code: 1184, category: 1, key: "Modifiers cannot appear here." },
-        Merge_conflict_marker_encountered: { code: 1185, category: 1, key: "Merge conflict marker encountered." },
-        A_rest_element_cannot_have_an_initializer: { code: 1186, category: 1, key: "A rest element cannot have an initializer." },
-        A_parameter_property_may_not_be_a_binding_pattern: { code: 1187, category: 1, key: "A parameter property may not be a binding pattern." },
-        Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement: { code: 1188, category: 1, key: "Only a single variable declaration is allowed in a 'for...of' statement." },
-        The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer: { code: 1189, category: 1, key: "The variable declaration of a 'for...in' statement cannot have an initializer." },
-        The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer: { code: 1190, category: 1, key: "The variable declaration of a 'for...of' statement cannot have an initializer." },
-        An_import_declaration_cannot_have_modifiers: { code: 1191, category: 1, key: "An import declaration cannot have modifiers." },
-        External_module_0_has_no_default_export_or_export_assignment: { code: 1192, category: 1, key: "External module '{0}' has no default export or export assignment." },
-        An_export_declaration_cannot_have_modifiers: { code: 1193, category: 1, key: "An export declaration cannot have modifiers." },
-        Export_declarations_are_not_permitted_in_an_internal_module: { code: 1194, category: 1, key: "Export declarations are not permitted in an internal module." },
-        Catch_clause_variable_name_must_be_an_identifier: { code: 1195, category: 1, key: "Catch clause variable name must be an identifier." },
-        Catch_clause_variable_cannot_have_a_type_annotation: { code: 1196, category: 1, key: "Catch clause variable cannot have a type annotation." },
-        Catch_clause_variable_cannot_have_an_initializer: { code: 1197, category: 1, key: "Catch clause variable cannot have an initializer." },
-        An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: { code: 1198, category: 1, key: "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive." },
-        Unterminated_Unicode_escape_sequence: { code: 1199, category: 1, key: "Unterminated Unicode escape sequence." },
-        Duplicate_identifier_0: { code: 2300, category: 1, key: "Duplicate identifier '{0}'." },
-        Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: { code: 2301, category: 1, 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: 1, key: "Static members cannot reference class type parameters." },
-        Circular_definition_of_import_alias_0: { code: 2303, category: 1, key: "Circular definition of import alias '{0}'." },
-        Cannot_find_name_0: { code: 2304, category: 1, key: "Cannot find name '{0}'." },
-        Module_0_has_no_exported_member_1: { code: 2305, category: 1, key: "Module '{0}' has no exported member '{1}'." },
-        File_0_is_not_an_external_module: { code: 2306, category: 1, key: "File '{0}' is not an external module." },
-        Cannot_find_external_module_0: { code: 2307, category: 1, key: "Cannot find external module '{0}'." },
-        A_module_cannot_have_more_than_one_export_assignment: { code: 2308, category: 1, key: "A module cannot have more than one export assignment." },
-        An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements: { code: 2309, category: 1, key: "An export assignment cannot be used in a module with other exported elements." },
-        Type_0_recursively_references_itself_as_a_base_type: { code: 2310, category: 1, key: "Type '{0}' recursively references itself as a base type." },
-        A_class_may_only_extend_another_class: { code: 2311, category: 1, key: "A class may only extend another class." },
-        An_interface_may_only_extend_a_class_or_another_interface: { code: 2312, category: 1, key: "An interface may only extend a class or another interface." },
-        Constraint_of_a_type_parameter_cannot_reference_any_type_parameter_from_the_same_type_parameter_list: { code: 2313, category: 1, key: "Constraint of a type parameter cannot reference any type parameter from the same type parameter list." },
-        Generic_type_0_requires_1_type_argument_s: { code: 2314, category: 1, key: "Generic type '{0}' requires {1} type argument(s)." },
-        Type_0_is_not_generic: { code: 2315, category: 1, key: "Type '{0}' is not generic." },
-        Global_type_0_must_be_a_class_or_interface_type: { code: 2316, category: 1, key: "Global type '{0}' must be a class or interface type." },
-        Global_type_0_must_have_1_type_parameter_s: { code: 2317, category: 1, key: "Global type '{0}' must have {1} type parameter(s)." },
-        Cannot_find_global_type_0: { code: 2318, category: 1, key: "Cannot find global type '{0}'." },
-        Named_property_0_of_types_1_and_2_are_not_identical: { code: 2319, category: 1, key: "Named property '{0}' of types '{1}' and '{2}' are not identical." },
-        Interface_0_cannot_simultaneously_extend_types_1_and_2: { code: 2320, category: 1, key: "Interface '{0}' cannot simultaneously extend types '{1}' and '{2}'." },
-        Excessive_stack_depth_comparing_types_0_and_1: { code: 2321, category: 1, key: "Excessive stack depth comparing types '{0}' and '{1}'." },
-        Type_0_is_not_assignable_to_type_1: { code: 2322, category: 1, key: "Type '{0}' is not assignable to type '{1}'." },
-        Property_0_is_missing_in_type_1: { code: 2324, category: 1, key: "Property '{0}' is missing in type '{1}'." },
-        Property_0_is_private_in_type_1_but_not_in_type_2: { code: 2325, category: 1, key: "Property '{0}' is private in type '{1}' but not in type '{2}'." },
-        Types_of_property_0_are_incompatible: { code: 2326, category: 1, key: "Types of property '{0}' are incompatible." },
-        Property_0_is_optional_in_type_1_but_required_in_type_2: { code: 2327, category: 1, key: "Property '{0}' is optional in type '{1}' but required in type '{2}'." },
-        Types_of_parameters_0_and_1_are_incompatible: { code: 2328, category: 1, key: "Types of parameters '{0}' and '{1}' are incompatible." },
-        Index_signature_is_missing_in_type_0: { code: 2329, category: 1, key: "Index signature is missing in type '{0}'." },
-        Index_signatures_are_incompatible: { code: 2330, category: 1, key: "Index signatures are incompatible." },
-        this_cannot_be_referenced_in_a_module_body: { code: 2331, category: 1, key: "'this' cannot be referenced in a module body." },
-        this_cannot_be_referenced_in_current_location: { code: 2332, category: 1, key: "'this' cannot be referenced in current location." },
-        this_cannot_be_referenced_in_constructor_arguments: { code: 2333, category: 1, key: "'this' cannot be referenced in constructor arguments." },
-        this_cannot_be_referenced_in_a_static_property_initializer: { code: 2334, category: 1, key: "'this' cannot be referenced in a static property initializer." },
-        super_can_only_be_referenced_in_a_derived_class: { code: 2335, category: 1, key: "'super' can only be referenced in a derived class." },
-        super_cannot_be_referenced_in_constructor_arguments: { code: 2336, category: 1, key: "'super' cannot be referenced in constructor arguments." },
-        Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors: { code: 2337, category: 1, key: "Super calls are not permitted outside constructors or in nested functions inside constructors" },
-        super_property_access_is_permitted_only_in_a_constructor_member_function_or_member_accessor_of_a_derived_class: { code: 2338, category: 1, key: "'super' property access is permitted only in a constructor, member function, or member accessor of a derived class" },
-        Property_0_does_not_exist_on_type_1: { code: 2339, category: 1, key: "Property '{0}' does not exist on type '{1}'." },
-        Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword: { code: 2340, category: 1, key: "Only public and protected methods of the base class are accessible via the 'super' keyword" },
-        Property_0_is_private_and_only_accessible_within_class_1: { code: 2341, category: 1, key: "Property '{0}' is private and only accessible within class '{1}'." },
-        An_index_expression_argument_must_be_of_type_string_number_symbol_or_any: { code: 2342, category: 1, key: "An index expression argument must be of type 'string', 'number', 'symbol, or 'any'." },
-        Type_0_does_not_satisfy_the_constraint_1: { code: 2344, category: 1, key: "Type '{0}' does not satisfy the constraint '{1}'." },
-        Argument_of_type_0_is_not_assignable_to_parameter_of_type_1: { code: 2345, category: 1, key: "Argument of type '{0}' is not assignable to parameter of type '{1}'." },
-        Supplied_parameters_do_not_match_any_signature_of_call_target: { code: 2346, category: 1, key: "Supplied parameters do not match any signature of call target." },
-        Untyped_function_calls_may_not_accept_type_arguments: { code: 2347, category: 1, key: "Untyped function calls may not accept type arguments." },
-        Value_of_type_0_is_not_callable_Did_you_mean_to_include_new: { code: 2348, category: 1, key: "Value of type '{0}' is not callable. Did you mean to include 'new'?" },
-        Cannot_invoke_an_expression_whose_type_lacks_a_call_signature: { code: 2349, category: 1, key: "Cannot invoke an expression whose type lacks a call signature." },
-        Only_a_void_function_can_be_called_with_the_new_keyword: { code: 2350, category: 1, key: "Only a void function can be called with the 'new' keyword." },
-        Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature: { code: 2351, category: 1, key: "Cannot use 'new' with an expression whose type lacks a call or construct signature." },
-        Neither_type_0_nor_type_1_is_assignable_to_the_other: { code: 2352, category: 1, key: "Neither type '{0}' nor type '{1}' is assignable to the other." },
-        No_best_common_type_exists_among_return_expressions: { code: 2354, category: 1, key: "No best common type exists among return expressions." },
-        A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_or_consist_of_a_single_throw_statement: { code: 2355, category: 1, key: "A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement." },
-        An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type: { code: 2356, category: 1, key: "An arithmetic operand must be of type 'any', 'number' or an enum type." },
-        The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer: { code: 2357, category: 1, key: "The operand of an increment or decrement operator must be a variable, property or indexer." },
-        The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2358, category: 1, key: "The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter." },
-        The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_Function_interface_type: { code: 2359, category: 1, key: "The right-hand side of an 'instanceof' expression must be of type 'any' or of a type assignable to the 'Function' interface type." },
-        The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol: { code: 2360, category: 1, key: "The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'." },
-        The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2361, category: 1, key: "The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter" },
-        The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2362, category: 1, key: "The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
-        The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2363, category: 1, key: "The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
-        Invalid_left_hand_side_of_assignment_expression: { code: 2364, category: 1, key: "Invalid left-hand side of assignment expression." },
-        Operator_0_cannot_be_applied_to_types_1_and_2: { code: 2365, category: 1, key: "Operator '{0}' cannot be applied to types '{1}' and '{2}'." },
-        Type_parameter_name_cannot_be_0: { code: 2368, category: 1, key: "Type parameter name cannot be '{0}'" },
-        A_parameter_property_is_only_allowed_in_a_constructor_implementation: { code: 2369, category: 1, key: "A parameter property is only allowed in a constructor implementation." },
-        A_rest_parameter_must_be_of_an_array_type: { code: 2370, category: 1, key: "A rest parameter must be of an array type." },
-        A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation: { code: 2371, category: 1, key: "A parameter initializer is only allowed in a function or constructor implementation." },
-        Parameter_0_cannot_be_referenced_in_its_initializer: { code: 2372, category: 1, key: "Parameter '{0}' cannot be referenced in its initializer." },
-        Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it: { code: 2373, category: 1, key: "Initializer of parameter '{0}' cannot reference identifier '{1}' declared after it." },
-        Duplicate_string_index_signature: { code: 2374, category: 1, key: "Duplicate string index signature." },
-        Duplicate_number_index_signature: { code: 2375, category: 1, key: "Duplicate number index signature." },
-        A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_or_has_parameter_properties: { code: 2376, category: 1, key: "A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties." },
-        Constructors_for_derived_classes_must_contain_a_super_call: { code: 2377, category: 1, key: "Constructors for derived classes must contain a 'super' call." },
-        A_get_accessor_must_return_a_value_or_consist_of_a_single_throw_statement: { code: 2378, category: 1, key: "A 'get' accessor must return a value or consist of a single 'throw' statement." },
-        Getter_and_setter_accessors_do_not_agree_in_visibility: { code: 2379, category: 1, key: "Getter and setter accessors do not agree in visibility." },
-        get_and_set_accessor_must_have_the_same_type: { code: 2380, category: 1, key: "'get' and 'set' accessor must have the same type." },
-        A_signature_with_an_implementation_cannot_use_a_string_literal_type: { code: 2381, category: 1, key: "A signature with an implementation cannot use a string literal type." },
-        Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature: { code: 2382, category: 1, key: "Specialized overload signature is not assignable to any non-specialized signature." },
-        Overload_signatures_must_all_be_exported_or_not_exported: { code: 2383, category: 1, key: "Overload signatures must all be exported or not exported." },
-        Overload_signatures_must_all_be_ambient_or_non_ambient: { code: 2384, category: 1, key: "Overload signatures must all be ambient or non-ambient." },
-        Overload_signatures_must_all_be_public_private_or_protected: { code: 2385, category: 1, key: "Overload signatures must all be public, private or protected." },
-        Overload_signatures_must_all_be_optional_or_required: { code: 2386, category: 1, key: "Overload signatures must all be optional or required." },
-        Function_overload_must_be_static: { code: 2387, category: 1, key: "Function overload must be static." },
-        Function_overload_must_not_be_static: { code: 2388, category: 1, key: "Function overload must not be static." },
-        Function_implementation_name_must_be_0: { code: 2389, category: 1, key: "Function implementation name must be '{0}'." },
-        Constructor_implementation_is_missing: { code: 2390, category: 1, key: "Constructor implementation is missing." },
-        Function_implementation_is_missing_or_not_immediately_following_the_declaration: { code: 2391, category: 1, key: "Function implementation is missing or not immediately following the declaration." },
-        Multiple_constructor_implementations_are_not_allowed: { code: 2392, category: 1, key: "Multiple constructor implementations are not allowed." },
-        Duplicate_function_implementation: { code: 2393, category: 1, key: "Duplicate function implementation." },
-        Overload_signature_is_not_compatible_with_function_implementation: { code: 2394, category: 1, key: "Overload signature is not compatible with function implementation." },
-        Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local: { code: 2395, category: 1, key: "Individual declarations in merged declaration {0} must be all exported or all local." },
-        Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters: { code: 2396, category: 1, key: "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters." },
-        Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference: { code: 2399, category: 1, key: "Duplicate identifier '_this'. Compiler uses variable declaration '_this' to capture 'this' reference." },
-        Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference: { code: 2400, category: 1, key: "Expression resolves to variable declaration '_this' that compiler uses to capture 'this' reference." },
-        Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference: { code: 2401, category: 1, key: "Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference." },
-        Expression_resolves_to_super_that_compiler_uses_to_capture_base_class_reference: { code: 2402, category: 1, key: "Expression resolves to '_super' that compiler uses to capture base class reference." },
-        Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2: { code: 2403, category: 1, key: "Subsequent variable declarations must have the same type.  Variable '{0}' must be of type '{1}', but here has type '{2}'." },
-        The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation: { code: 2404, category: 1, key: "The left-hand side of a 'for...in' statement cannot use a type annotation." },
-        The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any: { code: 2405, category: 1, key: "The left-hand side of a 'for...in' statement must be of type 'string' or 'any'." },
-        Invalid_left_hand_side_in_for_in_statement: { code: 2406, category: 1, key: "Invalid left-hand side in 'for...in' statement." },
-        The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2407, category: 1, key: "The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter." },
-        Setters_cannot_return_a_value: { code: 2408, category: 1, key: "Setters cannot return a value." },
-        Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class: { code: 2409, category: 1, key: "Return type of constructor signature must be assignable to the instance type of the class" },
-        All_symbols_within_a_with_block_will_be_resolved_to_any: { code: 2410, category: 1, key: "All symbols within a 'with' block will be resolved to 'any'." },
-        Property_0_of_type_1_is_not_assignable_to_string_index_type_2: { code: 2411, category: 1, key: "Property '{0}' of type '{1}' is not assignable to string index type '{2}'." },
-        Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2: { code: 2412, category: 1, key: "Property '{0}' of type '{1}' is not assignable to numeric index type '{2}'." },
-        Numeric_index_type_0_is_not_assignable_to_string_index_type_1: { code: 2413, category: 1, key: "Numeric index type '{0}' is not assignable to string index type '{1}'." },
-        Class_name_cannot_be_0: { code: 2414, category: 1, key: "Class name cannot be '{0}'" },
-        Class_0_incorrectly_extends_base_class_1: { code: 2415, category: 1, key: "Class '{0}' incorrectly extends base class '{1}'." },
-        Class_static_side_0_incorrectly_extends_base_class_static_side_1: { code: 2417, category: 1, key: "Class static side '{0}' incorrectly extends base class static side '{1}'." },
-        Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0: { code: 2419, category: 1, key: "Type name '{0}' in extends clause does not reference constructor function for '{0}'." },
-        Class_0_incorrectly_implements_interface_1: { code: 2420, category: 1, key: "Class '{0}' incorrectly implements interface '{1}'." },
-        A_class_may_only_implement_another_class_or_interface: { code: 2422, category: 1, key: "A class may only implement another class or interface." },
-        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_accessor: { code: 2423, category: 1, key: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member accessor." },
-        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_property: { code: 2424, category: 1, key: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member property." },
-        Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2425, category: 1, key: "Class '{0}' defines instance member property '{1}', but extended class '{2}' defines it as instance member function." },
-        Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2426, category: 1, key: "Class '{0}' defines instance member accessor '{1}', but extended class '{2}' defines it as instance member function." },
-        Interface_name_cannot_be_0: { code: 2427, category: 1, key: "Interface name cannot be '{0}'" },
-        All_declarations_of_an_interface_must_have_identical_type_parameters: { code: 2428, category: 1, key: "All declarations of an interface must have identical type parameters." },
-        Interface_0_incorrectly_extends_interface_1: { code: 2430, category: 1, key: "Interface '{0}' incorrectly extends interface '{1}'." },
-        Enum_name_cannot_be_0: { code: 2431, category: 1, key: "Enum name cannot be '{0}'" },
-        In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enum_element: { code: 2432, category: 1, key: "In an enum with multiple declarations, only one declaration can omit an initializer for its first enum element." },
-        A_module_declaration_cannot_be_in_a_different_file_from_a_class_or_function_with_which_it_is_merged: { code: 2433, category: 1, key: "A module declaration cannot be in a different file from a class or function with which it is merged" },
-        A_module_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged: { code: 2434, category: 1, key: "A module declaration cannot be located prior to a class or function with which it is merged" },
-        Ambient_external_modules_cannot_be_nested_in_other_modules: { code: 2435, category: 1, key: "Ambient external modules cannot be nested in other modules." },
-        Ambient_external_module_declaration_cannot_specify_relative_module_name: { code: 2436, category: 1, key: "Ambient external module declaration cannot specify relative module name." },
-        Module_0_is_hidden_by_a_local_declaration_with_the_same_name: { code: 2437, category: 1, key: "Module '{0}' is hidden by a local declaration with the same name" },
-        Import_name_cannot_be_0: { code: 2438, category: 1, key: "Import name cannot be '{0}'" },
-        Import_or_export_declaration_in_an_ambient_external_module_declaration_cannot_reference_external_module_through_relative_external_module_name: { code: 2439, category: 1, key: "Import or export declaration in an ambient external module declaration cannot reference external module through relative external module name." },
-        Import_declaration_conflicts_with_local_declaration_of_0: { code: 2440, category: 1, key: "Import declaration conflicts with local declaration of '{0}'" },
-        Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_an_external_module: { code: 2441, category: 1, key: "Duplicate identifier '{0}'. Compiler reserves name '{1}' in top level scope of an external module." },
-        Types_have_separate_declarations_of_a_private_property_0: { code: 2442, category: 1, key: "Types have separate declarations of a private property '{0}'." },
-        Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2: { code: 2443, category: 1, key: "Property '{0}' is protected but type '{1}' is not a class derived from '{2}'." },
-        Property_0_is_protected_in_type_1_but_public_in_type_2: { code: 2444, category: 1, key: "Property '{0}' is protected in type '{1}' but public in type '{2}'." },
-        Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses: { code: 2445, category: 1, key: "Property '{0}' is protected and only accessible within class '{1}' and its subclasses." },
-        Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1: { code: 2446, category: 1, key: "Property '{0}' is protected and only accessible through an instance of class '{1}'." },
-        The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead: { code: 2447, category: 1, key: "The '{0}' operator is not allowed for boolean types. Consider using '{1}' instead." },
-        Block_scoped_variable_0_used_before_its_declaration: { code: 2448, category: 1, key: "Block-scoped variable '{0}' used before its declaration." },
-        The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant: { code: 2449, category: 1, key: "The operand of an increment or decrement operator cannot be a constant." },
-        Left_hand_side_of_assignment_expression_cannot_be_a_constant: { code: 2450, category: 1, key: "Left-hand side of assignment expression cannot be a constant." },
-        Cannot_redeclare_block_scoped_variable_0: { code: 2451, category: 1, key: "Cannot redeclare block-scoped variable '{0}'." },
-        An_enum_member_cannot_have_a_numeric_name: { code: 2452, category: 1, key: "An enum member cannot have a numeric name." },
-        The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_type_arguments_explicitly: { code: 2453, category: 1, key: "The type argument for type parameter '{0}' cannot be inferred from the usage. Consider specifying the type arguments explicitly." },
-        Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0: { code: 2455, category: 1, key: "Type argument candidate '{1}' is not a valid type argument because it is not a supertype of candidate '{0}'." },
-        Type_alias_0_circularly_references_itself: { code: 2456, category: 1, key: "Type alias '{0}' circularly references itself." },
-        Type_alias_name_cannot_be_0: { code: 2457, category: 1, key: "Type alias name cannot be '{0}'" },
-        An_AMD_module_cannot_have_multiple_name_assignments: { code: 2458, category: 1, key: "An AMD module cannot have multiple name assignments." },
-        Type_0_has_no_property_1_and_no_string_index_signature: { code: 2459, category: 1, key: "Type '{0}' has no property '{1}' and no string index signature." },
-        Type_0_has_no_property_1: { code: 2460, category: 1, key: "Type '{0}' has no property '{1}'." },
-        Type_0_is_not_an_array_type: { code: 2461, category: 1, key: "Type '{0}' is not an array type." },
-        A_rest_element_must_be_last_in_an_array_destructuring_pattern: { code: 2462, category: 1, key: "A rest element must be last in an array destructuring pattern" },
-        A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature: { code: 2463, category: 1, key: "A binding pattern parameter cannot be optional in an implementation signature." },
-        A_computed_property_name_must_be_of_type_string_number_symbol_or_any: { code: 2464, category: 1, key: "A computed property name must be of type 'string', 'number', 'symbol', or 'any'." },
-        this_cannot_be_referenced_in_a_computed_property_name: { code: 2465, category: 1, key: "'this' cannot be referenced in a computed property name." },
-        super_cannot_be_referenced_in_a_computed_property_name: { code: 2466, category: 1, key: "'super' cannot be referenced in a computed property name." },
-        A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type: { code: 2467, category: 1, key: "A computed property name cannot reference a type parameter from its containing type." },
-        Cannot_find_global_value_0: { code: 2468, category: 1, key: "Cannot find global value '{0}'." },
-        The_0_operator_cannot_be_applied_to_type_symbol: { code: 2469, category: 1, key: "The '{0}' operator cannot be applied to type 'symbol'." },
-        Symbol_reference_does_not_refer_to_the_global_Symbol_constructor_object: { code: 2470, category: 1, key: "'Symbol' reference does not refer to the global Symbol constructor object." },
-        A_computed_property_name_of_the_form_0_must_be_of_type_symbol: { code: 2471, category: 1, key: "A computed property name of the form '{0}' must be of type 'symbol'." },
-        Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_6_and_higher: { code: 2472, category: 1, key: "Spread operator in 'new' expressions is only available when targeting ECMAScript 6 and higher." },
-        Enum_declarations_must_all_be_const_or_non_const: { code: 2473, category: 1, key: "Enum declarations must all be const or non-const." },
-        In_const_enum_declarations_member_initializer_must_be_constant_expression: { code: 2474, category: 1, key: "In 'const' enum declarations member initializer must be constant expression." },
-        const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment: { code: 2475, category: 1, key: "'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment." },
-        A_const_enum_member_can_only_be_accessed_using_a_string_literal: { code: 2476, category: 1, key: "A const enum member can only be accessed using a string literal." },
-        const_enum_member_initializer_was_evaluated_to_a_non_finite_value: { code: 2477, category: 1, key: "'const' enum member initializer was evaluated to a non-finite value." },
-        const_enum_member_initializer_was_evaluated_to_disallowed_value_NaN: { code: 2478, category: 1, key: "'const' enum member initializer was evaluated to disallowed value 'NaN'." },
-        Property_0_does_not_exist_on_const_enum_1: { code: 2479, category: 1, key: "Property '{0}' does not exist on 'const' enum '{1}'." },
-        let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations: { code: 2480, category: 1, key: "'let' is not allowed to be used as a name in 'let' or 'const' declarations." },
-        Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1: { code: 2481, category: 1, key: "Cannot initialize outer scoped variable '{0}' in the same scope as block scoped declaration '{1}'." },
-        for_of_statements_are_only_available_when_targeting_ECMAScript_6_or_higher: { code: 2482, category: 1, key: "'for...of' statements are only available when targeting ECMAScript 6 or higher." },
-        The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: { code: 2483, category: 1, key: "The left-hand side of a 'for...of' statement cannot use a type annotation." },
-        Export_declaration_conflicts_with_exported_declaration_of_0: { code: 2484, category: 1, key: "Export declaration conflicts with exported declaration of '{0}'" },
-        The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant: { code: 2485, category: 1, key: "The left-hand side of a 'for...of' statement cannot be a previously defined constant." },
-        The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant: { code: 2486, category: 1, key: "The left-hand side of a 'for...in' statement cannot be a previously defined constant." },
-        Invalid_left_hand_side_in_for_of_statement: { code: 2487, category: 1, key: "Invalid left-hand side in 'for...of' statement." },
-        The_right_hand_side_of_a_for_of_statement_must_have_a_Symbol_iterator_method_that_returns_an_iterator: { code: 2488, category: 1, key: "The right-hand side of a 'for...of' statement must have a '[Symbol.iterator]()' method that returns an iterator." },
-        The_iterator_returned_by_the_right_hand_side_of_a_for_of_statement_must_have_a_next_method: { code: 2489, category: 1, key: "The iterator returned by the right-hand side of a 'for...of' statement must have a 'next()' method." },
-        The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: { code: 2490, category: 1, key: "The type returned by the 'next()' method of an iterator must have a 'value' property." },
-        The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern: { code: 2491, category: 1, key: "The left-hand side of a 'for...in' statement cannot be a destructuring pattern." },
-        Cannot_redeclare_identifier_0_in_catch_clause: { code: 2492, category: 1, key: "Cannot redeclare identifier '{0}' in catch clause" },
-        Import_declaration_0_is_using_private_name_1: { code: 4000, category: 1, key: "Import declaration '{0}' is using private name '{1}'." },
-        Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: 1, key: "Type parameter '{0}' of exported class has or is using private name '{1}'." },
-        Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4004, category: 1, key: "Type parameter '{0}' of exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4006, category: 1, key: "Type parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4008, category: 1, key: "Type parameter '{0}' of call signature from exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: { code: 4010, category: 1, key: "Type parameter '{0}' of public static method from exported class has or is using private name '{1}'." },
-        Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: { code: 4012, category: 1, key: "Type parameter '{0}' of public method from exported class has or is using private name '{1}'." },
-        Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: { code: 4014, category: 1, key: "Type parameter '{0}' of method from exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4016, category: 1, key: "Type parameter '{0}' of exported function has or is using private name '{1}'." },
-        Implements_clause_of_exported_class_0_has_or_is_using_private_name_1: { code: 4019, category: 1, key: "Implements clause of exported class '{0}' has or is using private name '{1}'." },
-        Extends_clause_of_exported_class_0_has_or_is_using_private_name_1: { code: 4020, category: 1, key: "Extends clause of exported class '{0}' has or is using private name '{1}'." },
-        Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1: { code: 4022, category: 1, key: "Extends clause of exported interface '{0}' has or is using private name '{1}'." },
-        Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4023, category: 1, key: "Exported variable '{0}' has or is using name '{1}' from external module {2} but cannot be named." },
-        Exported_variable_0_has_or_is_using_name_1_from_private_module_2: { code: 4024, category: 1, key: "Exported variable '{0}' has or is using name '{1}' from private module '{2}'." },
-        Exported_variable_0_has_or_is_using_private_name_1: { code: 4025, category: 1, key: "Exported variable '{0}' has or is using private name '{1}'." },
-        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4026, category: 1, key: "Public static property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4027, category: 1, key: "Public static property '{0}' of exported class has or is using name '{1}' from private module '{2}'." },
-        Public_static_property_0_of_exported_class_has_or_is_using_private_name_1: { code: 4028, category: 1, key: "Public static property '{0}' of exported class has or is using private name '{1}'." },
-        Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4029, category: 1, key: "Public property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4030, category: 1, key: "Public property '{0}' of exported class has or is using name '{1}' from private module '{2}'." },
-        Public_property_0_of_exported_class_has_or_is_using_private_name_1: { code: 4031, category: 1, key: "Public property '{0}' of exported class has or is using private name '{1}'." },
-        Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4032, category: 1, key: "Property '{0}' of exported interface has or is using name '{1}' from private module '{2}'." },
-        Property_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4033, category: 1, key: "Property '{0}' of exported interface has or is using private name '{1}'." },
-        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4034, category: 1, key: "Parameter '{0}' of public static property setter from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1: { code: 4035, category: 1, key: "Parameter '{0}' of public static property setter from exported class has or is using private name '{1}'." },
-        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4036, category: 1, key: "Parameter '{0}' of public property setter from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1: { code: 4037, category: 1, key: "Parameter '{0}' of public property setter from exported class has or is using private name '{1}'." },
-        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4038, category: 1, key: "Return type of public static property getter from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4039, category: 1, key: "Return type of public static property getter from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0: { code: 4040, category: 1, key: "Return type of public static property getter from exported class has or is using private name '{0}'." },
-        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4041, category: 1, key: "Return type of public property getter from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4042, category: 1, key: "Return type of public property getter from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0: { code: 4043, category: 1, key: "Return type of public property getter from exported class has or is using private name '{0}'." },
-        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4044, category: 1, key: "Return type of constructor signature from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4045, category: 1, key: "Return type of constructor signature from exported interface has or is using private name '{0}'." },
-        Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4046, category: 1, key: "Return type of call signature from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4047, category: 1, key: "Return type of call signature from exported interface has or is using private name '{0}'." },
-        Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4048, category: 1, key: "Return type of index signature from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4049, category: 1, key: "Return type of index signature from exported interface has or is using private name '{0}'." },
-        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4050, category: 1, key: "Return type of public static method from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4051, category: 1, key: "Return type of public static method from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0: { code: 4052, category: 1, key: "Return type of public static method from exported class has or is using private name '{0}'." },
-        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4053, category: 1, key: "Return type of public method from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4054, category: 1, key: "Return type of public method from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0: { code: 4055, category: 1, key: "Return type of public method from exported class has or is using private name '{0}'." },
-        Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4056, category: 1, key: "Return type of method from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0: { code: 4057, category: 1, key: "Return type of method from exported interface has or is using private name '{0}'." },
-        Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4058, category: 1, key: "Return type of exported function has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1: { code: 4059, category: 1, key: "Return type of exported function has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_exported_function_has_or_is_using_private_name_0: { code: 4060, category: 1, key: "Return type of exported function has or is using private name '{0}'." },
-        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4061, category: 1, key: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4062, category: 1, key: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1: { code: 4063, category: 1, key: "Parameter '{0}' of constructor from exported class has or is using private name '{1}'." },
-        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4064, category: 1, key: "Parameter '{0}' of constructor signature from exported interface has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4065, category: 1, key: "Parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'." },
-        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4066, category: 1, key: "Parameter '{0}' of call signature from exported interface has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4067, category: 1, key: "Parameter '{0}' of call signature from exported interface has or is using private name '{1}'." },
-        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4068, category: 1, key: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4069, category: 1, key: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: { code: 4070, category: 1, key: "Parameter '{0}' of public static method from exported class has or is using private name '{1}'." },
-        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4071, category: 1, key: "Parameter '{0}' of public method from exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4072, category: 1, key: "Parameter '{0}' of public method from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: { code: 4073, category: 1, key: "Parameter '{0}' of public method from exported class has or is using private name '{1}'." },
-        Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4074, category: 1, key: "Parameter '{0}' of method from exported interface has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: { code: 4075, category: 1, key: "Parameter '{0}' of method from exported interface has or is using private name '{1}'." },
-        Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4076, category: 1, key: "Parameter '{0}' of exported function has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2: { code: 4077, category: 1, key: "Parameter '{0}' of exported function has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4078, category: 1, key: "Parameter '{0}' of exported function has or is using private name '{1}'." },
-        Exported_type_alias_0_has_or_is_using_private_name_1: { code: 4081, category: 1, key: "Exported type alias '{0}' has or is using private name '{1}'." },
-        Loop_contains_block_scoped_variable_0_referenced_by_a_function_in_the_loop_This_is_only_supported_in_ECMAScript_6_or_higher: { code: 4091, category: 1, key: "Loop contains block-scoped variable '{0}' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher." },
-        The_current_host_does_not_support_the_0_option: { code: 5001, category: 1, key: "The current host does not support the '{0}' option." },
-        Cannot_find_the_common_subdirectory_path_for_the_input_files: { code: 5009, category: 1, key: "Cannot find the common subdirectory path for the input files." },
-        Cannot_read_file_0_Colon_1: { code: 5012, category: 1, key: "Cannot read file '{0}': {1}" },
-        Unsupported_file_encoding: { code: 5013, category: 1, key: "Unsupported file encoding." },
-        Unknown_compiler_option_0: { code: 5023, category: 1, key: "Unknown compiler option '{0}'." },
-        Compiler_option_0_requires_a_value_of_type_1: { code: 5024, category: 1, key: "Compiler option '{0}' requires a value of type {1}." },
-        Could_not_write_file_0_Colon_1: { code: 5033, category: 1, key: "Could not write file '{0}': {1}" },
-        Option_mapRoot_cannot_be_specified_without_specifying_sourcemap_option: { code: 5038, category: 1, key: "Option 'mapRoot' cannot be specified without specifying 'sourcemap' option." },
-        Option_sourceRoot_cannot_be_specified_without_specifying_sourcemap_option: { code: 5039, category: 1, key: "Option 'sourceRoot' cannot be specified without specifying 'sourcemap' option." },
-        Option_noEmit_cannot_be_specified_with_option_out_or_outDir: { code: 5040, category: 1, key: "Option 'noEmit' cannot be specified with option 'out' or 'outDir'." },
-        Option_noEmit_cannot_be_specified_with_option_declaration: { code: 5041, category: 1, key: "Option 'noEmit' cannot be specified with option 'declaration'." },
-        Option_project_cannot_be_mixed_with_source_files_on_a_command_line: { code: 5042, category: 1, key: "Option 'project' cannot be mixed with source files on a command line." },
-        Concatenate_and_emit_output_to_single_file: { code: 6001, category: 2, key: "Concatenate and emit output to single file." },
-        Generates_corresponding_d_ts_file: { code: 6002, category: 2, key: "Generates corresponding '.d.ts' file." },
-        Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: { code: 6003, category: 2, key: "Specifies the location where debugger should locate map files instead of generated locations." },
-        Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations: { code: 6004, category: 2, key: "Specifies the location where debugger should locate TypeScript files instead of source locations." },
-        Watch_input_files: { code: 6005, category: 2, key: "Watch input files." },
-        Redirect_output_structure_to_the_directory: { code: 6006, category: 2, key: "Redirect output structure to the directory." },
-        Do_not_erase_const_enum_declarations_in_generated_code: { code: 6007, category: 2, key: "Do not erase const enum declarations in generated code." },
-        Do_not_emit_outputs_if_any_type_checking_errors_were_reported: { code: 6008, category: 2, key: "Do not emit outputs if any type checking errors were reported." },
-        Do_not_emit_comments_to_output: { code: 6009, category: 2, key: "Do not emit comments to output." },
-        Do_not_emit_outputs: { code: 6010, category: 2, key: "Do not emit outputs." },
-        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES6_experimental: { code: 6015, category: 2, key: "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES6' (experimental)" },
-        Specify_module_code_generation_Colon_commonjs_or_amd: { code: 6016, category: 2, key: "Specify module code generation: 'commonjs' or 'amd'" },
-        Print_this_message: { code: 6017, category: 2, key: "Print this message." },
-        Print_the_compiler_s_version: { code: 6019, category: 2, key: "Print the compiler's version." },
-        Compile_the_project_in_the_given_directory: { code: 6020, category: 2, key: "Compile the project in the given directory." },
-        Syntax_Colon_0: { code: 6023, category: 2, key: "Syntax: {0}" },
-        options: { code: 6024, category: 2, key: "options" },
-        file: { code: 6025, category: 2, key: "file" },
-        Examples_Colon_0: { code: 6026, category: 2, key: "Examples: {0}" },
-        Options_Colon: { code: 6027, category: 2, key: "Options:" },
-        Version_0: { code: 6029, category: 2, key: "Version {0}" },
-        Insert_command_line_options_and_files_from_a_file: { code: 6030, category: 2, key: "Insert command line options and files from a file." },
-        File_change_detected_Starting_incremental_compilation: { code: 6032, category: 2, key: "File change detected. Starting incremental compilation..." },
-        KIND: { code: 6034, category: 2, key: "KIND" },
-        FILE: { code: 6035, category: 2, key: "FILE" },
-        VERSION: { code: 6036, category: 2, key: "VERSION" },
-        LOCATION: { code: 6037, category: 2, key: "LOCATION" },
-        DIRECTORY: { code: 6038, category: 2, key: "DIRECTORY" },
-        Compilation_complete_Watching_for_file_changes: { code: 6042, category: 2, key: "Compilation complete. Watching for file changes." },
-        Generates_corresponding_map_file: { code: 6043, category: 2, key: "Generates corresponding '.map' file." },
-        Compiler_option_0_expects_an_argument: { code: 6044, category: 1, key: "Compiler option '{0}' expects an argument." },
-        Unterminated_quoted_string_in_response_file_0: { code: 6045, category: 1, key: "Unterminated quoted string in response file '{0}'." },
-        Argument_for_module_option_must_be_commonjs_or_amd: { code: 6046, category: 1, key: "Argument for '--module' option must be 'commonjs' or 'amd'." },
-        Argument_for_target_option_must_be_es3_es5_or_es6: { code: 6047, category: 1, key: "Argument for '--target' option must be 'es3', 'es5', or 'es6'." },
-        Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1: { code: 6048, category: 1, key: "Locale must be of the form <language> or <language>-<territory>. For example '{0}' or '{1}'." },
-        Unsupported_locale_0: { code: 6049, category: 1, key: "Unsupported locale '{0}'." },
-        Unable_to_open_file_0: { code: 6050, category: 1, key: "Unable to open file '{0}'." },
-        Corrupted_locale_file_0: { code: 6051, category: 1, key: "Corrupted locale file {0}." },
-        Raise_error_on_expressions_and_declarations_with_an_implied_any_type: { code: 6052, category: 2, key: "Raise error on expressions and declarations with an implied 'any' type." },
-        File_0_not_found: { code: 6053, category: 1, key: "File '{0}' not found." },
-        File_0_must_have_extension_ts_or_d_ts: { code: 6054, category: 1, key: "File '{0}' must have extension '.ts' or '.d.ts'." },
-        Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures: { code: 6055, category: 2, key: "Suppress noImplicitAny errors for indexing objects lacking index signatures." },
-        Do_not_emit_declarations_for_code_that_has_an_internal_annotation: { code: 6056, category: 2, key: "Do not emit declarations for code that has an '@internal' annotation." },
-        Variable_0_implicitly_has_an_1_type: { code: 7005, category: 1, key: "Variable '{0}' implicitly has an '{1}' type." },
-        Parameter_0_implicitly_has_an_1_type: { code: 7006, category: 1, key: "Parameter '{0}' implicitly has an '{1}' type." },
-        Member_0_implicitly_has_an_1_type: { code: 7008, category: 1, key: "Member '{0}' implicitly has an '{1}' type." },
-        new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type: { code: 7009, category: 1, key: "'new' expression, whose target lacks a construct signature, implicitly has an 'any' type." },
-        _0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type: { code: 7010, category: 1, key: "'{0}', which lacks return-type annotation, implicitly has an '{1}' return type." },
-        Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type: { code: 7011, category: 1, key: "Function expression, which lacks return-type annotation, implicitly has an '{0}' return type." },
-        Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7013, category: 1, key: "Construct signature, which lacks return-type annotation, implicitly has an 'any' return type." },
-        Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_type_annotation: { code: 7016, category: 1, key: "Property '{0}' implicitly has type 'any', because its 'set' accessor lacks a type annotation." },
-        Index_signature_of_object_type_implicitly_has_an_any_type: { code: 7017, category: 1, key: "Index signature of object type implicitly has an 'any' type." },
-        Object_literal_s_property_0_implicitly_has_an_1_type: { code: 7018, category: 1, key: "Object literal's property '{0}' implicitly has an '{1}' type." },
-        Rest_parameter_0_implicitly_has_an_any_type: { code: 7019, category: 1, key: "Rest parameter '{0}' implicitly has an 'any[]' type." },
-        Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7020, category: 1, key: "Call signature, which lacks return-type annotation, implicitly has an 'any' return type." },
-        _0_implicitly_has_type_any_because_it_is_referenced_directly_or_indirectly_in_its_own_type_annotation: { code: 7021, category: 1, key: "'{0}' implicitly has type 'any' because it is referenced directly or indirectly in its own type annotation." },
-        _0_implicitly_has_type_any_because_it_is_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer: { code: 7022, category: 1, key: "'{0}' implicitly has type 'any' because it is does not have a type annotation and is referenced directly or indirectly in its own initializer." },
-        _0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: { code: 7023, category: 1, key: "'{0}' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions." },
-        Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: { code: 7024, category: 1, key: "Function implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions." },
-        You_cannot_rename_this_element: { code: 8000, category: 1, key: "You cannot rename this element." },
-        You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: { code: 8001, category: 1, key: "You cannot rename elements that are defined in the standard TypeScript library." },
-        yield_expressions_are_not_currently_supported: { code: 9000, category: 1, key: "'yield' expressions are not currently supported." },
-        Generators_are_not_currently_supported: { code: 9001, category: 1, key: "Generators are not currently supported." },
-        The_arguments_object_cannot_be_referenced_in_an_arrow_function_Consider_using_a_standard_function_expression: { code: 9002, category: 1, key: "The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression." }
+        Unterminated_string_literal: {
+            code: 1002,
+            category: 1,
+            key: "Unterminated string literal."
+        },
+        Identifier_expected: {
+            code: 1003,
+            category: 1,
+            key: "Identifier expected."
+        },
+        _0_expected: {
+            code: 1005,
+            category: 1,
+            key: "'{0}' expected."
+        },
+        A_file_cannot_have_a_reference_to_itself: {
+            code: 1006,
+            category: 1,
+            key: "A file cannot have a reference to itself."
+        },
+        Trailing_comma_not_allowed: {
+            code: 1009,
+            category: 1,
+            key: "Trailing comma not allowed."
+        },
+        Asterisk_Slash_expected: {
+            code: 1010,
+            category: 1,
+            key: "'*/' expected."
+        },
+        Unexpected_token: {
+            code: 1012,
+            category: 1,
+            key: "Unexpected token."
+        },
+        A_rest_parameter_must_be_last_in_a_parameter_list: {
+            code: 1014,
+            category: 1,
+            key: "A rest parameter must be last in a parameter list."
+        },
+        Parameter_cannot_have_question_mark_and_initializer: {
+            code: 1015,
+            category: 1,
+            key: "Parameter cannot have question mark and initializer."
+        },
+        A_required_parameter_cannot_follow_an_optional_parameter: {
+            code: 1016,
+            category: 1,
+            key: "A required parameter cannot follow an optional parameter."
+        },
+        An_index_signature_cannot_have_a_rest_parameter: {
+            code: 1017,
+            category: 1,
+            key: "An index signature cannot have a rest parameter."
+        },
+        An_index_signature_parameter_cannot_have_an_accessibility_modifier: {
+            code: 1018,
+            category: 1,
+            key: "An index signature parameter cannot have an accessibility modifier."
+        },
+        An_index_signature_parameter_cannot_have_a_question_mark: {
+            code: 1019,
+            category: 1,
+            key: "An index signature parameter cannot have a question mark."
+        },
+        An_index_signature_parameter_cannot_have_an_initializer: {
+            code: 1020,
+            category: 1,
+            key: "An index signature parameter cannot have an initializer."
+        },
+        An_index_signature_must_have_a_type_annotation: {
+            code: 1021,
+            category: 1,
+            key: "An index signature must have a type annotation."
+        },
+        An_index_signature_parameter_must_have_a_type_annotation: {
+            code: 1022,
+            category: 1,
+            key: "An index signature parameter must have a type annotation."
+        },
+        An_index_signature_parameter_type_must_be_string_or_number: {
+            code: 1023,
+            category: 1,
+            key: "An index signature parameter type must be 'string' or 'number'."
+        },
+        A_class_or_interface_declaration_can_only_have_one_extends_clause: {
+            code: 1024,
+            category: 1,
+            key: "A class or interface declaration can only have one 'extends' clause."
+        },
+        An_extends_clause_must_precede_an_implements_clause: {
+            code: 1025,
+            category: 1,
+            key: "An 'extends' clause must precede an 'implements' clause."
+        },
+        A_class_can_only_extend_a_single_class: {
+            code: 1026,
+            category: 1,
+            key: "A class can only extend a single class."
+        },
+        A_class_declaration_can_only_have_one_implements_clause: {
+            code: 1027,
+            category: 1,
+            key: "A class declaration can only have one 'implements' clause."
+        },
+        Accessibility_modifier_already_seen: {
+            code: 1028,
+            category: 1,
+            key: "Accessibility modifier already seen."
+        },
+        _0_modifier_must_precede_1_modifier: {
+            code: 1029,
+            category: 1,
+            key: "'{0}' modifier must precede '{1}' modifier."
+        },
+        _0_modifier_already_seen: {
+            code: 1030,
+            category: 1,
+            key: "'{0}' modifier already seen."
+        },
+        _0_modifier_cannot_appear_on_a_class_element: {
+            code: 1031,
+            category: 1,
+            key: "'{0}' modifier cannot appear on a class element."
+        },
+        An_interface_declaration_cannot_have_an_implements_clause: {
+            code: 1032,
+            category: 1,
+            key: "An interface declaration cannot have an 'implements' clause."
+        },
+        super_must_be_followed_by_an_argument_list_or_member_access: {
+            code: 1034,
+            category: 1,
+            key: "'super' must be followed by an argument list or member access."
+        },
+        Only_ambient_modules_can_use_quoted_names: {
+            code: 1035,
+            category: 1,
+            key: "Only ambient modules can use quoted names."
+        },
+        Statements_are_not_allowed_in_ambient_contexts: {
+            code: 1036,
+            category: 1,
+            key: "Statements are not allowed in ambient contexts."
+        },
+        A_declare_modifier_cannot_be_used_in_an_already_ambient_context: {
+            code: 1038,
+            category: 1,
+            key: "A 'declare' modifier cannot be used in an already ambient context."
+        },
+        Initializers_are_not_allowed_in_ambient_contexts: {
+            code: 1039,
+            category: 1,
+            key: "Initializers are not allowed in ambient contexts."
+        },
+        _0_modifier_cannot_appear_on_a_module_element: {
+            code: 1044,
+            category: 1,
+            key: "'{0}' modifier cannot appear on a module element."
+        },
+        A_declare_modifier_cannot_be_used_with_an_interface_declaration: {
+            code: 1045,
+            category: 1,
+            key: "A 'declare' modifier cannot be used with an interface declaration."
+        },
+        A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file: {
+            code: 1046,
+            category: 1,
+            key: "A 'declare' modifier is required for a top level declaration in a .d.ts file."
+        },
+        A_rest_parameter_cannot_be_optional: {
+            code: 1047,
+            category: 1,
+            key: "A rest parameter cannot be optional."
+        },
+        A_rest_parameter_cannot_have_an_initializer: {
+            code: 1048,
+            category: 1,
+            key: "A rest parameter cannot have an initializer."
+        },
+        A_set_accessor_must_have_exactly_one_parameter: {
+            code: 1049,
+            category: 1,
+            key: "A 'set' accessor must have exactly one parameter."
+        },
+        A_set_accessor_cannot_have_an_optional_parameter: {
+            code: 1051,
+            category: 1,
+            key: "A 'set' accessor cannot have an optional parameter."
+        },
+        A_set_accessor_parameter_cannot_have_an_initializer: {
+            code: 1052,
+            category: 1,
+            key: "A 'set' accessor parameter cannot have an initializer."
+        },
+        A_set_accessor_cannot_have_rest_parameter: {
+            code: 1053,
+            category: 1,
+            key: "A 'set' accessor cannot have rest parameter."
+        },
+        A_get_accessor_cannot_have_parameters: {
+            code: 1054,
+            category: 1,
+            key: "A 'get' accessor cannot have parameters."
+        },
+        Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher: {
+            code: 1056,
+            category: 1,
+            key: "Accessors are only available when targeting ECMAScript 5 and higher."
+        },
+        Enum_member_must_have_initializer: {
+            code: 1061,
+            category: 1,
+            key: "Enum member must have initializer."
+        },
+        An_export_assignment_cannot_be_used_in_an_internal_module: {
+            code: 1063,
+            category: 1,
+            key: "An export assignment cannot be used in an internal module."
+        },
+        Ambient_enum_elements_can_only_have_integer_literal_initializers: {
+            code: 1066,
+            category: 1,
+            key: "Ambient enum elements can only have integer literal initializers."
+        },
+        Unexpected_token_A_constructor_method_accessor_or_property_was_expected: {
+            code: 1068,
+            category: 1,
+            key: "Unexpected token. A constructor, method, accessor, or property was expected."
+        },
+        A_declare_modifier_cannot_be_used_with_an_import_declaration: {
+            code: 1079,
+            category: 1,
+            key: "A 'declare' modifier cannot be used with an import declaration."
+        },
+        Invalid_reference_directive_syntax: {
+            code: 1084,
+            category: 1,
+            key: "Invalid 'reference' directive syntax."
+        },
+        Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher: {
+            code: 1085,
+            category: 1,
+            key: "Octal literals are not available when targeting ECMAScript 5 and higher."
+        },
+        An_accessor_cannot_be_declared_in_an_ambient_context: {
+            code: 1086,
+            category: 1,
+            key: "An accessor cannot be declared in an ambient context."
+        },
+        _0_modifier_cannot_appear_on_a_constructor_declaration: {
+            code: 1089,
+            category: 1,
+            key: "'{0}' modifier cannot appear on a constructor declaration."
+        },
+        _0_modifier_cannot_appear_on_a_parameter: {
+            code: 1090,
+            category: 1,
+            key: "'{0}' modifier cannot appear on a parameter."
+        },
+        Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement: {
+            code: 1091,
+            category: 1,
+            key: "Only a single variable declaration is allowed in a 'for...in' statement."
+        },
+        Type_parameters_cannot_appear_on_a_constructor_declaration: {
+            code: 1092,
+            category: 1,
+            key: "Type parameters cannot appear on a constructor declaration."
+        },
+        Type_annotation_cannot_appear_on_a_constructor_declaration: {
+            code: 1093,
+            category: 1,
+            key: "Type annotation cannot appear on a constructor declaration."
+        },
+        An_accessor_cannot_have_type_parameters: {
+            code: 1094,
+            category: 1,
+            key: "An accessor cannot have type parameters."
+        },
+        A_set_accessor_cannot_have_a_return_type_annotation: {
+            code: 1095,
+            category: 1,
+            key: "A 'set' accessor cannot have a return type annotation."
+        },
+        An_index_signature_must_have_exactly_one_parameter: {
+            code: 1096,
+            category: 1,
+            key: "An index signature must have exactly one parameter."
+        },
+        _0_list_cannot_be_empty: {
+            code: 1097,
+            category: 1,
+            key: "'{0}' list cannot be empty."
+        },
+        Type_parameter_list_cannot_be_empty: {
+            code: 1098,
+            category: 1,
+            key: "Type parameter list cannot be empty."
+        },
+        Type_argument_list_cannot_be_empty: {
+            code: 1099,
+            category: 1,
+            key: "Type argument list cannot be empty."
+        },
+        Invalid_use_of_0_in_strict_mode: {
+            code: 1100,
+            category: 1,
+            key: "Invalid use of '{0}' in strict mode."
+        },
+        with_statements_are_not_allowed_in_strict_mode: {
+            code: 1101,
+            category: 1,
+            key: "'with' statements are not allowed in strict mode."
+        },
+        delete_cannot_be_called_on_an_identifier_in_strict_mode: {
+            code: 1102,
+            category: 1,
+            key: "'delete' cannot be called on an identifier in strict mode."
+        },
+        A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement: {
+            code: 1104,
+            category: 1,
+            key: "A 'continue' statement can only be used within an enclosing iteration statement."
+        },
+        A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement: {
+            code: 1105,
+            category: 1,
+            key: "A 'break' statement can only be used within an enclosing iteration or switch statement."
+        },
+        Jump_target_cannot_cross_function_boundary: {
+            code: 1107,
+            category: 1,
+            key: "Jump target cannot cross function boundary."
+        },
+        A_return_statement_can_only_be_used_within_a_function_body: {
+            code: 1108,
+            category: 1,
+            key: "A 'return' statement can only be used within a function body."
+        },
+        Expression_expected: {
+            code: 1109,
+            category: 1,
+            key: "Expression expected."
+        },
+        Type_expected: {
+            code: 1110,
+            category: 1,
+            key: "Type expected."
+        },
+        A_class_member_cannot_be_declared_optional: {
+            code: 1112,
+            category: 1,
+            key: "A class member cannot be declared optional."
+        },
+        A_default_clause_cannot_appear_more_than_once_in_a_switch_statement: {
+            code: 1113,
+            category: 1,
+            key: "A 'default' clause cannot appear more than once in a 'switch' statement."
+        },
+        Duplicate_label_0: {
+            code: 1114,
+            category: 1,
+            key: "Duplicate label '{0}'"
+        },
+        A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement: {
+            code: 1115,
+            category: 1,
+            key: "A 'continue' statement can only jump to a label of an enclosing iteration statement."
+        },
+        A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement: {
+            code: 1116,
+            category: 1,
+            key: "A 'break' statement can only jump to a label of an enclosing statement."
+        },
+        An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode: {
+            code: 1117,
+            category: 1,
+            key: "An object literal cannot have multiple properties with the same name in strict mode."
+        },
+        An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name: {
+            code: 1118,
+            category: 1,
+            key: "An object literal cannot have multiple get/set accessors with the same name."
+        },
+        An_object_literal_cannot_have_property_and_accessor_with_the_same_name: {
+            code: 1119,
+            category: 1,
+            key: "An object literal cannot have property and accessor with the same name."
+        },
+        An_export_assignment_cannot_have_modifiers: {
+            code: 1120,
+            category: 1,
+            key: "An export assignment cannot have modifiers."
+        },
+        Octal_literals_are_not_allowed_in_strict_mode: {
+            code: 1121,
+            category: 1,
+            key: "Octal literals are not allowed in strict mode."
+        },
+        A_tuple_type_element_list_cannot_be_empty: {
+            code: 1122,
+            category: 1,
+            key: "A tuple type element list cannot be empty."
+        },
+        Variable_declaration_list_cannot_be_empty: {
+            code: 1123,
+            category: 1,
+            key: "Variable declaration list cannot be empty."
+        },
+        Digit_expected: {
+            code: 1124,
+            category: 1,
+            key: "Digit expected."
+        },
+        Hexadecimal_digit_expected: {
+            code: 1125,
+            category: 1,
+            key: "Hexadecimal digit expected."
+        },
+        Unexpected_end_of_text: {
+            code: 1126,
+            category: 1,
+            key: "Unexpected end of text."
+        },
+        Invalid_character: {
+            code: 1127,
+            category: 1,
+            key: "Invalid character."
+        },
+        Declaration_or_statement_expected: {
+            code: 1128,
+            category: 1,
+            key: "Declaration or statement expected."
+        },
+        Statement_expected: {
+            code: 1129,
+            category: 1,
+            key: "Statement expected."
+        },
+        case_or_default_expected: {
+            code: 1130,
+            category: 1,
+            key: "'case' or 'default' expected."
+        },
+        Property_or_signature_expected: {
+            code: 1131,
+            category: 1,
+            key: "Property or signature expected."
+        },
+        Enum_member_expected: {
+            code: 1132,
+            category: 1,
+            key: "Enum member expected."
+        },
+        Type_reference_expected: {
+            code: 1133,
+            category: 1,
+            key: "Type reference expected."
+        },
+        Variable_declaration_expected: {
+            code: 1134,
+            category: 1,
+            key: "Variable declaration expected."
+        },
+        Argument_expression_expected: {
+            code: 1135,
+            category: 1,
+            key: "Argument expression expected."
+        },
+        Property_assignment_expected: {
+            code: 1136,
+            category: 1,
+            key: "Property assignment expected."
+        },
+        Expression_or_comma_expected: {
+            code: 1137,
+            category: 1,
+            key: "Expression or comma expected."
+        },
+        Parameter_declaration_expected: {
+            code: 1138,
+            category: 1,
+            key: "Parameter declaration expected."
+        },
+        Type_parameter_declaration_expected: {
+            code: 1139,
+            category: 1,
+            key: "Type parameter declaration expected."
+        },
+        Type_argument_expected: {
+            code: 1140,
+            category: 1,
+            key: "Type argument expected."
+        },
+        String_literal_expected: {
+            code: 1141,
+            category: 1,
+            key: "String literal expected."
+        },
+        Line_break_not_permitted_here: {
+            code: 1142,
+            category: 1,
+            key: "Line break not permitted here."
+        },
+        or_expected: {
+            code: 1144,
+            category: 1,
+            key: "'{' or ';' expected."
+        },
+        Modifiers_not_permitted_on_index_signature_members: {
+            code: 1145,
+            category: 1,
+            key: "Modifiers not permitted on index signature members."
+        },
+        Declaration_expected: {
+            code: 1146,
+            category: 1,
+            key: "Declaration expected."
+        },
+        Import_declarations_in_an_internal_module_cannot_reference_an_external_module: {
+            code: 1147,
+            category: 1,
+            key: "Import declarations in an internal module cannot reference an external module."
+        },
+        Cannot_compile_external_modules_unless_the_module_flag_is_provided: {
+            code: 1148,
+            category: 1,
+            key: "Cannot compile external modules unless the '--module' flag is provided."
+        },
+        File_name_0_differs_from_already_included_file_name_1_only_in_casing: {
+            code: 1149,
+            category: 1,
+            key: "File name '{0}' differs from already included file name '{1}' only in casing"
+        },
+        new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead: {
+            code: 1150,
+            category: 1,
+            key: "'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead."
+        },
+        var_let_or_const_expected: {
+            code: 1152,
+            category: 1,
+            key: "'var', 'let' or 'const' expected."
+        },
+        let_declarations_are_only_available_when_targeting_ECMAScript_6_and_higher: {
+            code: 1153,
+            category: 1,
+            key: "'let' declarations are only available when targeting ECMAScript 6 and higher."
+        },
+        const_declarations_are_only_available_when_targeting_ECMAScript_6_and_higher: {
+            code: 1154,
+            category: 1,
+            key: "'const' declarations are only available when targeting ECMAScript 6 and higher."
+        },
+        const_declarations_must_be_initialized: {
+            code: 1155,
+            category: 1,
+            key: "'const' declarations must be initialized"
+        },
+        const_declarations_can_only_be_declared_inside_a_block: {
+            code: 1156,
+            category: 1,
+            key: "'const' declarations can only be declared inside a block."
+        },
+        let_declarations_can_only_be_declared_inside_a_block: {
+            code: 1157,
+            category: 1,
+            key: "'let' declarations can only be declared inside a block."
+        },
+        Unterminated_template_literal: {
+            code: 1160,
+            category: 1,
+            key: "Unterminated template literal."
+        },
+        Unterminated_regular_expression_literal: {
+            code: 1161,
+            category: 1,
+            key: "Unterminated regular expression literal."
+        },
+        An_object_member_cannot_be_declared_optional: {
+            code: 1162,
+            category: 1,
+            key: "An object member cannot be declared optional."
+        },
+        yield_expression_must_be_contained_within_a_generator_declaration: {
+            code: 1163,
+            category: 1,
+            key: "'yield' expression must be contained_within a generator declaration."
+        },
+        Computed_property_names_are_not_allowed_in_enums: {
+            code: 1164,
+            category: 1,
+            key: "Computed property names are not allowed in enums."
+        },
+        A_computed_property_name_in_an_ambient_context_must_directly_refer_to_a_built_in_symbol: {
+            code: 1165,
+            category: 1,
+            key: "A computed property name in an ambient context must directly refer to a built-in symbol."
+        },
+        A_computed_property_name_in_a_class_property_declaration_must_directly_refer_to_a_built_in_symbol: {
+            code: 1166,
+            category: 1,
+            key: "A computed property name in a class property declaration must directly refer to a built-in symbol."
+        },
+        Computed_property_names_are_only_available_when_targeting_ECMAScript_6_and_higher: {
+            code: 1167,
+            category: 1,
+            key: "Computed property names are only available when targeting ECMAScript 6 and higher."
+        },
+        A_computed_property_name_in_a_method_overload_must_directly_refer_to_a_built_in_symbol: {
+            code: 1168,
+            category: 1,
+            key: "A computed property name in a method overload must directly refer to a built-in symbol."
+        },
+        A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol: {
+            code: 1169,
+            category: 1,
+            key: "A computed property name in an interface must directly refer to a built-in symbol."
+        },
+        A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol: {
+            code: 1170,
+            category: 1,
+            key: "A computed property name in a type literal must directly refer to a built-in symbol."
+        },
+        A_comma_expression_is_not_allowed_in_a_computed_property_name: {
+            code: 1171,
+            category: 1,
+            key: "A comma expression is not allowed in a computed property name."
+        },
+        extends_clause_already_seen: {
+            code: 1172,
+            category: 1,
+            key: "'extends' clause already seen."
+        },
+        extends_clause_must_precede_implements_clause: {
+            code: 1173,
+            category: 1,
+            key: "'extends' clause must precede 'implements' clause."
+        },
+        Classes_can_only_extend_a_single_class: {
+            code: 1174,
+            category: 1,
+            key: "Classes can only extend a single class."
+        },
+        implements_clause_already_seen: {
+            code: 1175,
+            category: 1,
+            key: "'implements' clause already seen."
+        },
+        Interface_declaration_cannot_have_implements_clause: {
+            code: 1176,
+            category: 1,
+            key: "Interface declaration cannot have 'implements' clause."
+        },
+        Binary_digit_expected: {
+            code: 1177,
+            category: 1,
+            key: "Binary digit expected."
+        },
+        Octal_digit_expected: {
+            code: 1178,
+            category: 1,
+            key: "Octal digit expected."
+        },
+        Unexpected_token_expected: {
+            code: 1179,
+            category: 1,
+            key: "Unexpected token. '{' expected."
+        },
+        Property_destructuring_pattern_expected: {
+            code: 1180,
+            category: 1,
+            key: "Property destructuring pattern expected."
+        },
+        Array_element_destructuring_pattern_expected: {
+            code: 1181,
+            category: 1,
+            key: "Array element destructuring pattern expected."
+        },
+        A_destructuring_declaration_must_have_an_initializer: {
+            code: 1182,
+            category: 1,
+            key: "A destructuring declaration must have an initializer."
+        },
+        Destructuring_declarations_are_not_allowed_in_ambient_contexts: {
+            code: 1183,
+            category: 1,
+            key: "Destructuring declarations are not allowed in ambient contexts."
+        },
+        An_implementation_cannot_be_declared_in_ambient_contexts: {
+            code: 1184,
+            category: 1,
+            key: "An implementation cannot be declared in ambient contexts."
+        },
+        Modifiers_cannot_appear_here: {
+            code: 1184,
+            category: 1,
+            key: "Modifiers cannot appear here."
+        },
+        Merge_conflict_marker_encountered: {
+            code: 1185,
+            category: 1,
+            key: "Merge conflict marker encountered."
+        },
+        A_rest_element_cannot_have_an_initializer: {
+            code: 1186,
+            category: 1,
+            key: "A rest element cannot have an initializer."
+        },
+        A_parameter_property_may_not_be_a_binding_pattern: {
+            code: 1187,
+            category: 1,
+            key: "A parameter property may not be a binding pattern."
+        },
+        Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement: {
+            code: 1188,
+            category: 1,
+            key: "Only a single variable declaration is allowed in a 'for...of' statement."
+        },
+        The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer: {
+            code: 1189,
+            category: 1,
+            key: "The variable declaration of a 'for...in' statement cannot have an initializer."
+        },
+        The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer: {
+            code: 1190,
+            category: 1,
+            key: "The variable declaration of a 'for...of' statement cannot have an initializer."
+        },
+        An_import_declaration_cannot_have_modifiers: {
+            code: 1191,
+            category: 1,
+            key: "An import declaration cannot have modifiers."
+        },
+        External_module_0_has_no_default_export_or_export_assignment: {
+            code: 1192,
+            category: 1,
+            key: "External module '{0}' has no default export or export assignment."
+        },
+        An_export_declaration_cannot_have_modifiers: {
+            code: 1193,
+            category: 1,
+            key: "An export declaration cannot have modifiers."
+        },
+        Export_declarations_are_not_permitted_in_an_internal_module: {
+            code: 1194,
+            category: 1,
+            key: "Export declarations are not permitted in an internal module."
+        },
+        Catch_clause_variable_name_must_be_an_identifier: {
+            code: 1195,
+            category: 1,
+            key: "Catch clause variable name must be an identifier."
+        },
+        Catch_clause_variable_cannot_have_a_type_annotation: {
+            code: 1196,
+            category: 1,
+            key: "Catch clause variable cannot have a type annotation."
+        },
+        Catch_clause_variable_cannot_have_an_initializer: {
+            code: 1197,
+            category: 1,
+            key: "Catch clause variable cannot have an initializer."
+        },
+        An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: {
+            code: 1198,
+            category: 1,
+            key: "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive."
+        },
+        Unterminated_Unicode_escape_sequence: {
+            code: 1199,
+            category: 1,
+            key: "Unterminated Unicode escape sequence."
+        },
+        Duplicate_identifier_0: {
+            code: 2300,
+            category: 1,
+            key: "Duplicate identifier '{0}'."
+        },
+        Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: {
+            code: 2301,
+            category: 1,
+            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: 1,
+            key: "Static members cannot reference class type parameters."
+        },
+        Circular_definition_of_import_alias_0: {
+            code: 2303,
+            category: 1,
+            key: "Circular definition of import alias '{0}'."
+        },
+        Cannot_find_name_0: {
+            code: 2304,
+            category: 1,
+            key: "Cannot find name '{0}'."
+        },
+        Module_0_has_no_exported_member_1: {
+            code: 2305,
+            category: 1,
+            key: "Module '{0}' has no exported member '{1}'."
+        },
+        File_0_is_not_an_external_module: {
+            code: 2306,
+            category: 1,
+            key: "File '{0}' is not an external module."
+        },
+        Cannot_find_external_module_0: {
+            code: 2307,
+            category: 1,
+            key: "Cannot find external module '{0}'."
+        },
+        A_module_cannot_have_more_than_one_export_assignment: {
+            code: 2308,
+            category: 1,
+            key: "A module cannot have more than one export assignment."
+        },
+        An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements: {
+            code: 2309,
+            category: 1,
+            key: "An export assignment cannot be used in a module with other exported elements."
+        },
+        Type_0_recursively_references_itself_as_a_base_type: {
+            code: 2310,
+            category: 1,
+            key: "Type '{0}' recursively references itself as a base type."
+        },
+        A_class_may_only_extend_another_class: {
+            code: 2311,
+            category: 1,
+            key: "A class may only extend another class."
+        },
+        An_interface_may_only_extend_a_class_or_another_interface: {
+            code: 2312,
+            category: 1,
+            key: "An interface may only extend a class or another interface."
+        },
+        Constraint_of_a_type_parameter_cannot_reference_any_type_parameter_from_the_same_type_parameter_list: {
+            code: 2313,
+            category: 1,
+            key: "Constraint of a type parameter cannot reference any type parameter from the same type parameter list."
+        },
+        Generic_type_0_requires_1_type_argument_s: {
+            code: 2314,
+            category: 1,
+            key: "Generic type '{0}' requires {1} type argument(s)."
+        },
+        Type_0_is_not_generic: {
+            code: 2315,
+            category: 1,
+            key: "Type '{0}' is not generic."
+        },
+        Global_type_0_must_be_a_class_or_interface_type: {
+            code: 2316,
+            category: 1,
+            key: "Global type '{0}' must be a class or interface type."
+        },
+        Global_type_0_must_have_1_type_parameter_s: {
+            code: 2317,
+            category: 1,
+            key: "Global type '{0}' must have {1} type parameter(s)."
+        },
+        Cannot_find_global_type_0: {
+            code: 2318,
+            category: 1,
+            key: "Cannot find global type '{0}'."
+        },
+        Named_property_0_of_types_1_and_2_are_not_identical: {
+            code: 2319,
+            category: 1,
+            key: "Named property '{0}' of types '{1}' and '{2}' are not identical."
+        },
+        Interface_0_cannot_simultaneously_extend_types_1_and_2: {
+            code: 2320,
+            category: 1,
+            key: "Interface '{0}' cannot simultaneously extend types '{1}' and '{2}'."
+        },
+        Excessive_stack_depth_comparing_types_0_and_1: {
+            code: 2321,
+            category: 1,
+            key: "Excessive stack depth comparing types '{0}' and '{1}'."
+        },
+        Type_0_is_not_assignable_to_type_1: {
+            code: 2322,
+            category: 1,
+            key: "Type '{0}' is not assignable to type '{1}'."
+        },
+        Property_0_is_missing_in_type_1: {
+            code: 2324,
+            category: 1,
+            key: "Property '{0}' is missing in type '{1}'."
+        },
+        Property_0_is_private_in_type_1_but_not_in_type_2: {
+            code: 2325,
+            category: 1,
+            key: "Property '{0}' is private in type '{1}' but not in type '{2}'."
+        },
+        Types_of_property_0_are_incompatible: {
+            code: 2326,
+            category: 1,
+            key: "Types of property '{0}' are incompatible."
+        },
+        Property_0_is_optional_in_type_1_but_required_in_type_2: {
+            code: 2327,
+            category: 1,
+            key: "Property '{0}' is optional in type '{1}' but required in type '{2}'."
+        },
+        Types_of_parameters_0_and_1_are_incompatible: {
+            code: 2328,
+            category: 1,
+            key: "Types of parameters '{0}' and '{1}' are incompatible."
+        },
+        Index_signature_is_missing_in_type_0: {
+            code: 2329,
+            category: 1,
+            key: "Index signature is missing in type '{0}'."
+        },
+        Index_signatures_are_incompatible: {
+            code: 2330,
+            category: 1,
+            key: "Index signatures are incompatible."
+        },
+        this_cannot_be_referenced_in_a_module_body: {
+            code: 2331,
+            category: 1,
+            key: "'this' cannot be referenced in a module body."
+        },
+        this_cannot_be_referenced_in_current_location: {
+            code: 2332,
+            category: 1,
+            key: "'this' cannot be referenced in current location."
+        },
+        this_cannot_be_referenced_in_constructor_arguments: {
+            code: 2333,
+            category: 1,
+            key: "'this' cannot be referenced in constructor arguments."
+        },
+        this_cannot_be_referenced_in_a_static_property_initializer: {
+            code: 2334,
+            category: 1,
+            key: "'this' cannot be referenced in a static property initializer."
+        },
+        super_can_only_be_referenced_in_a_derived_class: {
+            code: 2335,
+            category: 1,
+            key: "'super' can only be referenced in a derived class."
+        },
+        super_cannot_be_referenced_in_constructor_arguments: {
+            code: 2336,
+            category: 1,
+            key: "'super' cannot be referenced in constructor arguments."
+        },
+        Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors: {
+            code: 2337,
+            category: 1,
+            key: "Super calls are not permitted outside constructors or in nested functions inside constructors"
+        },
+        super_property_access_is_permitted_only_in_a_constructor_member_function_or_member_accessor_of_a_derived_class: {
+            code: 2338,
+            category: 1,
+            key: "'super' property access is permitted only in a constructor, member function, or member accessor of a derived class"
+        },
+        Property_0_does_not_exist_on_type_1: {
+            code: 2339,
+            category: 1,
+            key: "Property '{0}' does not exist on type '{1}'."
+        },
+        Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword: {
+            code: 2340,
+            category: 1,
+            key: "Only public and protected methods of the base class are accessible via the 'super' keyword"
+        },
+        Property_0_is_private_and_only_accessible_within_class_1: {
+            code: 2341,
+            category: 1,
+            key: "Property '{0}' is private and only accessible within class '{1}'."
+        },
+        An_index_expression_argument_must_be_of_type_string_number_symbol_or_any: {
+            code: 2342,
+            category: 1,
+            key: "An index expression argument must be of type 'string', 'number', 'symbol, or 'any'."
+        },
+        Type_0_does_not_satisfy_the_constraint_1: {
+            code: 2344,
+            category: 1,
+            key: "Type '{0}' does not satisfy the constraint '{1}'."
+        },
+        Argument_of_type_0_is_not_assignable_to_parameter_of_type_1: {
+            code: 2345,
+            category: 1,
+            key: "Argument of type '{0}' is not assignable to parameter of type '{1}'."
+        },
+        Supplied_parameters_do_not_match_any_signature_of_call_target: {
+            code: 2346,
+            category: 1,
+            key: "Supplied parameters do not match any signature of call target."
+        },
+        Untyped_function_calls_may_not_accept_type_arguments: {
+            code: 2347,
+            category: 1,
+            key: "Untyped function calls may not accept type arguments."
+        },
+        Value_of_type_0_is_not_callable_Did_you_mean_to_include_new: {
+            code: 2348,
+            category: 1,
+            key: "Value of type '{0}' is not callable. Did you mean to include 'new'?"
+        },
+        Cannot_invoke_an_expression_whose_type_lacks_a_call_signature: {
+            code: 2349,
+            category: 1,
+            key: "Cannot invoke an expression whose type lacks a call signature."
+        },
+        Only_a_void_function_can_be_called_with_the_new_keyword: {
+            code: 2350,
+            category: 1,
+            key: "Only a void function can be called with the 'new' keyword."
+        },
+        Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature: {
+            code: 2351,
+            category: 1,
+            key: "Cannot use 'new' with an expression whose type lacks a call or construct signature."
+        },
+        Neither_type_0_nor_type_1_is_assignable_to_the_other: {
+            code: 2352,
+            category: 1,
+            key: "Neither type '{0}' nor type '{1}' is assignable to the other."
+        },
+        No_best_common_type_exists_among_return_expressions: {
+            code: 2354,
+            category: 1,
+            key: "No best common type exists among return expressions."
+        },
+        A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_or_consist_of_a_single_throw_statement: {
+            code: 2355,
+            category: 1,
+            key: "A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement."
+        },
+        An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type: {
+            code: 2356,
+            category: 1,
+            key: "An arithmetic operand must be of type 'any', 'number' or an enum type."
+        },
+        The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer: {
+            code: 2357,
+            category: 1,
+            key: "The operand of an increment or decrement operator must be a variable, property or indexer."
+        },
+        The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: {
+            code: 2358,
+            category: 1,
+            key: "The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter."
+        },
+        The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_Function_interface_type: {
+            code: 2359,
+            category: 1,
+            key: "The right-hand side of an 'instanceof' expression must be of type 'any' or of a type assignable to the 'Function' interface type."
+        },
+        The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol: {
+            code: 2360,
+            category: 1,
+            key: "The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'."
+        },
+        The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: {
+            code: 2361,
+            category: 1,
+            key: "The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter"
+        },
+        The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: {
+            code: 2362,
+            category: 1,
+            key: "The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type."
+        },
+        The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: {
+            code: 2363,
+            category: 1,
+            key: "The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type."
+        },
+        Invalid_left_hand_side_of_assignment_expression: {
+            code: 2364,
+            category: 1,
+            key: "Invalid left-hand side of assignment expression."
+        },
+        Operator_0_cannot_be_applied_to_types_1_and_2: {
+            code: 2365,
+            category: 1,
+            key: "Operator '{0}' cannot be applied to types '{1}' and '{2}'."
+        },
+        Type_parameter_name_cannot_be_0: {
+            code: 2368,
+            category: 1,
+            key: "Type parameter name cannot be '{0}'"
+        },
+        A_parameter_property_is_only_allowed_in_a_constructor_implementation: {
+            code: 2369,
+            category: 1,
+            key: "A parameter property is only allowed in a constructor implementation."
+        },
+        A_rest_parameter_must_be_of_an_array_type: {
+            code: 2370,
+            category: 1,
+            key: "A rest parameter must be of an array type."
+        },
+        A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation: {
+            code: 2371,
+            category: 1,
+            key: "A parameter initializer is only allowed in a function or constructor implementation."
+        },
+        Parameter_0_cannot_be_referenced_in_its_initializer: {
+            code: 2372,
+            category: 1,
+            key: "Parameter '{0}' cannot be referenced in its initializer."
+        },
+        Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it: {
+            code: 2373,
+            category: 1,
+            key: "Initializer of parameter '{0}' cannot reference identifier '{1}' declared after it."
+        },
+        Duplicate_string_index_signature: {
+            code: 2374,
+            category: 1,
+            key: "Duplicate string index signature."
+        },
+        Duplicate_number_index_signature: {
+            code: 2375,
+            category: 1,
+            key: "Duplicate number index signature."
+        },
+        A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_or_has_parameter_properties: {
+            code: 2376,
+            category: 1,
+            key: "A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties."
+        },
+        Constructors_for_derived_classes_must_contain_a_super_call: {
+            code: 2377,
+            category: 1,
+            key: "Constructors for derived classes must contain a 'super' call."
+        },
+        A_get_accessor_must_return_a_value_or_consist_of_a_single_throw_statement: {
+            code: 2378,
+            category: 1,
+            key: "A 'get' accessor must return a value or consist of a single 'throw' statement."
+        },
+        Getter_and_setter_accessors_do_not_agree_in_visibility: {
+            code: 2379,
+            category: 1,
+            key: "Getter and setter accessors do not agree in visibility."
+        },
+        get_and_set_accessor_must_have_the_same_type: {
+            code: 2380,
+            category: 1,
+            key: "'get' and 'set' accessor must have the same type."
+        },
+        A_signature_with_an_implementation_cannot_use_a_string_literal_type: {
+            code: 2381,
+            category: 1,
+            key: "A signature with an implementation cannot use a string literal type."
+        },
+        Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature: {
+            code: 2382,
+            category: 1,
+            key: "Specialized overload signature is not assignable to any non-specialized signature."
+        },
+        Overload_signatures_must_all_be_exported_or_not_exported: {
+            code: 2383,
+            category: 1,
+            key: "Overload signatures must all be exported or not exported."
+        },
+        Overload_signatures_must_all_be_ambient_or_non_ambient: {
+            code: 2384,
+            category: 1,
+            key: "Overload signatures must all be ambient or non-ambient."
+        },
+        Overload_signatures_must_all_be_public_private_or_protected: {
+            code: 2385,
+            category: 1,
+            key: "Overload signatures must all be public, private or protected."
+        },
+        Overload_signatures_must_all_be_optional_or_required: {
+            code: 2386,
+            category: 1,
+            key: "Overload signatures must all be optional or required."
+        },
+        Function_overload_must_be_static: {
+            code: 2387,
+            category: 1,
+            key: "Function overload must be static."
+        },
+        Function_overload_must_not_be_static: {
+            code: 2388,
+            category: 1,
+            key: "Function overload must not be static."
+        },
+        Function_implementation_name_must_be_0: {
+            code: 2389,
+            category: 1,
+            key: "Function implementation name must be '{0}'."
+        },
+        Constructor_implementation_is_missing: {
+            code: 2390,
+            category: 1,
+            key: "Constructor implementation is missing."
+        },
+        Function_implementation_is_missing_or_not_immediately_following_the_declaration: {
+            code: 2391,
+            category: 1,
+            key: "Function implementation is missing or not immediately following the declaration."
+        },
+        Multiple_constructor_implementations_are_not_allowed: {
+            code: 2392,
+            category: 1,
+            key: "Multiple constructor implementations are not allowed."
+        },
+        Duplicate_function_implementation: {
+            code: 2393,
+            category: 1,
+            key: "Duplicate function implementation."
+        },
+        Overload_signature_is_not_compatible_with_function_implementation: {
+            code: 2394,
+            category: 1,
+            key: "Overload signature is not compatible with function implementation."
+        },
+        Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local: {
+            code: 2395,
+            category: 1,
+            key: "Individual declarations in merged declaration {0} must be all exported or all local."
+        },
+        Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters: {
+            code: 2396,
+            category: 1,
+            key: "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters."
+        },
+        Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference: {
+            code: 2399,
+            category: 1,
+            key: "Duplicate identifier '_this'. Compiler uses variable declaration '_this' to capture 'this' reference."
+        },
+        Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference: {
+            code: 2400,
+            category: 1,
+            key: "Expression resolves to variable declaration '_this' that compiler uses to capture 'this' reference."
+        },
+        Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference: {
+            code: 2401,
+            category: 1,
+            key: "Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference."
+        },
+        Expression_resolves_to_super_that_compiler_uses_to_capture_base_class_reference: {
+            code: 2402,
+            category: 1,
+            key: "Expression resolves to '_super' that compiler uses to capture base class reference."
+        },
+        Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2: {
+            code: 2403,
+            category: 1,
+            key: "Subsequent variable declarations must have the same type.  Variable '{0}' must be of type '{1}', but here has type '{2}'."
+        },
+        The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation: {
+            code: 2404,
+            category: 1,
+            key: "The left-hand side of a 'for...in' statement cannot use a type annotation."
+        },
+        The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any: {
+            code: 2405,
+            category: 1,
+            key: "The left-hand side of a 'for...in' statement must be of type 'string' or 'any'."
+        },
+        Invalid_left_hand_side_in_for_in_statement: {
+            code: 2406,
+            category: 1,
+            key: "Invalid left-hand side in 'for...in' statement."
+        },
+        The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter: {
+            code: 2407,
+            category: 1,
+            key: "The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter."
+        },
+        Setters_cannot_return_a_value: {
+            code: 2408,
+            category: 1,
+            key: "Setters cannot return a value."
+        },
+        Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class: {
+            code: 2409,
+            category: 1,
+            key: "Return type of constructor signature must be assignable to the instance type of the class"
+        },
+        All_symbols_within_a_with_block_will_be_resolved_to_any: {
+            code: 2410,
+            category: 1,
+            key: "All symbols within a 'with' block will be resolved to 'any'."
+        },
+        Property_0_of_type_1_is_not_assignable_to_string_index_type_2: {
+            code: 2411,
+            category: 1,
+            key: "Property '{0}' of type '{1}' is not assignable to string index type '{2}'."
+        },
+        Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2: {
+            code: 2412,
+            category: 1,
+            key: "Property '{0}' of type '{1}' is not assignable to numeric index type '{2}'."
+        },
+        Numeric_index_type_0_is_not_assignable_to_string_index_type_1: {
+            code: 2413,
+            category: 1,
+            key: "Numeric index type '{0}' is not assignable to string index type '{1}'."
+        },
+        Class_name_cannot_be_0: {
+            code: 2414,
+            category: 1,
+            key: "Class name cannot be '{0}'"
+        },
+        Class_0_incorrectly_extends_base_class_1: {
+            code: 2415,
+            category: 1,
+            key: "Class '{0}' incorrectly extends base class '{1}'."
+        },
+        Class_static_side_0_incorrectly_extends_base_class_static_side_1: {
+            code: 2417,
+            category: 1,
+            key: "Class static side '{0}' incorrectly extends base class static side '{1}'."
+        },
+        Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0: {
+            code: 2419,
+            category: 1,
+            key: "Type name '{0}' in extends clause does not reference constructor function for '{0}'."
+        },
+        Class_0_incorrectly_implements_interface_1: {
+            code: 2420,
+            category: 1,
+            key: "Class '{0}' incorrectly implements interface '{1}'."
+        },
+        A_class_may_only_implement_another_class_or_interface: {
+            code: 2422,
+            category: 1,
+            key: "A class may only implement another class or interface."
+        },
+        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_accessor: {
+            code: 2423,
+            category: 1,
+            key: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member accessor."
+        },
+        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_property: {
+            code: 2424,
+            category: 1,
+            key: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member property."
+        },
+        Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_function: {
+            code: 2425,
+            category: 1,
+            key: "Class '{0}' defines instance member property '{1}', but extended class '{2}' defines it as instance member function."
+        },
+        Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_function: {
+            code: 2426,
+            category: 1,
+            key: "Class '{0}' defines instance member accessor '{1}', but extended class '{2}' defines it as instance member function."
+        },
+        Interface_name_cannot_be_0: {
+            code: 2427,
+            category: 1,
+            key: "Interface name cannot be '{0}'"
+        },
+        All_declarations_of_an_interface_must_have_identical_type_parameters: {
+            code: 2428,
+            category: 1,
+            key: "All declarations of an interface must have identical type parameters."
+        },
+        Interface_0_incorrectly_extends_interface_1: {
+            code: 2430,
+            category: 1,
+            key: "Interface '{0}' incorrectly extends interface '{1}'."
+        },
+        Enum_name_cannot_be_0: {
+            code: 2431,
+            category: 1,
+            key: "Enum name cannot be '{0}'"
+        },
+        In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enum_element: {
+            code: 2432,
+            category: 1,
+            key: "In an enum with multiple declarations, only one declaration can omit an initializer for its first enum element."
+        },
+        A_module_declaration_cannot_be_in_a_different_file_from_a_class_or_function_with_which_it_is_merged: {
+            code: 2433,
+            category: 1,
+            key: "A module declaration cannot be in a different file from a class or function with which it is merged"
+        },
+        A_module_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged: {
+            code: 2434,
+            category: 1,
+            key: "A module declaration cannot be located prior to a class or function with which it is merged"
+        },
+        Ambient_external_modules_cannot_be_nested_in_other_modules: {
+            code: 2435,
+            category: 1,
+            key: "Ambient external modules cannot be nested in other modules."
+        },
+        Ambient_external_module_declaration_cannot_specify_relative_module_name: {
+            code: 2436,
+            category: 1,
+            key: "Ambient external module declaration cannot specify relative module name."
+        },
+        Module_0_is_hidden_by_a_local_declaration_with_the_same_name: {
+            code: 2437,
+            category: 1,
+            key: "Module '{0}' is hidden by a local declaration with the same name"
+        },
+        Import_name_cannot_be_0: {
+            code: 2438,
+            category: 1,
+            key: "Import name cannot be '{0}'"
+        },
+        Import_or_export_declaration_in_an_ambient_external_module_declaration_cannot_reference_external_module_through_relative_external_module_name: {
+            code: 2439,
+            category: 1,
+            key: "Import or export declaration in an ambient external module declaration cannot reference external module through relative external module name."
+        },
+        Import_declaration_conflicts_with_local_declaration_of_0: {
+            code: 2440,
+            category: 1,
+            key: "Import declaration conflicts with local declaration of '{0}'"
+        },
+        Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_an_external_module: {
+            code: 2441,
+            category: 1,
+            key: "Duplicate identifier '{0}'. Compiler reserves name '{1}' in top level scope of an external module."
+        },
+        Types_have_separate_declarations_of_a_private_property_0: {
+            code: 2442,
+            category: 1,
+            key: "Types have separate declarations of a private property '{0}'."
+        },
+        Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2: {
+            code: 2443,
+            category: 1,
+            key: "Property '{0}' is protected but type '{1}' is not a class derived from '{2}'."
+        },
+        Property_0_is_protected_in_type_1_but_public_in_type_2: {
+            code: 2444,
+            category: 1,
+            key: "Property '{0}' is protected in type '{1}' but public in type '{2}'."
+        },
+        Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses: {
+            code: 2445,
+            category: 1,
+            key: "Property '{0}' is protected and only accessible within class '{1}' and its subclasses."
+        },
+        Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1: {
+            code: 2446,
+            category: 1,
+            key: "Property '{0}' is protected and only accessible through an instance of class '{1}'."
+        },
+        The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead: {
+            code: 2447,
+            category: 1,
+            key: "The '{0}' operator is not allowed for boolean types. Consider using '{1}' instead."
+        },
+        Block_scoped_variable_0_used_before_its_declaration: {
+            code: 2448,
+            category: 1,
+            key: "Block-scoped variable '{0}' used before its declaration."
+        },
+        The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant: {
+            code: 2449,
+            category: 1,
+            key: "The operand of an increment or decrement operator cannot be a constant."
+        },
+        Left_hand_side_of_assignment_expression_cannot_be_a_constant: {
+            code: 2450,
+            category: 1,
+            key: "Left-hand side of assignment expression cannot be a constant."
+        },
+        Cannot_redeclare_block_scoped_variable_0: {
+            code: 2451,
+            category: 1,
+            key: "Cannot redeclare block-scoped variable '{0}'."
+        },
+        An_enum_member_cannot_have_a_numeric_name: {
+            code: 2452,
+            category: 1,
+            key: "An enum member cannot have a numeric name."
+        },
+        The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_type_arguments_explicitly: {
+            code: 2453,
+            category: 1,
+            key: "The type argument for type parameter '{0}' cannot be inferred from the usage. Consider specifying the type arguments explicitly."
+        },
+        Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0: {
+            code: 2455,
+            category: 1,
+            key: "Type argument candidate '{1}' is not a valid type argument because it is not a supertype of candidate '{0}'."
+        },
+        Type_alias_0_circularly_references_itself: {
+            code: 2456,
+            category: 1,
+            key: "Type alias '{0}' circularly references itself."
+        },
+        Type_alias_name_cannot_be_0: {
+            code: 2457,
+            category: 1,
+            key: "Type alias name cannot be '{0}'"
+        },
+        An_AMD_module_cannot_have_multiple_name_assignments: {
+            code: 2458,
+            category: 1,
+            key: "An AMD module cannot have multiple name assignments."
+        },
+        Type_0_has_no_property_1_and_no_string_index_signature: {
+            code: 2459,
+            category: 1,
+            key: "Type '{0}' has no property '{1}' and no string index signature."
+        },
+        Type_0_has_no_property_1: {
+            code: 2460,
+            category: 1,
+            key: "Type '{0}' has no property '{1}'."
+        },
+        Type_0_is_not_an_array_type: {
+            code: 2461,
+            category: 1,
+            key: "Type '{0}' is not an array type."
+        },
+        A_rest_element_must_be_last_in_an_array_destructuring_pattern: {
+            code: 2462,
+            category: 1,
+            key: "A rest element must be last in an array destructuring pattern"
+        },
+        A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature: {
+            code: 2463,
+            category: 1,
+            key: "A binding pattern parameter cannot be optional in an implementation signature."
+        },
+        A_computed_property_name_must_be_of_type_string_number_symbol_or_any: {
+            code: 2464,
+            category: 1,
+            key: "A computed property name must be of type 'string', 'number', 'symbol', or 'any'."
+        },
+        this_cannot_be_referenced_in_a_computed_property_name: {
+            code: 2465,
+            category: 1,
+            key: "'this' cannot be referenced in a computed property name."
+        },
+        super_cannot_be_referenced_in_a_computed_property_name: {
+            code: 2466,
+            category: 1,
+            key: "'super' cannot be referenced in a computed property name."
+        },
+        A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type: {
+            code: 2467,
+            category: 1,
+            key: "A computed property name cannot reference a type parameter from its containing type."
+        },
+        Cannot_find_global_value_0: {
+            code: 2468,
+            category: 1,
+            key: "Cannot find global value '{0}'."
+        },
+        The_0_operator_cannot_be_applied_to_type_symbol: {
+            code: 2469,
+            category: 1,
+            key: "The '{0}' operator cannot be applied to type 'symbol'."
+        },
+        Symbol_reference_does_not_refer_to_the_global_Symbol_constructor_object: {
+            code: 2470,
+            category: 1,
+            key: "'Symbol' reference does not refer to the global Symbol constructor object."
+        },
+        A_computed_property_name_of_the_form_0_must_be_of_type_symbol: {
+            code: 2471,
+            category: 1,
+            key: "A computed property name of the form '{0}' must be of type 'symbol'."
+        },
+        Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_6_and_higher: {
+            code: 2472,
+            category: 1,
+            key: "Spread operator in 'new' expressions is only available when targeting ECMAScript 6 and higher."
+        },
+        Enum_declarations_must_all_be_const_or_non_const: {
+            code: 2473,
+            category: 1,
+            key: "Enum declarations must all be const or non-const."
+        },
+        In_const_enum_declarations_member_initializer_must_be_constant_expression: {
+            code: 2474,
+            category: 1,
+            key: "In 'const' enum declarations member initializer must be constant expression."
+        },
+        const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment: {
+            code: 2475,
+            category: 1,
+            key: "'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment."
+        },
+        A_const_enum_member_can_only_be_accessed_using_a_string_literal: {
+            code: 2476,
+            category: 1,
+            key: "A const enum member can only be accessed using a string literal."
+        },
+        const_enum_member_initializer_was_evaluated_to_a_non_finite_value: {
+            code: 2477,
+            category: 1,
+            key: "'const' enum member initializer was evaluated to a non-finite value."
+        },
+        const_enum_member_initializer_was_evaluated_to_disallowed_value_NaN: {
+            code: 2478,
+            category: 1,
+            key: "'const' enum member initializer was evaluated to disallowed value 'NaN'."
+        },
+        Property_0_does_not_exist_on_const_enum_1: {
+            code: 2479,
+            category: 1,
+            key: "Property '{0}' does not exist on 'const' enum '{1}'."
+        },
+        let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations: {
+            code: 2480,
+            category: 1,
+            key: "'let' is not allowed to be used as a name in 'let' or 'const' declarations."
+        },
+        Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1: {
+            code: 2481,
+            category: 1,
+            key: "Cannot initialize outer scoped variable '{0}' in the same scope as block scoped declaration '{1}'."
+        },
+        The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: {
+            code: 2483,
+            category: 1,
+            key: "The left-hand side of a 'for...of' statement cannot use a type annotation."
+        },
+        Export_declaration_conflicts_with_exported_declaration_of_0: {
+            code: 2484,
+            category: 1,
+            key: "Export declaration conflicts with exported declaration of '{0}'"
+        },
+        The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant: {
+            code: 2485,
+            category: 1,
+            key: "The left-hand side of a 'for...of' statement cannot be a previously defined constant."
+        },
+        The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant: {
+            code: 2486,
+            category: 1,
+            key: "The left-hand side of a 'for...in' statement cannot be a previously defined constant."
+        },
+        Invalid_left_hand_side_in_for_of_statement: {
+            code: 2487,
+            category: 1,
+            key: "Invalid left-hand side in 'for...of' statement."
+        },
+        The_right_hand_side_of_a_for_of_statement_must_have_a_Symbol_iterator_method_that_returns_an_iterator: {
+            code: 2488,
+            category: 1,
+            key: "The right-hand side of a 'for...of' statement must have a '[Symbol.iterator]()' method that returns an iterator."
+        },
+        The_iterator_returned_by_the_right_hand_side_of_a_for_of_statement_must_have_a_next_method: {
+            code: 2489,
+            category: 1,
+            key: "The iterator returned by the right-hand side of a 'for...of' statement must have a 'next()' method."
+        },
+        The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: {
+            code: 2490,
+            category: 1,
+            key: "The type returned by the 'next()' method of an iterator must have a 'value' property."
+        },
+        The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern: {
+            code: 2491,
+            category: 1,
+            key: "The left-hand side of a 'for...in' statement cannot be a destructuring pattern."
+        },
+        Cannot_redeclare_identifier_0_in_catch_clause: {
+            code: 2492,
+            category: 1,
+            key: "Cannot redeclare identifier '{0}' in catch clause"
+        },
+        Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2: {
+            code: 2493,
+            category: 1,
+            key: "Tuple type '{0}' with length '{1}' cannot be assigned to tuple with length '{2}'."
+        },
+        Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher: {
+            code: 2494,
+            category: 1,
+            key: "Using a string in a 'for...of' statement is only supported in ECMAScript 5 and higher."
+        },
+        Type_0_is_not_an_array_type_or_a_string_type: {
+            code: 2461,
+            category: 1,
+            key: "Type '{0}' is not an array type or a string type."
+        },
+        Import_declaration_0_is_using_private_name_1: {
+            code: 4000,
+            category: 1,
+            key: "Import declaration '{0}' is using private name '{1}'."
+        },
+        Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: {
+            code: 4002,
+            category: 1,
+            key: "Type parameter '{0}' of exported class has or is using private name '{1}'."
+        },
+        Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: {
+            code: 4004,
+            category: 1,
+            key: "Type parameter '{0}' of exported interface has or is using private name '{1}'."
+        },
+        Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: {
+            code: 4006,
+            category: 1,
+            key: "Type parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'."
+        },
+        Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: {
+            code: 4008,
+            category: 1,
+            key: "Type parameter '{0}' of call signature from exported interface has or is using private name '{1}'."
+        },
+        Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: {
+            code: 4010,
+            category: 1,
+            key: "Type parameter '{0}' of public static method from exported class has or is using private name '{1}'."
+        },
+        Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: {
+            code: 4012,
+            category: 1,
+            key: "Type parameter '{0}' of public method from exported class has or is using private name '{1}'."
+        },
+        Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: {
+            code: 4014,
+            category: 1,
+            key: "Type parameter '{0}' of method from exported interface has or is using private name '{1}'."
+        },
+        Type_parameter_0_of_exported_function_has_or_is_using_private_name_1: {
+            code: 4016,
+            category: 1,
+            key: "Type parameter '{0}' of exported function has or is using private name '{1}'."
+        },
+        Implements_clause_of_exported_class_0_has_or_is_using_private_name_1: {
+            code: 4019,
+            category: 1,
+            key: "Implements clause of exported class '{0}' has or is using private name '{1}'."
+        },
+        Extends_clause_of_exported_class_0_has_or_is_using_private_name_1: {
+            code: 4020,
+            category: 1,
+            key: "Extends clause of exported class '{0}' has or is using private name '{1}'."
+        },
+        Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1: {
+            code: 4022,
+            category: 1,
+            key: "Extends clause of exported interface '{0}' has or is using private name '{1}'."
+        },
+        Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: {
+            code: 4023,
+            category: 1,
+            key: "Exported variable '{0}' has or is using name '{1}' from external module {2} but cannot be named."
+        },
+        Exported_variable_0_has_or_is_using_name_1_from_private_module_2: {
+            code: 4024,
+            category: 1,
+            key: "Exported variable '{0}' has or is using name '{1}' from private module '{2}'."
+        },
+        Exported_variable_0_has_or_is_using_private_name_1: {
+            code: 4025,
+            category: 1,
+            key: "Exported variable '{0}' has or is using private name '{1}'."
+        },
+        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: {
+            code: 4026,
+            category: 1,
+            key: "Public static property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named."
+        },
+        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: {
+            code: 4027,
+            category: 1,
+            key: "Public static property '{0}' of exported class has or is using name '{1}' from private module '{2}'."
+        },
+        Public_static_property_0_of_exported_class_has_or_is_using_private_name_1: {
+            code: 4028,
+            category: 1,
+            key: "Public static property '{0}' of exported class has or is using private name '{1}'."
+        },
+        Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: {
+            code: 4029,
+            category: 1,
+            key: "Public property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named."
+        },
+        Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: {
+            code: 4030,
+            category: 1,
+            key: "Public property '{0}' of exported class has or is using name '{1}' from private module '{2}'."
+        },
+        Public_property_0_of_exported_class_has_or_is_using_private_name_1: {
+            code: 4031,
+            category: 1,
+            key: "Public property '{0}' of exported class has or is using private name '{1}'."
+        },
+        Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2: {
+            code: 4032,
+            category: 1,
+            key: "Property '{0}' of exported interface has or is using name '{1}' from private module '{2}'."
+        },
+        Property_0_of_exported_interface_has_or_is_using_private_name_1: {
+            code: 4033,
+            category: 1,
+            key: "Property '{0}' of exported interface has or is using private name '{1}'."
+        },
+        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: {
+            code: 4034,
+            category: 1,
+            key: "Parameter '{0}' of public static property setter from exported class has or is using name '{1}' from private module '{2}'."
+        },
+        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1: {
+            code: 4035,
+            category: 1,
+            key: "Parameter '{0}' of public static property setter from exported class has or is using private name '{1}'."
+        },
+        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: {
+            code: 4036,
+            category: 1,
+            key: "Parameter '{0}' of public property setter from exported class has or is using name '{1}' from private module '{2}'."
+        },
+        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1: {
+            code: 4037,
+            category: 1,
+            key: "Parameter '{0}' of public property setter from exported class has or is using private name '{1}'."
+        },
+        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: {
+            code: 4038,
+            category: 1,
+            key: "Return type of public static property getter from exported class has or is using name '{0}' from external module {1} but cannot be named."
+        },
+        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: {
+            code: 4039,
+            category: 1,
+            key: "Return type of public static property getter from exported class has or is using name '{0}' from private module '{1}'."
+        },
+        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0: {
+            code: 4040,
+            category: 1,
+            key: "Return type of public static property getter from exported class has or is using private name '{0}'."
+        },
+        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: {
+            code: 4041,
+            category: 1,
+            key: "Return type of public property getter from exported class has or is using name '{0}' from external module {1} but cannot be named."
+        },
+        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: {
+            code: 4042,
+            category: 1,
+            key: "Return type of public property getter from exported class has or is using name '{0}' from private module '{1}'."
+        },
+        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0: {
+            code: 4043,
+            category: 1,
+            key: "Return type of public property getter from exported class has or is using private name '{0}'."
+        },
+        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: {
+            code: 4044,
+            category: 1,
+            key: "Return type of constructor signature from exported interface has or is using name '{0}' from private module '{1}'."
+        },
+        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0: {
+            code: 4045,
+            category: 1,
+            key: "Return type of constructor signature from exported interface has or is using private name '{0}'."
+        },
+        Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: {
+            code: 4046,
+            category: 1,
+            key: "Return type of call signature from exported interface has or is using name '{0}' from private module '{1}'."
+        },
+        Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0: {
+            code: 4047,
+            category: 1,
+            key: "Return type of call signature from exported interface has or is using private name '{0}'."
+        },
+        Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: {
+            code: 4048,
+            category: 1,
+            key: "Return type of index signature from exported interface has or is using name '{0}' from private module '{1}'."
+        },
+        Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0: {
+            code: 4049,
+            category: 1,
+            key: "Return type of index signature from exported interface has or is using private name '{0}'."
+        },
+        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: {
+            code: 4050,
+            category: 1,
+            key: "Return type of public static method from exported class has or is using name '{0}' from external module {1} but cannot be named."
+        },
+        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: {
+            code: 4051,
+            category: 1,
+            key: "Return type of public static method from exported class has or is using name '{0}' from private module '{1}'."
+        },
+        Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0: {
+            code: 4052,
+            category: 1,
+            key: "Return type of public static method from exported class has or is using private name '{0}'."
+        },
+        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: {
+            code: 4053,
+            category: 1,
+            key: "Return type of public method from exported class has or is using name '{0}' from external module {1} but cannot be named."
+        },
+        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: {
+            code: 4054,
+            category: 1,
+            key: "Return type of public method from exported class has or is using name '{0}' from private module '{1}'."
+        },
+        Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0: {
+            code: 4055,
+            category: 1,
+            key: "Return type of public method from exported class has or is using private name '{0}'."
+        },
+        Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1: {
+            code: 4056,
+            category: 1,
+            key: "Return type of method from exported interface has or is using name '{0}' from private module '{1}'."
+        },
+        Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0: {
+            code: 4057,
+            category: 1,
+            key: "Return type of method from exported interface has or is using private name '{0}'."
+        },
+        Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: {
+            code: 4058,
+            category: 1,
+            key: "Return type of exported function has or is using name '{0}' from external module {1} but cannot be named."
+        },
+        Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1: {
+            code: 4059,
+            category: 1,
+            key: "Return type of exported function has or is using name '{0}' from private module '{1}'."
+        },
+        Return_type_of_exported_function_has_or_is_using_private_name_0: {
+            code: 4060,
+            category: 1,
+            key: "Return type of exported function has or is using private name '{0}'."
+        },
+        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: {
+            code: 4061,
+            category: 1,
+            key: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from external module {2} but cannot be named."
+        },
+        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2: {
+            code: 4062,
+            category: 1,
+            key: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from private module '{2}'."
+        },
+        Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1: {
+            code: 4063,
+            category: 1,
+            key: "Parameter '{0}' of constructor from exported class has or is using private name '{1}'."
+        },
+        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: {
+            code: 4064,
+            category: 1,
+            key: "Parameter '{0}' of constructor signature from exported interface has or is using name '{1}' from private module '{2}'."
+        },
+        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: {
+            code: 4065,
+            category: 1,
+            key: "Parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'."
+        },
+        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: {
+            code: 4066,
+            category: 1,
+            key: "Parameter '{0}' of call signature from exported interface has or is using name '{1}' from private module '{2}'."
+        },
+        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: {
+            code: 4067,
+            category: 1,
+            key: "Parameter '{0}' of call signature from exported interface has or is using private name '{1}'."
+        },
+        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: {
+            code: 4068,
+            category: 1,
+            key: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from external module {2} but cannot be named."
+        },
+        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: {
+            code: 4069,
+            category: 1,
+            key: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from private module '{2}'."
+        },
+        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: {
+            code: 4070,
+            category: 1,
+            key: "Parameter '{0}' of public static method from exported class has or is using private name '{1}'."
+        },
+        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: {
+            code: 4071,
+            category: 1,
+            key: "Parameter '{0}' of public method from exported class has or is using name '{1}' from external module {2} but cannot be named."
+        },
+        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: {
+            code: 4072,
+            category: 1,
+            key: "Parameter '{0}' of public method from exported class has or is using name '{1}' from private module '{2}'."
+        },
+        Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: {
+            code: 4073,
+            category: 1,
+            key: "Parameter '{0}' of public method from exported class has or is using private name '{1}'."
+        },
+        Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2: {
+            code: 4074,
+            category: 1,
+            key: "Parameter '{0}' of method from exported interface has or is using name '{1}' from private module '{2}'."
+        },
+        Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: {
+            code: 4075,
+            category: 1,
+            key: "Parameter '{0}' of method from exported interface has or is using private name '{1}'."
+        },
+        Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: {
+            code: 4076,
+            category: 1,
+            key: "Parameter '{0}' of exported function has or is using name '{1}' from external module {2} but cannot be named."
+        },
+        Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2: {
+            code: 4077,
+            category: 1,
+            key: "Parameter '{0}' of exported function has or is using name '{1}' from private module '{2}'."
+        },
+        Parameter_0_of_exported_function_has_or_is_using_private_name_1: {
+            code: 4078,
+            category: 1,
+            key: "Parameter '{0}' of exported function has or is using private name '{1}'."
+        },
+        Exported_type_alias_0_has_or_is_using_private_name_1: {
+            code: 4081,
+            category: 1,
+            key: "Exported type alias '{0}' has or is using private name '{1}'."
+        },
+        Loop_contains_block_scoped_variable_0_referenced_by_a_function_in_the_loop_This_is_only_supported_in_ECMAScript_6_or_higher: {
+            code: 4091,
+            category: 1,
+            key: "Loop contains block-scoped variable '{0}' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher."
+        },
+        The_current_host_does_not_support_the_0_option: {
+            code: 5001,
+            category: 1,
+            key: "The current host does not support the '{0}' option."
+        },
+        Cannot_find_the_common_subdirectory_path_for_the_input_files: {
+            code: 5009,
+            category: 1,
+            key: "Cannot find the common subdirectory path for the input files."
+        },
+        Cannot_read_file_0_Colon_1: {
+            code: 5012,
+            category: 1,
+            key: "Cannot read file '{0}': {1}"
+        },
+        Unsupported_file_encoding: {
+            code: 5013,
+            category: 1,
+            key: "Unsupported file encoding."
+        },
+        Unknown_compiler_option_0: {
+            code: 5023,
+            category: 1,
+            key: "Unknown compiler option '{0}'."
+        },
+        Compiler_option_0_requires_a_value_of_type_1: {
+            code: 5024,
+            category: 1,
+            key: "Compiler option '{0}' requires a value of type {1}."
+        },
+        Could_not_write_file_0_Colon_1: {
+            code: 5033,
+            category: 1,
+            key: "Could not write file '{0}': {1}"
+        },
+        Option_mapRoot_cannot_be_specified_without_specifying_sourcemap_option: {
+            code: 5038,
+            category: 1,
+            key: "Option 'mapRoot' cannot be specified without specifying 'sourcemap' option."
+        },
+        Option_sourceRoot_cannot_be_specified_without_specifying_sourcemap_option: {
+            code: 5039,
+            category: 1,
+            key: "Option 'sourceRoot' cannot be specified without specifying 'sourcemap' option."
+        },
+        Option_noEmit_cannot_be_specified_with_option_out_or_outDir: {
+            code: 5040,
+            category: 1,
+            key: "Option 'noEmit' cannot be specified with option 'out' or 'outDir'."
+        },
+        Option_noEmit_cannot_be_specified_with_option_declaration: {
+            code: 5041,
+            category: 1,
+            key: "Option 'noEmit' cannot be specified with option 'declaration'."
+        },
+        Option_project_cannot_be_mixed_with_source_files_on_a_command_line: {
+            code: 5042,
+            category: 1,
+            key: "Option 'project' cannot be mixed with source files on a command line."
+        },
+        Concatenate_and_emit_output_to_single_file: {
+            code: 6001,
+            category: 2,
+            key: "Concatenate and emit output to single file."
+        },
+        Generates_corresponding_d_ts_file: {
+            code: 6002,
+            category: 2,
+            key: "Generates corresponding '.d.ts' file."
+        },
+        Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: {
+            code: 6003,
+            category: 2,
+            key: "Specifies the location where debugger should locate map files instead of generated locations."
+        },
+        Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations: {
+            code: 6004,
+            category: 2,
+            key: "Specifies the location where debugger should locate TypeScript files instead of source locations."
+        },
+        Watch_input_files: {
+            code: 6005,
+            category: 2,
+            key: "Watch input files."
+        },
+        Redirect_output_structure_to_the_directory: {
+            code: 6006,
+            category: 2,
+            key: "Redirect output structure to the directory."
+        },
+        Do_not_erase_const_enum_declarations_in_generated_code: {
+            code: 6007,
+            category: 2,
+            key: "Do not erase const enum declarations in generated code."
+        },
+        Do_not_emit_outputs_if_any_type_checking_errors_were_reported: {
+            code: 6008,
+            category: 2,
+            key: "Do not emit outputs if any type checking errors were reported."
+        },
+        Do_not_emit_comments_to_output: {
+            code: 6009,
+            category: 2,
+            key: "Do not emit comments to output."
+        },
+        Do_not_emit_outputs: {
+            code: 6010,
+            category: 2,
+            key: "Do not emit outputs."
+        },
+        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES6_experimental: {
+            code: 6015,
+            category: 2,
+            key: "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES6' (experimental)"
+        },
+        Specify_module_code_generation_Colon_commonjs_or_amd: {
+            code: 6016,
+            category: 2,
+            key: "Specify module code generation: 'commonjs' or 'amd'"
+        },
+        Print_this_message: {
+            code: 6017,
+            category: 2,
+            key: "Print this message."
+        },
+        Print_the_compiler_s_version: {
+            code: 6019,
+            category: 2,
+            key: "Print the compiler's version."
+        },
+        Compile_the_project_in_the_given_directory: {
+            code: 6020,
+            category: 2,
+            key: "Compile the project in the given directory."
+        },
+        Syntax_Colon_0: {
+            code: 6023,
+            category: 2,
+            key: "Syntax: {0}"
+        },
+        options: {
+            code: 6024,
+            category: 2,
+            key: "options"
+        },
+        file: {
+            code: 6025,
+            category: 2,
+            key: "file"
+        },
+        Examples_Colon_0: {
+            code: 6026,
+            category: 2,
+            key: "Examples: {0}"
+        },
+        Options_Colon: {
+            code: 6027,
+            category: 2,
+            key: "Options:"
+        },
+        Version_0: {
+            code: 6029,
+            category: 2,
+            key: "Version {0}"
+        },
+        Insert_command_line_options_and_files_from_a_file: {
+            code: 6030,
+            category: 2,
+            key: "Insert command line options and files from a file."
+        },
+        File_change_detected_Starting_incremental_compilation: {
+            code: 6032,
+            category: 2,
+            key: "File change detected. Starting incremental compilation..."
+        },
+        KIND: {
+            code: 6034,
+            category: 2,
+            key: "KIND"
+        },
+        FILE: {
+            code: 6035,
+            category: 2,
+            key: "FILE"
+        },
+        VERSION: {
+            code: 6036,
+            category: 2,
+            key: "VERSION"
+        },
+        LOCATION: {
+            code: 6037,
+            category: 2,
+            key: "LOCATION"
+        },
+        DIRECTORY: {
+            code: 6038,
+            category: 2,
+            key: "DIRECTORY"
+        },
+        Compilation_complete_Watching_for_file_changes: {
+            code: 6042,
+            category: 2,
+            key: "Compilation complete. Watching for file changes."
+        },
+        Generates_corresponding_map_file: {
+            code: 6043,
+            category: 2,
+            key: "Generates corresponding '.map' file."
+        },
+        Compiler_option_0_expects_an_argument: {
+            code: 6044,
+            category: 1,
+            key: "Compiler option '{0}' expects an argument."
+        },
+        Unterminated_quoted_string_in_response_file_0: {
+            code: 6045,
+            category: 1,
+            key: "Unterminated quoted string in response file '{0}'."
+        },
+        Argument_for_module_option_must_be_commonjs_or_amd: {
+            code: 6046,
+            category: 1,
+            key: "Argument for '--module' option must be 'commonjs' or 'amd'."
+        },
+        Argument_for_target_option_must_be_es3_es5_or_es6: {
+            code: 6047,
+            category: 1,
+            key: "Argument for '--target' option must be 'es3', 'es5', or 'es6'."
+        },
+        Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1: {
+            code: 6048,
+            category: 1,
+            key: "Locale must be of the form <language> or <language>-<territory>. For example '{0}' or '{1}'."
+        },
+        Unsupported_locale_0: {
+            code: 6049,
+            category: 1,
+            key: "Unsupported locale '{0}'."
+        },
+        Unable_to_open_file_0: {
+            code: 6050,
+            category: 1,
+            key: "Unable to open file '{0}'."
+        },
+        Corrupted_locale_file_0: {
+            code: 6051,
+            category: 1,
+            key: "Corrupted locale file {0}."
+        },
+        Raise_error_on_expressions_and_declarations_with_an_implied_any_type: {
+            code: 6052,
+            category: 2,
+            key: "Raise error on expressions and declarations with an implied 'any' type."
+        },
+        File_0_not_found: {
+            code: 6053,
+            category: 1,
+            key: "File '{0}' not found."
+        },
+        File_0_must_have_extension_ts_or_d_ts: {
+            code: 6054,
+            category: 1,
+            key: "File '{0}' must have extension '.ts' or '.d.ts'."
+        },
+        Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures: {
+            code: 6055,
+            category: 2,
+            key: "Suppress noImplicitAny errors for indexing objects lacking index signatures."
+        },
+        Do_not_emit_declarations_for_code_that_has_an_internal_annotation: {
+            code: 6056,
+            category: 2,
+            key: "Do not emit declarations for code that has an '@internal' annotation."
+        },
+        Preserve_new_lines_when_emitting_code: {
+            code: 6057,
+            category: 2,
+            key: "Preserve new-lines when emitting code."
+        },
+        Variable_0_implicitly_has_an_1_type: {
+            code: 7005,
+            category: 1,
+            key: "Variable '{0}' implicitly has an '{1}' type."
+        },
+        Parameter_0_implicitly_has_an_1_type: {
+            code: 7006,
+            category: 1,
+            key: "Parameter '{0}' implicitly has an '{1}' type."
+        },
+        Member_0_implicitly_has_an_1_type: {
+            code: 7008,
+            category: 1,
+            key: "Member '{0}' implicitly has an '{1}' type."
+        },
+        new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type: {
+            code: 7009,
+            category: 1,
+            key: "'new' expression, whose target lacks a construct signature, implicitly has an 'any' type."
+        },
+        _0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type: {
+            code: 7010,
+            category: 1,
+            key: "'{0}', which lacks return-type annotation, implicitly has an '{1}' return type."
+        },
+        Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type: {
+            code: 7011,
+            category: 1,
+            key: "Function expression, which lacks return-type annotation, implicitly has an '{0}' return type."
+        },
+        Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: {
+            code: 7013,
+            category: 1,
+            key: "Construct signature, which lacks return-type annotation, implicitly has an 'any' return type."
+        },
+        Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_type_annotation: {
+            code: 7016,
+            category: 1,
+            key: "Property '{0}' implicitly has type 'any', because its 'set' accessor lacks a type annotation."
+        },
+        Index_signature_of_object_type_implicitly_has_an_any_type: {
+            code: 7017,
+            category: 1,
+            key: "Index signature of object type implicitly has an 'any' type."
+        },
+        Object_literal_s_property_0_implicitly_has_an_1_type: {
+            code: 7018,
+            category: 1,
+            key: "Object literal's property '{0}' implicitly has an '{1}' type."
+        },
+        Rest_parameter_0_implicitly_has_an_any_type: {
+            code: 7019,
+            category: 1,
+            key: "Rest parameter '{0}' implicitly has an 'any[]' type."
+        },
+        Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: {
+            code: 7020,
+            category: 1,
+            key: "Call signature, which lacks return-type annotation, implicitly has an 'any' return type."
+        },
+        _0_implicitly_has_type_any_because_it_is_referenced_directly_or_indirectly_in_its_own_type_annotation: {
+            code: 7021,
+            category: 1,
+            key: "'{0}' implicitly has type 'any' because it is referenced directly or indirectly in its own type annotation."
+        },
+        _0_implicitly_has_type_any_because_it_is_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer: {
+            code: 7022,
+            category: 1,
+            key: "'{0}' implicitly has type 'any' because it is does not have a type annotation and is referenced directly or indirectly in its own initializer."
+        },
+        _0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: {
+            code: 7023,
+            category: 1,
+            key: "'{0}' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions."
+        },
+        Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: {
+            code: 7024,
+            category: 1,
+            key: "Function implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions."
+        },
+        You_cannot_rename_this_element: {
+            code: 8000,
+            category: 1,
+            key: "You cannot rename this element."
+        },
+        You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: {
+            code: 8001,
+            category: 1,
+            key: "You cannot rename elements that are defined in the standard TypeScript library."
+        },
+        yield_expressions_are_not_currently_supported: {
+            code: 9000,
+            category: 1,
+            key: "'yield' expressions are not currently supported."
+        },
+        Generators_are_not_currently_supported: {
+            code: 9001,
+            category: 1,
+            key: "Generators are not currently supported."
+        },
+        The_arguments_object_cannot_be_referenced_in_an_arrow_function_Consider_using_a_standard_function_expression: {
+            code: 9002,
+            category: 1,
+            key: "The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression."
+        }
     };
 })(ts || (ts = {}));
 var ts;
@@ -2048,10 +4013,2806 @@ var ts;
         "|=": 62,
         "^=": 63
     };
-    var unicodeES3IdentifierStart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 543, 546, 563, 592, 685, 688, 696, 699, 705, 720, 721, 736, 740, 750, 750, 890, 890, 902, 902, 904, 906, 908, 908, 910, 929, 931, 974, 976, 983, 986, 1011, 1024, 1153, 1164, 1220, 1223, 1224, 1227, 1228, 1232, 1269, 1272, 1273, 1329, 1366, 1369, 1369, 1377, 1415, 1488, 1514, 1520, 1522, 1569, 1594, 1600, 1610, 1649, 1747, 1749, 1749, 1765, 1766, 1786, 1788, 1808, 1808, 1810, 1836, 1920, 1957, 2309, 2361, 2365, 2365, 2384, 2384, 2392, 2401, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2524, 2525, 2527, 2529, 2544, 2545, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2649, 2652, 2654, 2654, 2674, 2676, 2693, 2699, 2701, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2749, 2749, 2768, 2768, 2784, 2784, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2870, 2873, 2877, 2877, 2908, 2909, 2911, 2913, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 2997, 2999, 3001, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3168, 3169, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3294, 3294, 3296, 3297, 3333, 3340, 3342, 3344, 3346, 3368, 3370, 3385, 3424, 3425, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3585, 3632, 3634, 3635, 3648, 3654, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3760, 3762, 3763, 3773, 3773, 3776, 3780, 3782, 3782, 3804, 3805, 3840, 3840, 3904, 3911, 3913, 3946, 3976, 3979, 4096, 4129, 4131, 4135, 4137, 4138, 4176, 4181, 4256, 4293, 4304, 4342, 4352, 4441, 4447, 4514, 4520, 4601, 4608, 4614, 4616, 4678, 4680, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4742, 4744, 4744, 4746, 4749, 4752, 4782, 4784, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4814, 4816, 4822, 4824, 4846, 4848, 4878, 4880, 4880, 4882, 4885, 4888, 4894, 4896, 4934, 4936, 4954, 5024, 5108, 5121, 5740, 5743, 5750, 5761, 5786, 5792, 5866, 6016, 6067, 6176, 6263, 6272, 6312, 7680, 7835, 7840, 7929, 7936, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8319, 8319, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8497, 8499, 8505, 8544, 8579, 12293, 12295, 12321, 12329, 12337, 12341, 12344, 12346, 12353, 12436, 12445, 12446, 12449, 12538, 12540, 12542, 12549, 12588, 12593, 12686, 12704, 12727, 13312, 19893, 19968, 40869, 40960, 42124, 44032, 55203, 63744, 64045, 64256, 64262, 64275, 64279, 64285, 64285, 64287, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65136, 65138, 65140, 65140, 65142, 65276, 65313, 65338, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500,];
-    var unicodeES3IdentifierPart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 543, 546, 563, 592, 685, 688, 696, 699, 705, 720, 721, 736, 740, 750, 750, 768, 846, 864, 866, 890, 890, 902, 902, 904, 906, 908, 908, 910, 929, 931, 974, 976, 983, 986, 1011, 1024, 1153, 1155, 1158, 1164, 1220, 1223, 1224, 1227, 1228, 1232, 1269, 1272, 1273, 1329, 1366, 1369, 1369, 1377, 1415, 1425, 1441, 1443, 1465, 1467, 1469, 1471, 1471, 1473, 1474, 1476, 1476, 1488, 1514, 1520, 1522, 1569, 1594, 1600, 1621, 1632, 1641, 1648, 1747, 1749, 1756, 1759, 1768, 1770, 1773, 1776, 1788, 1808, 1836, 1840, 1866, 1920, 1968, 2305, 2307, 2309, 2361, 2364, 2381, 2384, 2388, 2392, 2403, 2406, 2415, 2433, 2435, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2492, 2492, 2494, 2500, 2503, 2504, 2507, 2509, 2519, 2519, 2524, 2525, 2527, 2531, 2534, 2545, 2562, 2562, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2620, 2620, 2622, 2626, 2631, 2632, 2635, 2637, 2649, 2652, 2654, 2654, 2662, 2676, 2689, 2691, 2693, 2699, 2701, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2748, 2757, 2759, 2761, 2763, 2765, 2768, 2768, 2784, 2784, 2790, 2799, 2817, 2819, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2870, 2873, 2876, 2883, 2887, 2888, 2891, 2893, 2902, 2903, 2908, 2909, 2911, 2913, 2918, 2927, 2946, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 2997, 2999, 3001, 3006, 3010, 3014, 3016, 3018, 3021, 3031, 3031, 3047, 3055, 3073, 3075, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3134, 3140, 3142, 3144, 3146, 3149, 3157, 3158, 3168, 3169, 3174, 3183, 3202, 3203, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3262, 3268, 3270, 3272, 3274, 3277, 3285, 3286, 3294, 3294, 3296, 3297, 3302, 3311, 3330, 3331, 3333, 3340, 3342, 3344, 3346, 3368, 3370, 3385, 3390, 3395, 3398, 3400, 3402, 3405, 3415, 3415, 3424, 3425, 3430, 3439, 3458, 3459, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3530, 3530, 3535, 3540, 3542, 3542, 3544, 3551, 3570, 3571, 3585, 3642, 3648, 3662, 3664, 3673, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3769, 3771, 3773, 3776, 3780, 3782, 3782, 3784, 3789, 3792, 3801, 3804, 3805, 3840, 3840, 3864, 3865, 3872, 3881, 3893, 3893, 3895, 3895, 3897, 3897, 3902, 3911, 3913, 3946, 3953, 3972, 3974, 3979, 3984, 3991, 3993, 4028, 4038, 4038, 4096, 4129, 4131, 4135, 4137, 4138, 4140, 4146, 4150, 4153, 4160, 4169, 4176, 4185, 4256, 4293, 4304, 4342, 4352, 4441, 4447, 4514, 4520, 4601, 4608, 4614, 4616, 4678, 4680, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4742, 4744, 4744, 4746, 4749, 4752, 4782, 4784, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4814, 4816, 4822, 4824, 4846, 4848, 4878, 4880, 4880, 4882, 4885, 4888, 4894, 4896, 4934, 4936, 4954, 4969, 4977, 5024, 5108, 5121, 5740, 5743, 5750, 5761, 5786, 5792, 5866, 6016, 6099, 6112, 6121, 6160, 6169, 6176, 6263, 6272, 6313, 7680, 7835, 7840, 7929, 7936, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8255, 8256, 8319, 8319, 8400, 8412, 8417, 8417, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8497, 8499, 8505, 8544, 8579, 12293, 12295, 12321, 12335, 12337, 12341, 12344, 12346, 12353, 12436, 12441, 12442, 12445, 12446, 12449, 12542, 12549, 12588, 12593, 12686, 12704, 12727, 13312, 19893, 19968, 40869, 40960, 42124, 44032, 55203, 63744, 64045, 64256, 64262, 64275, 64279, 64285, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65056, 65059, 65075, 65076, 65101, 65103, 65136, 65138, 65140, 65140, 65142, 65276, 65296, 65305, 65313, 65338, 65343, 65343, 65345, 65370, 65381, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500,];
-    var unicodeES5IdentifierStart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 705, 710, 721, 736, 740, 748, 748, 750, 750, 880, 884, 886, 887, 890, 893, 902, 902, 904, 906, 908, 908, 910, 929, 931, 1013, 1015, 1153, 1162, 1319, 1329, 1366, 1369, 1369, 1377, 1415, 1488, 1514, 1520, 1522, 1568, 1610, 1646, 1647, 1649, 1747, 1749, 1749, 1765, 1766, 1774, 1775, 1786, 1788, 1791, 1791, 1808, 1808, 1810, 1839, 1869, 1957, 1969, 1969, 1994, 2026, 2036, 2037, 2042, 2042, 2048, 2069, 2074, 2074, 2084, 2084, 2088, 2088, 2112, 2136, 2208, 2208, 2210, 2220, 2308, 2361, 2365, 2365, 2384, 2384, 2392, 2401, 2417, 2423, 2425, 2431, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2493, 2493, 2510, 2510, 2524, 2525, 2527, 2529, 2544, 2545, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2649, 2652, 2654, 2654, 2674, 2676, 2693, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2749, 2749, 2768, 2768, 2784, 2785, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2869, 2873, 2877, 2877, 2908, 2909, 2911, 2913, 2929, 2929, 2947, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 3001, 3024, 3024, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3133, 3133, 3160, 3161, 3168, 3169, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3261, 3261, 3294, 3294, 3296, 3297, 3313, 3314, 3333, 3340, 3342, 3344, 3346, 3386, 3389, 3389, 3406, 3406, 3424, 3425, 3450, 3455, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3585, 3632, 3634, 3635, 3648, 3654, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3760, 3762, 3763, 3773, 3773, 3776, 3780, 3782, 3782, 3804, 3807, 3840, 3840, 3904, 3911, 3913, 3948, 3976, 3980, 4096, 4138, 4159, 4159, 4176, 4181, 4186, 4189, 4193, 4193, 4197, 4198, 4206, 4208, 4213, 4225, 4238, 4238, 4256, 4293, 4295, 4295, 4301, 4301, 4304, 4346, 4348, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4744, 4746, 4749, 4752, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4822, 4824, 4880, 4882, 4885, 4888, 4954, 4992, 5007, 5024, 5108, 5121, 5740, 5743, 5759, 5761, 5786, 5792, 5866, 5870, 5872, 5888, 5900, 5902, 5905, 5920, 5937, 5952, 5969, 5984, 5996, 5998, 6000, 6016, 6067, 6103, 6103, 6108, 6108, 6176, 6263, 6272, 6312, 6314, 6314, 6320, 6389, 6400, 6428, 6480, 6509, 6512, 6516, 6528, 6571, 6593, 6599, 6656, 6678, 6688, 6740, 6823, 6823, 6917, 6963, 6981, 6987, 7043, 7072, 7086, 7087, 7098, 7141, 7168, 7203, 7245, 7247, 7258, 7293, 7401, 7404, 7406, 7409, 7413, 7414, 7424, 7615, 7680, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8305, 8305, 8319, 8319, 8336, 8348, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8505, 8508, 8511, 8517, 8521, 8526, 8526, 8544, 8584, 11264, 11310, 11312, 11358, 11360, 11492, 11499, 11502, 11506, 11507, 11520, 11557, 11559, 11559, 11565, 11565, 11568, 11623, 11631, 11631, 11648, 11670, 11680, 11686, 11688, 11694, 11696, 11702, 11704, 11710, 11712, 11718, 11720, 11726, 11728, 11734, 11736, 11742, 11823, 11823, 12293, 12295, 12321, 12329, 12337, 12341, 12344, 12348, 12353, 12438, 12445, 12447, 12449, 12538, 12540, 12543, 12549, 12589, 12593, 12686, 12704, 12730, 12784, 12799, 13312, 19893, 19968, 40908, 40960, 42124, 42192, 42237, 42240, 42508, 42512, 42527, 42538, 42539, 42560, 42606, 42623, 42647, 42656, 42735, 42775, 42783, 42786, 42888, 42891, 42894, 42896, 42899, 42912, 42922, 43000, 43009, 43011, 43013, 43015, 43018, 43020, 43042, 43072, 43123, 43138, 43187, 43250, 43255, 43259, 43259, 43274, 43301, 43312, 43334, 43360, 43388, 43396, 43442, 43471, 43471, 43520, 43560, 43584, 43586, 43588, 43595, 43616, 43638, 43642, 43642, 43648, 43695, 43697, 43697, 43701, 43702, 43705, 43709, 43712, 43712, 43714, 43714, 43739, 43741, 43744, 43754, 43762, 43764, 43777, 43782, 43785, 43790, 43793, 43798, 43808, 43814, 43816, 43822, 43968, 44002, 44032, 55203, 55216, 55238, 55243, 55291, 63744, 64109, 64112, 64217, 64256, 64262, 64275, 64279, 64285, 64285, 64287, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65136, 65140, 65142, 65276, 65313, 65338, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500,];
-    var unicodeES5IdentifierPart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 705, 710, 721, 736, 740, 748, 748, 750, 750, 768, 884, 886, 887, 890, 893, 902, 902, 904, 906, 908, 908, 910, 929, 931, 1013, 1015, 1153, 1155, 1159, 1162, 1319, 1329, 1366, 1369, 1369, 1377, 1415, 1425, 1469, 1471, 1471, 1473, 1474, 1476, 1477, 1479, 1479, 1488, 1514, 1520, 1522, 1552, 1562, 1568, 1641, 1646, 1747, 1749, 1756, 1759, 1768, 1770, 1788, 1791, 1791, 1808, 1866, 1869, 1969, 1984, 2037, 2042, 2042, 2048, 2093, 2112, 2139, 2208, 2208, 2210, 2220, 2276, 2302, 2304, 2403, 2406, 2415, 2417, 2423, 2425, 2431, 2433, 2435, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2492, 2500, 2503, 2504, 2507, 2510, 2519, 2519, 2524, 2525, 2527, 2531, 2534, 2545, 2561, 2563, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2620, 2620, 2622, 2626, 2631, 2632, 2635, 2637, 2641, 2641, 2649, 2652, 2654, 2654, 2662, 2677, 2689, 2691, 2693, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2748, 2757, 2759, 2761, 2763, 2765, 2768, 2768, 2784, 2787, 2790, 2799, 2817, 2819, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2869, 2873, 2876, 2884, 2887, 2888, 2891, 2893, 2902, 2903, 2908, 2909, 2911, 2915, 2918, 2927, 2929, 2929, 2946, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 3001, 3006, 3010, 3014, 3016, 3018, 3021, 3024, 3024, 3031, 3031, 3046, 3055, 3073, 3075, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3133, 3140, 3142, 3144, 3146, 3149, 3157, 3158, 3160, 3161, 3168, 3171, 3174, 3183, 3202, 3203, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3260, 3268, 3270, 3272, 3274, 3277, 3285, 3286, 3294, 3294, 3296, 3299, 3302, 3311, 3313, 3314, 3330, 3331, 3333, 3340, 3342, 3344, 3346, 3386, 3389, 3396, 3398, 3400, 3402, 3406, 3415, 3415, 3424, 3427, 3430, 3439, 3450, 3455, 3458, 3459, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3530, 3530, 3535, 3540, 3542, 3542, 3544, 3551, 3570, 3571, 3585, 3642, 3648, 3662, 3664, 3673, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3769, 3771, 3773, 3776, 3780, 3782, 3782, 3784, 3789, 3792, 3801, 3804, 3807, 3840, 3840, 3864, 3865, 3872, 3881, 3893, 3893, 3895, 3895, 3897, 3897, 3902, 3911, 3913, 3948, 3953, 3972, 3974, 3991, 3993, 4028, 4038, 4038, 4096, 4169, 4176, 4253, 4256, 4293, 4295, 4295, 4301, 4301, 4304, 4346, 4348, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4744, 4746, 4749, 4752, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4822, 4824, 4880, 4882, 4885, 4888, 4954, 4957, 4959, 4992, 5007, 5024, 5108, 5121, 5740, 5743, 5759, 5761, 5786, 5792, 5866, 5870, 5872, 5888, 5900, 5902, 5908, 5920, 5940, 5952, 5971, 5984, 5996, 5998, 6000, 6002, 6003, 6016, 6099, 6103, 6103, 6108, 6109, 6112, 6121, 6155, 6157, 6160, 6169, 6176, 6263, 6272, 6314, 6320, 6389, 6400, 6428, 6432, 6443, 6448, 6459, 6470, 6509, 6512, 6516, 6528, 6571, 6576, 6601, 6608, 6617, 6656, 6683, 6688, 6750, 6752, 6780, 6783, 6793, 6800, 6809, 6823, 6823, 6912, 6987, 6992, 7001, 7019, 7027, 7040, 7155, 7168, 7223, 7232, 7241, 7245, 7293, 7376, 7378, 7380, 7414, 7424, 7654, 7676, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8204, 8205, 8255, 8256, 8276, 8276, 8305, 8305, 8319, 8319, 8336, 8348, 8400, 8412, 8417, 8417, 8421, 8432, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8505, 8508, 8511, 8517, 8521, 8526, 8526, 8544, 8584, 11264, 11310, 11312, 11358, 11360, 11492, 11499, 11507, 11520, 11557, 11559, 11559, 11565, 11565, 11568, 11623, 11631, 11631, 11647, 11670, 11680, 11686, 11688, 11694, 11696, 11702, 11704, 11710, 11712, 11718, 11720, 11726, 11728, 11734, 11736, 11742, 11744, 11775, 11823, 11823, 12293, 12295, 12321, 12335, 12337, 12341, 12344, 12348, 12353, 12438, 12441, 12442, 12445, 12447, 12449, 12538, 12540, 12543, 12549, 12589, 12593, 12686, 12704, 12730, 12784, 12799, 13312, 19893, 19968, 40908, 40960, 42124, 42192, 42237, 42240, 42508, 42512, 42539, 42560, 42607, 42612, 42621, 42623, 42647, 42655, 42737, 42775, 42783, 42786, 42888, 42891, 42894, 42896, 42899, 42912, 42922, 43000, 43047, 43072, 43123, 43136, 43204, 43216, 43225, 43232, 43255, 43259, 43259, 43264, 43309, 43312, 43347, 43360, 43388, 43392, 43456, 43471, 43481, 43520, 43574, 43584, 43597, 43600, 43609, 43616, 43638, 43642, 43643, 43648, 43714, 43739, 43741, 43744, 43759, 43762, 43766, 43777, 43782, 43785, 43790, 43793, 43798, 43808, 43814, 43816, 43822, 43968, 44010, 44012, 44013, 44016, 44025, 44032, 55203, 55216, 55238, 55243, 55291, 63744, 64109, 64112, 64217, 64256, 64262, 64275, 64279, 64285, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65024, 65039, 65056, 65062, 65075, 65076, 65101, 65103, 65136, 65140, 65142, 65276, 65296, 65305, 65313, 65338, 65343, 65343, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500,];
+    var unicodeES3IdentifierStart = [
+        170,
+        170,
+        181,
+        181,
+        186,
+        186,
+        192,
+        214,
+        216,
+        246,
+        248,
+        543,
+        546,
+        563,
+        592,
+        685,
+        688,
+        696,
+        699,
+        705,
+        720,
+        721,
+        736,
+        740,
+        750,
+        750,
+        890,
+        890,
+        902,
+        902,
+        904,
+        906,
+        908,
+        908,
+        910,
+        929,
+        931,
+        974,
+        976,
+        983,
+        986,
+        1011,
+        1024,
+        1153,
+        1164,
+        1220,
+        1223,
+        1224,
+        1227,
+        1228,
+        1232,
+        1269,
+        1272,
+        1273,
+        1329,
+        1366,
+        1369,
+        1369,
+        1377,
+        1415,
+        1488,
+        1514,
+        1520,
+        1522,
+        1569,
+        1594,
+        1600,
+        1610,
+        1649,
+        1747,
+        1749,
+        1749,
+        1765,
+        1766,
+        1786,
+        1788,
+        1808,
+        1808,
+        1810,
+        1836,
+        1920,
+        1957,
+        2309,
+        2361,
+        2365,
+        2365,
+        2384,
+        2384,
+        2392,
+        2401,
+        2437,
+        2444,
+        2447,
+        2448,
+        2451,
+        2472,
+        2474,
+        2480,
+        2482,
+        2482,
+        2486,
+        2489,
+        2524,
+        2525,
+        2527,
+        2529,
+        2544,
+        2545,
+        2565,
+        2570,
+        2575,
+        2576,
+        2579,
+        2600,
+        2602,
+        2608,
+        2610,
+        2611,
+        2613,
+        2614,
+        2616,
+        2617,
+        2649,
+        2652,
+        2654,
+        2654,
+        2674,
+        2676,
+        2693,
+        2699,
+        2701,
+        2701,
+        2703,
+        2705,
+        2707,
+        2728,
+        2730,
+        2736,
+        2738,
+        2739,
+        2741,
+        2745,
+        2749,
+        2749,
+        2768,
+        2768,
+        2784,
+        2784,
+        2821,
+        2828,
+        2831,
+        2832,
+        2835,
+        2856,
+        2858,
+        2864,
+        2866,
+        2867,
+        2870,
+        2873,
+        2877,
+        2877,
+        2908,
+        2909,
+        2911,
+        2913,
+        2949,
+        2954,
+        2958,
+        2960,
+        2962,
+        2965,
+        2969,
+        2970,
+        2972,
+        2972,
+        2974,
+        2975,
+        2979,
+        2980,
+        2984,
+        2986,
+        2990,
+        2997,
+        2999,
+        3001,
+        3077,
+        3084,
+        3086,
+        3088,
+        3090,
+        3112,
+        3114,
+        3123,
+        3125,
+        3129,
+        3168,
+        3169,
+        3205,
+        3212,
+        3214,
+        3216,
+        3218,
+        3240,
+        3242,
+        3251,
+        3253,
+        3257,
+        3294,
+        3294,
+        3296,
+        3297,
+        3333,
+        3340,
+        3342,
+        3344,
+        3346,
+        3368,
+        3370,
+        3385,
+        3424,
+        3425,
+        3461,
+        3478,
+        3482,
+        3505,
+        3507,
+        3515,
+        3517,
+        3517,
+        3520,
+        3526,
+        3585,
+        3632,
+        3634,
+        3635,
+        3648,
+        3654,
+        3713,
+        3714,
+        3716,
+        3716,
+        3719,
+        3720,
+        3722,
+        3722,
+        3725,
+        3725,
+        3732,
+        3735,
+        3737,
+        3743,
+        3745,
+        3747,
+        3749,
+        3749,
+        3751,
+        3751,
+        3754,
+        3755,
+        3757,
+        3760,
+        3762,
+        3763,
+        3773,
+        3773,
+        3776,
+        3780,
+        3782,
+        3782,
+        3804,
+        3805,
+        3840,
+        3840,
+        3904,
+        3911,
+        3913,
+        3946,
+        3976,
+        3979,
+        4096,
+        4129,
+        4131,
+        4135,
+        4137,
+        4138,
+        4176,
+        4181,
+        4256,
+        4293,
+        4304,
+        4342,
+        4352,
+        4441,
+        4447,
+        4514,
+        4520,
+        4601,
+        4608,
+        4614,
+        4616,
+        4678,
+        4680,
+        4680,
+        4682,
+        4685,
+        4688,
+        4694,
+        4696,
+        4696,
+        4698,
+        4701,
+        4704,
+        4742,
+        4744,
+        4744,
+        4746,
+        4749,
+        4752,
+        4782,
+        4784,
+        4784,
+        4786,
+        4789,
+        4792,
+        4798,
+        4800,
+        4800,
+        4802,
+        4805,
+        4808,
+        4814,
+        4816,
+        4822,
+        4824,
+        4846,
+        4848,
+        4878,
+        4880,
+        4880,
+        4882,
+        4885,
+        4888,
+        4894,
+        4896,
+        4934,
+        4936,
+        4954,
+        5024,
+        5108,
+        5121,
+        5740,
+        5743,
+        5750,
+        5761,
+        5786,
+        5792,
+        5866,
+        6016,
+        6067,
+        6176,
+        6263,
+        6272,
+        6312,
+        7680,
+        7835,
+        7840,
+        7929,
+        7936,
+        7957,
+        7960,
+        7965,
+        7968,
+        8005,
+        8008,
+        8013,
+        8016,
+        8023,
+        8025,
+        8025,
+        8027,
+        8027,
+        8029,
+        8029,
+        8031,
+        8061,
+        8064,
+        8116,
+        8118,
+        8124,
+        8126,
+        8126,
+        8130,
+        8132,
+        8134,
+        8140,
+        8144,
+        8147,
+        8150,
+        8155,
+        8160,
+        8172,
+        8178,
+        8180,
+        8182,
+        8188,
+        8319,
+        8319,
+        8450,
+        8450,
+        8455,
+        8455,
+        8458,
+        8467,
+        8469,
+        8469,
+        8473,
+        8477,
+        8484,
+        8484,
+        8486,
+        8486,
+        8488,
+        8488,
+        8490,
+        8493,
+        8495,
+        8497,
+        8499,
+        8505,
+        8544,
+        8579,
+        12293,
+        12295,
+        12321,
+        12329,
+        12337,
+        12341,
+        12344,
+        12346,
+        12353,
+        12436,
+        12445,
+        12446,
+        12449,
+        12538,
+        12540,
+        12542,
+        12549,
+        12588,
+        12593,
+        12686,
+        12704,
+        12727,
+        13312,
+        19893,
+        19968,
+        40869,
+        40960,
+        42124,
+        44032,
+        55203,
+        63744,
+        64045,
+        64256,
+        64262,
+        64275,
+        64279,
+        64285,
+        64285,
+        64287,
+        64296,
+        64298,
+        64310,
+        64312,
+        64316,
+        64318,
+        64318,
+        64320,
+        64321,
+        64323,
+        64324,
+        64326,
+        64433,
+        64467,
+        64829,
+        64848,
+        64911,
+        64914,
+        64967,
+        65008,
+        65019,
+        65136,
+        65138,
+        65140,
+        65140,
+        65142,
+        65276,
+        65313,
+        65338,
+        65345,
+        65370,
+        65382,
+        65470,
+        65474,
+        65479,
+        65482,
+        65487,
+        65490,
+        65495,
+        65498,
+        65500,
+    ];
+    var unicodeES3IdentifierPart = [
+        170,
+        170,
+        181,
+        181,
+        186,
+        186,
+        192,
+        214,
+        216,
+        246,
+        248,
+        543,
+        546,
+        563,
+        592,
+        685,
+        688,
+        696,
+        699,
+        705,
+        720,
+        721,
+        736,
+        740,
+        750,
+        750,
+        768,
+        846,
+        864,
+        866,
+        890,
+        890,
+        902,
+        902,
+        904,
+        906,
+        908,
+        908,
+        910,
+        929,
+        931,
+        974,
+        976,
+        983,
+        986,
+        1011,
+        1024,
+        1153,
+        1155,
+        1158,
+        1164,
+        1220,
+        1223,
+        1224,
+        1227,
+        1228,
+        1232,
+        1269,
+        1272,
+        1273,
+        1329,
+        1366,
+        1369,
+        1369,
+        1377,
+        1415,
+        1425,
+        1441,
+        1443,
+        1465,
+        1467,
+        1469,
+        1471,
+        1471,
+        1473,
+        1474,
+        1476,
+        1476,
+        1488,
+        1514,
+        1520,
+        1522,
+        1569,
+        1594,
+        1600,
+        1621,
+        1632,
+        1641,
+        1648,
+        1747,
+        1749,
+        1756,
+        1759,
+        1768,
+        1770,
+        1773,
+        1776,
+        1788,
+        1808,
+        1836,
+        1840,
+        1866,
+        1920,
+        1968,
+        2305,
+        2307,
+        2309,
+        2361,
+        2364,
+        2381,
+        2384,
+        2388,
+        2392,
+        2403,
+        2406,
+        2415,
+        2433,
+        2435,
+        2437,
+        2444,
+        2447,
+        2448,
+        2451,
+        2472,
+        2474,
+        2480,
+        2482,
+        2482,
+        2486,
+        2489,
+        2492,
+        2492,
+        2494,
+        2500,
+        2503,
+        2504,
+        2507,
+        2509,
+        2519,
+        2519,
+        2524,
+        2525,
+        2527,
+        2531,
+        2534,
+        2545,
+        2562,
+        2562,
+        2565,
+        2570,
+        2575,
+        2576,
+        2579,
+        2600,
+        2602,
+        2608,
+        2610,
+        2611,
+        2613,
+        2614,
+        2616,
+        2617,
+        2620,
+        2620,
+        2622,
+        2626,
+        2631,
+        2632,
+        2635,
+        2637,
+        2649,
+        2652,
+        2654,
+        2654,
+        2662,
+        2676,
+        2689,
+        2691,
+        2693,
+        2699,
+        2701,
+        2701,
+        2703,
+        2705,
+        2707,
+        2728,
+        2730,
+        2736,
+        2738,
+        2739,
+        2741,
+        2745,
+        2748,
+        2757,
+        2759,
+        2761,
+        2763,
+        2765,
+        2768,
+        2768,
+        2784,
+        2784,
+        2790,
+        2799,
+        2817,
+        2819,
+        2821,
+        2828,
+        2831,
+        2832,
+        2835,
+        2856,
+        2858,
+        2864,
+        2866,
+        2867,
+        2870,
+        2873,
+        2876,
+        2883,
+        2887,
+        2888,
+        2891,
+        2893,
+        2902,
+        2903,
+        2908,
+        2909,
+        2911,
+        2913,
+        2918,
+        2927,
+        2946,
+        2947,
+        2949,
+        2954,
+        2958,
+        2960,
+        2962,
+        2965,
+        2969,
+        2970,
+        2972,
+        2972,
+        2974,
+        2975,
+        2979,
+        2980,
+        2984,
+        2986,
+        2990,
+        2997,
+        2999,
+        3001,
+        3006,
+        3010,
+        3014,
+        3016,
+        3018,
+        3021,
+        3031,
+        3031,
+        3047,
+        3055,
+        3073,
+        3075,
+        3077,
+        3084,
+        3086,
+        3088,
+        3090,
+        3112,
+        3114,
+        3123,
+        3125,
+        3129,
+        3134,
+        3140,
+        3142,
+        3144,
+        3146,
+        3149,
+        3157,
+        3158,
+        3168,
+        3169,
+        3174,
+        3183,
+        3202,
+        3203,
+        3205,
+        3212,
+        3214,
+        3216,
+        3218,
+        3240,
+        3242,
+        3251,
+        3253,
+        3257,
+        3262,
+        3268,
+        3270,
+        3272,
+        3274,
+        3277,
+        3285,
+        3286,
+        3294,
+        3294,
+        3296,
+        3297,
+        3302,
+        3311,
+        3330,
+        3331,
+        3333,
+        3340,
+        3342,
+        3344,
+        3346,
+        3368,
+        3370,
+        3385,
+        3390,
+        3395,
+        3398,
+        3400,
+        3402,
+        3405,
+        3415,
+        3415,
+        3424,
+        3425,
+        3430,
+        3439,
+        3458,
+        3459,
+        3461,
+        3478,
+        3482,
+        3505,
+        3507,
+        3515,
+        3517,
+        3517,
+        3520,
+        3526,
+        3530,
+        3530,
+        3535,
+        3540,
+        3542,
+        3542,
+        3544,
+        3551,
+        3570,
+        3571,
+        3585,
+        3642,
+        3648,
+        3662,
+        3664,
+        3673,
+        3713,
+        3714,
+        3716,
+        3716,
+        3719,
+        3720,
+        3722,
+        3722,
+        3725,
+        3725,
+        3732,
+        3735,
+        3737,
+        3743,
+        3745,
+        3747,
+        3749,
+        3749,
+        3751,
+        3751,
+        3754,
+        3755,
+        3757,
+        3769,
+        3771,
+        3773,
+        3776,
+        3780,
+        3782,
+        3782,
+        3784,
+        3789,
+        3792,
+        3801,
+        3804,
+        3805,
+        3840,
+        3840,
+        3864,
+        3865,
+        3872,
+        3881,
+        3893,
+        3893,
+        3895,
+        3895,
+        3897,
+        3897,
+        3902,
+        3911,
+        3913,
+        3946,
+        3953,
+        3972,
+        3974,
+        3979,
+        3984,
+        3991,
+        3993,
+        4028,
+        4038,
+        4038,
+        4096,
+        4129,
+        4131,
+        4135,
+        4137,
+        4138,
+        4140,
+        4146,
+        4150,
+        4153,
+        4160,
+        4169,
+        4176,
+        4185,
+        4256,
+        4293,
+        4304,
+        4342,
+        4352,
+        4441,
+        4447,
+        4514,
+        4520,
+        4601,
+        4608,
+        4614,
+        4616,
+        4678,
+        4680,
+        4680,
+        4682,
+        4685,
+        4688,
+        4694,
+        4696,
+        4696,
+        4698,
+        4701,
+        4704,
+        4742,
+        4744,
+        4744,
+        4746,
+        4749,
+        4752,
+        4782,
+        4784,
+        4784,
+        4786,
+        4789,
+        4792,
+        4798,
+        4800,
+        4800,
+        4802,
+        4805,
+        4808,
+        4814,
+        4816,
+        4822,
+        4824,
+        4846,
+        4848,
+        4878,
+        4880,
+        4880,
+        4882,
+        4885,
+        4888,
+        4894,
+        4896,
+        4934,
+        4936,
+        4954,
+        4969,
+        4977,
+        5024,
+        5108,
+        5121,
+        5740,
+        5743,
+        5750,
+        5761,
+        5786,
+        5792,
+        5866,
+        6016,
+        6099,
+        6112,
+        6121,
+        6160,
+        6169,
+        6176,
+        6263,
+        6272,
+        6313,
+        7680,
+        7835,
+        7840,
+        7929,
+        7936,
+        7957,
+        7960,
+        7965,
+        7968,
+        8005,
+        8008,
+        8013,
+        8016,
+        8023,
+        8025,
+        8025,
+        8027,
+        8027,
+        8029,
+        8029,
+        8031,
+        8061,
+        8064,
+        8116,
+        8118,
+        8124,
+        8126,
+        8126,
+        8130,
+        8132,
+        8134,
+        8140,
+        8144,
+        8147,
+        8150,
+        8155,
+        8160,
+        8172,
+        8178,
+        8180,
+        8182,
+        8188,
+        8255,
+        8256,
+        8319,
+        8319,
+        8400,
+        8412,
+        8417,
+        8417,
+        8450,
+        8450,
+        8455,
+        8455,
+        8458,
+        8467,
+        8469,
+        8469,
+        8473,
+        8477,
+        8484,
+        8484,
+        8486,
+        8486,
+        8488,
+        8488,
+        8490,
+        8493,
+        8495,
+        8497,
+        8499,
+        8505,
+        8544,
+        8579,
+        12293,
+        12295,
+        12321,
+        12335,
+        12337,
+        12341,
+        12344,
+        12346,
+        12353,
+        12436,
+        12441,
+        12442,
+        12445,
+        12446,
+        12449,
+        12542,
+        12549,
+        12588,
+        12593,
+        12686,
+        12704,
+        12727,
+        13312,
+        19893,
+        19968,
+        40869,
+        40960,
+        42124,
+        44032,
+        55203,
+        63744,
+        64045,
+        64256,
+        64262,
+        64275,
+        64279,
+        64285,
+        64296,
+        64298,
+        64310,
+        64312,
+        64316,
+        64318,
+        64318,
+        64320,
+        64321,
+        64323,
+        64324,
+        64326,
+        64433,
+        64467,
+        64829,
+        64848,
+        64911,
+        64914,
+        64967,
+        65008,
+        65019,
+        65056,
+        65059,
+        65075,
+        65076,
+        65101,
+        65103,
+        65136,
+        65138,
+        65140,
+        65140,
+        65142,
+        65276,
+        65296,
+        65305,
+        65313,
+        65338,
+        65343,
+        65343,
+        65345,
+        65370,
+        65381,
+        65470,
+        65474,
+        65479,
+        65482,
+        65487,
+        65490,
+        65495,
+        65498,
+        65500,
+    ];
+    var unicodeES5IdentifierStart = [
+        170,
+        170,
+        181,
+        181,
+        186,
+        186,
+        192,
+        214,
+        216,
+        246,
+        248,
+        705,
+        710,
+        721,
+        736,
+        740,
+        748,
+        748,
+        750,
+        750,
+        880,
+        884,
+        886,
+        887,
+        890,
+        893,
+        902,
+        902,
+        904,
+        906,
+        908,
+        908,
+        910,
+        929,
+        931,
+        1013,
+        1015,
+        1153,
+        1162,
+        1319,
+        1329,
+        1366,
+        1369,
+        1369,
+        1377,
+        1415,
+        1488,
+        1514,
+        1520,
+        1522,
+        1568,
+        1610,
+        1646,
+        1647,
+        1649,
+        1747,
+        1749,
+        1749,
+        1765,
+        1766,
+        1774,
+        1775,
+        1786,
+        1788,
+        1791,
+        1791,
+        1808,
+        1808,
+        1810,
+        1839,
+        1869,
+        1957,
+        1969,
+        1969,
+        1994,
+        2026,
+        2036,
+        2037,
+        2042,
+        2042,
+        2048,
+        2069,
+        2074,
+        2074,
+        2084,
+        2084,
+        2088,
+        2088,
+        2112,
+        2136,
+        2208,
+        2208,
+        2210,
+        2220,
+        2308,
+        2361,
+        2365,
+        2365,
+        2384,
+        2384,
+        2392,
+        2401,
+        2417,
+        2423,
+        2425,
+        2431,
+        2437,
+        2444,
+        2447,
+        2448,
+        2451,
+        2472,
+        2474,
+        2480,
+        2482,
+        2482,
+        2486,
+        2489,
+        2493,
+        2493,
+        2510,
+        2510,
+        2524,
+        2525,
+        2527,
+        2529,
+        2544,
+        2545,
+        2565,
+        2570,
+        2575,
+        2576,
+        2579,
+        2600,
+        2602,
+        2608,
+        2610,
+        2611,
+        2613,
+        2614,
+        2616,
+        2617,
+        2649,
+        2652,
+        2654,
+        2654,
+        2674,
+        2676,
+        2693,
+        2701,
+        2703,
+        2705,
+        2707,
+        2728,
+        2730,
+        2736,
+        2738,
+        2739,
+        2741,
+        2745,
+        2749,
+        2749,
+        2768,
+        2768,
+        2784,
+        2785,
+        2821,
+        2828,
+        2831,
+        2832,
+        2835,
+        2856,
+        2858,
+        2864,
+        2866,
+        2867,
+        2869,
+        2873,
+        2877,
+        2877,
+        2908,
+        2909,
+        2911,
+        2913,
+        2929,
+        2929,
+        2947,
+        2947,
+        2949,
+        2954,
+        2958,
+        2960,
+        2962,
+        2965,
+        2969,
+        2970,
+        2972,
+        2972,
+        2974,
+        2975,
+        2979,
+        2980,
+        2984,
+        2986,
+        2990,
+        3001,
+        3024,
+        3024,
+        3077,
+        3084,
+        3086,
+        3088,
+        3090,
+        3112,
+        3114,
+        3123,
+        3125,
+        3129,
+        3133,
+        3133,
+        3160,
+        3161,
+        3168,
+        3169,
+        3205,
+        3212,
+        3214,
+        3216,
+        3218,
+        3240,
+        3242,
+        3251,
+        3253,
+        3257,
+        3261,
+        3261,
+        3294,
+        3294,
+        3296,
+        3297,
+        3313,
+        3314,
+        3333,
+        3340,
+        3342,
+        3344,
+        3346,
+        3386,
+        3389,
+        3389,
+        3406,
+        3406,
+        3424,
+        3425,
+        3450,
+        3455,
+        3461,
+        3478,
+        3482,
+        3505,
+        3507,
+        3515,
+        3517,
+        3517,
+        3520,
+        3526,
+        3585,
+        3632,
+        3634,
+        3635,
+        3648,
+        3654,
+        3713,
+        3714,
+        3716,
+        3716,
+        3719,
+        3720,
+        3722,
+        3722,
+        3725,
+        3725,
+        3732,
+        3735,
+        3737,
+        3743,
+        3745,
+        3747,
+        3749,
+        3749,
+        3751,
+        3751,
+        3754,
+        3755,
+        3757,
+        3760,
+        3762,
+        3763,
+        3773,
+        3773,
+        3776,
+        3780,
+        3782,
+        3782,
+        3804,
+        3807,
+        3840,
+        3840,
+        3904,
+        3911,
+        3913,
+        3948,
+        3976,
+        3980,
+        4096,
+        4138,
+        4159,
+        4159,
+        4176,
+        4181,
+        4186,
+        4189,
+        4193,
+        4193,
+        4197,
+        4198,
+        4206,
+        4208,
+        4213,
+        4225,
+        4238,
+        4238,
+        4256,
+        4293,
+        4295,
+        4295,
+        4301,
+        4301,
+        4304,
+        4346,
+        4348,
+        4680,
+        4682,
+        4685,
+        4688,
+        4694,
+        4696,
+        4696,
+        4698,
+        4701,
+        4704,
+        4744,
+        4746,
+        4749,
+        4752,
+        4784,
+        4786,
+        4789,
+        4792,
+        4798,
+        4800,
+        4800,
+        4802,
+        4805,
+        4808,
+        4822,
+        4824,
+        4880,
+        4882,
+        4885,
+        4888,
+        4954,
+        4992,
+        5007,
+        5024,
+        5108,
+        5121,
+        5740,
+        5743,
+        5759,
+        5761,
+        5786,
+        5792,
+        5866,
+        5870,
+        5872,
+        5888,
+        5900,
+        5902,
+        5905,
+        5920,
+        5937,
+        5952,
+        5969,
+        5984,
+        5996,
+        5998,
+        6000,
+        6016,
+        6067,
+        6103,
+        6103,
+        6108,
+        6108,
+        6176,
+        6263,
+        6272,
+        6312,
+        6314,
+        6314,
+        6320,
+        6389,
+        6400,
+        6428,
+        6480,
+        6509,
+        6512,
+        6516,
+        6528,
+        6571,
+        6593,
+        6599,
+        6656,
+        6678,
+        6688,
+        6740,
+        6823,
+        6823,
+        6917,
+        6963,
+        6981,
+        6987,
+        7043,
+        7072,
+        7086,
+        7087,
+        7098,
+        7141,
+        7168,
+        7203,
+        7245,
+        7247,
+        7258,
+        7293,
+        7401,
+        7404,
+        7406,
+        7409,
+        7413,
+        7414,
+        7424,
+        7615,
+        7680,
+        7957,
+        7960,
+        7965,
+        7968,
+        8005,
+        8008,
+        8013,
+        8016,
+        8023,
+        8025,
+        8025,
+        8027,
+        8027,
+        8029,
+        8029,
+        8031,
+        8061,
+        8064,
+        8116,
+        8118,
+        8124,
+        8126,
+        8126,
+        8130,
+        8132,
+        8134,
+        8140,
+        8144,
+        8147,
+        8150,
+        8155,
+        8160,
+        8172,
+        8178,
+        8180,
+        8182,
+        8188,
+        8305,
+        8305,
+        8319,
+        8319,
+        8336,
+        8348,
+        8450,
+        8450,
+        8455,
+        8455,
+        8458,
+        8467,
+        8469,
+        8469,
+        8473,
+        8477,
+        8484,
+        8484,
+        8486,
+        8486,
+        8488,
+        8488,
+        8490,
+        8493,
+        8495,
+        8505,
+        8508,
+        8511,
+        8517,
+        8521,
+        8526,
+        8526,
+        8544,
+        8584,
+        11264,
+        11310,
+        11312,
+        11358,
+        11360,
+        11492,
+        11499,
+        11502,
+        11506,
+        11507,
+        11520,
+        11557,
+        11559,
+        11559,
+        11565,
+        11565,
+        11568,
+        11623,
+        11631,
+        11631,
+        11648,
+        11670,
+        11680,
+        11686,
+        11688,
+        11694,
+        11696,
+        11702,
+        11704,
+        11710,
+        11712,
+        11718,
+        11720,
+        11726,
+        11728,
+        11734,
+        11736,
+        11742,
+        11823,
+        11823,
+        12293,
+        12295,
+        12321,
+        12329,
+        12337,
+        12341,
+        12344,
+        12348,
+        12353,
+        12438,
+        12445,
+        12447,
+        12449,
+        12538,
+        12540,
+        12543,
+        12549,
+        12589,
+        12593,
+        12686,
+        12704,
+        12730,
+        12784,
+        12799,
+        13312,
+        19893,
+        19968,
+        40908,
+        40960,
+        42124,
+        42192,
+        42237,
+        42240,
+        42508,
+        42512,
+        42527,
+        42538,
+        42539,
+        42560,
+        42606,
+        42623,
+        42647,
+        42656,
+        42735,
+        42775,
+        42783,
+        42786,
+        42888,
+        42891,
+        42894,
+        42896,
+        42899,
+        42912,
+        42922,
+        43000,
+        43009,
+        43011,
+        43013,
+        43015,
+        43018,
+        43020,
+        43042,
+        43072,
+        43123,
+        43138,
+        43187,
+        43250,
+        43255,
+        43259,
+        43259,
+        43274,
+        43301,
+        43312,
+        43334,
+        43360,
+        43388,
+        43396,
+        43442,
+        43471,
+        43471,
+        43520,
+        43560,
+        43584,
+        43586,
+        43588,
+        43595,
+        43616,
+        43638,
+        43642,
+        43642,
+        43648,
+        43695,
+        43697,
+        43697,
+        43701,
+        43702,
+        43705,
+        43709,
+        43712,
+        43712,
+        43714,
+        43714,
+        43739,
+        43741,
+        43744,
+        43754,
+        43762,
+        43764,
+        43777,
+        43782,
+        43785,
+        43790,
+        43793,
+        43798,
+        43808,
+        43814,
+        43816,
+        43822,
+        43968,
+        44002,
+        44032,
+        55203,
+        55216,
+        55238,
+        55243,
+        55291,
+        63744,
+        64109,
+        64112,
+        64217,
+        64256,
+        64262,
+        64275,
+        64279,
+        64285,
+        64285,
+        64287,
+        64296,
+        64298,
+        64310,
+        64312,
+        64316,
+        64318,
+        64318,
+        64320,
+        64321,
+        64323,
+        64324,
+        64326,
+        64433,
+        64467,
+        64829,
+        64848,
+        64911,
+        64914,
+        64967,
+        65008,
+        65019,
+        65136,
+        65140,
+        65142,
+        65276,
+        65313,
+        65338,
+        65345,
+        65370,
+        65382,
+        65470,
+        65474,
+        65479,
+        65482,
+        65487,
+        65490,
+        65495,
+        65498,
+        65500,
+    ];
+    var unicodeES5IdentifierPart = [
+        170,
+        170,
+        181,
+        181,
+        186,
+        186,
+        192,
+        214,
+        216,
+        246,
+        248,
+        705,
+        710,
+        721,
+        736,
+        740,
+        748,
+        748,
+        750,
+        750,
+        768,
+        884,
+        886,
+        887,
+        890,
+        893,
+        902,
+        902,
+        904,
+        906,
+        908,
+        908,
+        910,
+        929,
+        931,
+        1013,
+        1015,
+        1153,
+        1155,
+        1159,
+        1162,
+        1319,
+        1329,
+        1366,
+        1369,
+        1369,
+        1377,
+        1415,
+        1425,
+        1469,
+        1471,
+        1471,
+        1473,
+        1474,
+        1476,
+        1477,
+        1479,
+        1479,
+        1488,
+        1514,
+        1520,
+        1522,
+        1552,
+        1562,
+        1568,
+        1641,
+        1646,
+        1747,
+        1749,
+        1756,
+        1759,
+        1768,
+        1770,
+        1788,
+        1791,
+        1791,
+        1808,
+        1866,
+        1869,
+        1969,
+        1984,
+        2037,
+        2042,
+        2042,
+        2048,
+        2093,
+        2112,
+        2139,
+        2208,
+        2208,
+        2210,
+        2220,
+        2276,
+        2302,
+        2304,
+        2403,
+        2406,
+        2415,
+        2417,
+        2423,
+        2425,
+        2431,
+        2433,
+        2435,
+        2437,
+        2444,
+        2447,
+        2448,
+        2451,
+        2472,
+        2474,
+        2480,
+        2482,
+        2482,
+        2486,
+        2489,
+        2492,
+        2500,
+        2503,
+        2504,
+        2507,
+        2510,
+        2519,
+        2519,
+        2524,
+        2525,
+        2527,
+        2531,
+        2534,
+        2545,
+        2561,
+        2563,
+        2565,
+        2570,
+        2575,
+        2576,
+        2579,
+        2600,
+        2602,
+        2608,
+        2610,
+        2611,
+        2613,
+        2614,
+        2616,
+        2617,
+        2620,
+        2620,
+        2622,
+        2626,
+        2631,
+        2632,
+        2635,
+        2637,
+        2641,
+        2641,
+        2649,
+        2652,
+        2654,
+        2654,
+        2662,
+        2677,
+        2689,
+        2691,
+        2693,
+        2701,
+        2703,
+        2705,
+        2707,
+        2728,
+        2730,
+        2736,
+        2738,
+        2739,
+        2741,
+        2745,
+        2748,
+        2757,
+        2759,
+        2761,
+        2763,
+        2765,
+        2768,
+        2768,
+        2784,
+        2787,
+        2790,
+        2799,
+        2817,
+        2819,
+        2821,
+        2828,
+        2831,
+        2832,
+        2835,
+        2856,
+        2858,
+        2864,
+        2866,
+        2867,
+        2869,
+        2873,
+        2876,
+        2884,
+        2887,
+        2888,
+        2891,
+        2893,
+        2902,
+        2903,
+        2908,
+        2909,
+        2911,
+        2915,
+        2918,
+        2927,
+        2929,
+        2929,
+        2946,
+        2947,
+        2949,
+        2954,
+        2958,
+        2960,
+        2962,
+        2965,
+        2969,
+        2970,
+        2972,
+        2972,
+        2974,
+        2975,
+        2979,
+        2980,
+        2984,
+        2986,
+        2990,
+        3001,
+        3006,
+        3010,
+        3014,
+        3016,
+        3018,
+        3021,
+        3024,
+        3024,
+        3031,
+        3031,
+        3046,
+        3055,
+        3073,
+        3075,
+        3077,
+        3084,
+        3086,
+        3088,
+        3090,
+        3112,
+        3114,
+        3123,
+        3125,
+        3129,
+        3133,
+        3140,
+        3142,
+        3144,
+        3146,
+        3149,
+        3157,
+        3158,
+        3160,
+        3161,
+        3168,
+        3171,
+        3174,
+        3183,
+        3202,
+        3203,
+        3205,
+        3212,
+        3214,
+        3216,
+        3218,
+        3240,
+        3242,
+        3251,
+        3253,
+        3257,
+        3260,
+        3268,
+        3270,
+        3272,
+        3274,
+        3277,
+        3285,
+        3286,
+        3294,
+        3294,
+        3296,
+        3299,
+        3302,
+        3311,
+        3313,
+        3314,
+        3330,
+        3331,
+        3333,
+        3340,
+        3342,
+        3344,
+        3346,
+        3386,
+        3389,
+        3396,
+        3398,
+        3400,
+        3402,
+        3406,
+        3415,
+        3415,
+        3424,
+        3427,
+        3430,
+        3439,
+        3450,
+        3455,
+        3458,
+        3459,
+        3461,
+        3478,
+        3482,
+        3505,
+        3507,
+        3515,
+        3517,
+        3517,
+        3520,
+        3526,
+        3530,
+        3530,
+        3535,
+        3540,
+        3542,
+        3542,
+        3544,
+        3551,
+        3570,
+        3571,
+        3585,
+        3642,
+        3648,
+        3662,
+        3664,
+        3673,
+        3713,
+        3714,
+        3716,
+        3716,
+        3719,
+        3720,
+        3722,
+        3722,
+        3725,
+        3725,
+        3732,
+        3735,
+        3737,
+        3743,
+        3745,
+        3747,
+        3749,
+        3749,
+        3751,
+        3751,
+        3754,
+        3755,
+        3757,
+        3769,
+        3771,
+        3773,
+        3776,
+        3780,
+        3782,
+        3782,
+        3784,
+        3789,
+        3792,
+        3801,
+        3804,
+        3807,
+        3840,
+        3840,
+        3864,
+        3865,
+        3872,
+        3881,
+        3893,
+        3893,
+        3895,
+        3895,
+        3897,
+        3897,
+        3902,
+        3911,
+        3913,
+        3948,
+        3953,
+        3972,
+        3974,
+        3991,
+        3993,
+        4028,
+        4038,
+        4038,
+        4096,
+        4169,
+        4176,
+        4253,
+        4256,
+        4293,
+        4295,
+        4295,
+        4301,
+        4301,
+        4304,
+        4346,
+        4348,
+        4680,
+        4682,
+        4685,
+        4688,
+        4694,
+        4696,
+        4696,
+        4698,
+        4701,
+        4704,
+        4744,
+        4746,
+        4749,
+        4752,
+        4784,
+        4786,
+        4789,
+        4792,
+        4798,
+        4800,
+        4800,
+        4802,
+        4805,
+        4808,
+        4822,
+        4824,
+        4880,
+        4882,
+        4885,
+        4888,
+        4954,
+        4957,
+        4959,
+        4992,
+        5007,
+        5024,
+        5108,
+        5121,
+        5740,
+        5743,
+        5759,
+        5761,
+        5786,
+        5792,
+        5866,
+        5870,
+        5872,
+        5888,
+        5900,
+        5902,
+        5908,
+        5920,
+        5940,
+        5952,
+        5971,
+        5984,
+        5996,
+        5998,
+        6000,
+        6002,
+        6003,
+        6016,
+        6099,
+        6103,
+        6103,
+        6108,
+        6109,
+        6112,
+        6121,
+        6155,
+        6157,
+        6160,
+        6169,
+        6176,
+        6263,
+        6272,
+        6314,
+        6320,
+        6389,
+        6400,
+        6428,
+        6432,
+        6443,
+        6448,
+        6459,
+        6470,
+        6509,
+        6512,
+        6516,
+        6528,
+        6571,
+        6576,
+        6601,
+        6608,
+        6617,
+        6656,
+        6683,
+        6688,
+        6750,
+        6752,
+        6780,
+        6783,
+        6793,
+        6800,
+        6809,
+        6823,
+        6823,
+        6912,
+        6987,
+        6992,
+        7001,
+        7019,
+        7027,
+        7040,
+        7155,
+        7168,
+        7223,
+        7232,
+        7241,
+        7245,
+        7293,
+        7376,
+        7378,
+        7380,
+        7414,
+        7424,
+        7654,
+        7676,
+        7957,
+        7960,
+        7965,
+        7968,
+        8005,
+        8008,
+        8013,
+        8016,
+        8023,
+        8025,
+        8025,
+        8027,
+        8027,
+        8029,
+        8029,
+        8031,
+        8061,
+        8064,
+        8116,
+        8118,
+        8124,
+        8126,
+        8126,
+        8130,
+        8132,
+        8134,
+        8140,
+        8144,
+        8147,
+        8150,
+        8155,
+        8160,
+        8172,
+        8178,
+        8180,
+        8182,
+        8188,
+        8204,
+        8205,
+        8255,
+        8256,
+        8276,
+        8276,
+        8305,
+        8305,
+        8319,
+        8319,
+        8336,
+        8348,
+        8400,
+        8412,
+        8417,
+        8417,
+        8421,
+        8432,
+        8450,
+        8450,
+        8455,
+        8455,
+        8458,
+        8467,
+        8469,
+        8469,
+        8473,
+        8477,
+        8484,
+        8484,
+        8486,
+        8486,
+        8488,
+        8488,
+        8490,
+        8493,
+        8495,
+        8505,
+        8508,
+        8511,
+        8517,
+        8521,
+        8526,
+        8526,
+        8544,
+        8584,
+        11264,
+        11310,
+        11312,
+        11358,
+        11360,
+        11492,
+        11499,
+        11507,
+        11520,
+        11557,
+        11559,
+        11559,
+        11565,
+        11565,
+        11568,
+        11623,
+        11631,
+        11631,
+        11647,
+        11670,
+        11680,
+        11686,
+        11688,
+        11694,
+        11696,
+        11702,
+        11704,
+        11710,
+        11712,
+        11718,
+        11720,
+        11726,
+        11728,
+        11734,
+        11736,
+        11742,
+        11744,
+        11775,
+        11823,
+        11823,
+        12293,
+        12295,
+        12321,
+        12335,
+        12337,
+        12341,
+        12344,
+        12348,
+        12353,
+        12438,
+        12441,
+        12442,
+        12445,
+        12447,
+        12449,
+        12538,
+        12540,
+        12543,
+        12549,
+        12589,
+        12593,
+        12686,
+        12704,
+        12730,
+        12784,
+        12799,
+        13312,
+        19893,
+        19968,
+        40908,
+        40960,
+        42124,
+        42192,
+        42237,
+        42240,
+        42508,
+        42512,
+        42539,
+        42560,
+        42607,
+        42612,
+        42621,
+        42623,
+        42647,
+        42655,
+        42737,
+        42775,
+        42783,
+        42786,
+        42888,
+        42891,
+        42894,
+        42896,
+        42899,
+        42912,
+        42922,
+        43000,
+        43047,
+        43072,
+        43123,
+        43136,
+        43204,
+        43216,
+        43225,
+        43232,
+        43255,
+        43259,
+        43259,
+        43264,
+        43309,
+        43312,
+        43347,
+        43360,
+        43388,
+        43392,
+        43456,
+        43471,
+        43481,
+        43520,
+        43574,
+        43584,
+        43597,
+        43600,
+        43609,
+        43616,
+        43638,
+        43642,
+        43643,
+        43648,
+        43714,
+        43739,
+        43741,
+        43744,
+        43759,
+        43762,
+        43766,
+        43777,
+        43782,
+        43785,
+        43790,
+        43793,
+        43798,
+        43808,
+        43814,
+        43816,
+        43822,
+        43968,
+        44010,
+        44012,
+        44013,
+        44016,
+        44025,
+        44032,
+        55203,
+        55216,
+        55238,
+        55243,
+        55291,
+        63744,
+        64109,
+        64112,
+        64217,
+        64256,
+        64262,
+        64275,
+        64279,
+        64285,
+        64296,
+        64298,
+        64310,
+        64312,
+        64316,
+        64318,
+        64318,
+        64320,
+        64321,
+        64323,
+        64324,
+        64326,
+        64433,
+        64467,
+        64829,
+        64848,
+        64911,
+        64914,
+        64967,
+        65008,
+        65019,
+        65024,
+        65039,
+        65056,
+        65062,
+        65075,
+        65076,
+        65101,
+        65103,
+        65136,
+        65140,
+        65142,
+        65276,
+        65296,
+        65305,
+        65313,
+        65338,
+        65343,
+        65343,
+        65345,
+        65370,
+        65382,
+        65470,
+        65474,
+        65479,
+        65482,
+        65487,
+        65490,
+        65495,
+        65498,
+        65500,
+    ];
     function lookupInUnicodeMap(code, map) {
         if (code < map[0]) {
             return false;
@@ -2075,15 +6836,11 @@ var ts;
         return false;
     }
     function isUnicodeIdentifierStart(code, languageVersion) {
-        return languageVersion >= 1 ?
-            lookupInUnicodeMap(code, unicodeES5IdentifierStart) :
-            lookupInUnicodeMap(code, unicodeES3IdentifierStart);
+        return languageVersion >= 1 ? lookupInUnicodeMap(code, unicodeES5IdentifierStart) : lookupInUnicodeMap(code, unicodeES3IdentifierStart);
     }
     ts.isUnicodeIdentifierStart = isUnicodeIdentifierStart;
     function isUnicodeIdentifierPart(code, languageVersion) {
-        return languageVersion >= 1 ?
-            lookupInUnicodeMap(code, unicodeES5IdentifierPart) :
-            lookupInUnicodeMap(code, unicodeES3IdentifierPart);
+        return languageVersion >= 1 ? lookupInUnicodeMap(code, unicodeES5IdentifierPart) : lookupInUnicodeMap(code, unicodeES3IdentifierPart);
     }
     function makeReverseMap(source) {
         var result = [];
@@ -2156,9 +6913,7 @@ var ts;
     ts.getLineAndCharacterOfPosition = getLineAndCharacterOfPosition;
     var hasOwnProperty = Object.prototype.hasOwnProperty;
     function isWhiteSpace(ch) {
-        return ch === 32 || ch === 9 || ch === 11 || ch === 12 ||
-            ch === 160 || ch === 5760 || ch >= 8192 && ch <= 8203 ||
-            ch === 8239 || ch === 8287 || ch === 12288 || ch === 65279;
+        return ch === 32 || ch === 9 || ch === 11 || ch === 12 || ch === 160 || ch === 5760 || ch >= 8192 && ch <= 8203 || ch === 8239 || ch === 8287 || ch === 12288 || ch === 65279;
     }
     ts.isWhiteSpace = isWhiteSpace;
     function isLineBreak(ch) {
@@ -2245,8 +7000,7 @@ var ts;
                         return false;
                     }
                 }
-                return ch === 61 ||
-                    text.charCodeAt(pos + mergeConflictMarkerLength) === 32;
+                return ch === 61 || text.charCodeAt(pos + mergeConflictMarkerLength) === 32;
             }
         }
         return false;
@@ -2326,7 +7080,11 @@ var ts;
                         if (collecting) {
                             if (!result)
                                 result = [];
-                            result.push({ pos: startPos, end: pos, hasTrailingNewLine: hasTrailingNewLine });
+                            result.push({
+                                pos: startPos,
+                                end: pos,
+                                hasTrailingNewLine: hasTrailingNewLine
+                            });
                         }
                         continue;
                     }
@@ -2353,15 +7111,11 @@ var ts;
     }
     ts.getTrailingCommentRanges = getTrailingCommentRanges;
     function isIdentifierStart(ch, languageVersion) {
-        return ch >= 65 && ch <= 90 || ch >= 97 && ch <= 122 ||
-            ch === 36 || ch === 95 ||
-            ch > 127 && isUnicodeIdentifierStart(ch, languageVersion);
+        return ch >= 65 && ch <= 90 || ch >= 97 && ch <= 122 || ch === 36 || ch === 95 || ch > 127 && isUnicodeIdentifierStart(ch, languageVersion);
     }
     ts.isIdentifierStart = isIdentifierStart;
     function isIdentifierPart(ch, languageVersion) {
-        return ch >= 65 && ch <= 90 || ch >= 97 && ch <= 122 ||
-            ch >= 48 && ch <= 57 || ch === 36 || ch === 95 ||
-            ch > 127 && isUnicodeIdentifierPart(ch, languageVersion);
+        return ch >= 65 && ch <= 90 || ch >= 97 && ch <= 122 || ch >= 48 && ch <= 57 || ch === 36 || ch === 95 || ch > 127 && isUnicodeIdentifierPart(ch, languageVersion);
     }
     ts.isIdentifierPart = isIdentifierPart;
     function createScanner(languageVersion, skipTrivia, text, onError) {
@@ -2380,14 +7134,10 @@ var ts;
             }
         }
         function isIdentifierStart(ch) {
-            return ch >= 65 && ch <= 90 || ch >= 97 && ch <= 122 ||
-                ch === 36 || ch === 95 ||
-                ch > 127 && isUnicodeIdentifierStart(ch, languageVersion);
+            return ch >= 65 && ch <= 90 || ch >= 97 && ch <= 122 || ch === 36 || ch === 95 || ch > 127 && isUnicodeIdentifierStart(ch, languageVersion);
         }
         function isIdentifierPart(ch) {
-            return ch >= 65 && ch <= 90 || ch >= 97 && ch <= 122 ||
-                ch >= 48 && ch <= 57 || ch === 36 || ch === 95 ||
-                ch > 127 && isUnicodeIdentifierPart(ch, languageVersion);
+            return ch >= 65 && ch <= 90 || ch >= 97 && ch <= 122 || ch >= 48 && ch <= 57 || ch === 36 || ch === 95 || ch > 127 && isUnicodeIdentifierPart(ch, languageVersion);
         }
         function scanNumber() {
             var start = pos;
@@ -3110,17 +7860,39 @@ var ts;
         }
         setText(text);
         return {
-            getStartPos: function () { return startPos; },
-            getTextPos: function () { return pos; },
-            getToken: function () { return token; },
-            getTokenPos: function () { return tokenPos; },
-            getTokenText: function () { return text.substring(tokenPos, pos); },
-            getTokenValue: function () { return tokenValue; },
-            hasExtendedUnicodeEscape: function () { return hasExtendedUnicodeEscape; },
-            hasPrecedingLineBreak: function () { return precedingLineBreak; },
-            isIdentifier: function () { return token === 64 || token > 100; },
-            isReservedWord: function () { return token >= 65 && token <= 100; },
-            isUnterminated: function () { return tokenIsUnterminated; },
+            getStartPos: function () {
+                return startPos;
+            },
+            getTextPos: function () {
+                return pos;
+            },
+            getToken: function () {
+                return token;
+            },
+            getTokenPos: function () {
+                return tokenPos;
+            },
+            getTokenText: function () {
+                return text.substring(tokenPos, pos);
+            },
+            getTokenValue: function () {
+                return tokenValue;
+            },
+            hasExtendedUnicodeEscape: function () {
+                return hasExtendedUnicodeEscape;
+            },
+            hasPrecedingLineBreak: function () {
+                return precedingLineBreak;
+            },
+            isIdentifier: function () {
+                return token === 64 || token > 100;
+            },
+            isReservedWord: function () {
+                return token >= 65 && token <= 100;
+            },
+            isUnterminated: function () {
+                return tokenIsUnterminated;
+            },
             reScanGreaterToken: reScanGreaterToken,
             reScanSlashToken: reScanSlashToken,
             reScanTemplateToken: reScanTemplateToken,
@@ -3150,9 +7922,13 @@ var ts;
     function getSingleLineStringWriter() {
         if (stringWriters.length == 0) {
             var str = "";
-            var writeText = function (text) { return str += text; };
+            var writeText = function (text) {
+                return str += text;
+            };
             return {
-                string: function () { return str; },
+                string: function () {
+                    return str;
+                },
                 writeKeyword: writeText,
                 writeOperator: writeText,
                 writePunctuation: writeText,
@@ -3160,11 +7936,18 @@ var ts;
                 writeStringLiteral: writeText,
                 writeParameter: writeText,
                 writeSymbol: writeText,
-                writeLine: function () { return str += " "; },
-                increaseIndent: function () { },
-                decreaseIndent: function () { },
-                clear: function () { return str = ""; },
-                trackSymbol: function () { }
+                writeLine: function () {
+                    return str += " ";
+                },
+                increaseIndent: function () {
+                },
+                decreaseIndent: function () {
+                },
+                clear: function () {
+                    return str = "";
+                },
+                trackSymbol: function () {
+                }
             };
         }
         return stringWriters.pop();
@@ -3186,8 +7969,7 @@ var ts;
     ts.containsParseError = containsParseError;
     function aggregateChildData(node) {
         if (!(node.parserContextFlags & 64)) {
-            var thisNodeOrAnySubNodesHasError = ((node.parserContextFlags & 16) !== 0) ||
-                ts.forEachChild(node, containsParseError);
+            var thisNodeOrAnySubNodesHasError = ((node.parserContextFlags & 16) !== 0) || ts.forEachChild(node, containsParseError);
             if (thisNodeOrAnySubNodesHasError) {
                 node.parserContextFlags |= 32;
             }
@@ -3195,7 +7977,7 @@ var ts;
         }
     }
     function getSourceFileOfNode(node) {
-        while (node && node.kind !== 220) {
+        while (node && node.kind !== 221) {
             node = node.parent;
         }
         return node;
@@ -3266,15 +8048,35 @@ var ts;
     }
     ts.makeIdentifierFromModuleName = makeIdentifierFromModuleName;
     function isBlockOrCatchScoped(declaration) {
-        return (getCombinedNodeFlags(declaration) & 12288) !== 0 ||
-            isCatchClauseVariableDeclaration(declaration);
+        return (getCombinedNodeFlags(declaration) & 12288) !== 0 || isCatchClauseVariableDeclaration(declaration);
     }
     ts.isBlockOrCatchScoped = isBlockOrCatchScoped;
+    function getEnclosingBlockScopeContainer(node) {
+        var current = node;
+        while (current) {
+            if (isFunctionLike(current)) {
+                return current;
+            }
+            switch (current.kind) {
+                case 221:
+                case 202:
+                case 217:
+                case 200:
+                case 181:
+                case 182:
+                case 183:
+                    return current;
+                case 174:
+                    if (!isFunctionLike(current.parent)) {
+                        return current;
+                    }
+            }
+            current = current.parent;
+        }
+    }
+    ts.getEnclosingBlockScopeContainer = getEnclosingBlockScopeContainer;
     function isCatchClauseVariableDeclaration(declaration) {
-        return declaration &&
-            declaration.kind === 193 &&
-            declaration.parent &&
-            declaration.parent.kind === 216;
+        return declaration && declaration.kind === 193 && declaration.parent && declaration.parent.kind === 217;
     }
     ts.isCatchClauseVariableDeclaration = isCatchClauseVariableDeclaration;
     function declarationNameToString(name) {
@@ -3317,7 +8119,7 @@ var ts;
             case 197:
             case 200:
             case 199:
-            case 219:
+            case 220:
             case 195:
             case 160:
                 errorNode = node.name;
@@ -3326,9 +8128,7 @@ var ts;
         if (errorNode === undefined) {
             return getSpanOfTokenAtPosition(sourceFile, node.pos);
         }
-        var pos = nodeIsMissing(errorNode)
-            ? errorNode.pos
-            : ts.skipTrivia(sourceFile.text, errorNode.pos);
+        var pos = nodeIsMissing(errorNode) ? errorNode.pos : ts.skipTrivia(sourceFile.text, errorNode.pos);
         return createTextSpanFromBounds(pos, errorNode.end);
     }
     ts.getErrorSpanForNode = getErrorSpanForNode;
@@ -3391,9 +8191,7 @@ var ts;
     function getJsDocComments(node, sourceFileOfNode) {
         return ts.filter(getLeadingCommentRangesOfNode(node, sourceFileOfNode), isJsDocComment);
         function isJsDocComment(comment) {
-            return sourceFileOfNode.text.charCodeAt(comment.pos + 1) === 42 &&
-                sourceFileOfNode.text.charCodeAt(comment.pos + 2) === 42 &&
-                sourceFileOfNode.text.charCodeAt(comment.pos + 3) !== 47;
+            return sourceFileOfNode.text.charCodeAt(comment.pos + 1) === 42 && sourceFileOfNode.text.charCodeAt(comment.pos + 2) === 42 && sourceFileOfNode.text.charCodeAt(comment.pos + 3) !== 47;
         }
     }
     ts.getJsDocComments = getJsDocComments;
@@ -3404,6 +8202,7 @@ var ts;
             switch (node.kind) {
                 case 186:
                     return visitor(node);
+                case 202:
                 case 174:
                 case 178:
                 case 179:
@@ -3413,11 +8212,11 @@ var ts;
                 case 183:
                 case 187:
                 case 188:
-                case 213:
                 case 214:
+                case 215:
                 case 189:
                 case 191:
-                case 216:
+                case 217:
                     return ts.forEachChild(node, traverse);
             }
         }
@@ -3427,12 +8226,12 @@ var ts;
         if (node) {
             switch (node.kind) {
                 case 150:
-                case 219:
+                case 220:
                 case 128:
-                case 217:
+                case 218:
                 case 130:
                 case 129:
-                case 218:
+                case 219:
                 case 193:
                     return true;
             }
@@ -3510,7 +8309,7 @@ var ts;
                 case 134:
                 case 135:
                 case 199:
-                case 220:
+                case 221:
                     return node;
             }
         }
@@ -3601,8 +8400,8 @@ var ts;
                     case 128:
                     case 130:
                     case 129:
-                    case 219:
-                    case 217:
+                    case 220:
+                    case 218:
                     case 150:
                         return parent.initializer === node;
                     case 177:
@@ -3612,20 +8411,17 @@ var ts;
                     case 186:
                     case 187:
                     case 188:
-                    case 213:
+                    case 214:
                     case 190:
                     case 188:
                         return parent.expression === node;
                     case 181:
                         var forStatement = parent;
-                        return (forStatement.initializer === node && forStatement.initializer.kind !== 194) ||
-                            forStatement.condition === node ||
-                            forStatement.iterator === node;
+                        return (forStatement.initializer === node && forStatement.initializer.kind !== 194) || forStatement.condition === node || forStatement.iterator === node;
                     case 182:
                     case 183:
                         var forInStatement = parent;
-                        return (forInStatement.initializer === node && forInStatement.initializer.kind !== 194) ||
-                            forInStatement.expression === node;
+                        return (forInStatement.initializer === node && forInStatement.initializer.kind !== 194) || forInStatement.expression === node;
                     case 158:
                         return node === parent.expression;
                     case 173:
@@ -3643,12 +8439,11 @@ var ts;
     ts.isExpression = isExpression;
     function isInstantiatedModule(node, preserveConstEnums) {
         var moduleState = ts.getModuleInstanceState(node);
-        return moduleState === 1 ||
-            (preserveConstEnums && moduleState === 2);
+        return moduleState === 1 || (preserveConstEnums && moduleState === 2);
     }
     ts.isInstantiatedModule = isInstantiatedModule;
     function isExternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 202 && node.moduleReference.kind === 212;
+        return node.kind === 203 && node.moduleReference.kind === 213;
     }
     ts.isExternalModuleImportEqualsDeclaration = isExternalModuleImportEqualsDeclaration;
     function getExternalModuleImportEqualsDeclarationExpression(node) {
@@ -3657,20 +8452,20 @@ var ts;
     }
     ts.getExternalModuleImportEqualsDeclarationExpression = getExternalModuleImportEqualsDeclarationExpression;
     function isInternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 202 && node.moduleReference.kind !== 212;
+        return node.kind === 203 && node.moduleReference.kind !== 213;
     }
     ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration;
     function getExternalModuleName(node) {
-        if (node.kind === 203) {
+        if (node.kind === 204) {
             return node.moduleSpecifier;
         }
-        if (node.kind === 202) {
+        if (node.kind === 203) {
             var reference = node.moduleReference;
-            if (reference.kind === 212) {
+            if (reference.kind === 213) {
                 return reference.expression;
             }
         }
-        if (node.kind === 209) {
+        if (node.kind === 210) {
             return node.moduleSpecifier;
         }
     }
@@ -3687,8 +8482,8 @@ var ts;
                 case 132:
                 case 131:
                     return node.questionToken !== undefined;
+                case 219:
                 case 218:
-                case 217:
                 case 130:
                 case 129:
                     return node.questionToken !== undefined;
@@ -3734,25 +8529,25 @@ var ts;
             case 196:
             case 133:
             case 199:
-            case 219:
-            case 211:
+            case 220:
+            case 212:
             case 195:
             case 160:
             case 134:
-            case 204:
-            case 202:
-            case 207:
+            case 205:
+            case 203:
+            case 208:
             case 197:
             case 132:
             case 131:
             case 200:
-            case 205:
+            case 206:
             case 128:
-            case 217:
+            case 218:
             case 130:
             case 129:
             case 135:
-            case 218:
+            case 219:
             case 198:
             case 127:
             case 193:
@@ -3781,7 +8576,7 @@ var ts;
             case 175:
             case 180:
             case 187:
-            case 208:
+            case 209:
                 return true;
             default:
                 return false;
@@ -3793,7 +8588,7 @@ var ts;
             return false;
         }
         var parent = name.parent;
-        if (parent.kind === 207 || parent.kind === 211) {
+        if (parent.kind === 208 || parent.kind === 212) {
             if (parent.propertyName) {
                 return true;
             }
@@ -3891,9 +8686,7 @@ var ts;
     }
     ts.isTrivia = isTrivia;
     function hasDynamicName(declaration) {
-        return declaration.name &&
-            declaration.name.kind === 126 &&
-            !isWellKnownSymbolSyntactically(declaration.name.expression);
+        return declaration.name && declaration.name.kind === 126 && !isWellKnownSymbolSyntactically(declaration.name.expression);
     }
     ts.hasDynamicName = hasDynamicName;
     function isWellKnownSymbolSyntactically(node) {
@@ -3997,7 +8790,10 @@ var ts;
         if (length < 0) {
             throw new Error("length < 0");
         }
-        return { start: start, length: length };
+        return {
+            start: start,
+            length: length
+        };
     }
     ts.createTextSpan = createTextSpan;
     function createTextSpanFromBounds(start, end) {
@@ -4016,7 +8812,10 @@ var ts;
         if (newLength < 0) {
             throw new Error("newLength < 0");
         }
-        return { span: span, newLength: newLength };
+        return {
+            span: span,
+            newLength: newLength
+        };
     }
     ts.createTextChangeRange = createTextChangeRange;
     ts.unchangedTextChangeRange = createTextChangeRange(createTextSpan(0, 0), 0);
@@ -4047,11 +8846,11 @@ var ts;
     }
     ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions;
     function nodeStartsNewLexicalEnvironment(n) {
-        return isFunctionLike(n) || n.kind === 200 || n.kind === 220;
+        return isFunctionLike(n) || n.kind === 200 || n.kind === 221;
     }
     ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment;
     function nodeIsSynthesized(node) {
-        return node.pos === -1 && node.end === -1;
+        return node.pos === -1;
     }
     ts.nodeIsSynthesized = nodeIsSynthesized;
     function createSynthesizedNode(kind, startsOnNewLine) {
@@ -4177,15 +8976,15 @@ var ts;
     }
     var nonAsciiCharacters = /[^\u0000-\u007F]/g;
     function escapeNonAsciiCharacters(s) {
-        return nonAsciiCharacters.test(s) ?
-            s.replace(nonAsciiCharacters, function (c) { return get16BitUnicodeEscapeSequence(c.charCodeAt(0)); }) :
-            s;
+        return nonAsciiCharacters.test(s) ? s.replace(nonAsciiCharacters, function (c) {
+            return get16BitUnicodeEscapeSequence(c.charCodeAt(0));
+        }) : s;
     }
     ts.escapeNonAsciiCharacters = escapeNonAsciiCharacters;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    var nodeConstructors = new Array(222);
+    var nodeConstructors = new Array(223);
     ts.parseTime = 0;
     function getNodeConstructor(kind) {
         return nodeConstructors[kind] || (nodeConstructors[kind] = ts.objectAllocator.getNodeConstructor(kind));
@@ -4223,35 +9022,23 @@ var ts;
         var cbNodes = cbNodeArray || cbNode;
         switch (node.kind) {
             case 125:
-                return visitNode(cbNode, node.left) ||
-                    visitNode(cbNode, node.right);
+                return visitNode(cbNode, node.left) || visitNode(cbNode, node.right);
             case 127:
-                return visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.constraint) ||
-                    visitNode(cbNode, node.expression);
+                return visitNode(cbNode, node.name) || visitNode(cbNode, node.constraint) || visitNode(cbNode, node.expression);
             case 128:
             case 130:
             case 129:
-            case 217:
             case 218:
+            case 219:
             case 193:
             case 150:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.propertyName) ||
-                    visitNode(cbNode, node.dotDotDotToken) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.questionToken) ||
-                    visitNode(cbNode, node.type) ||
-                    visitNode(cbNode, node.initializer);
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.propertyName) || visitNode(cbNode, node.dotDotDotToken) || visitNode(cbNode, node.name) || visitNode(cbNode, node.questionToken) || visitNode(cbNode, node.type) || visitNode(cbNode, node.initializer);
             case 140:
             case 141:
             case 136:
             case 137:
             case 138:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNodes(cbNodes, node.typeParameters) ||
-                    visitNodes(cbNodes, node.parameters) ||
-                    visitNode(cbNode, node.type);
+                return visitNodes(cbNodes, node.modifiers) || visitNodes(cbNodes, node.typeParameters) || visitNodes(cbNodes, node.parameters) || visitNode(cbNode, node.type);
             case 132:
             case 131:
             case 133:
@@ -4260,17 +9047,9 @@ var ts;
             case 160:
             case 195:
             case 161:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.asteriskToken) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.questionToken) ||
-                    visitNodes(cbNodes, node.typeParameters) ||
-                    visitNodes(cbNodes, node.parameters) ||
-                    visitNode(cbNode, node.type) ||
-                    visitNode(cbNode, node.body);
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.asteriskToken) || visitNode(cbNode, node.name) || visitNode(cbNode, node.questionToken) || visitNodes(cbNodes, node.typeParameters) || visitNodes(cbNodes, node.parameters) || visitNode(cbNode, node.type) || visitNode(cbNode, node.body);
             case 139:
-                return visitNode(cbNode, node.typeName) ||
-                    visitNodes(cbNodes, node.typeArguments);
+                return visitNode(cbNode, node.typeName) || visitNodes(cbNodes, node.typeArguments);
             case 142:
                 return visitNode(cbNode, node.exprName);
             case 143:
@@ -4291,23 +9070,16 @@ var ts;
             case 152:
                 return visitNodes(cbNodes, node.properties);
             case 153:
-                return visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.dotToken) ||
-                    visitNode(cbNode, node.name);
+                return visitNode(cbNode, node.expression) || visitNode(cbNode, node.dotToken) || visitNode(cbNode, node.name);
             case 154:
-                return visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.argumentExpression);
+                return visitNode(cbNode, node.expression) || visitNode(cbNode, node.argumentExpression);
             case 155:
             case 156:
-                return visitNode(cbNode, node.expression) ||
-                    visitNodes(cbNodes, node.typeArguments) ||
-                    visitNodes(cbNodes, node.arguments);
+                return visitNode(cbNode, node.expression) || visitNodes(cbNodes, node.typeArguments) || visitNodes(cbNodes, node.arguments);
             case 157:
-                return visitNode(cbNode, node.tag) ||
-                    visitNode(cbNode, node.template);
+                return visitNode(cbNode, node.tag) || visitNode(cbNode, node.template);
             case 158:
-                return visitNode(cbNode, node.type) ||
-                    visitNode(cbNode, node.expression);
+                return visitNode(cbNode, node.type) || visitNode(cbNode, node.expression);
             case 159:
                 return visitNode(cbNode, node.expression);
             case 162:
@@ -4319,149 +9091,100 @@ var ts;
             case 165:
                 return visitNode(cbNode, node.operand);
             case 170:
-                return visitNode(cbNode, node.asteriskToken) ||
-                    visitNode(cbNode, node.expression);
+                return visitNode(cbNode, node.asteriskToken) || visitNode(cbNode, node.expression);
             case 166:
                 return visitNode(cbNode, node.operand);
             case 167:
-                return visitNode(cbNode, node.left) ||
-                    visitNode(cbNode, node.operatorToken) ||
-                    visitNode(cbNode, node.right);
+                return visitNode(cbNode, node.left) || visitNode(cbNode, node.operatorToken) || visitNode(cbNode, node.right);
             case 168:
-                return visitNode(cbNode, node.condition) ||
-                    visitNode(cbNode, node.questionToken) ||
-                    visitNode(cbNode, node.whenTrue) ||
-                    visitNode(cbNode, node.colonToken) ||
-                    visitNode(cbNode, node.whenFalse);
+                return visitNode(cbNode, node.condition) || visitNode(cbNode, node.questionToken) || visitNode(cbNode, node.whenTrue) || visitNode(cbNode, node.colonToken) || visitNode(cbNode, node.whenFalse);
             case 171:
                 return visitNode(cbNode, node.expression);
             case 174:
             case 201:
                 return visitNodes(cbNodes, node.statements);
-            case 220:
-                return visitNodes(cbNodes, node.statements) ||
-                    visitNode(cbNode, node.endOfFileToken);
+            case 221:
+                return visitNodes(cbNodes, node.statements) || visitNode(cbNode, node.endOfFileToken);
             case 175:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.declarationList);
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.declarationList);
             case 194:
                 return visitNodes(cbNodes, node.declarations);
             case 177:
                 return visitNode(cbNode, node.expression);
             case 178:
-                return visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.thenStatement) ||
-                    visitNode(cbNode, node.elseStatement);
+                return visitNode(cbNode, node.expression) || visitNode(cbNode, node.thenStatement) || visitNode(cbNode, node.elseStatement);
             case 179:
-                return visitNode(cbNode, node.statement) ||
-                    visitNode(cbNode, node.expression);
+                return visitNode(cbNode, node.statement) || visitNode(cbNode, node.expression);
             case 180:
-                return visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.statement);
+                return visitNode(cbNode, node.expression) || visitNode(cbNode, node.statement);
             case 181:
-                return visitNode(cbNode, node.initializer) ||
-                    visitNode(cbNode, node.condition) ||
-                    visitNode(cbNode, node.iterator) ||
-                    visitNode(cbNode, node.statement);
+                return visitNode(cbNode, node.initializer) || visitNode(cbNode, node.condition) || visitNode(cbNode, node.iterator) || visitNode(cbNode, node.statement);
             case 182:
-                return visitNode(cbNode, node.initializer) ||
-                    visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.statement);
+                return visitNode(cbNode, node.initializer) || visitNode(cbNode, node.expression) || visitNode(cbNode, node.statement);
             case 183:
-                return visitNode(cbNode, node.initializer) ||
-                    visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.statement);
+                return visitNode(cbNode, node.initializer) || visitNode(cbNode, node.expression) || visitNode(cbNode, node.statement);
             case 184:
             case 185:
                 return visitNode(cbNode, node.label);
             case 186:
                 return visitNode(cbNode, node.expression);
             case 187:
-                return visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.statement);
+                return visitNode(cbNode, node.expression) || visitNode(cbNode, node.statement);
             case 188:
-                return visitNode(cbNode, node.expression) ||
-                    visitNodes(cbNodes, node.clauses);
-            case 213:
-                return visitNode(cbNode, node.expression) ||
-                    visitNodes(cbNodes, node.statements);
+                return visitNode(cbNode, node.expression) || visitNode(cbNode, node.caseBlock);
+            case 202:
+                return visitNodes(cbNodes, node.clauses);
             case 214:
+                return visitNode(cbNode, node.expression) || visitNodes(cbNodes, node.statements);
+            case 215:
                 return visitNodes(cbNodes, node.statements);
             case 189:
-                return visitNode(cbNode, node.label) ||
-                    visitNode(cbNode, node.statement);
+                return visitNode(cbNode, node.label) || visitNode(cbNode, node.statement);
             case 190:
                 return visitNode(cbNode, node.expression);
             case 191:
-                return visitNode(cbNode, node.tryBlock) ||
-                    visitNode(cbNode, node.catchClause) ||
-                    visitNode(cbNode, node.finallyBlock);
-            case 216:
-                return visitNode(cbNode, node.variableDeclaration) ||
-                    visitNode(cbNode, node.block);
+                return visitNode(cbNode, node.tryBlock) || visitNode(cbNode, node.catchClause) || visitNode(cbNode, node.finallyBlock);
+            case 217:
+                return visitNode(cbNode, node.variableDeclaration) || visitNode(cbNode, node.block);
             case 196:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNodes(cbNodes, node.typeParameters) ||
-                    visitNodes(cbNodes, node.heritageClauses) ||
-                    visitNodes(cbNodes, node.members);
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.name) || visitNodes(cbNodes, node.typeParameters) || visitNodes(cbNodes, node.heritageClauses) || visitNodes(cbNodes, node.members);
             case 197:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNodes(cbNodes, node.typeParameters) ||
-                    visitNodes(cbNodes, node.heritageClauses) ||
-                    visitNodes(cbNodes, node.members);
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.name) || visitNodes(cbNodes, node.typeParameters) || visitNodes(cbNodes, node.heritageClauses) || visitNodes(cbNodes, node.members);
             case 198:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.type);
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.name) || visitNode(cbNode, node.type);
             case 199:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNodes(cbNodes, node.members);
-            case 219:
-                return visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.initializer);
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.name) || visitNodes(cbNodes, node.members);
+            case 220:
+                return visitNode(cbNode, node.name) || visitNode(cbNode, node.initializer);
             case 200:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.body);
-            case 202:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.moduleReference);
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.name) || visitNode(cbNode, node.body);
             case 203:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.importClause) ||
-                    visitNode(cbNode, node.moduleSpecifier);
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.name) || visitNode(cbNode, node.moduleReference);
             case 204:
-                return visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.namedBindings);
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.importClause) || visitNode(cbNode, node.moduleSpecifier);
             case 205:
-                return visitNode(cbNode, node.name);
+                return visitNode(cbNode, node.name) || visitNode(cbNode, node.namedBindings);
             case 206:
-            case 210:
-                return visitNodes(cbNodes, node.elements);
-            case 209:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.exportClause) ||
-                    visitNode(cbNode, node.moduleSpecifier);
+                return visitNode(cbNode, node.name);
             case 207:
             case 211:
-                return visitNode(cbNode, node.propertyName) ||
-                    visitNode(cbNode, node.name);
+                return visitNodes(cbNodes, node.elements);
+            case 210:
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.exportClause) || visitNode(cbNode, node.moduleSpecifier);
             case 208:
-                return visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.expression);
+            case 212:
+                return visitNode(cbNode, node.propertyName) || visitNode(cbNode, node.name);
+            case 209:
+                return visitNodes(cbNodes, node.modifiers) || visitNode(cbNode, node.expression);
             case 169:
                 return visitNode(cbNode, node.head) || visitNodes(cbNodes, node.templateSpans);
             case 173:
                 return visitNode(cbNode, node.expression) || visitNode(cbNode, node.literal);
             case 126:
                 return visitNode(cbNode, node.expression);
-            case 215:
+            case 216:
                 return visitNodes(cbNodes, node.types);
-            case 212:
+            case 213:
                 return visitNode(cbNode, node.expression);
         }
     }
@@ -4499,40 +9222,69 @@ var ts;
     })(Tristate || (Tristate = {}));
     function parsingContextErrors(context) {
         switch (context) {
-            case 0: return ts.Diagnostics.Declaration_or_statement_expected;
-            case 1: return ts.Diagnostics.Declaration_or_statement_expected;
-            case 2: return ts.Diagnostics.Statement_expected;
-            case 3: return ts.Diagnostics.case_or_default_expected;
-            case 4: return ts.Diagnostics.Statement_expected;
-            case 5: return ts.Diagnostics.Property_or_signature_expected;
-            case 6: return ts.Diagnostics.Unexpected_token_A_constructor_method_accessor_or_property_was_expected;
-            case 7: return ts.Diagnostics.Enum_member_expected;
-            case 8: return ts.Diagnostics.Type_reference_expected;
-            case 9: return ts.Diagnostics.Variable_declaration_expected;
-            case 10: return ts.Diagnostics.Property_destructuring_pattern_expected;
-            case 11: return ts.Diagnostics.Array_element_destructuring_pattern_expected;
-            case 12: return ts.Diagnostics.Argument_expression_expected;
-            case 13: return ts.Diagnostics.Property_assignment_expected;
-            case 14: return ts.Diagnostics.Expression_or_comma_expected;
-            case 15: return ts.Diagnostics.Parameter_declaration_expected;
-            case 16: return ts.Diagnostics.Type_parameter_declaration_expected;
-            case 17: return ts.Diagnostics.Type_argument_expected;
-            case 18: return ts.Diagnostics.Type_expected;
-            case 19: return ts.Diagnostics.Unexpected_token_expected;
-            case 20: return ts.Diagnostics.Identifier_expected;
+            case 0:
+                return ts.Diagnostics.Declaration_or_statement_expected;
+            case 1:
+                return ts.Diagnostics.Declaration_or_statement_expected;
+            case 2:
+                return ts.Diagnostics.Statement_expected;
+            case 3:
+                return ts.Diagnostics.case_or_default_expected;
+            case 4:
+                return ts.Diagnostics.Statement_expected;
+            case 5:
+                return ts.Diagnostics.Property_or_signature_expected;
+            case 6:
+                return ts.Diagnostics.Unexpected_token_A_constructor_method_accessor_or_property_was_expected;
+            case 7:
+                return ts.Diagnostics.Enum_member_expected;
+            case 8:
+                return ts.Diagnostics.Type_reference_expected;
+            case 9:
+                return ts.Diagnostics.Variable_declaration_expected;
+            case 10:
+                return ts.Diagnostics.Property_destructuring_pattern_expected;
+            case 11:
+                return ts.Diagnostics.Array_element_destructuring_pattern_expected;
+            case 12:
+                return ts.Diagnostics.Argument_expression_expected;
+            case 13:
+                return ts.Diagnostics.Property_assignment_expected;
+            case 14:
+                return ts.Diagnostics.Expression_or_comma_expected;
+            case 15:
+                return ts.Diagnostics.Parameter_declaration_expected;
+            case 16:
+                return ts.Diagnostics.Type_parameter_declaration_expected;
+            case 17:
+                return ts.Diagnostics.Type_argument_expected;
+            case 18:
+                return ts.Diagnostics.Type_expected;
+            case 19:
+                return ts.Diagnostics.Unexpected_token_expected;
+            case 20:
+                return ts.Diagnostics.Identifier_expected;
         }
     }
     ;
     function modifierToFlag(token) {
         switch (token) {
-            case 109: return 128;
-            case 108: return 16;
-            case 107: return 64;
-            case 106: return 32;
-            case 77: return 1;
-            case 114: return 2;
-            case 69: return 8192;
-            case 72: return 256;
+            case 109:
+                return 128;
+            case 108:
+                return 16;
+            case 107:
+                return 64;
+            case 106:
+                return 32;
+            case 77:
+                return 1;
+            case 114:
+                return 2;
+            case 69:
+                return 8192;
+            case 72:
+                return 256;
         }
         return 0;
     }
@@ -4763,8 +9515,7 @@ var ts;
     }
     ts.updateSourceFile = updateSourceFile;
     function isEvalOrArgumentsIdentifier(node) {
-        return node.kind === 64 &&
-            (node.text === "eval" || node.text === "arguments");
+        return node.kind === 64 && (node.text === "eval" || node.text === "arguments");
     }
     ts.isEvalOrArgumentsIdentifier = isEvalOrArgumentsIdentifier;
     function isUseStrictPrologueDirective(sourceFile, node) {
@@ -4850,7 +9601,7 @@ var ts;
         var identifierCount = 0;
         var nodeCount = 0;
         var token;
-        var sourceFile = createNode(220, 0);
+        var sourceFile = createNode(221, 0);
         sourceFile.pos = 0;
         sourceFile.end = sourceText.length;
         sourceFile.text = sourceText;
@@ -4986,9 +9737,7 @@ var ts;
             var saveParseDiagnosticsLength = sourceFile.parseDiagnostics.length;
             var saveParseErrorBeforeNextFinishedNode = parseErrorBeforeNextFinishedNode;
             var saveContextFlags = contextFlags;
-            var result = isLookAhead
-                ? scanner.lookAhead(callback)
-                : scanner.tryScan(callback);
+            var result = isLookAhead ? scanner.lookAhead(callback) : scanner.tryScan(callback);
             ts.Debug.assert(saveContextFlags === contextFlags);
             if (!result || isLookAhead) {
                 token = saveToken;
@@ -5039,8 +9788,7 @@ var ts;
             return undefined;
         }
         function parseExpectedToken(t, reportAtCurrentPosition, diagnosticMessage, arg0) {
-            return parseOptionalToken(t) ||
-                createMissingNode(t, reportAtCurrentPosition, diagnosticMessage, arg0);
+            return parseOptionalToken(t) || createMissingNode(t, reportAtCurrentPosition, diagnosticMessage, arg0);
         }
         function parseTokenNode() {
             var node = createNode(token);
@@ -5117,9 +9865,7 @@ var ts;
             return createIdentifier(isIdentifierOrKeyword());
         }
         function isLiteralPropertyName() {
-            return isIdentifierOrKeyword() ||
-                token === 8 ||
-                token === 7;
+            return isIdentifierOrKeyword() || token === 8 || token === 7;
         }
         function parsePropertyName() {
             if (token === 8 || token === 7) {
@@ -5172,10 +9918,7 @@ var ts;
             return canFollowModifier();
         }
         function canFollowModifier() {
-            return token === 18
-                || token === 14
-                || token === 35
-                || isLiteralPropertyName();
+            return token === 18 || token === 14 || token === 35 || isLiteralPropertyName();
         }
         function nextTokenIsClassOrFunction() {
             nextToken();
@@ -5233,8 +9976,7 @@ var ts;
             return isIdentifier();
         }
         function isNotHeritageClauseTypeName() {
-            if (token === 102 ||
-                token === 78) {
+            if (token === 102 || token === 78) {
                 return lookAhead(nextTokenIsIdentifier);
             }
             return false;
@@ -5400,10 +10142,10 @@ var ts;
         function isReusableModuleElement(node) {
             if (node) {
                 switch (node.kind) {
+                    case 204:
                     case 203:
-                    case 202:
+                    case 210:
                     case 209:
-                    case 208:
                     case 196:
                     case 197:
                     case 200:
@@ -5431,8 +10173,8 @@ var ts;
         function isReusableSwitchClause(node) {
             if (node) {
                 switch (node.kind) {
-                    case 213:
                     case 214:
+                    case 215:
                         return true;
                 }
             }
@@ -5467,7 +10209,7 @@ var ts;
             return false;
         }
         function isReusableEnumMember(node) {
-            return node.kind === 219;
+            return node.kind === 220;
         }
         function isReusableTypeMember(node) {
             if (node) {
@@ -5615,9 +10357,7 @@ var ts;
             var tokenPos = scanner.getTokenPos();
             nextToken();
             finishNode(node);
-            if (node.kind === 7
-                && sourceText.charCodeAt(tokenPos) === 48
-                && ts.isOctalDigit(sourceText.charCodeAt(tokenPos + 1))) {
+            if (node.kind === 7 && sourceText.charCodeAt(tokenPos) === 48 && ts.isOctalDigit(sourceText.charCodeAt(tokenPos + 1))) {
                 node.flags |= 16384;
             }
             return node;
@@ -5656,9 +10396,7 @@ var ts;
         }
         function parseParameterType() {
             if (parseOptional(51)) {
-                return token === 8
-                    ? parseLiteralNode(true)
-                    : parseType();
+                return token === 8 ? parseLiteralNode(true) : parseType();
             }
             return undefined;
         }
@@ -5816,11 +10554,7 @@ var ts;
         }
         function isTypeMemberWithLiteralPropertyName() {
             nextToken();
-            return token === 16 ||
-                token === 24 ||
-                token === 50 ||
-                token === 51 ||
-                canParseSemicolon();
+            return token === 16 || token === 24 || token === 50 || token === 51 || canParseSemicolon();
         }
         function parseTypeMember() {
             switch (token) {
@@ -5828,9 +10562,7 @@ var ts;
                 case 24:
                     return parseSignatureMember(136);
                 case 18:
-                    return isIndexSignature()
-                        ? parseIndexSignatureDeclaration(undefined)
-                        : parsePropertyOrMethodSignature();
+                    return isIndexSignature() ? parseIndexSignatureDeclaration(undefined) : parsePropertyOrMethodSignature();
                 case 87:
                     if (lookAhead(isStartOfConstructSignature)) {
                         return parseSignatureMember(137);
@@ -5852,9 +10584,7 @@ var ts;
         }
         function parseIndexSignatureWithModifiers() {
             var modifiers = parseModifiers();
-            return isIndexSignature()
-                ? parseIndexSignatureDeclaration(modifiers)
-                : undefined;
+            return isIndexSignature() ? parseIndexSignatureDeclaration(modifiers) : undefined;
         }
         function isStartOfConstructSignature() {
             nextToken();
@@ -5960,7 +10690,9 @@ var ts;
         function parseUnionTypeOrHigher() {
             var type = parseArrayTypeOrHigher();
             if (token === 44) {
-                var types = [type];
+                var types = [
+                    type
+                ];
                 types.pos = type.pos;
                 while (parseOptional(44)) {
                     types.push(parseArrayTypeOrHigher());
@@ -5985,9 +10717,7 @@ var ts;
             }
             if (isIdentifier() || ts.isModifier(token)) {
                 nextToken();
-                if (token === 51 || token === 23 ||
-                    token === 50 || token === 52 ||
-                    isIdentifier() || ts.isModifier(token)) {
+                if (token === 51 || token === 23 || token === 50 || token === 52 || isIdentifier() || ts.isModifier(token)) {
                     return true;
                 }
                 if (token === 17) {
@@ -6115,8 +10845,7 @@ var ts;
         function parseYieldExpression() {
             var node = createNode(170);
             nextToken();
-            if (!scanner.hasPrecedingLineBreak() &&
-                (token === 35 || isStartOfExpression())) {
+            if (!scanner.hasPrecedingLineBreak() && (token === 35 || isStartOfExpression())) {
                 node.asteriskToken = parseOptionalToken(35);
                 node.expression = parseAssignmentExpressionOrHigher();
                 return finishNode(node);
@@ -6131,7 +10860,9 @@ var ts;
             var parameter = createNode(128, identifier.pos);
             parameter.name = identifier;
             finishNode(parameter);
-            node.parameters = [parameter];
+            node.parameters = [
+                parameter
+            ];
             node.parameters.pos = parameter.pos;
             node.parameters.end = parameter.end;
             parseExpected(32);
@@ -6143,9 +10874,7 @@ var ts;
             if (triState === 0) {
                 return undefined;
             }
-            var arrowFunction = triState === 1
-                ? parseParenthesizedArrowFunctionExpressionHead(true)
-                : tryParse(parsePossibleParenthesizedArrowFunctionExpressionHead);
+            var arrowFunction = triState === 1 ? parseParenthesizedArrowFunctionExpressionHead(true) : tryParse(parsePossibleParenthesizedArrowFunctionExpressionHead);
             if (!arrowFunction) {
                 return undefined;
             }
@@ -6367,9 +11096,7 @@ var ts;
             return expression;
         }
         function parseLeftHandSideExpressionOrHigher() {
-            var expression = token === 90
-                ? parseSuperExpression()
-                : parseMemberExpressionOrHigher();
+            var expression = token === 90 ? parseSuperExpression() : parseMemberExpressionOrHigher();
             return parseCallExpressionRest(expression);
         }
         function parseMemberExpressionOrHigher() {
@@ -6423,9 +11150,7 @@ var ts;
                 if (token === 10 || token === 11) {
                     var tagExpression = createNode(157, expression.pos);
                     tagExpression.tag = expression;
-                    tagExpression.template = token === 10
-                        ? parseLiteralNode()
-                        : parseTemplateExpression();
+                    tagExpression.template = token === 10 ? parseLiteralNode() : parseTemplateExpression();
                     expression = finishNode(tagExpression);
                     continue;
                 }
@@ -6471,9 +11196,7 @@ var ts;
             if (!parseExpected(25)) {
                 return undefined;
             }
-            return typeArguments && canFollowTypeArgumentsInExpression()
-                ? typeArguments
-                : undefined;
+            return typeArguments && canFollowTypeArgumentsInExpression() ? typeArguments : undefined;
         }
         function canFollowTypeArgumentsInExpression() {
             switch (token) {
@@ -6548,9 +11271,7 @@ var ts;
             return finishNode(node);
         }
         function parseArgumentOrArrayLiteralElement() {
-            return token === 21 ? parseSpreadElement() :
-                token === 23 ? createNode(172) :
-                    parseAssignmentExpressionOrHigher();
+            return token === 21 ? parseSpreadElement() : token === 23 ? createNode(172) : parseAssignmentExpressionOrHigher();
         }
         function parseArgumentExpression() {
             return allowInAnd(parseArgumentOrArrayLiteralElement);
@@ -6589,13 +11310,13 @@ var ts;
                 return parseMethodDeclaration(fullStart, modifiers, asteriskToken, propertyName, questionToken);
             }
             if ((token === 23 || token === 15) && tokenIsIdentifier) {
-                var shorthandDeclaration = createNode(218, fullStart);
+                var shorthandDeclaration = createNode(219, fullStart);
                 shorthandDeclaration.name = propertyName;
                 shorthandDeclaration.questionToken = questionToken;
                 return finishNode(shorthandDeclaration);
             }
             else {
-                var propertyAssignment = createNode(217, fullStart);
+                var propertyAssignment = createNode(218, fullStart);
                 propertyAssignment.name = propertyName;
                 propertyAssignment.questionToken = questionToken;
                 parseExpected(51);
@@ -6761,7 +11482,7 @@ var ts;
             return finishNode(node);
         }
         function parseCaseClause() {
-            var node = createNode(213);
+            var node = createNode(214);
             parseExpected(66);
             node.expression = allowInAnd(parseExpression);
             parseExpected(51);
@@ -6769,7 +11490,7 @@ var ts;
             return finishNode(node);
         }
         function parseDefaultClause() {
-            var node = createNode(214);
+            var node = createNode(215);
             parseExpected(72);
             parseExpected(51);
             node.statements = parseList(4, false, parseStatement);
@@ -6784,9 +11505,11 @@ var ts;
             parseExpected(16);
             node.expression = allowInAnd(parseExpression);
             parseExpected(17);
+            var caseBlock = createNode(202, scanner.getStartPos());
             parseExpected(14);
-            node.clauses = parseList(3, false, parseCaseOrDefaultClause);
+            caseBlock.clauses = parseList(3, false, parseCaseOrDefaultClause);
             parseExpected(15);
+            node.caseBlock = finishNode(caseBlock);
             return finishNode(node);
         }
         function parseThrowStatement() {
@@ -6808,7 +11531,7 @@ var ts;
             return finishNode(node);
         }
         function parseCatchClause() {
-            var result = createNode(216);
+            var result = createNode(217);
             parseExpected(67);
             if (parseExpected(16)) {
                 result.variableDeclaration = parseVariableDeclaration();
@@ -7198,11 +11921,7 @@ var ts;
             if (isIndexSignature()) {
                 return parseIndexSignatureDeclaration(modifiers);
             }
-            if (isIdentifierOrKeyword() ||
-                token === 8 ||
-                token === 7 ||
-                token === 35 ||
-                token === 18) {
+            if (isIdentifierOrKeyword() || token === 8 || token === 7 || token === 35 || token === 18) {
                 return parsePropertyOrMethodDeclaration(fullStart, modifiers);
             }
             ts.Debug.fail("Should not have attempted to parse class member declaration.");
@@ -7215,9 +11934,7 @@ var ts;
             node.typeParameters = parseTypeParameters();
             node.heritageClauses = parseHeritageClauses(true);
             if (parseExpected(14)) {
-                node.members = inGeneratorParameterContext()
-                    ? doOutsideOfYieldContext(parseClassMembers)
-                    : parseClassMembers();
+                node.members = inGeneratorParameterContext() ? doOutsideOfYieldContext(parseClassMembers) : parseClassMembers();
                 parseExpected(15);
             }
             else {
@@ -7227,9 +11944,7 @@ var ts;
         }
         function parseHeritageClauses(isClassHeritageClause) {
             if (isHeritageClause()) {
-                return isClassHeritageClause && inGeneratorParameterContext()
-                    ? doOutsideOfYieldContext(parseHeritageClausesWorker)
-                    : parseHeritageClausesWorker();
+                return isClassHeritageClause && inGeneratorParameterContext() ? doOutsideOfYieldContext(parseHeritageClausesWorker) : parseHeritageClausesWorker();
             }
             return undefined;
         }
@@ -7238,7 +11953,7 @@ var ts;
         }
         function parseHeritageClause() {
             if (token === 78 || token === 102) {
-                var node = createNode(215);
+                var node = createNode(216);
                 node.token = token;
                 nextToken();
                 node.types = parseDelimitedList(8, parseTypeReference);
@@ -7273,7 +11988,7 @@ var ts;
             return finishNode(node);
         }
         function parseEnumMember() {
-            var node = createNode(219, scanner.getStartPos());
+            var node = createNode(220, scanner.getStartPos());
             node.name = parsePropertyName();
             node.initializer = allowInAnd(parseNonParameterInitializer);
             return finishNode(node);
@@ -7308,9 +12023,7 @@ var ts;
             setModifiers(node, modifiers);
             node.flags |= flags;
             node.name = parseIdentifier();
-            node.body = parseOptional(20)
-                ? parseInternalModuleTail(getNodePos(), undefined, 1)
-                : parseModuleBlock();
+            node.body = parseOptional(20) ? parseInternalModuleTail(getNodePos(), undefined, 1) : parseModuleBlock();
             return finishNode(node);
         }
         function parseAmbientExternalModuleDeclaration(fullStart, modifiers) {
@@ -7322,21 +12035,17 @@ var ts;
         }
         function parseModuleDeclaration(fullStart, modifiers) {
             parseExpected(116);
-            return token === 8
-                ? parseAmbientExternalModuleDeclaration(fullStart, modifiers)
-                : parseInternalModuleTail(fullStart, modifiers, modifiers ? modifiers.flags : 0);
+            return token === 8 ? parseAmbientExternalModuleDeclaration(fullStart, modifiers) : parseInternalModuleTail(fullStart, modifiers, modifiers ? modifiers.flags : 0);
         }
         function isExternalModuleReference() {
-            return token === 117 &&
-                lookAhead(nextTokenIsOpenParen);
+            return token === 117 && lookAhead(nextTokenIsOpenParen);
         }
         function nextTokenIsOpenParen() {
             return nextToken() === 16;
         }
         function nextTokenIsCommaOrFromKeyword() {
             nextToken();
-            return token === 23 ||
-                token === 123;
+            return token === 23 || token === 123;
         }
         function parseImportDeclarationOrImportEqualsDeclaration(fullStart, modifiers) {
             parseExpected(84);
@@ -7345,7 +12054,7 @@ var ts;
             if (isIdentifier()) {
                 identifier = parseIdentifier();
                 if (token !== 23 && token !== 123) {
-                    var importEqualsDeclaration = createNode(202, fullStart);
+                    var importEqualsDeclaration = createNode(203, fullStart);
                     setModifiers(importEqualsDeclaration, modifiers);
                     importEqualsDeclaration.name = identifier;
                     parseExpected(52);
@@ -7354,11 +12063,9 @@ var ts;
                     return finishNode(importEqualsDeclaration);
                 }
             }
-            var importDeclaration = createNode(203, fullStart);
+            var importDeclaration = createNode(204, fullStart);
             setModifiers(importDeclaration, modifiers);
-            if (identifier ||
-                token === 35 ||
-                token === 14) {
+            if (identifier || token === 35 || token === 14) {
                 importDeclaration.importClause = parseImportClause(identifier, afterImportPos);
                 parseExpected(123);
             }
@@ -7367,23 +12074,20 @@ var ts;
             return finishNode(importDeclaration);
         }
         function parseImportClause(identifier, fullStart) {
-            var importClause = createNode(204, fullStart);
+            var importClause = createNode(205, fullStart);
             if (identifier) {
                 importClause.name = identifier;
             }
-            if (!importClause.name ||
-                parseOptional(23)) {
-                importClause.namedBindings = token === 35 ? parseNamespaceImport() : parseNamedImportsOrExports(206);
+            if (!importClause.name || parseOptional(23)) {
+                importClause.namedBindings = token === 35 ? parseNamespaceImport() : parseNamedImportsOrExports(207);
             }
             return finishNode(importClause);
         }
         function parseModuleReference() {
-            return isExternalModuleReference()
-                ? parseExternalModuleReference()
-                : parseEntityName(false);
+            return isExternalModuleReference() ? parseExternalModuleReference() : parseEntityName(false);
         }
         function parseExternalModuleReference() {
-            var node = createNode(212);
+            var node = createNode(213);
             parseExpected(117);
             parseExpected(16);
             node.expression = parseModuleSpecifier();
@@ -7398,7 +12102,7 @@ var ts;
             return result;
         }
         function parseNamespaceImport() {
-            var namespaceImport = createNode(205);
+            var namespaceImport = createNode(206);
             parseExpected(35);
             parseExpected(101);
             namespaceImport.name = parseIdentifier();
@@ -7406,14 +12110,14 @@ var ts;
         }
         function parseNamedImportsOrExports(kind) {
             var node = createNode(kind);
-            node.elements = parseBracketedList(20, kind === 206 ? parseImportSpecifier : parseExportSpecifier, 14, 15);
+            node.elements = parseBracketedList(20, kind === 207 ? parseImportSpecifier : parseExportSpecifier, 14, 15);
             return finishNode(node);
         }
         function parseExportSpecifier() {
-            return parseImportOrExportSpecifier(211);
+            return parseImportOrExportSpecifier(212);
         }
         function parseImportSpecifier() {
-            return parseImportOrExportSpecifier(207);
+            return parseImportOrExportSpecifier(208);
         }
         function parseImportOrExportSpecifier(kind) {
             var node = createNode(kind);
@@ -7439,14 +12143,14 @@ var ts;
             return finishNode(node);
         }
         function parseExportDeclaration(fullStart, modifiers) {
-            var node = createNode(209, fullStart);
+            var node = createNode(210, fullStart);
             setModifiers(node, modifiers);
             if (parseOptional(35)) {
                 parseExpected(123);
                 node.moduleSpecifier = parseModuleSpecifier();
             }
             else {
-                node.exportClause = parseNamedImportsOrExports(210);
+                node.exportClause = parseNamedImportsOrExports(211);
                 if (parseOptional(123)) {
                     node.moduleSpecifier = parseModuleSpecifier();
                 }
@@ -7455,7 +12159,7 @@ var ts;
             return finishNode(node);
         }
         function parseExportAssignment(fullStart, modifiers) {
-            var node = createNode(208, fullStart);
+            var node = createNode(209, fullStart);
             setModifiers(node, modifiers);
             if (parseOptional(52)) {
                 node.isExportEquals = true;
@@ -7510,13 +12214,11 @@ var ts;
         }
         function nextTokenCanFollowImportKeyword() {
             nextToken();
-            return isIdentifierOrKeyword() || token === 8 ||
-                token === 35 || token === 14;
+            return isIdentifierOrKeyword() || token === 8 || token === 35 || token === 14;
         }
         function nextTokenCanFollowExportKeyword() {
             nextToken();
-            return token === 52 || token === 35 ||
-                token === 14 || token === 72 || isDeclarationStart();
+            return token === 52 || token === 35 || token === 14 || token === 72 || isDeclarationStart();
         }
         function nextTokenIsDeclarationStart() {
             nextToken();
@@ -7570,9 +12272,7 @@ var ts;
             return parseSourceElementOrModuleElement();
         }
         function parseSourceElementOrModuleElement() {
-            return isDeclarationStart()
-                ? parseDeclaration()
-                : parseStatement();
+            return isDeclarationStart() ? parseDeclaration() : parseStatement();
         }
         function processReferenceComments(sourceFile) {
             var triviaScanner = ts.createScanner(sourceFile.languageVersion, false, sourceText);
@@ -7587,7 +12287,10 @@ var ts;
                 if (kind !== 2) {
                     break;
                 }
-                var range = { pos: triviaScanner.getTokenPos(), end: triviaScanner.getTextPos() };
+                var range = {
+                    pos: triviaScanner.getTokenPos(),
+                    end: triviaScanner.getTextPos()
+                };
                 var comment = sourceText.substring(range.pos, range.end);
                 var referencePathMatchResult = ts.getFileReferenceFromReferencePath(comment, range);
                 if (referencePathMatchResult) {
@@ -7618,7 +12321,10 @@ var ts;
                         var pathMatchResult = pathRegex.exec(comment);
                         var nameMatchResult = nameRegex.exec(comment);
                         if (pathMatchResult) {
-                            var amdDependency = { path: pathMatchResult[2], name: nameMatchResult ? nameMatchResult[2] : undefined };
+                            var amdDependency = {
+                                path: pathMatchResult[2],
+                                name: nameMatchResult ? nameMatchResult[2] : undefined
+                            };
                             amdDependencies.push(amdDependency);
                         }
                     }
@@ -7630,13 +12336,7 @@ var ts;
         }
         function setExternalModuleIndicator(sourceFile) {
             sourceFile.externalModuleIndicator = ts.forEach(sourceFile.statements, function (node) {
-                return node.flags & 1
-                    || node.kind === 202 && node.moduleReference.kind === 212
-                    || node.kind === 203
-                    || node.kind === 208
-                    || node.kind === 209
-                    ? node
-                    : undefined;
+                return node.flags & 1 || node.kind === 203 && node.moduleReference.kind === 213 || node.kind === 204 || node.kind === 209 || node.kind === 210 ? node : undefined;
             });
         }
     }
@@ -7690,7 +12390,7 @@ var ts;
         else if (ts.isConstEnumDeclaration(node)) {
             return 2;
         }
-        else if ((node.kind === 203 || node.kind === 202) && !(node.flags & 1)) {
+        else if ((node.kind === 204 || node.kind === 203) && !(node.flags & 1)) {
             return 0;
         }
         else if (node.kind === 201) {
@@ -7783,9 +12483,9 @@ var ts;
                     return "__new";
                 case 138:
                     return "__index";
-                case 209:
+                case 210:
                     return "__export";
-                case 208:
+                case 209:
                     return "default";
                 case 195:
                 case 196:
@@ -7804,9 +12504,7 @@ var ts;
                     if (node.name) {
                         node.name.parent = node;
                     }
-                    var message = symbol.flags & 2
-                        ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0
-                        : ts.Diagnostics.Duplicate_identifier_0;
+                    var message = symbol.flags & 2 ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 : ts.Diagnostics.Duplicate_identifier_0;
                     ts.forEach(symbol.declarations, function (declaration) {
                         file.bindDiagnostics.push(ts.createDiagnosticForNode(declaration.name || declaration, message, getDisplayName(declaration)));
                     });
@@ -7843,7 +12541,7 @@ var ts;
         function declareModuleMember(node, symbolKind, symbolExcludes) {
             var hasExportModifier = ts.getCombinedNodeFlags(node) & 1;
             if (symbolKind & 8388608) {
-                if (node.kind === 211 || (node.kind === 202 && hasExportModifier)) {
+                if (node.kind === 212 || (node.kind === 203 && hasExportModifier)) {
                     declareSymbol(container.symbol.exports, container.symbol, node, symbolKind, symbolExcludes);
                 }
                 else {
@@ -7852,9 +12550,7 @@ var ts;
             }
             else {
                 if (hasExportModifier || isAmbientContext(container)) {
-                    var exportKind = (symbolKind & 107455 ? 1048576 : 0) |
-                        (symbolKind & 793056 ? 2097152 : 0) |
-                        (symbolKind & 1536 ? 4194304 : 0);
+                    var exportKind = (symbolKind & 107455 ? 1048576 : 0) | (symbolKind & 793056 ? 2097152 : 0) | (symbolKind & 1536 ? 4194304 : 0);
                     var local = declareSymbol(container.locals, undefined, node, exportKind, symbolExcludes);
                     local.exportSymbol = declareSymbol(container.symbol.exports, container.symbol, node, symbolKind, symbolExcludes);
                     node.localSymbol = local;
@@ -7880,7 +12576,7 @@ var ts;
                 lastContainer = container;
             }
             if (isBlockScopeContainer) {
-                setBlockScopeContainer(node, (symbolKind & 255504) === 0 && node.kind !== 220);
+                setBlockScopeContainer(node, (symbolKind & 255504) === 0 && node.kind !== 221);
             }
             ts.forEachChild(node, bind);
             container = saveContainer;
@@ -7892,7 +12588,7 @@ var ts;
                 case 200:
                     declareModuleMember(node, symbolKind, symbolExcludes);
                     break;
-                case 220:
+                case 221:
                     if (ts.isExternalModule(container)) {
                         declareModuleMember(node, symbolKind, symbolExcludes);
                         break;
@@ -7970,7 +12666,7 @@ var ts;
                 case 200:
                     declareModuleMember(node, 2, 107455);
                     break;
-                case 220:
+                case 221:
                     if (ts.isExternalModule(container)) {
                         declareModuleMember(node, 2, 107455);
                         break;
@@ -8011,11 +12707,11 @@ var ts;
                 case 129:
                     bindPropertyOrMethodOrAccessor(node, 4 | (node.questionToken ? 536870912 : 0), 107455, false);
                     break;
-                case 217:
                 case 218:
+                case 219:
                     bindPropertyOrMethodOrAccessor(node, 4, 107455, false);
                     break;
-                case 219:
+                case 220:
                     bindPropertyOrMethodOrAccessor(node, 8, 107455, false);
                     break;
                 case 136:
@@ -8053,7 +12749,7 @@ var ts;
                 case 161:
                     bindAnonymousDeclaration(node, 16, "__function", true);
                     break;
-                case 216:
+                case 217:
                     bindCatchVariableDeclaration(node);
                     break;
                 case 196:
@@ -8076,13 +12772,13 @@ var ts;
                 case 200:
                     bindModuleDeclaration(node);
                     break;
-                case 202:
-                case 205:
-                case 207:
-                case 211:
+                case 203:
+                case 206:
+                case 208:
+                case 212:
                     bindDeclaration(node, 8388608, 8388608, false);
                     break;
-                case 204:
+                case 205:
                     if (node.name) {
                         bindDeclaration(node, 8388608, 8388608, false);
                     }
@@ -8090,13 +12786,13 @@ var ts;
                         bindChildren(node, 0, false);
                     }
                     break;
-                case 209:
+                case 210:
                     if (!node.exportClause) {
                         declareSymbol(container.symbol.exports, container.symbol, node, 1073741824, 0);
                     }
                     bindChildren(node, 0, false);
                     break;
-                case 208:
+                case 209:
                     if (node.expression.kind === 64) {
                         declareSymbol(container.symbol.exports, container.symbol, node, 8388608, 8388608);
                     }
@@ -8105,7 +12801,7 @@ var ts;
                     }
                     bindChildren(node, 0, false);
                     break;
-                case 220:
+                case 221:
                     if (ts.isExternalModule(node)) {
                         bindAnonymousDeclaration(node, 512, '"' + ts.removeFileExtension(node.fileName) + '"', true);
                         break;
@@ -8113,11 +12809,11 @@ var ts;
                 case 174:
                     bindChildren(node, 0, !ts.isFunctionLike(node.parent));
                     break;
-                case 216:
+                case 217:
                 case 181:
                 case 182:
                 case 183:
-                case 188:
+                case 202:
                     bindChildren(node, 0, true);
                     break;
                 default:
@@ -8134,9 +12830,7 @@ var ts;
             else {
                 bindDeclaration(node, 1, 107455, false);
             }
-            if (node.flags & 112 &&
-                node.parent.kind === 133 &&
-                node.parent.parent.kind === 196) {
+            if (node.flags & 112 && node.parent.kind === 133 && node.parent.parent.kind === 196) {
                 var classDeclaration = node.parent.parent;
                 declareSymbol(classDeclaration.symbol.members, classDeclaration.symbol, node, 4, 107455);
             }
@@ -8168,12 +12862,24 @@ var ts;
         var languageVersion = compilerOptions.target || 0;
         var emitResolver = createResolver();
         var checker = {
-            getNodeCount: function () { return ts.sum(host.getSourceFiles(), "nodeCount"); },
-            getIdentifierCount: function () { return ts.sum(host.getSourceFiles(), "identifierCount"); },
-            getSymbolCount: function () { return ts.sum(host.getSourceFiles(), "symbolCount"); },
-            getTypeCount: function () { return typeCount; },
-            isUndefinedSymbol: function (symbol) { return symbol === undefinedSymbol; },
-            isArgumentsSymbol: function (symbol) { return symbol === argumentsSymbol; },
+            getNodeCount: function () {
+                return ts.sum(host.getSourceFiles(), "nodeCount");
+            },
+            getIdentifierCount: function () {
+                return ts.sum(host.getSourceFiles(), "identifierCount");
+            },
+            getSymbolCount: function () {
+                return ts.sum(host.getSourceFiles(), "symbolCount");
+            },
+            getTypeCount: function () {
+                return typeCount;
+            },
+            isUndefinedSymbol: function (symbol) {
+                return symbol === undefinedSymbol;
+            },
+            isArgumentsSymbol: function (symbol) {
+                return symbol === argumentsSymbol;
+            },
             getDiagnostics: getDiagnostics,
             getGlobalDiagnostics: getGlobalDiagnostics,
             getTypeOfSymbolAtLocation: getTypeOfSymbolAtLocation,
@@ -8269,9 +12975,7 @@ var ts;
             return emitResolver;
         }
         function error(location, message, arg0, arg1, arg2) {
-            var diagnostic = location
-                ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2)
-                : ts.createCompilerDiagnostic(message, arg0, arg1, arg2);
+            var diagnostic = location ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2) : ts.createCompilerDiagnostic(message, arg0, arg1, arg2);
             diagnostics.add(diagnostic);
         }
         function createSymbol(flags, name) {
@@ -8357,8 +13061,7 @@ var ts;
                 recordMergedSymbol(target, source);
             }
             else {
-                var message = target.flags & 2 || source.flags & 2
-                    ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 : ts.Diagnostics.Duplicate_identifier_0;
+                var message = target.flags & 2 || source.flags & 2 ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 : ts.Diagnostics.Duplicate_identifier_0;
                 ts.forEach(source.declarations, function (node) {
                     error(node.name ? node.name : node, message, symbolToString(source));
                 });
@@ -8405,10 +13108,10 @@ var ts;
             return nodeLinks[node.id] || (nodeLinks[node.id] = {});
         }
         function getSourceFile(node) {
-            return ts.getAncestor(node, 220);
+            return ts.getAncestor(node, 221);
         }
         function isGlobalSourceFile(node) {
-            return node.kind === 220 && !ts.isExternalModule(node);
+            return node.kind === 221 && !ts.isExternalModule(node);
         }
         function getSymbol(symbols, name, meaning) {
             if (meaning && ts.hasProperty(symbols, name)) {
@@ -8449,12 +13152,12 @@ var ts;
                     }
                 }
                 switch (location.kind) {
-                    case 220:
+                    case 221:
                         if (!ts.isExternalModule(location))
                             break;
                     case 200:
                         if (result = getSymbol(getSymbolOfNode(location).exports, name, meaning & 8914931)) {
-                            if (!(result.flags & 8388608 && getDeclarationOfAliasSymbol(result).kind === 211)) {
+                            if (!(result.flags & 8388608 && getDeclarationOfAliasSymbol(result).kind === 212)) {
                                 break loop;
                             }
                             result = undefined;
@@ -8538,28 +13241,54 @@ var ts;
                     return undefined;
                 }
                 if (result.flags & 2) {
-                    var declaration = ts.forEach(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) ? d : undefined; });
-                    ts.Debug.assert(declaration !== undefined, "Block-scoped variable declaration is undefined");
-                    if (!isDefinedBefore(declaration, errorLocation)) {
-                        error(errorLocation, ts.Diagnostics.Block_scoped_variable_0_used_before_its_declaration, ts.declarationNameToString(declaration.name));
-                    }
+                    checkResolvedBlockScopedVariable(result, errorLocation);
                 }
             }
             return result;
         }
+        function checkResolvedBlockScopedVariable(result, errorLocation) {
+            ts.Debug.assert((result.flags & 2) !== 0);
+            var declaration = ts.forEach(result.declarations, function (d) {
+                return ts.isBlockOrCatchScoped(d) ? d : undefined;
+            });
+            ts.Debug.assert(declaration !== undefined, "Block-scoped variable declaration is undefined");
+            var isUsedBeforeDeclaration = !isDefinedBefore(declaration, errorLocation);
+            if (!isUsedBeforeDeclaration) {
+                var variableDeclaration = ts.getAncestor(declaration, 193);
+                var container = ts.getEnclosingBlockScopeContainer(variableDeclaration);
+                if (variableDeclaration.parent.parent.kind === 175 || variableDeclaration.parent.parent.kind === 181) {
+                    isUsedBeforeDeclaration = isSameScopeDescendentOf(errorLocation, variableDeclaration, container);
+                }
+                else if (variableDeclaration.parent.parent.kind === 183 || variableDeclaration.parent.parent.kind === 182) {
+                    var expression = variableDeclaration.parent.parent.expression;
+                    isUsedBeforeDeclaration = isSameScopeDescendentOf(errorLocation, expression, container);
+                }
+            }
+            if (isUsedBeforeDeclaration) {
+                error(errorLocation, ts.Diagnostics.Block_scoped_variable_0_used_before_its_declaration, ts.declarationNameToString(declaration.name));
+            }
+        }
+        function isSameScopeDescendentOf(initial, parent, stopAt) {
+            if (!parent) {
+                return false;
+            }
+            for (var current = initial; current && current !== stopAt && !ts.isFunctionLike(current); current = current.parent) {
+                if (current === parent) {
+                    return true;
+                }
+            }
+            return false;
+        }
         function isAliasSymbolDeclaration(node) {
-            return node.kind === 202 ||
-                node.kind === 204 && !!node.name ||
-                node.kind === 205 ||
-                node.kind === 207 ||
-                node.kind === 211 ||
-                node.kind === 208;
+            return node.kind === 203 || node.kind === 205 && !!node.name || node.kind === 206 || node.kind === 208 || node.kind === 212 || node.kind === 209;
         }
         function getDeclarationOfAliasSymbol(symbol) {
-            return ts.forEach(symbol.declarations, function (d) { return isAliasSymbolDeclaration(d) ? d : undefined; });
+            return ts.forEach(symbol.declarations, function (d) {
+                return isAliasSymbolDeclaration(d) ? d : undefined;
+            });
         }
         function getTargetOfImportEqualsDeclaration(node) {
-            if (node.moduleReference.kind === 212) {
+            if (node.moduleReference.kind === 213) {
                 var moduleSymbol = resolveExternalModuleName(node, ts.getExternalModuleImportEqualsDeclarationExpression(node));
                 var exportAssignmentSymbol = moduleSymbol && getResolvedExportAssignmentSymbol(moduleSymbol);
                 return exportAssignmentSymbol || moduleSymbol;
@@ -8597,26 +13326,24 @@ var ts;
             return getExternalModuleMember(node.parent.parent.parent, node);
         }
         function getTargetOfExportSpecifier(node) {
-            return node.parent.parent.moduleSpecifier ?
-                getExternalModuleMember(node.parent.parent, node) :
-                resolveEntityName(node.propertyName || node.name, 107455 | 793056 | 1536);
+            return node.parent.parent.moduleSpecifier ? getExternalModuleMember(node.parent.parent, node) : resolveEntityName(node.propertyName || node.name, 107455 | 793056 | 1536);
         }
         function getTargetOfExportAssignment(node) {
             return resolveEntityName(node.expression, 107455 | 793056 | 1536);
         }
         function getTargetOfImportDeclaration(node) {
             switch (node.kind) {
-                case 202:
+                case 203:
                     return getTargetOfImportEqualsDeclaration(node);
-                case 204:
-                    return getTargetOfImportClause(node);
                 case 205:
+                    return getTargetOfImportClause(node);
+                case 206:
                     return getTargetOfNamespaceImport(node);
-                case 207:
-                    return getTargetOfImportSpecifier(node);
-                case 211:
-                    return getTargetOfExportSpecifier(node);
                 case 208:
+                    return getTargetOfImportSpecifier(node);
+                case 212:
+                    return getTargetOfExportSpecifier(node);
+                case 209:
                     return getTargetOfExportAssignment(node);
             }
         }
@@ -8651,10 +13378,10 @@ var ts;
             if (!links.referenced) {
                 links.referenced = true;
                 var node = getDeclarationOfAliasSymbol(symbol);
-                if (node.kind === 208) {
+                if (node.kind === 209) {
                     checkExpressionCached(node.expression);
                 }
-                else if (node.kind === 211) {
+                else if (node.kind === 212) {
                     checkExpressionCached(node.propertyName || node.name);
                 }
                 else if (ts.isInternalModuleImportEqualsDeclaration(node)) {
@@ -8664,7 +13391,7 @@ var ts;
         }
         function getSymbolOfPartOfRightHandSideOfImportEquals(entityName, importDeclaration) {
             if (!importDeclaration) {
-                importDeclaration = ts.getAncestor(entityName, 202);
+                importDeclaration = ts.getAncestor(entityName, 203);
                 ts.Debug.assert(importDeclaration !== undefined);
             }
             if (entityName.kind === 64 && isRightSideOfQualifiedNameOrPropertyAccess(entityName)) {
@@ -8674,7 +13401,7 @@ var ts;
                 return resolveEntityName(entityName, 1536);
             }
             else {
-                ts.Debug.assert(entityName.parent.kind === 202);
+                ts.Debug.assert(entityName.parent.kind === 203);
                 return resolveEntityName(entityName, 107455 | 793056 | 1536);
             }
         }
@@ -8814,9 +13541,7 @@ var ts;
             return getMergedSymbol(symbol.parent);
         }
         function getExportSymbolOfValueSymbolIfExported(symbol) {
-            return symbol && (symbol.flags & 1048576) !== 0
-                ? getMergedSymbol(symbol.exportSymbol)
-                : symbol;
+            return symbol && (symbol.flags & 1048576) !== 0 ? getMergedSymbol(symbol.exportSymbol) : symbol;
         }
         function symbolIsValue(symbol) {
             if (symbol.flags & 16777216) {
@@ -8855,10 +13580,7 @@ var ts;
             return type;
         }
         function isReservedMemberName(name) {
-            return name.charCodeAt(0) === 95 &&
-                name.charCodeAt(1) === 95 &&
-                name.charCodeAt(2) !== 95 &&
-                name.charCodeAt(2) !== 64;
+            return name.charCodeAt(0) === 95 && name.charCodeAt(1) === 95 && name.charCodeAt(2) !== 95 && name.charCodeAt(2) !== 64;
         }
         function getNamedMembers(members) {
             var result;
@@ -8899,7 +13621,7 @@ var ts;
                     }
                 }
                 switch (location.kind) {
-                    case 220:
+                    case 221:
                         if (!ts.isExternalModule(location)) {
                             break;
                         }
@@ -8932,24 +13654,28 @@ var ts;
                 }
                 function isAccessible(symbolFromSymbolTable, resolvedAliasSymbol) {
                     if (symbol === (resolvedAliasSymbol || symbolFromSymbolTable)) {
-                        return !ts.forEach(symbolFromSymbolTable.declarations, hasExternalModuleSymbol) &&
-                            canQualifySymbol(symbolFromSymbolTable, meaning);
+                        return !ts.forEach(symbolFromSymbolTable.declarations, hasExternalModuleSymbol) && canQualifySymbol(symbolFromSymbolTable, meaning);
                     }
                 }
                 if (isAccessible(ts.lookUp(symbols, symbol.name))) {
-                    return [symbol];
+                    return [
+                        symbol
+                    ];
                 }
                 return ts.forEachValue(symbols, function (symbolFromSymbolTable) {
                     if (symbolFromSymbolTable.flags & 8388608) {
-                        if (!useOnlyExternalAliasing ||
-                            ts.forEach(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration)) {
+                        if (!useOnlyExternalAliasing || ts.forEach(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration)) {
                             var resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable);
                             if (isAccessible(symbolFromSymbolTable, resolveAlias(symbolFromSymbolTable))) {
-                                return [symbolFromSymbolTable];
+                                return [
+                                    symbolFromSymbolTable
+                                ];
                             }
                             var accessibleSymbolsFromExports = resolvedImportedSymbol.exports ? getAccessibleSymbolChainFromSymbolTable(resolvedImportedSymbol.exports) : undefined;
                             if (accessibleSymbolsFromExports && canQualifySymbol(symbolFromSymbolTable, getQualifiedLeftMeaning(meaning))) {
-                                return [symbolFromSymbolTable].concat(accessibleSymbolsFromExports);
+                                return [
+                                    symbolFromSymbolTable
+                                ].concat(accessibleSymbolsFromExports);
                             }
                         }
                     }
@@ -9014,7 +13740,9 @@ var ts;
                     errorSymbolName: symbolToString(initialSymbol, enclosingDeclaration, meaning)
                 };
             }
-            return { accessibility: 0 };
+            return {
+                accessibility: 0
+            };
             function getExternalModuleContainer(declaration) {
                 for (; declaration; declaration = declaration.parent) {
                     if (hasExternalModuleSymbol(declaration)) {
@@ -9024,20 +13752,22 @@ var ts;
             }
         }
         function hasExternalModuleSymbol(declaration) {
-            return (declaration.kind === 200 && declaration.name.kind === 8) ||
-                (declaration.kind === 220 && ts.isExternalModule(declaration));
+            return (declaration.kind === 200 && declaration.name.kind === 8) || (declaration.kind === 221 && ts.isExternalModule(declaration));
         }
         function hasVisibleDeclarations(symbol) {
             var aliasesToMakeVisible;
-            if (ts.forEach(symbol.declarations, function (declaration) { return !getIsDeclarationVisible(declaration); })) {
+            if (ts.forEach(symbol.declarations, function (declaration) {
+                return !getIsDeclarationVisible(declaration);
+            })) {
                 return undefined;
             }
-            return { accessibility: 0, aliasesToMakeVisible: aliasesToMakeVisible };
+            return {
+                accessibility: 0,
+                aliasesToMakeVisible: aliasesToMakeVisible
+            };
             function getIsDeclarationVisible(declaration) {
                 if (!isDeclarationVisible(declaration)) {
-                    if (declaration.kind === 202 &&
-                        !(declaration.flags & 1) &&
-                        isDeclarationVisible(declaration.parent)) {
+                    if (declaration.kind === 203 && !(declaration.flags & 1) && isDeclarationVisible(declaration.parent)) {
                         getNodeLinks(declaration).isVisible = true;
                         if (aliasesToMakeVisible) {
                             if (!ts.contains(aliasesToMakeVisible, declaration)) {
@@ -9045,7 +13775,9 @@ var ts;
                             }
                         }
                         else {
-                            aliasesToMakeVisible = [declaration];
+                            aliasesToMakeVisible = [
+                                declaration
+                            ];
                         }
                         return true;
                     }
@@ -9059,8 +13791,7 @@ var ts;
             if (entityName.parent.kind === 142) {
                 meaning = 107455 | 1048576;
             }
-            else if (entityName.kind === 125 ||
-                entityName.parent.kind === 202) {
+            else if (entityName.kind === 125 || entityName.parent.kind === 203) {
                 meaning = 1536;
             }
             else {
@@ -9146,8 +13877,7 @@ var ts;
                 function walkSymbol(symbol, meaning) {
                     if (symbol) {
                         var accessibleSymbolChain = getAccessibleSymbolChain(symbol, enclosingDeclaration, meaning, !!(flags & 2));
-                        if (!accessibleSymbolChain ||
-                            needsQualification(accessibleSymbolChain[0], enclosingDeclaration, accessibleSymbolChain.length === 1 ? meaning : getQualifiedLeftMeaning(meaning))) {
+                        if (!accessibleSymbolChain || needsQualification(accessibleSymbolChain[0], enclosingDeclaration, accessibleSymbolChain.length === 1 ? meaning : getQualifiedLeftMeaning(meaning))) {
                             walkSymbol(getParentOfSymbol(accessibleSymbolChain ? accessibleSymbolChain[0] : symbol), getQualifiedLeftMeaning(meaning));
                         }
                         if (accessibleSymbolChain) {
@@ -9179,8 +13909,7 @@ var ts;
                 return writeType(type, globalFlags);
                 function writeType(type, flags) {
                     if (type.flags & 1048703) {
-                        writer.writeKeyword(!(globalFlags & 16) &&
-                            (type.flags & 1) ? "any" : type.intrinsicName);
+                        writer.writeKeyword(!(globalFlags & 16) && (type.flags & 1) ? "any" : type.intrinsicName);
                     }
                     else if (type.flags & 4096) {
                         writeTypeReference(type, flags);
@@ -9273,16 +14002,14 @@ var ts;
                     }
                     function shouldWriteTypeOfFunctionSymbol() {
                         if (type.symbol) {
-                            var isStaticMethodSymbol = !!(type.symbol.flags & 8192 &&
-                                ts.forEach(type.symbol.declarations, function (declaration) { return declaration.flags & 128; }));
-                            var isNonLocalFunctionSymbol = !!(type.symbol.flags & 16) &&
-                                (type.symbol.parent ||
-                                    ts.forEach(type.symbol.declarations, function (declaration) {
-                                        return declaration.parent.kind === 220 || declaration.parent.kind === 201;
-                                    }));
+                            var isStaticMethodSymbol = !!(type.symbol.flags & 8192 && ts.forEach(type.symbol.declarations, function (declaration) {
+                                return declaration.flags & 128;
+                            }));
+                            var isNonLocalFunctionSymbol = !!(type.symbol.flags & 16) && (type.symbol.parent || ts.forEach(type.symbol.declarations, function (declaration) {
+                                return declaration.parent.kind === 221 || declaration.parent.kind === 201;
+                            }));
                             if (isStaticMethodSymbol || isNonLocalFunctionSymbol) {
-                                return !!(flags & 2) ||
-                                    (typeStack && ts.contains(typeStack, type));
+                                return !!(flags & 2) || (typeStack && ts.contains(typeStack, type));
                             }
                         }
                     }
@@ -9512,7 +14239,7 @@ var ts;
                             return node;
                         }
                     }
-                    else if (node.kind === 220) {
+                    else if (node.kind === 221) {
                         return ts.isExternalModule(node) ? node : undefined;
                     }
                 }
@@ -9562,10 +14289,9 @@ var ts;
                     case 198:
                     case 195:
                     case 199:
-                    case 202:
+                    case 203:
                         var parent = getDeclarationContainer(node);
-                        if (!(ts.getCombinedNodeFlags(node) & 1) &&
-                            !(node.kind !== 202 && parent.kind !== 220 && ts.isInAmbientContext(parent))) {
+                        if (!(ts.getCombinedNodeFlags(node) & 1) && !(node.kind !== 203 && parent.kind !== 221 && ts.isInAmbientContext(parent))) {
                             return isGlobalSourceFile(parent) || isUsedInExportAssignment(node);
                         }
                         return isDeclarationVisible(parent);
@@ -9594,7 +14320,7 @@ var ts;
                     case 147:
                         return isDeclarationVisible(node.parent);
                     case 127:
-                    case 220:
+                    case 221:
                         return true;
                     default:
                         ts.Debug.fail("isDeclarationVisible unknown: SyntaxKind: " + node.kind);
@@ -9620,7 +14346,9 @@ var ts;
         }
         function getTypeOfPrototypeProperty(prototype) {
             var classType = getDeclaredTypeOfSymbol(prototype.parent);
-            return classType.typeParameters ? createTypeReference(classType, ts.map(classType.typeParameters, function (_) { return anyType; })) : classType;
+            return classType.typeParameters ? createTypeReference(classType, ts.map(classType.typeParameters, function (_) {
+                return anyType;
+            })) : classType;
         }
         function getTypeOfPropertyOfType(type, name) {
             var prop = getPropertyOfType(type, name);
@@ -9640,9 +14368,7 @@ var ts;
             }
             if (pattern.kind === 148) {
                 var name = declaration.propertyName || declaration.name;
-                var type = getTypeOfPropertyOfType(parentType, name.text) ||
-                    isNumericLiteralName(name.text) && getIndexTypeOfType(parentType, 1) ||
-                    getIndexTypeOfType(parentType, 0);
+                var type = getTypeOfPropertyOfType(parentType, name.text) || isNumericLiteralName(name.text) && getIndexTypeOfType(parentType, 1) || getIndexTypeOfType(parentType, 0);
                 if (!type) {
                     error(name, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(parentType), ts.declarationNameToString(name));
                     return unknownType;
@@ -9657,7 +14383,12 @@ var ts;
                     var propName = "" + ts.indexOf(pattern.elements, declaration);
                     var type = isTupleLikeType(parentType) ? getTypeOfPropertyOfType(parentType, propName) : getIndexTypeOfType(parentType, 1);
                     if (!type) {
-                        error(declaration, ts.Diagnostics.Type_0_has_no_property_1, typeToString(parentType), propName);
+                        if (isTupleType(parentType)) {
+                            error(declaration, ts.Diagnostics.Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2, typeToString(parentType), parentType.elementTypes.length, pattern.elements.length);
+                        }
+                        else {
+                            error(declaration, ts.Diagnostics.Type_0_has_no_property_1, typeToString(parentType), propName);
+                        }
                         return unknownType;
                     }
                 }
@@ -9672,7 +14403,7 @@ var ts;
                 return anyType;
             }
             if (declaration.parent.parent.kind === 183) {
-                return getTypeForVariableDeclarationInForOfStatement(declaration.parent.parent);
+                return checkRightHandSideOfForOf(declaration.parent.parent.expression) || anyType;
             }
             if (ts.isBindingPattern(declaration.parent)) {
                 return getTypeForBindingElement(declaration);
@@ -9696,7 +14427,7 @@ var ts;
             if (declaration.initializer) {
                 return checkExpressionCached(declaration.initializer);
             }
-            if (declaration.kind === 218) {
+            if (declaration.kind === 219) {
                 return checkIdentifier(declaration.name);
             }
             return undefined;
@@ -9733,9 +14464,7 @@ var ts;
             return !elementTypes.length ? anyArrayType : hasSpreadElement ? createArrayType(getUnionType(elementTypes)) : createTupleType(elementTypes);
         }
         function getTypeFromBindingPattern(pattern) {
-            return pattern.kind === 148
-                ? getTypeFromObjectBindingPattern(pattern)
-                : getTypeFromArrayBindingPattern(pattern);
+            return pattern.kind === 148 ? getTypeFromObjectBindingPattern(pattern) : getTypeFromArrayBindingPattern(pattern);
         }
         function getWidenedTypeForVariableLikeDeclaration(declaration, reportErrors) {
             var type = getTypeForVariableLikeDeclaration(declaration);
@@ -9743,7 +14472,7 @@ var ts;
                 if (reportErrors) {
                     reportErrorsFromWidening(declaration, type);
                 }
-                return declaration.kind !== 217 ? getWidenedType(type) : type;
+                return declaration.kind !== 218 ? getWidenedType(type) : type;
             }
             if (ts.isBindingPattern(declaration.name)) {
                 return getTypeFromBindingPattern(declaration.name);
@@ -9764,10 +14493,10 @@ var ts;
                     return links.type = getTypeOfPrototypeProperty(symbol);
                 }
                 var declaration = symbol.valueDeclaration;
-                if (declaration.parent.kind === 216) {
+                if (declaration.parent.kind === 217) {
                     return links.type = anyType;
                 }
-                if (declaration.kind === 208) {
+                if (declaration.kind === 209) {
                     return links.type = checkExpression(declaration.expression);
                 }
                 links.type = resolvingType;
@@ -9779,9 +14508,7 @@ var ts;
             else if (links.type === resolvingType) {
                 links.type = anyType;
                 if (compilerOptions.noImplicitAny) {
-                    var diagnostic = symbol.valueDeclaration.type ?
-                        ts.Diagnostics._0_implicitly_has_type_any_because_it_is_referenced_directly_or_indirectly_in_its_own_type_annotation :
-                        ts.Diagnostics._0_implicitly_has_type_any_because_it_is_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer;
+                    var diagnostic = symbol.valueDeclaration.type ? ts.Diagnostics._0_implicitly_has_type_any_because_it_is_referenced_directly_or_indirectly_in_its_own_type_annotation : ts.Diagnostics._0_implicitly_has_type_any_because_it_is_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer;
                     error(symbol.valueDeclaration, diagnostic, symbolToString(symbol));
                 }
             }
@@ -9915,7 +14642,9 @@ var ts;
                         ts.forEach(declaration.typeParameters, function (node) {
                             var tp = getDeclaredTypeOfTypeParameter(getSymbolOfNode(node));
                             if (!result) {
-                                result = [tp];
+                                result = [
+                                    tp
+                                ];
                             }
                             else if (!ts.contains(result, tp)) {
                                 result.push(tp);
@@ -10161,14 +14890,15 @@ var ts;
                 var baseType = classType.baseTypes[0];
                 var baseSignatures = getSignaturesOfType(getTypeOfSymbol(baseType.symbol), 1);
                 return ts.map(baseSignatures, function (baseSignature) {
-                    var signature = baseType.flags & 4096 ?
-                        getSignatureInstantiation(baseSignature, baseType.typeArguments) : cloneSignature(baseSignature);
+                    var signature = baseType.flags & 4096 ? getSignatureInstantiation(baseSignature, baseType.typeArguments) : cloneSignature(baseSignature);
                     signature.typeParameters = classType.typeParameters;
                     signature.resolvedReturnType = classType;
                     return signature;
                 });
             }
-            return [createSignature(undefined, classType.typeParameters, emptyArray, classType, 0, false, false)];
+            return [
+                createSignature(undefined, classType.typeParameters, emptyArray, classType, 0, false, false)
+            ];
         }
         function createTupleTypeMemberSymbols(memberTypes) {
             var members = {};
@@ -10197,7 +14927,9 @@ var ts;
             return true;
         }
         function getUnionSignatures(types, kind) {
-            var signatureLists = ts.map(types, function (t) { return getSignaturesOfType(t, kind); });
+            var signatureLists = ts.map(types, function (t) {
+                return getSignaturesOfType(t, kind);
+            });
             var signatures = signatureLists[0];
             for (var i = 0; i < signatures.length; i++) {
                 if (signatures[i].typeParameters) {
@@ -10213,7 +14945,9 @@ var ts;
             for (var i = 0; i < result.length; i++) {
                 var s = result[i];
                 s.resolvedReturnType = undefined;
-                s.unionSignatures = ts.map(signatureLists, function (signatures) { return signatures[i]; });
+                s.unionSignatures = ts.map(signatureLists, function (signatures) {
+                    return signatures[i];
+                });
             }
             return result;
         }
@@ -10357,7 +15091,9 @@ var ts;
                         return undefined;
                     }
                     if (!props) {
-                        props = [prop];
+                        props = [
+                            prop
+                        ];
                     }
                     else {
                         props.push(prop);
@@ -10457,8 +15193,7 @@ var ts;
             var links = getNodeLinks(declaration);
             if (!links.resolvedSignature) {
                 var classType = declaration.kind === 133 ? getDeclaredTypeOfClass(declaration.parent.symbol) : undefined;
-                var typeParameters = classType ? classType.typeParameters :
-                    declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) : undefined;
+                var typeParameters = classType ? classType.typeParameters : declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) : undefined;
                 var parameters = [];
                 var hasStringLiterals = false;
                 var minArgumentCount = -1;
@@ -10589,8 +15324,12 @@ var ts;
                 var type = createObjectType(32768 | 65536);
                 type.members = emptySymbols;
                 type.properties = emptyArray;
-                type.callSignatures = !isConstructor ? [signature] : emptyArray;
-                type.constructSignatures = isConstructor ? [signature] : emptyArray;
+                type.callSignatures = !isConstructor ? [
+                    signature
+                ] : emptyArray;
+                type.constructSignatures = isConstructor ? [
+                    signature
+                ] : emptyArray;
                 signature.isolatedSignatureType = type;
             }
             return signature.isolatedSignatureType;
@@ -10617,9 +15356,7 @@ var ts;
         }
         function getIndexTypeOfSymbol(symbol, kind) {
             var declaration = getIndexDeclarationOfSymbol(symbol, kind);
-            return declaration
-                ? declaration.type ? getTypeFromTypeNode(declaration.type) : anyType
-                : undefined;
+            return declaration ? declaration.type ? getTypeFromTypeNode(declaration.type) : anyType : undefined;
         }
         function getConstraintOfTypeParameter(type) {
             if (!type.constraint) {
@@ -10673,7 +15410,9 @@ var ts;
                 return links.isIllegalTypeReferenceInConstraint;
             }
             var currentNode = typeReferenceNode;
-            while (!ts.forEach(typeParameterSymbol.declarations, function (d) { return d.parent === currentNode.parent; })) {
+            while (!ts.forEach(typeParameterSymbol.declarations, function (d) {
+                return d.parent === currentNode.parent;
+            })) {
                 currentNode = currentNode.parent;
             }
             links.isIllegalTypeReferenceInConstraint = currentNode.kind === 127;
@@ -10687,7 +15426,9 @@ var ts;
                     if (links.isIllegalTypeReferenceInConstraint === undefined) {
                         var symbol = resolveName(typeParameter, n.typeName.text, 793056, undefined, undefined);
                         if (symbol && (symbol.flags & 262144)) {
-                            links.isIllegalTypeReferenceInConstraint = ts.forEach(symbol.declarations, function (d) { return d.parent == typeParameter.parent; });
+                            links.isIllegalTypeReferenceInConstraint = ts.forEach(symbol.declarations, function (d) {
+                                return d.parent == typeParameter.parent;
+                            });
                         }
                     }
                     if (links.isIllegalTypeReferenceInConstraint) {
@@ -10786,7 +15527,9 @@ var ts;
         }
         function createArrayType(elementType) {
             var arrayType = globalArrayType || getDeclaredTypeOfSymbol(globalArraySymbol);
-            return arrayType !== emptyObjectType ? createTypeReference(arrayType, [elementType]) : emptyObjectType;
+            return arrayType !== emptyObjectType ? createTypeReference(arrayType, [
+                elementType
+            ]) : emptyObjectType;
         }
         function getTypeFromArrayTypeNode(node) {
             var links = getNodeLinks(node);
@@ -10972,15 +15715,21 @@ var ts;
             return items;
         }
         function createUnaryTypeMapper(source, target) {
-            return function (t) { return t === source ? target : t; };
+            return function (t) {
+                return t === source ? target : t;
+            };
         }
         function createBinaryTypeMapper(source1, target1, source2, target2) {
-            return function (t) { return t === source1 ? target1 : t === source2 ? target2 : t; };
+            return function (t) {
+                return t === source1 ? target1 : t === source2 ? target2 : t;
+            };
         }
         function createTypeMapper(sources, targets) {
             switch (sources.length) {
-                case 1: return createUnaryTypeMapper(sources[0], targets[0]);
-                case 2: return createBinaryTypeMapper(sources[0], targets[0], sources[1], targets[1]);
+                case 1:
+                    return createUnaryTypeMapper(sources[0], targets[0]);
+                case 2:
+                    return createBinaryTypeMapper(sources[0], targets[0], sources[1], targets[1]);
             }
             return function (t) {
                 for (var i = 0; i < sources.length; i++) {
@@ -10991,15 +15740,21 @@ var ts;
             };
         }
         function createUnaryTypeEraser(source) {
-            return function (t) { return t === source ? anyType : t; };
+            return function (t) {
+                return t === source ? anyType : t;
+            };
         }
         function createBinaryTypeEraser(source1, source2) {
-            return function (t) { return t === source1 || t === source2 ? anyType : t; };
+            return function (t) {
+                return t === source1 || t === source2 ? anyType : t;
+            };
         }
         function createTypeEraser(sources) {
             switch (sources.length) {
-                case 1: return createUnaryTypeEraser(sources[0]);
-                case 2: return createBinaryTypeEraser(sources[0], sources[1]);
+                case 1:
+                    return createUnaryTypeEraser(sources[0]);
+                case 2:
+                    return createBinaryTypeEraser(sources[0], sources[1]);
             }
             return function (t) {
                 for (var i = 0; i < sources.length; i++) {
@@ -11023,7 +15778,9 @@ var ts;
             return type;
         }
         function combineTypeMappers(mapper1, mapper2) {
-            return function (t) { return mapper2(mapper1(t)); };
+            return function (t) {
+                return mapper2(mapper1(t));
+            };
         }
         function instantiateTypeParameter(typeParameter, mapper) {
             var result = createType(512);
@@ -11083,8 +15840,7 @@ var ts;
                     return mapper(type);
                 }
                 if (type.flags & 32768) {
-                    return type.symbol && type.symbol.flags & (16 | 8192 | 2048 | 4096) ?
-                        instantiateAnonymousType(type, mapper) : type;
+                    return type.symbol && type.symbol.flags & (16 | 8192 | 2048 | 4096) ? instantiateAnonymousType(type, mapper) : type;
                 }
                 if (type.flags & 4096) {
                     return createTypeReference(type.target, instantiateList(type.typeArguments, mapper, instantiateType));
@@ -11109,12 +15865,10 @@ var ts;
                 case 151:
                     return ts.forEach(node.elements, isContextSensitive);
                 case 168:
-                    return isContextSensitive(node.whenTrue) ||
-                        isContextSensitive(node.whenFalse);
+                    return isContextSensitive(node.whenTrue) || isContextSensitive(node.whenFalse);
                 case 167:
-                    return node.operatorToken.kind === 49 &&
-                        (isContextSensitive(node.left) || isContextSensitive(node.right));
-                case 217:
+                    return node.operatorToken.kind === 49 && (isContextSensitive(node.left) || isContextSensitive(node.right));
+                case 218:
                     return isContextSensitive(node.initializer);
                 case 132:
                 case 131:
@@ -11125,7 +15879,9 @@ var ts;
             return false;
         }
         function isContextSensitiveFunctionLikeDeclaration(node) {
-            return !node.typeParameters && node.parameters.length && !ts.forEach(node.parameters, function (p) { return p.type; });
+            return !node.typeParameters && node.parameters.length && !ts.forEach(node.parameters, function (p) {
+                return p.type;
+            });
         }
         function getTypeWithoutConstructors(type) {
             if (type.flags & 48128) {
@@ -11264,8 +16020,7 @@ var ts;
                     }
                     var reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo;
                     var sourceOrApparentType = relation === identityRelation ? source : getApparentType(source);
-                    if (sourceOrApparentType.flags & 48128 && target.flags & 48128 &&
-                        (result = objectTypeRelatedTo(sourceOrApparentType, target, reportStructuralErrors, elaborateErrors))) {
+                    if (sourceOrApparentType.flags & 48128 && target.flags & 48128 && (result = objectTypeRelatedTo(sourceOrApparentType, target, reportStructuralErrors, elaborateErrors))) {
                         errorInfo = saveErrorInfo;
                         return result;
                     }
@@ -11722,9 +16477,7 @@ var ts;
             if (source === target) {
                 return -1;
             }
-            if (source.parameters.length !== target.parameters.length ||
-                source.minArgumentCount !== target.minArgumentCount ||
-                source.hasRestParameter !== target.hasRestParameter) {
+            if (source.parameters.length !== target.parameters.length || source.minArgumentCount !== target.minArgumentCount || source.hasRestParameter !== target.hasRestParameter) {
                 return 0;
             }
             var result = -1;
@@ -11767,7 +16520,9 @@ var ts;
             return true;
         }
         function getCommonSupertype(types) {
-            return ts.forEach(types, function (t) { return isSupertypeOfEach(t, types) ? t : undefined; });
+            return ts.forEach(types, function (t) {
+                return isSupertypeOfEach(t, types) ? t : undefined;
+            });
         }
         function reportNoCommonSupertypeError(types, errorLocation, errorMessageChainHead) {
             var bestSupertype;
@@ -11804,6 +16559,9 @@ var ts;
         function isTupleLikeType(type) {
             return !!getPropertyOfType(type, "0");
         }
+        function isTupleType(type) {
+            return (type.flags & 8192) && !!type.elementTypes;
+        }
         function getWidenedTypeOfObjectLiteral(type) {
             var properties = getPropertiesOfObjectType(type);
             var members = {};
@@ -11883,9 +16641,7 @@ var ts;
                     var diagnostic = ts.Diagnostics.Member_0_implicitly_has_an_1_type;
                     break;
                 case 128:
-                    var diagnostic = declaration.dotDotDotToken ?
-                        ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type :
-                        ts.Diagnostics.Parameter_0_implicitly_has_an_1_type;
+                    var diagnostic = declaration.dotDotDotToken ? ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type : ts.Diagnostics.Parameter_0_implicitly_has_an_1_type;
                     break;
                 case 195:
                 case 132:
@@ -11941,7 +16697,10 @@ var ts;
         function createInferenceContext(typeParameters, inferUnionTypes) {
             var inferences = [];
             for (var i = 0; i < typeParameters.length; i++) {
-                inferences.push({ primary: undefined, secondary: undefined });
+                inferences.push({
+                    primary: undefined,
+                    secondary: undefined
+                });
             }
             return {
                 typeParameters: typeParameters,
@@ -11986,9 +16745,7 @@ var ts;
                     for (var i = 0; i < typeParameters.length; i++) {
                         if (target === typeParameters[i]) {
                             var inferences = context.inferences[i];
-                            var candidates = inferiority ?
-                                inferences.secondary || (inferences.secondary = []) :
-                                inferences.primary || (inferences.primary = []);
+                            var candidates = inferiority ? inferences.secondary || (inferences.secondary = []) : inferences.primary || (inferences.primary = []);
                             if (!ts.contains(candidates, source))
                                 candidates.push(source);
                             break;
@@ -12028,8 +16785,7 @@ var ts;
                         inferFromTypes(sourceTypes[i], target);
                     }
                 }
-                else if (source.flags & 48128 && (target.flags & (4096 | 8192) ||
-                    (target.flags & 32768) && target.symbol && target.symbol.flags & (8192 | 2048))) {
+                else if (source.flags & 48128 && (target.flags & (4096 | 8192) || (target.flags & 32768) && target.symbol && target.symbol.flags & (8192 | 2048))) {
                     if (!isInProcess(source, target) && isWithinDepthLimit(source, sourceStack) && isWithinDepthLimit(target, targetStack)) {
                         if (depth === 0) {
                             sourceStack = [];
@@ -12136,16 +16892,23 @@ var ts;
             }
             ts.Debug.fail("should not get here");
         }
-        function removeTypesFromUnionType(type, typeKind, isOfTypeKind) {
+        function removeTypesFromUnionType(type, typeKind, isOfTypeKind, allowEmptyUnionResult) {
             if (type.flags & 16384) {
                 var types = type.types;
-                if (ts.forEach(types, function (t) { return !!(t.flags & typeKind) === isOfTypeKind; })) {
-                    var narrowedType = getUnionType(ts.filter(types, function (t) { return !(t.flags & typeKind) === isOfTypeKind; }));
-                    if (narrowedType !== emptyObjectType) {
+                if (ts.forEach(types, function (t) {
+                    return !!(t.flags & typeKind) === isOfTypeKind;
+                })) {
+                    var narrowedType = getUnionType(ts.filter(types, function (t) {
+                        return !(t.flags & typeKind) === isOfTypeKind;
+                    }));
+                    if (allowEmptyUnionResult || narrowedType !== emptyObjectType) {
                         return narrowedType;
                     }
                 }
             }
+            else if (allowEmptyUnionResult && !!(type.flags & typeKind) === isOfTypeKind) {
+                return getUnionType(emptyArray);
+            }
             return type;
         }
         function hasInitializer(node) {
@@ -12217,12 +16980,12 @@ var ts;
                     case 186:
                     case 187:
                     case 188:
-                    case 213:
                     case 214:
+                    case 215:
                     case 189:
                     case 190:
                     case 191:
-                    case 216:
+                    case 217:
                         return ts.forEachChild(node, isAssignedIn);
                 }
                 return false;
@@ -12231,12 +16994,13 @@ var ts;
         function resolveLocation(node) {
             var containerNodes = [];
             for (var parent = node.parent; parent; parent = parent.parent) {
-                if ((ts.isExpression(parent) || ts.isObjectLiteralMethod(node)) &&
-                    isContextSensitive(parent)) {
+                if ((ts.isExpression(parent) || ts.isObjectLiteralMethod(node)) && isContextSensitive(parent)) {
                     containerNodes.unshift(parent);
                 }
             }
-            ts.forEach(containerNodes, function (node) { getTypeOfNode(node); });
+            ts.forEach(containerNodes, function (node) {
+                getTypeOfNode(node);
+            });
         }
         function getSymbolAtLocation(node) {
             resolveLocation(node);
@@ -12278,7 +17042,7 @@ var ts;
                                 }
                             }
                             break;
-                        case 220:
+                        case 221:
                         case 200:
                         case 195:
                         case 132:
@@ -12312,16 +17076,16 @@ var ts;
                 }
                 if (assumeTrue) {
                     if (!typeInfo) {
-                        return removeTypesFromUnionType(type, 258 | 132 | 8 | 1048576, true);
+                        return removeTypesFromUnionType(type, 258 | 132 | 8 | 1048576, true, false);
                     }
                     if (isTypeSubtypeOf(typeInfo.type, type)) {
                         return typeInfo.type;
                     }
-                    return removeTypesFromUnionType(type, typeInfo.flags, false);
+                    return removeTypesFromUnionType(type, typeInfo.flags, false, false);
                 }
                 else {
                     if (typeInfo) {
-                        return removeTypesFromUnionType(type, typeInfo.flags, true);
+                        return removeTypesFromUnionType(type, typeInfo.flags, true, false);
                     }
                     return type;
                 }
@@ -12365,7 +17129,9 @@ var ts;
                     return targetType;
                 }
                 if (type.flags & 16384) {
-                    return getUnionType(ts.filter(type.types, function (t) { return isTypeSubtypeOf(t, targetType); }));
+                    return getUnionType(ts.filter(type.types, function (t) {
+                        return isTypeSubtypeOf(t, targetType);
+                    }));
                 }
                 return type;
             }
@@ -12421,9 +17187,7 @@ var ts;
             return false;
         }
         function checkBlockScopedBindingCapturedInLoop(node, symbol) {
-            if (languageVersion >= 2 ||
-                (symbol.flags & 2) === 0 ||
-                symbol.valueDeclaration.parent.kind === 216) {
+            if (languageVersion >= 2 || (symbol.flags & 2) === 0 || symbol.valueDeclaration.parent.kind === 217) {
                 return;
             }
             var container = symbol.valueDeclaration;
@@ -12530,21 +17294,10 @@ var ts;
                     }
                     if (container && container.parent && container.parent.kind === 196) {
                         if (container.flags & 128) {
-                            canUseSuperExpression =
-                                container.kind === 132 ||
-                                    container.kind === 131 ||
-                                    container.kind === 134 ||
-                                    container.kind === 135;
+                            canUseSuperExpression = container.kind === 132 || container.kind === 131 || container.kind === 134 || container.kind === 135;
                         }
                         else {
-                            canUseSuperExpression =
-                                container.kind === 132 ||
-                                    container.kind === 131 ||
-                                    container.kind === 134 ||
-                                    container.kind === 135 ||
-                                    container.kind === 130 ||
-                                    container.kind === 129 ||
-                                    container.kind === 133;
+                            canUseSuperExpression = container.kind === 132 || container.kind === 131 || container.kind === 134 || container.kind === 135 || container.kind === 130 || container.kind === 129 || container.kind === 133;
                         }
                     }
                 }
@@ -12591,8 +17344,7 @@ var ts;
                         if (indexOfParameter < len) {
                             return getTypeAtPosition(contextualSignature, indexOfParameter);
                         }
-                        if (indexOfParameter === (func.parameters.length - 1) &&
-                            funcHasRestParameters && contextualSignature.hasRestParameter && func.parameters.length >= contextualSignature.parameters.length) {
+                        if (indexOfParameter === (func.parameters.length - 1) && funcHasRestParameters && contextualSignature.hasRestParameter && func.parameters.length >= contextualSignature.parameters.length) {
                             return getTypeOfSymbol(contextualSignature.parameters[contextualSignature.parameters.length - 1]);
                         }
                     }
@@ -12677,7 +17429,10 @@ var ts;
                         mappedType = t;
                     }
                     else if (!mappedTypes) {
-                        mappedTypes = [mappedType, t];
+                        mappedTypes = [
+                            mappedType,
+                            t
+                        ];
                     }
                     else {
                         mappedTypes.push(t);
@@ -12693,13 +17448,17 @@ var ts;
             });
         }
         function getIndexTypeOfContextualType(type, kind) {
-            return applyToContextualType(type, function (t) { return getIndexTypeOfObjectOrUnionType(t, kind); });
+            return applyToContextualType(type, function (t) {
+                return getIndexTypeOfObjectOrUnionType(t, kind);
+            });
         }
         function contextualTypeIsTupleLikeType(type) {
             return !!(type.flags & 16384 ? ts.forEach(type.types, isTupleLikeType) : isTupleLikeType(type));
         }
         function contextualTypeHasIndexSignature(type, kind) {
-            return !!(type.flags & 16384 ? ts.forEach(type.types, function (t) { return getIndexTypeOfObjectOrUnionType(t, kind); }) : getIndexTypeOfObjectOrUnionType(type, kind));
+            return !!(type.flags & 16384 ? ts.forEach(type.types, function (t) {
+                return getIndexTypeOfObjectOrUnionType(t, kind);
+            }) : getIndexTypeOfObjectOrUnionType(type, kind));
         }
         function getContextualTypeForObjectLiteralMethod(node) {
             ts.Debug.assert(ts.isObjectLiteralMethod(node));
@@ -12719,8 +17478,7 @@ var ts;
                         return propertyType;
                     }
                 }
-                return isNumericName(element.name) && getIndexTypeOfContextualType(type, 1) ||
-                    getIndexTypeOfContextualType(type, 0);
+                return isNumericName(element.name) && getIndexTypeOfContextualType(type, 1) || getIndexTypeOfContextualType(type, 0);
             }
             return undefined;
         }
@@ -12729,9 +17487,7 @@ var ts;
             var type = getContextualType(arrayLiteral);
             if (type) {
                 var index = ts.indexOf(arrayLiteral.elements, node);
-                return getTypeOfPropertyOfContextualType(type, "" + index)
-                    || getIndexTypeOfContextualType(type, 1)
-                    || (languageVersion >= 2 ? checkIteratedType(type, undefined) : undefined);
+                return getTypeOfPropertyOfContextualType(type, "" + index) || getIndexTypeOfContextualType(type, 1) || (languageVersion >= 2 ? checkIteratedType(type, undefined) : undefined);
             }
             return undefined;
         }
@@ -12764,7 +17520,7 @@ var ts;
                     return getTypeFromTypeNode(parent.type);
                 case 167:
                     return getContextualTypeForBinaryOperand(node);
-                case 217:
+                case 218:
                     return getContextualTypeForObjectLiteralElement(parent);
                 case 151:
                     return getContextualTypeForElementExpression(node);
@@ -12795,9 +17551,7 @@ var ts;
         }
         function getContextualSignature(node) {
             ts.Debug.assert(node.kind !== 132 || ts.isObjectLiteralMethod(node));
-            var type = ts.isObjectLiteralMethod(node)
-                ? getContextualTypeForObjectLiteralMethod(node)
-                : getContextualType(node);
+            var type = ts.isObjectLiteralMethod(node) ? getContextualTypeForObjectLiteralMethod(node) : getContextualType(node);
             if (!type) {
                 return undefined;
             }
@@ -12807,14 +17561,15 @@ var ts;
             var signatureList;
             var types = type.types;
             for (var i = 0; i < types.length; i++) {
-                if (signatureList &&
-                    getSignaturesOfObjectOrUnionType(types[i], 0).length > 1) {
+                if (signatureList && getSignaturesOfObjectOrUnionType(types[i], 0).length > 1) {
                     return undefined;
                 }
                 var signature = getNonGenericSignature(types[i]);
                 if (signature) {
                     if (!signatureList) {
-                        signatureList = [signature];
+                        signatureList = [
+                            signature
+                        ];
                     }
                     else if (!compareSignatures(signatureList[0], signature, false, compareTypes)) {
                         return undefined;
@@ -12840,7 +17595,7 @@ var ts;
             if (parent.kind === 167 && parent.operatorToken.kind === 52 && parent.left === node) {
                 return true;
             }
-            if (parent.kind === 217) {
+            if (parent.kind === 218) {
                 return isAssignmentTarget(parent.parent);
             }
             if (parent.kind === 151) {
@@ -12912,20 +17667,16 @@ var ts;
             for (var i = 0; i < node.properties.length; i++) {
                 var memberDecl = node.properties[i];
                 var member = memberDecl.symbol;
-                if (memberDecl.kind === 217 ||
-                    memberDecl.kind === 218 ||
-                    ts.isObjectLiteralMethod(memberDecl)) {
-                    if (memberDecl.kind === 217) {
+                if (memberDecl.kind === 218 || memberDecl.kind === 219 || ts.isObjectLiteralMethod(memberDecl)) {
+                    if (memberDecl.kind === 218) {
                         var type = checkPropertyAssignment(memberDecl, contextualMapper);
                     }
                     else if (memberDecl.kind === 132) {
                         var type = checkObjectLiteralMethod(memberDecl, contextualMapper);
                     }
                     else {
-                        ts.Debug.assert(memberDecl.kind === 218);
-                        var type = memberDecl.name.kind === 126
-                            ? unknownType
-                            : checkExpression(memberDecl.name, contextualMapper);
+                        ts.Debug.assert(memberDecl.kind === 219);
+                        var type = memberDecl.name.kind === 126 ? unknownType : checkExpression(memberDecl.name, contextualMapper);
                     }
                     typeFlags |= type.flags;
                     var prop = createSymbol(4 | 67108864 | member.flags, member.name);
@@ -13041,9 +17792,7 @@ var ts;
             return anyType;
         }
         function isValidPropertyAccess(node, propertyName) {
-            var left = node.kind === 153
-                ? node.expression
-                : node.left;
+            var left = node.kind === 153 ? node.expression : node.left;
             var type = checkExpressionOrQualifiedName(left);
             if (type !== unknownType && type !== anyType) {
                 var prop = getPropertyOfType(getWidenedType(type), propertyName);
@@ -13080,8 +17829,7 @@ var ts;
                 return unknownType;
             }
             var isConstEnum = isConstEnumObjectType(objectType);
-            if (isConstEnum &&
-                (!node.argumentExpression || node.argumentExpression.kind !== 8)) {
+            if (isConstEnum && (!node.argumentExpression || node.argumentExpression.kind !== 8)) {
                 error(node.argumentExpression, ts.Diagnostics.A_const_enum_member_can_only_be_accessed_using_a_string_literal);
                 return unknownType;
             }
@@ -13248,8 +17996,7 @@ var ts;
                 callIsIncomplete = callExpression.arguments.end === callExpression.end;
                 typeArguments = callExpression.typeArguments;
             }
-            var hasRightNumberOfTypeArgs = !typeArguments ||
-                (signature.typeParameters && typeArguments.length === signature.typeParameters.length);
+            var hasRightNumberOfTypeArgs = !typeArguments || (signature.typeParameters && typeArguments.length === signature.typeParameters.length);
             if (!hasRightNumberOfTypeArgs) {
                 return false;
             }
@@ -13266,8 +18013,7 @@ var ts;
         function getSingleCallSignature(type) {
             if (type.flags & 48128) {
                 var resolved = resolveObjectOrUnionTypeMembers(type);
-                if (resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0 &&
-                    resolved.properties.length === 0 && !resolved.stringIndexType && !resolved.numberIndexType) {
+                if (resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0 && resolved.properties.length === 0 && !resolved.stringIndexType && !resolved.numberIndexType) {
                     return resolved.callSignatures[0];
                 }
             }
@@ -13337,9 +18083,7 @@ var ts;
                 var arg = args[i];
                 if (arg.kind !== 172) {
                     var paramType = getTypeAtPosition(signature, arg.kind === 171 ? -1 : i);
-                    var argType = i === 0 && node.kind === 157 ? globalTemplateStringsArrayType :
-                        arg.kind === 8 && !reportErrors ? getStringLiteralType(arg) :
-                            checkExpressionWithContextualType(arg, paramType, excludeArgument && excludeArgument[i] ? identityMapper : undefined);
+                    var argType = i === 0 && node.kind === 157 ? globalTemplateStringsArrayType : arg.kind === 8 && !reportErrors ? getStringLiteralType(arg) : checkExpressionWithContextualType(arg, paramType, excludeArgument && excludeArgument[i] ? identityMapper : undefined);
                     if (!checkTypeRelatedTo(argType, paramType, relation, reportErrors ? arg : undefined, ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1)) {
                         return false;
                     }
@@ -13351,7 +18095,9 @@ var ts;
             var args;
             if (node.kind === 157) {
                 var template = node.template;
-                args = [template];
+                args = [
+                    template
+                ];
                 if (template.kind === 169) {
                     ts.forEach(template.templateSpans, function (span) {
                         args.push(span.expression);
@@ -13603,10 +18349,7 @@ var ts;
             }
             if (node.kind === 156) {
                 var declaration = signature.declaration;
-                if (declaration &&
-                    declaration.kind !== 133 &&
-                    declaration.kind !== 137 &&
-                    declaration.kind !== 141) {
+                if (declaration && declaration.kind !== 133 && declaration.kind !== 137 && declaration.kind !== 141) {
                     if (compilerOptions.noImplicitAny) {
                         error(node, ts.Diagnostics.new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type);
                     }
@@ -13631,13 +18374,9 @@ var ts;
         }
         function getTypeAtPosition(signature, pos) {
             if (pos >= 0) {
-                return signature.hasRestParameter ?
-                    pos < signature.parameters.length - 1 ? getTypeOfSymbol(signature.parameters[pos]) : getRestTypeOfSignature(signature) :
-                    pos < signature.parameters.length ? getTypeOfSymbol(signature.parameters[pos]) : anyType;
+                return signature.hasRestParameter ? pos < signature.parameters.length - 1 ? getTypeOfSymbol(signature.parameters[pos]) : getRestTypeOfSignature(signature) : pos < signature.parameters.length ? getTypeOfSymbol(signature.parameters[pos]) : anyType;
             }
-            return signature.hasRestParameter ?
-                getTypeOfSymbol(signature.parameters[signature.parameters.length - 1]) :
-                anyArrayType;
+            return signature.hasRestParameter ? getTypeOfSymbol(signature.parameters[signature.parameters.length - 1]) : anyArrayType;
         }
         function assignContextualParameterTypes(signature, context, mapper) {
             var len = signature.parameters.length - (signature.hasRestParameter ? 1 : 0);
@@ -13937,12 +18676,9 @@ var ts;
             var properties = node.properties;
             for (var i = 0; i < properties.length; i++) {
                 var p = properties[i];
-                if (p.kind === 217 || p.kind === 218) {
+                if (p.kind === 218 || p.kind === 219) {
                     var name = p.name;
-                    var type = sourceType.flags & 1 ? sourceType :
-                        getTypeOfPropertyOfType(sourceType, name.text) ||
-                            isNumericLiteralName(name.text) && getIndexTypeOfType(sourceType, 1) ||
-                            getIndexTypeOfType(sourceType, 0);
+                    var type = sourceType.flags & 1 ? sourceType : getTypeOfPropertyOfType(sourceType, name.text) || isNumericLiteralName(name.text) && getIndexTypeOfType(sourceType, 1) || getIndexTypeOfType(sourceType, 0);
                     if (type) {
                         checkDestructuringAssignment(p.initializer || name, type);
                     }
@@ -13967,14 +18703,17 @@ var ts;
                 if (e.kind !== 172) {
                     if (e.kind !== 171) {
                         var propName = "" + i;
-                        var type = sourceType.flags & 1 ? sourceType :
-                            isTupleLikeType(sourceType) ? getTypeOfPropertyOfType(sourceType, propName) :
-                                getIndexTypeOfType(sourceType, 1);
+                        var type = sourceType.flags & 1 ? sourceType : isTupleLikeType(sourceType) ? getTypeOfPropertyOfType(sourceType, propName) : getIndexTypeOfType(sourceType, 1);
                         if (type) {
                             checkDestructuringAssignment(e, type, contextualMapper);
                         }
                         else {
-                            error(e, ts.Diagnostics.Type_0_has_no_property_1, typeToString(sourceType), propName);
+                            if (isTupleType(sourceType)) {
+                                error(e, ts.Diagnostics.Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2, typeToString(sourceType), sourceType.elementTypes.length, elements.length);
+                            }
+                            else {
+                                error(e, ts.Diagnostics.Type_0_has_no_property_1, typeToString(sourceType), propName);
+                            }
                         }
                     }
                     else {
@@ -14045,9 +18784,7 @@ var ts;
                     if (rightType.flags & (32 | 64))
                         rightType = leftType;
                     var suggestedOperator;
-                    if ((leftType.flags & 8) &&
-                        (rightType.flags & 8) &&
-                        (suggestedOperator = getSuggestedBooleanOperator(node.operatorToken.kind)) !== undefined) {
+                    if ((leftType.flags & 8) && (rightType.flags & 8) && (suggestedOperator = getSuggestedBooleanOperator(node.operatorToken.kind)) !== undefined) {
                         error(node, ts.Diagnostics.The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead, ts.tokenToString(node.operatorToken.kind), ts.tokenToString(suggestedOperator));
                     }
                     else {
@@ -14109,7 +18846,10 @@ var ts;
                 case 48:
                     return rightType;
                 case 49:
-                    return getUnionType([leftType, rightType]);
+                    return getUnionType([
+                        leftType,
+                        rightType
+                    ]);
                 case 52:
                     checkAssignmentOperator(rightType);
                     return rightType;
@@ -14117,9 +18857,7 @@ var ts;
                     return rightType;
             }
             function checkForDisallowedESSymbolOperand(operator) {
-                var offendingSymbolOperand = someConstituentTypeHasKind(leftType, 1048576) ? node.left :
-                    someConstituentTypeHasKind(rightType, 1048576) ? node.right :
-                        undefined;
+                var offendingSymbolOperand = someConstituentTypeHasKind(leftType, 1048576) ? node.left : someConstituentTypeHasKind(rightType, 1048576) ? node.right : undefined;
                 if (offendingSymbolOperand) {
                     error(offendingSymbolOperand, ts.Diagnostics.The_0_operator_cannot_be_applied_to_type_symbol, ts.tokenToString(operator));
                     return false;
@@ -14165,7 +18903,10 @@ var ts;
             checkExpression(node.condition);
             var type1 = checkExpression(node.whenTrue, contextualMapper);
             var type2 = checkExpression(node.whenFalse, contextualMapper);
-            return getUnionType([type1, type2]);
+            return getUnionType([
+                type1,
+                type2
+            ]);
         }
         function checkTemplateExpression(node) {
             ts.forEach(node.templateSpans, function (templateSpan) {
@@ -14229,9 +18970,7 @@ var ts;
                 type = instantiateTypeWithSingleGenericCallSignature(node, uninstantiatedType, contextualMapper);
             }
             if (isConstEnumObjectType(type)) {
-                var ok = (node.parent.kind === 153 && node.parent.expression === node) ||
-                    (node.parent.kind === 154 && node.parent.expression === node) ||
-                    ((node.kind === 64 || node.kind === 125) && isInRightSideOfImportOrExportAssignment(node));
+                var ok = (node.parent.kind === 153 && node.parent.expression === node) || (node.parent.kind === 154 && node.parent.expression === node) || ((node.kind === 64 || node.kind === 125) && isInRightSideOfImportOrExportAssignment(node));
                 if (!ok) {
                     error(node, ts.Diagnostics.const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment);
                 }
@@ -14341,9 +19080,7 @@ var ts;
             if (node.kind === 138) {
                 checkGrammarIndexSignature(node);
             }
-            else if (node.kind === 140 || node.kind === 195 || node.kind === 141 ||
-                node.kind === 136 || node.kind === 133 ||
-                node.kind === 137) {
+            else if (node.kind === 140 || node.kind === 195 || node.kind === 141 || node.kind === 136 || node.kind === 133 || node.kind === 137) {
                 checkGrammarFunctionLikeDeclaration(node);
             }
             checkTypeParameters(node.typeParameters);
@@ -14436,8 +19173,10 @@ var ts;
                     case 160:
                     case 195:
                     case 161:
-                    case 152: return false;
-                    default: return ts.forEachChild(n, containsSuperCall);
+                    case 152:
+                        return false;
+                    default:
+                        return ts.forEachChild(n, containsSuperCall);
                 }
             }
             function markThisReferencesAsErrors(n) {
@@ -14449,14 +19188,13 @@ var ts;
                 }
             }
             function isInstancePropertyWithInitializer(n) {
-                return n.kind === 130 &&
-                    !(n.flags & 128) &&
-                    !!n.initializer;
+                return n.kind === 130 && !(n.flags & 128) && !!n.initializer;
             }
             if (ts.getClassBaseTypeNode(node.parent)) {
                 if (containsSuperCall(node.body)) {
-                    var superCallShouldBeFirst = ts.forEach(node.parent.members, isInstancePropertyWithInitializer) ||
-                        ts.forEach(node.parameters, function (p) { return p.flags & (16 | 32 | 64); });
+                    var superCallShouldBeFirst = ts.forEach(node.parent.members, isInstancePropertyWithInitializer) || ts.forEach(node.parameters, function (p) {
+                        return p.flags & (16 | 32 | 64);
+                    });
                     if (superCallShouldBeFirst) {
                         var statements = node.body.statements;
                         if (!statements.length || statements[0].kind !== 177 || !isSuperCallExpression(statements[0].expression)) {
@@ -14778,16 +19516,16 @@ var ts;
                     case 197:
                         return 2097152;
                     case 200:
-                        return d.name.kind === 8 || ts.getModuleInstanceState(d) !== 0
-                            ? 4194304 | 1048576
-                            : 4194304;
+                        return d.name.kind === 8 || ts.getModuleInstanceState(d) !== 0 ? 4194304 | 1048576 : 4194304;
                     case 196:
                     case 199:
                         return 2097152 | 1048576;
-                    case 202:
+                    case 203:
                         var result = 0;
                         var target = resolveAlias(getSymbolOfNode(d));
-                        ts.forEach(target.declarations, function (d) { result |= getDeclarationSpaces(d); });
+                        ts.forEach(target.declarations, function (d) {
+                            result |= getDeclarationSpaces(d);
+                        });
                         return result;
                     default:
                         return 1048576;
@@ -14796,10 +19534,7 @@ var ts;
         }
         function checkFunctionDeclaration(node) {
             if (produceDiagnostics) {
-                checkFunctionLikeDeclaration(node) ||
-                    checkGrammarDisallowedModifiersInBlockOrObjectLiteralExpression(node) ||
-                    checkGrammarFunctionName(node.name) ||
-                    checkGrammarForGenerator(node);
+                checkFunctionLikeDeclaration(node) || checkGrammarDisallowedModifiersInBlockOrObjectLiteralExpression(node) || checkGrammarFunctionName(node.name) || checkGrammarForGenerator(node);
                 checkCollisionWithCapturedSuperVariable(node, node.name);
                 checkCollisionWithCapturedThisVariable(node, node.name);
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
@@ -14854,12 +19589,7 @@ var ts;
             if (!(identifier && identifier.text === name)) {
                 return false;
             }
-            if (node.kind === 130 ||
-                node.kind === 129 ||
-                node.kind === 132 ||
-                node.kind === 131 ||
-                node.kind === 134 ||
-                node.kind === 135) {
+            if (node.kind === 130 || node.kind === 129 || node.kind === 132 || node.kind === 131 || node.kind === 134 || node.kind === 135) {
                 return false;
             }
             if (ts.isInAmbientContext(node)) {
@@ -14918,7 +19648,7 @@ var ts;
                 return;
             }
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 220 && ts.isExternalModule(parent)) {
+            if (parent.kind === 221 && ts.isExternalModule(parent)) {
                 error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_an_external_module, ts.declarationNameToString(name), ts.declarationNameToString(name));
             }
         }
@@ -14927,17 +19657,11 @@ var ts;
                 var symbol = getSymbolOfNode(node);
                 if (symbol.flags & 1) {
                     var localDeclarationSymbol = resolveName(node, node.name.text, 3, undefined, undefined);
-                    if (localDeclarationSymbol &&
-                        localDeclarationSymbol !== symbol &&
-                        localDeclarationSymbol.flags & 2) {
+                    if (localDeclarationSymbol && localDeclarationSymbol !== symbol && localDeclarationSymbol.flags & 2) {
                         if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & 12288) {
                             var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 194);
-                            var container = varDeclList.parent.kind === 175 &&
-                                varDeclList.parent.parent;
-                            var namesShareScope = container &&
-                                (container.kind === 174 && ts.isFunctionLike(container.parent) ||
-                                    (container.kind === 201 && container.kind === 200) ||
-                                    container.kind === 220);
+                            var container = varDeclList.parent.kind === 175 && varDeclList.parent.parent;
+                            var namesShareScope = container && (container.kind === 174 && ts.isFunctionLike(container.parent) || (container.kind === 201 && container.kind === 200) || container.kind === 221);
                             if (!namesShareScope) {
                                 var name = symbolToString(localDeclarationSymbol);
                                 error(node, ts.Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name, name);
@@ -15096,18 +19820,13 @@ var ts;
             checkSourceElement(node.statement);
         }
         function checkForOfStatement(node) {
-            if (languageVersion < 2) {
-                grammarErrorOnFirstToken(node, ts.Diagnostics.for_of_statements_are_only_available_when_targeting_ECMAScript_6_or_higher);
-                return;
-            }
             checkGrammarForInOrForOfStatement(node);
             if (node.initializer.kind === 194) {
                 checkForInOrForOfVariableDeclaration(node);
             }
             else {
                 var varExpr = node.initializer;
-                var rightType = checkExpression(node.expression);
-                var iteratedType = checkIteratedType(rightType, node.expression);
+                var iteratedType = checkRightHandSideOfForOf(node.expression);
                 if (varExpr.kind === 151 || varExpr.kind === 152) {
                     checkDestructuringAssignment(varExpr, iteratedType || unknownType);
                 }
@@ -15156,20 +19875,17 @@ var ts;
                 checkVariableDeclaration(decl);
             }
         }
-        function getTypeForVariableDeclarationInForOfStatement(forOfStatement) {
-            if (languageVersion < 2) {
-                return anyType;
-            }
-            var expressionType = getTypeOfExpression(forOfStatement.expression);
-            return checkIteratedType(expressionType, forOfStatement.expression) || anyType;
+        function checkRightHandSideOfForOf(rhsExpression) {
+            var expressionType = getTypeOfExpression(rhsExpression);
+            return languageVersion >= 2 ? checkIteratedType(expressionType, rhsExpression) : checkElementTypeOfArrayOrString(expressionType, rhsExpression);
         }
         function checkIteratedType(iterable, expressionForError) {
             ts.Debug.assert(languageVersion >= 2);
             var iteratedType = getIteratedType(iterable, expressionForError);
             if (expressionForError && iteratedType) {
-                var completeIterableType = globalIterableType !== emptyObjectType
-                    ? createTypeReference(globalIterableType, [iteratedType])
-                    : emptyObjectType;
+                var completeIterableType = globalIterableType !== emptyObjectType ? createTypeReference(globalIterableType, [
+                    iteratedType
+                ]) : emptyObjectType;
                 checkTypeAssignableTo(iterable, completeIterableType, expressionForError);
             }
             return iteratedType;
@@ -15217,6 +19933,39 @@ var ts;
                 return iteratorNextValue;
             }
         }
+        function checkElementTypeOfArrayOrString(arrayOrStringType, expressionForError) {
+            ts.Debug.assert(languageVersion < 2);
+            var arrayType = removeTypesFromUnionType(arrayOrStringType, 258, true, true);
+            var hasStringConstituent = arrayOrStringType !== arrayType;
+            var reportedError = false;
+            if (hasStringConstituent) {
+                if (languageVersion < 1) {
+                    error(expressionForError, ts.Diagnostics.Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher);
+                    reportedError = true;
+                }
+                if (arrayType === emptyObjectType) {
+                    return stringType;
+                }
+            }
+            if (!isArrayLikeType(arrayType)) {
+                if (!reportedError) {
+                    var diagnostic = hasStringConstituent ? ts.Diagnostics.Type_0_is_not_an_array_type : ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type;
+                    error(expressionForError, diagnostic, typeToString(arrayType));
+                }
+                return hasStringConstituent ? stringType : unknownType;
+            }
+            var arrayElementType = getIndexTypeOfType(arrayType, 1) || unknownType;
+            if (hasStringConstituent) {
+                if (arrayElementType.flags & 258) {
+                    return stringType;
+                }
+                return getUnionType([
+                    arrayElementType,
+                    stringType
+                ]);
+            }
+            return arrayElementType;
+        }
         function checkBreakOrContinueStatement(node) {
             checkGrammarStatementInAmbientContext(node) || checkGrammarBreakOrContinueStatement(node);
         }
@@ -15265,8 +20014,8 @@ var ts;
             var firstDefaultClause;
             var hasDuplicateDefaultClause = false;
             var expressionType = checkExpression(node.expression);
-            ts.forEach(node.clauses, function (clause) {
-                if (clause.kind === 214 && !hasDuplicateDefaultClause) {
+            ts.forEach(node.caseBlock.clauses, function (clause) {
+                if (clause.kind === 215 && !hasDuplicateDefaultClause) {
                     if (firstDefaultClause === undefined) {
                         firstDefaultClause = clause;
                     }
@@ -15278,7 +20027,7 @@ var ts;
                         hasDuplicateDefaultClause = true;
                     }
                 }
-                if (produceDiagnostics && clause.kind === 213) {
+                if (produceDiagnostics && clause.kind === 214) {
                     var caseClause = clause;
                     var caseType = checkExpression(caseClause.expression);
                     if (!isTypeAssignableTo(expressionType, caseType)) {
@@ -15375,7 +20124,9 @@ var ts;
             if (stringIndexType && numberIndexType) {
                 errorNode = declaredNumberIndexer || declaredStringIndexer;
                 if (!errorNode && (type.flags & 2048)) {
-                    var someBaseTypeHasBothIndexers = ts.forEach(type.baseTypes, function (base) { return getIndexTypeOfType(base, 0) && getIndexTypeOfType(base, 1); });
+                    var someBaseTypeHasBothIndexers = ts.forEach(type.baseTypes, function (base) {
+                        return getIndexTypeOfType(base, 0) && getIndexTypeOfType(base, 1);
+                    });
                     errorNode = someBaseTypeHasBothIndexers ? undefined : type.symbol.declarations[0];
                 }
             }
@@ -15397,13 +20148,13 @@ var ts;
                     errorNode = indexDeclaration;
                 }
                 else if (containingType.flags & 2048) {
-                    var someBaseClassHasBothPropertyAndIndexer = ts.forEach(containingType.baseTypes, function (base) { return getPropertyOfObjectType(base, prop.name) && getIndexTypeOfType(base, indexKind); });
+                    var someBaseClassHasBothPropertyAndIndexer = ts.forEach(containingType.baseTypes, function (base) {
+                        return getPropertyOfObjectType(base, prop.name) && getIndexTypeOfType(base, indexKind);
+                    });
                     errorNode = someBaseClassHasBothPropertyAndIndexer ? undefined : containingType.symbol.declarations[0];
                 }
                 if (errorNode && !isTypeAssignableTo(propertyType, indexType)) {
-                    var errorMessage = indexKind === 0
-                        ? ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_string_index_type_2
-                        : ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2;
+                    var errorMessage = indexKind === 0 ? ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_string_index_type_2 : ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2;
                     error(errorNode, errorMessage, symbolToString(prop), typeToString(propertyType), typeToString(indexType));
                 }
             }
@@ -15567,7 +20318,12 @@ var ts;
                 return true;
             }
             var seen = {};
-            ts.forEach(type.declaredProperties, function (p) { seen[p.name] = { prop: p, containingType: type }; });
+            ts.forEach(type.declaredProperties, function (p) {
+                seen[p.name] = {
+                    prop: p,
+                    containingType: type
+                };
+            });
             var ok = true;
             for (var i = 0, len = type.baseTypes.length; i < len; ++i) {
                 var base = type.baseTypes[i];
@@ -15575,7 +20331,10 @@ var ts;
                 for (var j = 0, proplen = properties.length; j < proplen; ++j) {
                     var prop = properties[j];
                     if (!ts.hasProperty(seen, prop.name)) {
-                        seen[prop.name] = { prop: prop, containingType: base };
+                        seen[prop.name] = {
+                            prop: prop,
+                            containingType: base
+                        };
                     }
                     else {
                         var existing = seen[prop.name];
@@ -15678,9 +20437,12 @@ var ts;
                                 return undefined;
                             }
                             switch (e.operator) {
-                                case 33: return value;
-                                case 34: return -value;
-                                case 47: return enumIsConst ? ~value : undefined;
+                                case 33:
+                                    return value;
+                                case 34:
+                                    return -value;
+                                case 47:
+                                    return enumIsConst ? ~value : undefined;
                             }
                             return undefined;
                         case 167:
@@ -15696,17 +20458,28 @@ var ts;
                                 return undefined;
                             }
                             switch (e.operatorToken.kind) {
-                                case 44: return left | right;
-                                case 43: return left & right;
-                                case 41: return left >> right;
-                                case 42: return left >>> right;
-                                case 40: return left << right;
-                                case 45: return left ^ right;
-                                case 35: return left * right;
-                                case 36: return left / right;
-                                case 33: return left + right;
-                                case 34: return left - right;
-                                case 37: return left % right;
+                                case 44:
+                                    return left | right;
+                                case 43:
+                                    return left & right;
+                                case 41:
+                                    return left >> right;
+                                case 42:
+                                    return left >>> right;
+                                case 40:
+                                    return left << right;
+                                case 45:
+                                    return left ^ right;
+                                case 35:
+                                    return left * right;
+                                case 36:
+                                    return left / right;
+                                case 33:
+                                    return left + right;
+                                case 34:
+                                    return left - right;
+                                case 37:
+                                    return left % right;
                             }
                             return undefined;
                         case 7:
@@ -15729,8 +20502,7 @@ var ts;
                             }
                             else {
                                 if (e.kind === 154) {
-                                    if (e.argumentExpression === undefined ||
-                                        e.argumentExpression.kind !== 8) {
+                                    if (e.argumentExpression === undefined || e.argumentExpression.kind !== 8) {
                                         return undefined;
                                     }
                                     var enumType = getTypeOfNode(e.expression);
@@ -15826,10 +20598,7 @@ var ts;
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
                 checkExportsOnMergedDeclarations(node);
                 var symbol = getSymbolOfNode(node);
-                if (symbol.flags & 512
-                    && symbol.declarations.length > 1
-                    && !ts.isInAmbientContext(node)
-                    && ts.isInstantiatedModule(node, compilerOptions.preserveConstEnums)) {
+                if (symbol.flags & 512 && symbol.declarations.length > 1 && !ts.isInAmbientContext(node) && ts.isInstantiatedModule(node, compilerOptions.preserveConstEnums)) {
                     var classOrFunc = getFirstNonAmbientClassOrFunctionDeclaration(symbol);
                     if (classOrFunc) {
                         if (ts.getSourceFileOfNode(node) !== ts.getSourceFileOfNode(classOrFunc)) {
@@ -15864,10 +20633,8 @@ var ts;
                 return false;
             }
             var inAmbientExternalModule = node.parent.kind === 201 && node.parent.parent.name.kind === 8;
-            if (node.parent.kind !== 220 && !inAmbientExternalModule) {
-                error(moduleName, node.kind === 209 ?
-                    ts.Diagnostics.Export_declarations_are_not_permitted_in_an_internal_module :
-                    ts.Diagnostics.Import_declarations_in_an_internal_module_cannot_reference_an_external_module);
+            if (node.parent.kind !== 221 && !inAmbientExternalModule) {
+                error(moduleName, node.kind === 210 ? ts.Diagnostics.Export_declarations_are_not_permitted_in_an_internal_module : ts.Diagnostics.Import_declarations_in_an_internal_module_cannot_reference_an_external_module);
                 return false;
             }
             if (inAmbientExternalModule && isExternalModuleNameRelative(moduleName.text)) {
@@ -15880,13 +20647,9 @@ var ts;
             var symbol = getSymbolOfNode(node);
             var target = resolveAlias(symbol);
             if (target !== unknownSymbol) {
-                var excludedMeanings = (symbol.flags & 107455 ? 107455 : 0) |
-                    (symbol.flags & 793056 ? 793056 : 0) |
-                    (symbol.flags & 1536 ? 1536 : 0);
+                var excludedMeanings = (symbol.flags & 107455 ? 107455 : 0) | (symbol.flags & 793056 ? 793056 : 0) | (symbol.flags & 1536 ? 1536 : 0);
                 if (target.flags & excludedMeanings) {
-                    var message = node.kind === 211 ?
-                        ts.Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 :
-                        ts.Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0;
+                    var message = node.kind === 212 ? ts.Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 : ts.Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0;
                     error(node, message, symbolToString(symbol));
                 }
             }
@@ -15907,7 +20670,7 @@ var ts;
                         checkImportBinding(importClause);
                     }
                     if (importClause.namedBindings) {
-                        if (importClause.namedBindings.kind === 205) {
+                        if (importClause.namedBindings.kind === 206) {
                             checkImportBinding(importClause.namedBindings);
                         }
                         else {
@@ -15957,7 +20720,7 @@ var ts;
             }
         }
         function checkExportAssignment(node) {
-            var container = node.parent.kind === 220 ? node.parent : node.parent.parent;
+            var container = node.parent.kind === 221 ? node.parent : node.parent.parent;
             if (container.kind === 200 && container.name.kind === 64) {
                 error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_an_internal_module);
                 return;
@@ -15974,7 +20737,7 @@ var ts;
             checkExternalModuleExports(container);
         }
         function getModuleStatements(node) {
-            if (node.kind === 220) {
+            if (node.kind === 221) {
                 return node.statements;
             }
             if (node.kind === 200 && node.body.kind === 201) {
@@ -15988,7 +20751,7 @@ var ts;
                 var statements = getModuleStatements(declarations[i]);
                 for (var j = 0; j < statements.length; j++) {
                     var node = statements[j];
-                    if (node.kind === 209) {
+                    if (node.kind === 210) {
                         var exportClause = node.exportClause;
                         if (!exportClause) {
                             return true;
@@ -16001,7 +20764,7 @@ var ts;
                             }
                         }
                     }
-                    else if (node.kind !== 208 && node.flags & 1 && !(node.flags & 256)) {
+                    else if (node.kind !== 209 && node.flags & 1 && !(node.flags & 256)) {
                         return true;
                     }
                 }
@@ -16111,13 +20874,13 @@ var ts;
                     return checkEnumDeclaration(node);
                 case 200:
                     return checkModuleDeclaration(node);
-                case 203:
+                case 204:
                     return checkImportDeclaration(node);
-                case 202:
+                case 203:
                     return checkImportEqualsDeclaration(node);
-                case 209:
+                case 210:
                     return checkExportDeclaration(node);
-                case 208:
+                case 209:
                     return checkExportAssignment(node);
                 case 176:
                     checkGrammarStatementInAmbientContext(node);
@@ -16158,7 +20921,7 @@ var ts;
                 case 150:
                 case 151:
                 case 152:
-                case 217:
+                case 218:
                 case 153:
                 case 154:
                 case 155:
@@ -16190,19 +20953,20 @@ var ts;
                 case 185:
                 case 186:
                 case 188:
-                case 213:
+                case 202:
                 case 214:
+                case 215:
                 case 189:
                 case 190:
                 case 191:
-                case 216:
+                case 217:
                 case 193:
                 case 194:
                 case 196:
                 case 199:
-                case 219:
-                case 208:
                 case 220:
+                case 209:
+                case 221:
                     ts.forEachChild(node, checkFunctionExpressionBodies);
                     break;
             }
@@ -16290,7 +21054,7 @@ var ts;
                     copySymbols(location.locals, meaning);
                 }
                 switch (location.kind) {
-                    case 220:
+                    case 221:
                         if (!ts.isExternalModule(location))
                             break;
                     case 200:
@@ -16318,9 +21082,7 @@ var ts;
             return ts.mapToArray(symbols);
         }
         function isTypeDeclarationName(name) {
-            return name.kind == 64 &&
-                isTypeDeclaration(name.parent) &&
-                name.parent.name === name;
+            return name.kind == 64 && isTypeDeclaration(name.parent) && name.parent.name === name;
         }
         function isTypeDeclaration(node) {
             switch (node.kind) {
@@ -16402,10 +21164,10 @@ var ts;
             while (nodeOnRightSide.parent.kind === 125) {
                 nodeOnRightSide = nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 202) {
+            if (nodeOnRightSide.parent.kind === 203) {
                 return nodeOnRightSide.parent.moduleReference === nodeOnRightSide && nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 208) {
+            if (nodeOnRightSide.parent.kind === 209) {
                 return nodeOnRightSide.parent.expression === nodeOnRightSide && nodeOnRightSide.parent;
             }
             return undefined;
@@ -16414,14 +21176,13 @@ var ts;
             return getLeftSideOfImportEqualsOrExportAssignment(node) !== undefined;
         }
         function isRightSideOfQualifiedNameOrPropertyAccess(node) {
-            return (node.parent.kind === 125 && node.parent.right === node) ||
-                (node.parent.kind === 153 && node.parent.name === node);
+            return (node.parent.kind === 125 && node.parent.right === node) || (node.parent.kind === 153 && node.parent.name === node);
         }
         function getSymbolOfEntityNameOrPropertyAccessExpression(entityName) {
             if (ts.isDeclarationName(entityName)) {
                 return getSymbolOfNode(entityName.parent);
             }
-            if (entityName.parent.kind === 208) {
+            if (entityName.parent.kind === 209) {
                 return resolveEntityName(entityName, 107455 | 793056 | 1536 | 8388608);
             }
             if (entityName.kind !== 153) {
@@ -16470,9 +21231,7 @@ var ts;
                 return getSymbolOfNode(node.parent);
             }
             if (node.kind === 64 && isInRightSideOfImportOrExportAssignment(node)) {
-                return node.parent.kind === 208
-                    ? getSymbolOfEntityNameOrPropertyAccessExpression(node)
-                    : getSymbolOfPartOfRightHandSideOfImportEquals(node);
+                return node.parent.kind === 209 ? getSymbolOfEntityNameOrPropertyAccessExpression(node) : getSymbolOfPartOfRightHandSideOfImportEquals(node);
             }
             switch (node.kind) {
                 case 64:
@@ -16491,10 +21250,7 @@ var ts;
                     return undefined;
                 case 8:
                     var moduleName;
-                    if ((ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) &&
-                        ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) ||
-                        ((node.parent.kind === 203 || node.parent.kind === 209) &&
-                            node.parent.moduleSpecifier === node)) {
+                    if ((ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) && ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) || ((node.parent.kind === 204 || node.parent.kind === 210) && node.parent.moduleSpecifier === node)) {
                         return resolveExternalModuleName(node, node);
                     }
                 case 7:
@@ -16512,7 +21268,7 @@ var ts;
             return undefined;
         }
         function getShorthandAssignmentValueSymbol(location) {
-            if (location && location.kind === 218) {
+            if (location && location.kind === 219) {
                 return resolveEntityName(location.name, 107455);
             }
             return undefined;
@@ -16580,13 +21336,17 @@ var ts;
             else if (symbol.flags & 67108864) {
                 var target = getSymbolLinks(symbol).target;
                 if (target) {
-                    return [target];
+                    return [
+                        target
+                    ];
                 }
             }
-            return [symbol];
+            return [
+                symbol
+            ];
         }
         function isExternalModuleSymbol(symbol) {
-            return symbol.flags & 512 && symbol.declarations.length === 1 && symbol.declarations[0].kind === 220;
+            return symbol.flags & 512 && symbol.declarations.length === 1 && symbol.declarations[0].kind === 221;
         }
         function isNodeDescendentOf(node, ancestor) {
             while (node) {
@@ -16627,16 +21387,16 @@ var ts;
                     case 199:
                         generateNameForModuleOrEnum(node);
                         break;
-                    case 203:
+                    case 204:
                         generateNameForImportDeclaration(node);
                         break;
-                    case 209:
+                    case 210:
                         generateNameForExportDeclaration(node);
                         break;
-                    case 208:
+                    case 209:
                         generateNameForExportAssignment(node);
                         break;
-                    case 220:
+                    case 221:
                     case 201:
                         ts.forEach(node.statements, generateNames);
                         break;
@@ -16665,12 +21425,11 @@ var ts;
             }
             function generateNameForImportOrExportDeclaration(node) {
                 var expr = ts.getExternalModuleName(node);
-                var baseName = expr.kind === 8 ?
-                    ts.escapeIdentifier(ts.makeIdentifierFromModuleName(expr.text)) : "module";
+                var baseName = expr.kind === 8 ? ts.escapeIdentifier(ts.makeIdentifierFromModuleName(expr.text)) : "module";
                 assignGeneratedName(node, makeUniqueName(baseName));
             }
             function generateNameForImportDeclaration(node) {
-                if (node.importClause && node.importClause.namedBindings && node.importClause.namedBindings.kind === 206) {
+                if (node.importClause && node.importClause.namedBindings && node.importClause.namedBindings.kind === 207) {
                     generateNameForImportOrExportDeclaration(node);
                 }
             }
@@ -16700,7 +21459,7 @@ var ts;
         }
         function getAliasNameSubstitution(symbol) {
             var declaration = getDeclarationOfAliasSymbol(symbol);
-            if (declaration && declaration.kind === 207) {
+            if (declaration && declaration.kind === 208) {
                 var moduleName = getGeneratedNameForNode(declaration.parent.parent.parent);
                 var propertyName = declaration.propertyName || declaration.name;
                 return moduleName + "." + ts.unescapeIdentifier(propertyName.text);
@@ -16739,7 +21498,7 @@ var ts;
             return symbol && symbol !== unknownSymbol && symbolIsValue(symbol) && !isConstEnumSymbol(symbol);
         }
         function isTopLevelValueImportEqualsWithEntityName(node) {
-            if (node.parent.kind !== 220 || !ts.isInternalModuleImportEqualsDeclaration(node)) {
+            if (node.parent.kind !== 221 || !ts.isInternalModuleImportEqualsDeclaration(node)) {
                 return false;
             }
             return isAliasResolvedToValue(getSymbolOfNode(node));
@@ -16764,8 +21523,7 @@ var ts;
             if (ts.nodeIsPresent(node.body)) {
                 var symbol = getSymbolOfNode(node);
                 var signaturesOfSymbol = getSignaturesOfSymbol(symbol);
-                return signaturesOfSymbol.length > 1 ||
-                    (signaturesOfSymbol.length === 1 && signaturesOfSymbol[0].declaration !== node);
+                return signaturesOfSymbol.length > 1 || (signaturesOfSymbol.length === 1 && signaturesOfSymbol[0].declaration !== node);
             }
             return false;
         }
@@ -16777,14 +21535,14 @@ var ts;
             return getNodeLinks(node).enumMemberValue;
         }
         function getConstantValue(node) {
-            if (node.kind === 219) {
+            if (node.kind === 220) {
                 return getEnumMemberValue(node);
             }
             var symbol = getNodeLinks(node).resolvedSymbol;
             if (symbol && (symbol.flags & 8)) {
                 var declaration = symbol.valueDeclaration;
                 var constantValue;
-                if (declaration.kind === 219) {
+                if (declaration.kind === 220) {
                     return getEnumMemberValue(declaration);
                 }
             }
@@ -16792,9 +21550,7 @@ var ts;
         }
         function writeTypeOfDeclaration(declaration, enclosingDeclaration, flags, writer) {
             var symbol = getSymbolOfNode(declaration);
-            var type = symbol && !(symbol.flags & (2048 | 131072))
-                ? getTypeOfSymbol(symbol)
-                : unknownType;
+            var type = symbol && !(symbol.flags & (2048 | 131072)) ? getTypeOfSymbol(symbol) : unknownType;
             getSymbolDisplayBuilder().buildTypeDisplay(type, writer, enclosingDeclaration, flags);
         }
         function writeReturnTypeOfSignatureDeclaration(signatureDeclaration, enclosingDeclaration, flags, writer) {
@@ -16802,29 +21558,20 @@ var ts;
             getSymbolDisplayBuilder().buildTypeDisplay(getReturnTypeOfSignature(signature), writer, enclosingDeclaration, flags);
         }
         function isUnknownIdentifier(location, name) {
-            return !resolveName(location, name, 107455, undefined, undefined) &&
-                !ts.hasProperty(getGeneratedNamesForSourceFile(getSourceFile(location)), name);
+            ts.Debug.assert(!ts.nodeIsSynthesized(location), "isUnknownIdentifier called with a synthesized location");
+            return !resolveName(location, name, 107455, undefined, undefined) && !ts.hasProperty(getGeneratedNamesForSourceFile(getSourceFile(location)), name);
         }
         function getBlockScopedVariableId(n) {
             ts.Debug.assert(!ts.nodeIsSynthesized(n));
-            if (n.parent.kind === 153 &&
-                n.parent.name === n) {
+            if (n.parent.kind === 153 && n.parent.name === n) {
                 return undefined;
             }
-            if (n.parent.kind === 150 &&
-                n.parent.propertyName === n) {
+            if (n.parent.kind === 150 && n.parent.propertyName === n) {
                 return undefined;
             }
-            var declarationSymbol = (n.parent.kind === 193 && n.parent.name === n) ||
-                n.parent.kind === 150
-                ? getSymbolOfNode(n.parent)
-                : undefined;
-            var symbol = declarationSymbol ||
-                getNodeLinks(n).resolvedSymbol ||
-                resolveName(n, n.text, 2 | 8388608, undefined, undefined);
-            var isLetOrConst = symbol &&
-                (symbol.flags & 2) &&
-                symbol.valueDeclaration.parent.kind !== 216;
+            var declarationSymbol = (n.parent.kind === 193 && n.parent.name === n) || n.parent.kind === 150 ? getSymbolOfNode(n.parent) : undefined;
+            var symbol = declarationSymbol || getNodeLinks(n).resolvedSymbol || resolveName(n, n.text, 2 | 8388608, undefined, undefined);
+            var isLetOrConst = symbol && (symbol.flags & 2) && symbol.valueDeclaration.parent.kind !== 217;
             if (isLetOrConst) {
                 getSymbolLinks(symbol);
                 return symbol.id;
@@ -16901,10 +21648,10 @@ var ts;
                 case 175:
                 case 195:
                 case 198:
+                case 204:
                 case 203:
-                case 202:
+                case 210:
                 case 209:
-                case 208:
                 case 128:
                     break;
                 default:
@@ -16939,7 +21686,7 @@ var ts;
                         else if (flags & 128) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "static");
                         }
-                        else if (node.parent.kind === 201 || node.parent.kind === 220) {
+                        else if (node.parent.kind === 201 || node.parent.kind === 221) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_element, text);
                         }
                         flags |= ts.modifierToFlag(modifier.kind);
@@ -16948,7 +21695,7 @@ var ts;
                         if (flags & 128) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "static");
                         }
-                        else if (node.parent.kind === 201 || node.parent.kind === 220) {
+                        else if (node.parent.kind === 201 || node.parent.kind === 221) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_element, "static");
                         }
                         else if (node.kind === 128) {
@@ -17001,7 +21748,7 @@ var ts;
                     return grammarErrorOnNode(lastPrivate, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "private");
                 }
             }
-            else if ((node.kind === 203 || node.kind === 202) && flags & 2) {
+            else if ((node.kind === 204 || node.kind === 203) && flags & 2) {
                 return grammarErrorOnNode(lastDeclare, ts.Diagnostics.A_declare_modifier_cannot_be_used_with_an_import_declaration, "declare");
             }
             else if (node.kind === 197 && flags & 2) {
@@ -17114,8 +21861,7 @@ var ts;
             }
         }
         function checkGrammarTypeArguments(node, typeArguments) {
-            return checkGrammarForDisallowedTrailingComma(typeArguments) ||
-                checkGrammarForAtLeastOneTypeArgument(node, typeArguments);
+            return checkGrammarForDisallowedTrailingComma(typeArguments) || checkGrammarForAtLeastOneTypeArgument(node, typeArguments);
         }
         function checkGrammarForOmittedArgument(node, arguments) {
             if (arguments) {
@@ -17129,8 +21875,7 @@ var ts;
             }
         }
         function checkGrammarArguments(node, arguments) {
-            return checkGrammarForDisallowedTrailingComma(arguments) ||
-                checkGrammarForOmittedArgument(node, arguments);
+            return checkGrammarForDisallowedTrailingComma(arguments) || checkGrammarForOmittedArgument(node, arguments);
         }
         function checkGrammarHeritageClause(node) {
             var types = node.types;
@@ -17226,13 +21971,12 @@ var ts;
             for (var i = 0, n = node.properties.length; i < n; i++) {
                 var prop = node.properties[i];
                 var name = prop.name;
-                if (prop.kind === 172 ||
-                    name.kind === 126) {
+                if (prop.kind === 172 || name.kind === 126) {
                     checkGrammarComputedPropertyName(name);
                     continue;
                 }
                 var currentKind;
-                if (prop.kind === 217 || prop.kind === 218) {
+                if (prop.kind === 218 || prop.kind === 219) {
                     checkGrammarForInvalidQuestionMark(prop, prop.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional);
                     if (name.kind === 7) {
                         checkGrammarNumbericLiteral(name);
@@ -17283,22 +22027,16 @@ var ts;
                 var variableList = forInOrOfStatement.initializer;
                 if (!checkGrammarVariableDeclarationList(variableList)) {
                     if (variableList.declarations.length > 1) {
-                        var diagnostic = forInOrOfStatement.kind === 182
-                            ? ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement
-                            : ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement;
+                        var diagnostic = forInOrOfStatement.kind === 182 ? ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement : ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement;
                         return grammarErrorOnFirstToken(variableList.declarations[1], diagnostic);
                     }
                     var firstDeclaration = variableList.declarations[0];
                     if (firstDeclaration.initializer) {
-                        var diagnostic = forInOrOfStatement.kind === 182
-                            ? ts.Diagnostics.The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer
-                            : ts.Diagnostics.The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer;
+                        var diagnostic = forInOrOfStatement.kind === 182 ? ts.Diagnostics.The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer : ts.Diagnostics.The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer;
                         return grammarErrorOnNode(firstDeclaration.name, diagnostic);
                     }
                     if (firstDeclaration.type) {
-                        var diagnostic = forInOrOfStatement.kind === 182
-                            ? ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation
-                            : ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation;
+                        var diagnostic = forInOrOfStatement.kind === 182 ? ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation : ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation;
                         return grammarErrorOnNode(firstDeclaration, diagnostic);
                     }
                 }
@@ -17352,9 +22090,7 @@ var ts;
             }
         }
         function checkGrammarMethod(node) {
-            if (checkGrammarDisallowedModifiersInBlockOrObjectLiteralExpression(node) ||
-                checkGrammarFunctionLikeDeclaration(node) ||
-                checkGrammarForGenerator(node)) {
+            if (checkGrammarDisallowedModifiersInBlockOrObjectLiteralExpression(node) || checkGrammarFunctionLikeDeclaration(node) || checkGrammarForGenerator(node)) {
                 return true;
             }
             if (node.parent.kind === 152) {
@@ -17405,8 +22141,7 @@ var ts;
                 switch (current.kind) {
                     case 189:
                         if (node.label && current.label.text === node.label.text) {
-                            var isMisplacedContinueLabel = node.kind === 184
-                                && !isIterationStatement(current.statement, true);
+                            var isMisplacedContinueLabel = node.kind === 184 && !isIterationStatement(current.statement, true);
                             if (isMisplacedContinueLabel) {
                                 return grammarErrorOnNode(node, ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement);
                             }
@@ -17427,15 +22162,11 @@ var ts;
                 current = current.parent;
             }
             if (node.label) {
-                var message = node.kind === 185
-                    ? ts.Diagnostics.A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement
-                    : ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement;
+                var message = node.kind === 185 ? ts.Diagnostics.A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement : ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement;
                 return grammarErrorOnNode(node, message);
             }
             else {
-                var message = node.kind === 185
-                    ? ts.Diagnostics.A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement
-                    : ts.Diagnostics.A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement;
+                var message = node.kind === 185 ? ts.Diagnostics.A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement : ts.Diagnostics.A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement;
                 return grammarErrorOnNode(node, message);
             }
         }
@@ -17472,8 +22203,7 @@ var ts;
                 }
             }
             var checkLetConstNames = languageVersion >= 2 && (ts.isLet(node) || ts.isConst(node));
-            return (checkLetConstNames && checkGrammarNameInLetOrConstDeclarations(node.name)) ||
-                checkGrammarEvalOrArgumentsInStrictMode(node, node.name);
+            return (checkLetConstNames && checkGrammarNameInLetOrConstDeclarations(node.name)) || checkGrammarEvalOrArgumentsInStrictMode(node, node.name);
         }
         function checkGrammarNameInLetOrConstDeclarations(name) {
             if (name.kind === 64) {
@@ -17605,8 +22335,7 @@ var ts;
         }
         function checkGrammarProperty(node) {
             if (node.parent.kind === 196) {
-                if (checkGrammarForInvalidQuestionMark(node, node.questionToken, ts.Diagnostics.A_class_member_cannot_be_declared_optional) ||
-                    checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_class_property_declaration_must_directly_refer_to_a_built_in_symbol)) {
+                if (checkGrammarForInvalidQuestionMark(node, node.questionToken, ts.Diagnostics.A_class_member_cannot_be_declared_optional) || checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_class_property_declaration_must_directly_refer_to_a_built_in_symbol)) {
                     return true;
                 }
             }
@@ -17625,12 +22354,7 @@ var ts;
             }
         }
         function checkGrammarTopLevelElementForRequiredDeclareModifier(node) {
-            if (node.kind === 197 ||
-                node.kind === 203 ||
-                node.kind === 202 ||
-                node.kind === 209 ||
-                node.kind === 208 ||
-                (node.flags & 2)) {
+            if (node.kind === 197 || node.kind === 204 || node.kind === 203 || node.kind === 210 || node.kind === 209 || (node.flags & 2)) {
                 return false;
             }
             return grammarErrorOnFirstToken(node, ts.Diagnostics.A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file);
@@ -17657,7 +22381,7 @@ var ts;
                 if (!links.hasReportedStatementInAmbientContext && ts.isFunctionLike(node.parent)) {
                     return getNodeLinks(node).hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.An_implementation_cannot_be_declared_in_ambient_contexts);
                 }
-                if (node.parent.kind === 174 || node.parent.kind === 201 || node.parent.kind === 220) {
+                if (node.parent.kind === 174 || node.parent.kind === 201 || node.parent.kind === 221) {
                     var links = getNodeLinks(node.parent);
                     if (!links.hasReportedStatementInAmbientContext) {
                         return links.hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.Statements_are_not_allowed_in_ambient_contexts);
@@ -17692,7 +22416,10 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    var indentStrings = ["", "    "];
+    var indentStrings = [
+        "",
+        "    "
+    ];
     function getIndentString(level) {
         if (indentStrings[level] === undefined) {
             indentStrings[level] = getIndentString(level - 1) + indentStrings[1];
@@ -17767,21 +22494,34 @@ var ts;
             writeTextOfNode: writeTextOfNode,
             writeLiteral: writeLiteral,
             writeLine: writeLine,
-            increaseIndent: function () { return indent++; },
-            decreaseIndent: function () { return indent--; },
-            getIndent: function () { return indent; },
-            getTextPos: function () { return output.length; },
-            getLine: function () { return lineCount + 1; },
-            getColumn: function () { return lineStart ? indent * getIndentSize() + 1 : output.length - linePos + 1; },
-            getText: function () { return output; }
+            increaseIndent: function () {
+                return indent++;
+            },
+            decreaseIndent: function () {
+                return indent--;
+            },
+            getIndent: function () {
+                return indent;
+            },
+            getTextPos: function () {
+                return output.length;
+            },
+            getLine: function () {
+                return lineCount + 1;
+            },
+            getColumn: function () {
+                return lineStart ? indent * getIndentSize() + 1 : output.length - linePos + 1;
+            },
+            getText: function () {
+                return output;
+            }
         };
     }
     function getLineOfLocalPosition(currentSourceFile, pos) {
         return ts.getLineAndCharacterOfPosition(currentSourceFile, pos).line;
     }
     function emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments) {
-        if (leadingComments && leadingComments.length && node.pos !== leadingComments[0].pos &&
-            getLineOfLocalPosition(currentSourceFile, node.pos) !== getLineOfLocalPosition(currentSourceFile, leadingComments[0].pos)) {
+        if (leadingComments && leadingComments.length && node.pos !== leadingComments[0].pos && getLineOfLocalPosition(currentSourceFile, node.pos) !== getLineOfLocalPosition(currentSourceFile, leadingComments[0].pos)) {
             writer.writeLine();
         }
     }
@@ -17810,9 +22550,7 @@ var ts;
             var lineCount = ts.getLineStarts(currentSourceFile).length;
             var firstCommentLineIndent;
             for (var pos = comment.pos, currentLine = firstCommentLineAndCharacter.line; pos < comment.end; currentLine++) {
-                var nextLineStart = (currentLine + 1) === lineCount
-                    ? currentSourceFile.text.length + 1
-                    : ts.getStartPositionOfLine(currentLine + 1, currentSourceFile);
+                var nextLineStart = (currentLine + 1) === lineCount ? currentSourceFile.text.length + 1 : ts.getStartPositionOfLine(currentLine + 1, currentSourceFile);
                 if (pos !== comment.pos) {
                     if (firstCommentLineIndent === undefined) {
                         firstCommentLineIndent = calculateIndent(ts.getStartPositionOfLine(firstCommentLineAndCharacter.line, currentSourceFile), comment.pos);
@@ -17890,8 +22628,7 @@ var ts;
         }
         else {
             ts.forEach(declarations, function (member) {
-                if ((member.kind === 134 || member.kind === 135)
-                    && (member.flags & 128) === (accessor.flags & 128)) {
+                if ((member.kind === 134 || member.kind === 135) && (member.flags & 128) === (accessor.flags & 128)) {
                     var memberName = ts.getPropertyNameForPropertyNameNode(member.name);
                     var accessorName = ts.getPropertyNameForPropertyNameNode(accessor.name);
                     if (memberName === accessorName) {
@@ -17947,7 +22684,8 @@ var ts;
         var enclosingDeclaration;
         var currentSourceFile;
         var reportedDeclarationError = false;
-        var emitJsDocComments = compilerOptions.removeComments ? function (declaration) { } : writeJsDocComments;
+        var emitJsDocComments = compilerOptions.removeComments ? function (declaration) {
+        } : writeJsDocComments;
         var emit = compilerOptions.stripInternal ? stripInternal : emitNode;
         var aliasDeclarationEmitInfo = [];
         var referencePathsOutput = "";
@@ -17956,9 +22694,7 @@ var ts;
                 var addedGlobalFileReference = false;
                 ts.forEach(root.referencedFiles, function (fileReference) {
                     var referencedFile = ts.tryResolveScriptReference(host, root, fileReference);
-                    if (referencedFile && ((referencedFile.flags & 2048) ||
-                        shouldEmitToOwnFile(referencedFile, compilerOptions) ||
-                        !addedGlobalFileReference)) {
+                    if (referencedFile && ((referencedFile.flags & 2048) || shouldEmitToOwnFile(referencedFile, compilerOptions) || !addedGlobalFileReference)) {
                         writeReferencePath(referencedFile);
                         if (!isExternalModuleOrDeclarationFile(referencedFile)) {
                             addedGlobalFileReference = true;
@@ -17975,8 +22711,7 @@ var ts;
                     if (!compilerOptions.noResolve) {
                         ts.forEach(sourceFile.referencedFiles, function (fileReference) {
                             var referencedFile = ts.tryResolveScriptReference(host, sourceFile, fileReference);
-                            if (referencedFile && (isExternalModuleOrDeclarationFile(referencedFile) &&
-                                !ts.contains(emittedReferencedFiles, referencedFile))) {
+                            if (referencedFile && (isExternalModuleOrDeclarationFile(referencedFile) && !ts.contains(emittedReferencedFiles, referencedFile))) {
                                 writeReferencePath(referencedFile);
                                 emittedReferencedFiles.push(referencedFile);
                             }
@@ -18030,7 +22765,9 @@ var ts;
         function writeAsychronousImportEqualsDeclarations(importEqualsDeclarations) {
             var oldWriter = writer;
             ts.forEach(importEqualsDeclarations, function (aliasToWrite) {
-                var aliasEmitInfo = ts.forEach(aliasDeclarationEmitInfo, function (declEmitInfo) { return declEmitInfo.declaration === aliasToWrite ? declEmitInfo : undefined; });
+                var aliasEmitInfo = ts.forEach(aliasDeclarationEmitInfo, function (declEmitInfo) {
+                    return declEmitInfo.declaration === aliasToWrite ? declEmitInfo : undefined;
+                });
                 if (aliasEmitInfo) {
                     createAndSetNewTextWriterWithSymbolWriter();
                     for (var declarationIndent = aliasEmitInfo.indent; declarationIndent; declarationIndent--) {
@@ -18148,7 +22885,7 @@ var ts;
                     ts.Debug.fail("Unknown type annotation: " + type.kind);
             }
             function emitEntityName(entityName) {
-                var visibilityResult = resolver.isEntityNameVisible(entityName, entityName.parent.kind === 202 ? entityName.parent : enclosingDeclaration);
+                var visibilityResult = resolver.isEntityNameVisible(entityName, entityName.parent.kind === 203 ? entityName.parent : enclosingDeclaration);
                 handleSymbolAccessibilityError(visibilityResult);
                 writeEntityName(entityName);
                 function writeEntityName(entityName) {
@@ -18355,15 +23092,8 @@ var ts;
                 writeTextOfNode(currentSourceFile, node.name);
                 if (node.constraint && !isPrivateMethodTypeParameter(node)) {
                     write(" extends ");
-                    if (node.parent.kind === 140 ||
-                        node.parent.kind === 141 ||
-                        (node.parent.parent && node.parent.parent.kind === 143)) {
-                        ts.Debug.assert(node.parent.kind === 132 ||
-                            node.parent.kind === 131 ||
-                            node.parent.kind === 140 ||
-                            node.parent.kind === 141 ||
-                            node.parent.kind === 136 ||
-                            node.parent.kind === 137);
+                    if (node.parent.kind === 140 || node.parent.kind === 141 || (node.parent.parent && node.parent.parent.kind === 143)) {
+                        ts.Debug.assert(node.parent.kind === 132 || node.parent.kind === 131 || node.parent.kind === 140 || node.parent.kind === 141 || node.parent.kind === 136 || node.parent.kind === 137);
                         emitType(node.constraint);
                     }
                     else {
@@ -18426,9 +23156,7 @@ var ts;
                 function getHeritageClauseVisibilityError(symbolAccesibilityResult) {
                     var diagnosticMessage;
                     if (node.parent.parent.kind === 196) {
-                        diagnosticMessage = isImplementsList ?
-                            ts.Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 :
-                            ts.Diagnostics.Extends_clause_of_exported_class_0_has_or_is_using_private_name_1;
+                        diagnosticMessage = isImplementsList ? ts.Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 : ts.Diagnostics.Extends_clause_of_exported_class_0_has_or_is_using_private_name_1;
                     }
                     else {
                         diagnosticMessage = ts.Diagnostics.Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1;
@@ -18461,7 +23189,9 @@ var ts;
                 emitTypeParameters(node.typeParameters);
                 var baseTypeNode = ts.getClassBaseTypeNode(node);
                 if (baseTypeNode) {
-                    emitHeritageClause([baseTypeNode], false);
+                    emitHeritageClause([
+                        baseTypeNode
+                    ], false);
                 }
                 emitHeritageClause(ts.getClassImplementedTypeNodes(node), true);
                 write(" {");
@@ -18521,31 +23251,17 @@ var ts;
             function getVariableDeclarationTypeVisibilityError(symbolAccesibilityResult) {
                 var diagnosticMessage;
                 if (node.kind === 193) {
-                    diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                        symbolAccesibilityResult.accessibility === 2 ?
-                            ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
-                            ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_private_module_2 :
-                        ts.Diagnostics.Exported_variable_0_has_or_is_using_private_name_1;
+                    diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Exported_variable_0_has_or_is_using_private_name_1;
                 }
                 else if (node.kind === 130 || node.kind === 129) {
                     if (node.flags & 128) {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
-                                ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
-                                ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1;
                     }
                     else if (node.parent.kind === 196) {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
-                                ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
-                                ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_private_name_1;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_private_name_1;
                     }
                     else {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_private_name_1;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_private_name_1;
                     }
                 }
                 return diagnosticMessage !== undefined ? {
@@ -18562,7 +23278,9 @@ var ts;
             }
         }
         function emitVariableStatement(node) {
-            var hasDeclarationWithEmit = ts.forEach(node.declarationList.declarations, function (varDeclaration) { return resolver.isDeclarationVisible(varDeclaration); });
+            var hasDeclarationWithEmit = ts.forEach(node.declarationList.declarations, function (varDeclaration) {
+                return resolver.isDeclarationVisible(varDeclaration);
+            });
             if (hasDeclarationWithEmit) {
                 emitJsDocComments(node);
                 emitModuleElementDeclarationFlags(node);
@@ -18607,25 +23325,17 @@ var ts;
             }
             function getTypeAnnotationFromAccessor(accessor) {
                 if (accessor) {
-                    return accessor.kind === 134
-                        ? accessor.type
-                        : accessor.parameters.length > 0
-                            ? accessor.parameters[0].type
-                            : undefined;
+                    return accessor.kind === 134 ? accessor.type : accessor.parameters.length > 0 ? accessor.parameters[0].type : undefined;
                 }
             }
             function getAccessorDeclarationTypeVisibilityError(symbolAccesibilityResult) {
                 var diagnosticMessage;
                 if (accessorWithTypeAnnotation.kind === 135) {
                     if (accessorWithTypeAnnotation.parent.flags & 128) {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1;
                     }
                     else {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1;
                     }
                     return {
                         diagnosticMessage: diagnosticMessage,
@@ -18635,18 +23345,10 @@ var ts;
                 }
                 else {
                     if (accessorWithTypeAnnotation.flags & 128) {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
-                                ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
-                                ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
-                            ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0;
                     }
                     else {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
-                                ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
-                                ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
-                            ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0;
                     }
                     return {
                         diagnosticMessage: diagnosticMessage,
@@ -18660,8 +23362,7 @@ var ts;
             if (ts.hasDynamicName(node)) {
                 return;
             }
-            if ((node.kind !== 195 || resolver.isDeclarationVisible(node)) &&
-                !resolver.isImplementationOfOverload(node)) {
+            if ((node.kind !== 195 || resolver.isDeclarationVisible(node)) && !resolver.isImplementationOfOverload(node)) {
                 emitJsDocComments(node);
                 if (node.kind === 195) {
                     emitModuleElementDeclarationFlags(node);
@@ -18728,48 +23429,28 @@ var ts;
                 var diagnosticMessage;
                 switch (node.kind) {
                     case 137:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
-                            ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0;
                         break;
                     case 136:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
-                            ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0;
                         break;
                     case 138:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
-                            ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0;
                         break;
                     case 132:
                     case 131:
                         if (node.flags & 128) {
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === 2 ?
-                                    ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
-                                    ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
-                                ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0;
+                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0;
                         }
                         else if (node.parent.kind === 196) {
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === 2 ?
-                                    ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
-                                    ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
-                                ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0;
+                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0;
                         }
                         else {
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                                ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
-                                ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0;
+                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0;
                         }
                         break;
                     case 195:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
-                                ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
-                                ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1 :
-                            ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_private_name_0;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_private_name_0;
                         break;
                     default:
                         ts.Debug.fail("This is unknown kind for signature: " + node.kind);
@@ -18796,9 +23477,7 @@ var ts;
                 write("?");
             }
             decreaseIndent();
-            if (node.parent.kind === 140 ||
-                node.parent.kind === 141 ||
-                node.parent.parent.kind === 143) {
+            if (node.parent.kind === 140 || node.parent.kind === 141 || node.parent.parent.kind === 143) {
                 emitTypeOfVariableDeclarationFromTypeLiteral(node);
             }
             else if (!(node.parent.flags & 32)) {
@@ -18808,50 +23487,28 @@ var ts;
                 var diagnosticMessage;
                 switch (node.parent.kind) {
                     case 133:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
-                                ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
-                                ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1;
                         break;
                     case 137:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
                         break;
                     case 136:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
                         break;
                     case 132:
                     case 131:
                         if (node.parent.flags & 128) {
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === 2 ?
-                                    ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
-                                    ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
-                                ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
+                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
                         }
                         else if (node.parent.parent.kind === 196) {
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === 2 ?
-                                    ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
-                                    ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
-                                ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1;
+                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1;
                         }
                         else {
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                                ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
-                                ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
+                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
                         }
                         break;
                     case 195:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
-                                ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
-                                ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_private_name_1;
+                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ? symbolAccesibilityResult.accessibility === 2 ? ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_private_name_1;
                         break;
                     default:
                         ts.Debug.fail("This is unknown parent for parameter: " + node.parent.kind);
@@ -18888,26 +23545,22 @@ var ts;
                     return emitClassDeclaration(node);
                 case 198:
                     return emitTypeAliasDeclaration(node);
-                case 219:
+                case 220:
                     return emitEnumMemberDeclaration(node);
                 case 199:
                     return emitEnumDeclaration(node);
                 case 200:
                     return emitModuleDeclaration(node);
-                case 202:
+                case 203:
                     return emitImportEqualsDeclaration(node);
-                case 208:
+                case 209:
                     return emitExportAssignment(node);
-                case 220:
+                case 221:
                     return emitSourceFile(node);
             }
         }
         function writeReferencePath(referencedFile) {
-            var declFileName = referencedFile.flags & 2048
-                ? referencedFile.fileName
-                : shouldEmitToOwnFile(referencedFile, compilerOptions)
-                    ? getOwnEmitOutputFilePath(referencedFile, host, ".d.ts")
-                    : ts.removeFileExtension(compilerOptions.out) + ".d.ts";
+            var declFileName = referencedFile.flags & 2048 ? referencedFile.fileName : shouldEmitToOwnFile(referencedFile, compilerOptions) ? getOwnEmitOutputFilePath(referencedFile, host, ".d.ts") : ts.removeFileExtension(compilerOptions.out) + ".d.ts";
             declFileName = ts.getRelativePathToDirectoryOrUrl(ts.getDirectoryPath(ts.normalizeSlashes(jsFilePath)), declFileName, host.getCurrentDirectory(), host.getCanonicalFileName, false);
             referencePathsOutput += "/// <reference path=\"" + declFileName + "\" />" + newLine;
         }
@@ -18958,6 +23611,7 @@ var ts;
             var writeLine = writer.writeLine;
             var increaseIndent = writer.increaseIndent;
             var decreaseIndent = writer.decreaseIndent;
+            var preserveNewLines = compilerOptions.preserveNewLines || false;
             var currentSourceFile;
             var lastFrame;
             var currentScopeNames;
@@ -18970,41 +23624,57 @@ var ts;
             var exportSpecifiers;
             var exportDefault;
             var writeEmittedFiles = writeJavaScriptFile;
-            var emitLeadingComments = compilerOptions.removeComments ? function (node) { } : emitLeadingDeclarationComments;
-            var emitTrailingComments = compilerOptions.removeComments ? function (node) { } : emitTrailingDeclarationComments;
-            var emitLeadingCommentsOfPosition = compilerOptions.removeComments ? function (pos) { } : emitLeadingCommentsOfLocalPosition;
+            var emitLeadingComments = compilerOptions.removeComments ? function (node) {
+            } : emitLeadingDeclarationComments;
+            var emitTrailingComments = compilerOptions.removeComments ? function (node) {
+            } : emitTrailingDeclarationComments;
+            var emitLeadingCommentsOfPosition = compilerOptions.removeComments ? function (pos) {
+            } : emitLeadingCommentsOfLocalPosition;
             var detachedCommentsInfo;
-            var emitDetachedComments = compilerOptions.removeComments ? function (node) { } : emitDetachedCommentsAtPosition;
-            var emitPinnedOrTripleSlashComments = compilerOptions.removeComments ? function (node) { } : emitPinnedOrTripleSlashCommentsOfNode;
+            var emitDetachedComments = compilerOptions.removeComments ? function (node) {
+            } : emitDetachedCommentsAtPosition;
             var writeComment = writeCommentRange;
-            var emit = emitNode;
-            var emitStart = function (node) { };
-            var emitEnd = function (node) { };
+            var emitNodeWithoutSourceMap = compilerOptions.removeComments ? emitNodeWithoutSourceMapWithoutComments : emitNodeWithoutSourceMapWithComments;
+            var emit = emitNodeWithoutSourceMap;
+            var emitWithoutComments = emitNodeWithoutSourceMapWithoutComments;
+            var emitStart = function (node) {
+            };
+            var emitEnd = function (node) {
+            };
             var emitToken = emitTokenText;
-            var scopeEmitStart = function (scopeDeclaration, scopeName) { };
-            var scopeEmitEnd = function () { };
+            var scopeEmitStart = function (scopeDeclaration, scopeName) {
+            };
+            var scopeEmitEnd = function () {
+            };
             var sourceMapData;
             if (compilerOptions.sourceMap) {
                 initializeEmitterWithSourceMaps();
             }
             if (root) {
-                emit(root);
+                emitSourceFile(root);
             }
             else {
                 ts.forEach(host.getSourceFiles(), function (sourceFile) {
                     if (!isExternalModuleOrDeclarationFile(sourceFile)) {
-                        emit(sourceFile);
+                        emitSourceFile(sourceFile);
                     }
                 });
             }
             writeLine();
             writeEmittedFiles(writer.getText(), compilerOptions.emitBOM);
             return;
+            function emitSourceFile(sourceFile) {
+                currentSourceFile = sourceFile;
+                emit(sourceFile);
+            }
             function enterNameScope() {
                 var names = currentScopeNames;
                 currentScopeNames = undefined;
                 if (names) {
-                    lastFrame = { names: names, previous: lastFrame };
+                    lastFrame = {
+                        names: names,
+                        previous: lastFrame
+                    };
                     return true;
                 }
                 return false;
@@ -19024,8 +23694,13 @@ var ts;
                     name = baseName;
                 }
                 else {
-                    name = ts.generateUniqueName(baseName, function (n) { return isExistingName(location, n); });
+                    name = ts.generateUniqueName(baseName, function (n) {
+                        return isExistingName(location, n);
+                    });
                 }
+                return recordNameInCurrentScope(name);
+            }
+            function recordNameInCurrentScope(name) {
                 if (!currentScopeNames) {
                     currentScopeNames = {};
                 }
@@ -19121,12 +23796,7 @@ var ts;
                     sourceLinePos.character++;
                     var emittedLine = writer.getLine();
                     var emittedColumn = writer.getColumn();
-                    if (!lastRecordedSourceMapSpan ||
-                        lastRecordedSourceMapSpan.emittedLine != emittedLine ||
-                        lastRecordedSourceMapSpan.emittedColumn != emittedColumn ||
-                        (lastRecordedSourceMapSpan.sourceIndex === sourceMapSourceIndex &&
-                            (lastRecordedSourceMapSpan.sourceLine > sourceLinePos.line ||
-                                (lastRecordedSourceMapSpan.sourceLine === sourceLinePos.line && lastRecordedSourceMapSpan.sourceColumn > sourceLinePos.character)))) {
+                    if (!lastRecordedSourceMapSpan || lastRecordedSourceMapSpan.emittedLine != emittedLine || lastRecordedSourceMapSpan.emittedColumn != emittedColumn || (lastRecordedSourceMapSpan.sourceIndex === sourceMapSourceIndex && (lastRecordedSourceMapSpan.sourceLine > sourceLinePos.line || (lastRecordedSourceMapSpan.sourceLine === sourceLinePos.line && lastRecordedSourceMapSpan.sourceColumn > sourceLinePos.character)))) {
                         encodeLastRecordedSourceMapSpan();
                         lastRecordedSourceMapSpan = {
                             emittedLine: emittedLine,
@@ -19189,20 +23859,10 @@ var ts;
                     if (scopeName) {
                         recordScopeNameStart(scopeName);
                     }
-                    else if (node.kind === 195 ||
-                        node.kind === 160 ||
-                        node.kind === 132 ||
-                        node.kind === 131 ||
-                        node.kind === 134 ||
-                        node.kind === 135 ||
-                        node.kind === 200 ||
-                        node.kind === 196 ||
-                        node.kind === 199) {
+                    else if (node.kind === 195 || node.kind === 160 || node.kind === 132 || node.kind === 131 || node.kind === 134 || node.kind === 135 || node.kind === 200 || node.kind === 196 || node.kind === 199) {
                         if (node.name) {
                             var name = node.name;
-                            scopeName = name.kind === 126
-                                ? ts.getTextOfNode(name)
-                                : node.name.text;
+                            scopeName = name.kind === 126 ? ts.getTextOfNode(name) : node.name.text;
                         }
                         recordScopeNameStart(scopeName);
                     }
@@ -19280,21 +23940,32 @@ var ts;
                 else {
                     sourceMapDir = ts.getDirectoryPath(ts.normalizePath(jsFilePath));
                 }
-                function emitNodeWithMap(node) {
+                function emitNodeWithSourceMap(node) {
                     if (node) {
-                        if (node.kind != 220) {
+                        if (ts.nodeIsSynthesized(node)) {
+                            return emitNodeWithoutSourceMap(node);
+                        }
+                        if (node.kind != 221) {
                             recordEmitNodeStartSpan(node);
-                            emitNode(node);
+                            emitNodeWithoutSourceMap(node);
                             recordEmitNodeEndSpan(node);
                         }
                         else {
                             recordNewSourceFileStart(node);
-                            emitNode(node);
+                            emitNodeWithoutSourceMap(node);
                         }
                     }
                 }
+                function emitNodeWithSourceMapWithoutComments(node) {
+                    if (node) {
+                        recordEmitNodeStartSpan(node);
+                        emitNodeWithoutSourceMapWithoutComments(node);
+                        recordEmitNodeEndSpan(node);
+                    }
+                }
                 writeEmittedFiles = writeJavaScriptAndSourceMapFile;
-                emit = emitNodeWithMap;
+                emit = emitNodeWithSourceMap;
+                emitWithoutComments = emitNodeWithSourceMapWithoutComments;
                 emitStart = recordEmitNodeStartSpan;
                 emitEnd = recordEmitNodeEndSpan;
                 emitToken = writeTextWithSpanRecord;
@@ -19314,6 +23985,7 @@ var ts;
                     name = "_" + (tempCount < 25 ? String.fromCharCode(tempCount + (tempCount < 8 ? 0 : 1) + 97) : tempCount - 25);
                     tempCount++;
                 }
+                recordNameInCurrentScope(name);
                 var result = ts.createSynthesizedNode(64);
                 result.text = name;
                 return result;
@@ -19375,7 +24047,7 @@ var ts;
             function emitLinePreservingList(parent, nodes, allowTrailingComma, spacesBetweenBraces) {
                 ts.Debug.assert(nodes.length > 0);
                 increaseIndent();
-                if (nodeStartPositionsAreOnSameLine(parent, nodes[0])) {
+                if (preserveNewLines && nodeStartPositionsAreOnSameLine(parent, nodes[0])) {
                     if (spacesBetweenBraces) {
                         write(" ");
                     }
@@ -19385,7 +24057,7 @@ var ts;
                 }
                 for (var i = 0, n = nodes.length; i < n; i++) {
                     if (i) {
-                        if (nodeEndIsOnSameLineAsNodeStart(nodes[i - 1], nodes[i])) {
+                        if (preserveNewLines && nodeEndIsOnSameLineAsNodeStart(nodes[i - 1], nodes[i])) {
                             write(", ");
                         }
                         else {
@@ -19395,12 +24067,11 @@ var ts;
                     }
                     emit(nodes[i]);
                 }
-                var closeTokenIsOnSameLineAsLastElement = nodeEndPositionsAreOnSameLine(parent, ts.lastOrUndefined(nodes));
                 if (nodes.hasTrailingComma && allowTrailingComma) {
                     write(",");
                 }
                 decreaseIndent();
-                if (closeTokenIsOnSameLineAsLastElement) {
+                if (preserveNewLines && nodeEndPositionsAreOnSameLine(parent, ts.lastOrUndefined(nodes))) {
                     if (spacesBetweenBraces) {
                         write(" ");
                     }
@@ -19534,8 +24205,7 @@ var ts;
                 if (node.template.kind === 169) {
                     ts.forEach(node.template.templateSpans, function (templateSpan) {
                         write(", ");
-                        var needsParens = templateSpan.expression.kind === 167
-                            && templateSpan.expression.operatorToken.kind === 23;
+                        var needsParens = templateSpan.expression.kind === 167 && templateSpan.expression.operatorToken.kind === 23;
                         emitParenthesizedIf(templateSpan.expression, needsParens);
                     });
                 }
@@ -19546,8 +24216,7 @@ var ts;
                     ts.forEachChild(node, emit);
                     return;
                 }
-                var emitOuterParens = ts.isExpression(node.parent)
-                    && templateNeedsParens(node, node.parent);
+                var emitOuterParens = ts.isExpression(node.parent) && templateNeedsParens(node, node.parent);
                 if (emitOuterParens) {
                     write("(");
                 }
@@ -19558,8 +24227,7 @@ var ts;
                 }
                 for (var i = 0; i < node.templateSpans.length; i++) {
                     var templateSpan = node.templateSpans[i];
-                    var needsParens = templateSpan.expression.kind !== 159
-                        && comparePrecedenceToBinaryPlus(templateSpan.expression) !== 1;
+                    var needsParens = templateSpan.expression.kind !== 159 && comparePrecedenceToBinaryPlus(templateSpan.expression) !== 1;
                     if (i > 0 || headEmitted) {
                         write(" + ");
                     }
@@ -19640,9 +24308,9 @@ var ts;
                     case 150:
                     case 130:
                     case 129:
-                    case 217:
                     case 218:
                     case 219:
+                    case 220:
                     case 132:
                     case 131:
                     case 195:
@@ -19653,11 +24321,11 @@ var ts;
                     case 197:
                     case 199:
                     case 200:
-                    case 202:
+                    case 203:
                         return parent.name === node;
                     case 185:
                     case 184:
-                    case 208:
+                    case 209:
                         return false;
                     case 189:
                         return node.parent.label === node;
@@ -19845,9 +24513,9 @@ var ts;
             }
             function tryGetRightHandSideOfPatchingPropertyAssignment(objectLiteral, property) {
                 switch (property.kind) {
-                    case 217:
-                        return property.initializer;
                     case 218:
+                        return property.initializer;
+                    case 219:
                         return createIdentifier(resolver.getExpressionNameSubstitution(property.name));
                     case 132:
                         return createFunctionExpression(property.parameters, property.body);
@@ -19901,6 +24569,11 @@ var ts;
                 result.right = right;
                 return result;
             }
+            function createExpressionStatement(expression) {
+                var result = ts.createSynthesizedNode(177);
+                result.expression = expression;
+                return result;
+            }
             function createMemberAccessForPropertyName(expression, memberName) {
                 if (memberName.kind === 64) {
                     return createPropertyAccessExpression(expression, memberName);
@@ -19916,7 +24589,7 @@ var ts;
                 }
             }
             function createPropertyAssignment(name, initializer) {
-                var result = ts.createSynthesizedNode(217);
+                var result = ts.createSynthesizedNode(218);
                 result.name = name;
                 result.initializer = initializer;
                 return result;
@@ -20011,29 +24684,31 @@ var ts;
                 }
                 return false;
             }
-            function indentIfOnDifferentLines(parent, node1, node2) {
-                var isSynthesized = ts.nodeIsSynthesized(parent);
-                var realNodesAreOnDifferentLines = !isSynthesized && !nodeEndIsOnSameLineAsNodeStart(node1, node2);
+            function indentIfOnDifferentLines(parent, node1, node2, valueToWriteWhenNotIndenting) {
+                var realNodesAreOnDifferentLines = preserveNewLines && !ts.nodeIsSynthesized(parent) && !nodeEndIsOnSameLineAsNodeStart(node1, node2);
                 var synthesizedNodeIsOnDifferentLine = synthesizedNodeStartsOnNewLine(node2);
                 if (realNodesAreOnDifferentLines || synthesizedNodeIsOnDifferentLine) {
                     increaseIndent();
                     writeLine();
                     return true;
                 }
-                return false;
+                else {
+                    if (valueToWriteWhenNotIndenting) {
+                        write(valueToWriteWhenNotIndenting);
+                    }
+                    return false;
+                }
             }
             function emitPropertyAccess(node) {
                 if (tryEmitConstantValue(node)) {
                     return;
                 }
                 emit(node.expression);
-                var indented = indentIfOnDifferentLines(node, node.expression, node.dotToken);
+                var indentedBeforeDot = indentIfOnDifferentLines(node, node.expression, node.dotToken);
                 write(".");
-                indented = indented || indentIfOnDifferentLines(node, node.dotToken, node.name);
+                var indentedAfterDot = indentIfOnDifferentLines(node, node.dotToken, node.name);
                 emit(node.name);
-                if (indented) {
-                    decreaseIndent();
-                }
+                decreaseIndentIf(indentedBeforeDot, indentedAfterDot);
             }
             function emitQualifiedName(node) {
                 emit(node.left);
@@ -20050,7 +24725,9 @@ var ts;
                 write("]");
             }
             function hasSpreadElement(elements) {
-                return ts.forEach(elements, function (e) { return e.kind === 171; });
+                return ts.forEach(elements, function (e) {
+                    return e.kind === 171;
+                });
             }
             function skipParentheses(node) {
                 while (node.kind === 159 || node.kind === 158) {
@@ -20163,14 +24840,7 @@ var ts;
                         while (operand.kind == 158) {
                             operand = operand.expression;
                         }
-                        if (operand.kind !== 165 &&
-                            operand.kind !== 164 &&
-                            operand.kind !== 163 &&
-                            operand.kind !== 162 &&
-                            operand.kind !== 166 &&
-                            operand.kind !== 156 &&
-                            !(operand.kind === 155 && node.parent.kind === 156) &&
-                            !(operand.kind === 160 && node.parent.kind === 155)) {
+                        if (operand.kind !== 165 && operand.kind !== 164 && operand.kind !== 163 && operand.kind !== 162 && operand.kind !== 166 && operand.kind !== 156 && !(operand.kind === 155 && node.parent.kind === 156) && !(operand.kind === 160 && node.parent.kind === 155)) {
                             emit(operand);
                             return;
                         }
@@ -20213,27 +24883,16 @@ var ts;
                 write(ts.tokenToString(node.operator));
             }
             function emitBinaryExpression(node) {
-                if (languageVersion < 2 && node.operatorToken.kind === 52 &&
-                    (node.left.kind === 152 || node.left.kind === 151)) {
-                    emitDestructuring(node);
+                if (languageVersion < 2 && node.operatorToken.kind === 52 && (node.left.kind === 152 || node.left.kind === 151)) {
+                    emitDestructuring(node, node.parent.kind === 177);
                 }
                 else {
                     emit(node.left);
-                    var indented1 = indentIfOnDifferentLines(node, node.left, node.operatorToken);
-                    if (!indented1 && node.operatorToken.kind !== 23) {
-                        write(" ");
-                    }
+                    var indentedBeforeOperator = indentIfOnDifferentLines(node, node.left, node.operatorToken, node.operatorToken.kind !== 23 ? " " : undefined);
                     write(ts.tokenToString(node.operatorToken.kind));
-                    if (!indented1) {
-                        var indented2 = indentIfOnDifferentLines(node, node.operatorToken, node.right);
-                    }
-                    if (!indented2) {
-                        write(" ");
-                    }
+                    var indentedAfterOperator = indentIfOnDifferentLines(node, node.operatorToken, node.right, " ");
                     emit(node.right);
-                    if (indented1 || indented2) {
-                        decreaseIndent();
-                    }
+                    decreaseIndentIf(indentedBeforeOperator, indentedAfterOperator);
                 }
             }
             function synthesizedNodeStartsOnNewLine(node) {
@@ -20241,34 +24900,22 @@ var ts;
             }
             function emitConditionalExpression(node) {
                 emit(node.condition);
-                var indent1 = indentIfOnDifferentLines(node, node.condition, node.questionToken);
-                if (!indent1) {
-                    write(" ");
-                }
+                var indentedBeforeQuestion = indentIfOnDifferentLines(node, node.condition, node.questionToken, " ");
                 write("?");
-                if (!indent1) {
-                    var indent2 = indentIfOnDifferentLines(node, node.questionToken, node.whenTrue);
-                }
-                if (!indent2) {
-                    write(" ");
-                }
+                var indentedAfterQuestion = indentIfOnDifferentLines(node, node.questionToken, node.whenTrue, " ");
                 emit(node.whenTrue);
-                if (indent1 || indent2) {
+                decreaseIndentIf(indentedBeforeQuestion, indentedAfterQuestion);
+                var indentedBeforeColon = indentIfOnDifferentLines(node, node.whenTrue, node.colonToken, " ");
+                write(":");
+                var indentedAfterColon = indentIfOnDifferentLines(node, node.colonToken, node.whenFalse, " ");
+                emit(node.whenFalse);
+                decreaseIndentIf(indentedBeforeColon, indentedAfterColon);
+            }
+            function decreaseIndentIf(value1, value2) {
+                if (value1) {
                     decreaseIndent();
                 }
-                var indent3 = indentIfOnDifferentLines(node, node.whenTrue, node.colonToken);
-                if (!indent3) {
-                    write(" ");
-                }
-                write(":");
-                if (!indent3) {
-                    var indent4 = indentIfOnDifferentLines(node, node.colonToken, node.whenFalse);
-                }
-                if (!indent4) {
-                    write(" ");
-                }
-                emit(node.whenFalse);
-                if (indent3 || indent4) {
+                if (value2) {
                     decreaseIndent();
                 }
             }
@@ -20279,7 +24926,7 @@ var ts;
                 }
             }
             function emitBlock(node) {
-                if (isSingleLineEmptyBlock(node)) {
+                if (preserveNewLines && isSingleLineEmptyBlock(node)) {
                     emitToken(14, node.pos);
                     write(" ");
                     emitToken(15, node.statements.end);
@@ -20401,6 +25048,9 @@ var ts;
                 emitEmbeddedStatement(node.statement);
             }
             function emitForInOrForOfStatement(node) {
+                if (languageVersion < 2 && node.kind === 183) {
+                    return emitDownLevelForOfStatement(node);
+                }
                 var endPos = emitToken(81, node.pos);
                 write(" ");
                 endPos = emitToken(16, endPos);
@@ -20426,6 +25076,86 @@ var ts;
                 emitToken(17, node.expression.end);
                 emitEmbeddedStatement(node.statement);
             }
+            function emitDownLevelForOfStatement(node) {
+                var endPos = emitToken(81, node.pos);
+                write(" ");
+                endPos = emitToken(16, endPos);
+                var rhsIsIdentifier = node.expression.kind === 64;
+                var counter = createTempVariable(node, true);
+                var rhsReference = rhsIsIdentifier ? node.expression : createTempVariable(node, false);
+                emitStart(node.expression);
+                write("var ");
+                emitNodeWithoutSourceMap(counter);
+                write(" = 0");
+                emitEnd(node.expression);
+                if (!rhsIsIdentifier) {
+                    write(", ");
+                    emitStart(node.expression);
+                    emitNodeWithoutSourceMap(rhsReference);
+                    write(" = ");
+                    emitNodeWithoutSourceMap(node.expression);
+                    emitEnd(node.expression);
+                }
+                write("; ");
+                emitStart(node.initializer);
+                emitNodeWithoutSourceMap(counter);
+                write(" < ");
+                emitNodeWithoutSourceMap(rhsReference);
+                write(".length");
+                emitEnd(node.initializer);
+                write("; ");
+                emitStart(node.initializer);
+                emitNodeWithoutSourceMap(counter);
+                write("++");
+                emitEnd(node.initializer);
+                emitToken(17, node.expression.end);
+                write(" {");
+                writeLine();
+                increaseIndent();
+                var rhsIterationValue = createElementAccessExpression(rhsReference, counter);
+                emitStart(node.initializer);
+                if (node.initializer.kind === 194) {
+                    write("var ");
+                    var variableDeclarationList = node.initializer;
+                    if (variableDeclarationList.declarations.length > 0) {
+                        var declaration = variableDeclarationList.declarations[0];
+                        if (ts.isBindingPattern(declaration.name)) {
+                            emitDestructuring(declaration, false, rhsIterationValue);
+                        }
+                        else {
+                            emitNodeWithoutSourceMap(declaration);
+                            write(" = ");
+                            emitNodeWithoutSourceMap(rhsIterationValue);
+                        }
+                    }
+                    else {
+                        emitNodeWithoutSourceMap(createTempVariable(node, false));
+                        write(" = ");
+                        emitNodeWithoutSourceMap(rhsIterationValue);
+                    }
+                }
+                else {
+                    var assignmentExpression = createBinaryExpression(node.initializer, 52, rhsIterationValue, false);
+                    if (node.initializer.kind === 151 || node.initializer.kind === 152) {
+                        emitDestructuring(assignmentExpression, true, undefined, node);
+                    }
+                    else {
+                        emitNodeWithoutSourceMap(assignmentExpression);
+                    }
+                }
+                emitEnd(node.initializer);
+                write(";");
+                if (node.statement.kind === 174) {
+                    emitLines(node.statement.statements);
+                }
+                else {
+                    writeLine();
+                    emit(node.statement);
+                }
+                writeLine();
+                decreaseIndent();
+                write("}");
+            }
             function emitBreakOrContinueStatement(node) {
                 emitToken(node.kind === 185 ? 65 : 70, node.pos);
                 emitOptional(" ", node.label);
@@ -20449,7 +25179,10 @@ var ts;
                 emit(node.expression);
                 endPos = emitToken(17, node.expression.end);
                 write(" ");
-                emitToken(14, endPos);
+                emitCaseBlock(node.caseBlock, endPos);
+            }
+            function emitCaseBlock(node, startPos) {
+                emitToken(14, startPos);
                 increaseIndent();
                 emitLines(node.clauses);
                 decreaseIndent();
@@ -20457,19 +25190,16 @@ var ts;
                 emitToken(15, node.clauses.end);
             }
             function nodeStartPositionsAreOnSameLine(node1, node2) {
-                return getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node1.pos)) ===
-                    getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node2.pos));
+                return getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node1.pos)) === getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node2.pos));
             }
             function nodeEndPositionsAreOnSameLine(node1, node2) {
-                return getLineOfLocalPosition(currentSourceFile, node1.end) ===
-                    getLineOfLocalPosition(currentSourceFile, node2.end);
+                return getLineOfLocalPosition(currentSourceFile, node1.end) === getLineOfLocalPosition(currentSourceFile, node2.end);
             }
             function nodeEndIsOnSameLineAsNodeStart(node1, node2) {
-                return getLineOfLocalPosition(currentSourceFile, node1.end) ===
-                    getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node2.pos));
+                return getLineOfLocalPosition(currentSourceFile, node1.end) === getLineOfLocalPosition(currentSourceFile, ts.skipTrivia(currentSourceFile.text, node2.pos));
             }
             function emitCaseOrDefaultClause(node) {
-                if (node.kind === 213) {
+                if (node.kind === 214) {
                     write("case ");
                     emit(node.expression);
                     write(":");
@@ -20477,7 +25207,7 @@ var ts;
                 else {
                     write("default:");
                 }
-                if (node.statements.length === 1 && nodeStartPositionsAreOnSameLine(node, node.statements[0])) {
+                if (preserveNewLines && node.statements.length === 1 && nodeStartPositionsAreOnSameLine(node, node.statements[0])) {
                     write(" ");
                     emit(node.statements[0]);
                 }
@@ -20537,7 +25267,7 @@ var ts;
                     emitContainingModuleName(node);
                     write(".");
                 }
-                emitNode(node.name);
+                emitNodeWithoutSourceMap(node.name);
                 emitEnd(node.name);
             }
             function createVoidZero() {
@@ -20554,21 +25284,22 @@ var ts;
                         emitStart(specifier.name);
                         emitContainingModuleName(specifier);
                         write(".");
-                        emitNode(specifier.name);
+                        emitNodeWithoutSourceMap(specifier.name);
                         emitEnd(specifier.name);
                         write(" = ");
-                        emitNode(name);
+                        emitNodeWithoutSourceMap(name);
                         write(";");
                     });
                 }
             }
-            function emitDestructuring(root, value) {
+            function emitDestructuring(root, isAssignmentExpressionStatement, value, lowestNonSynthesizedAncestor) {
                 var emitCount = 0;
                 var isDeclaration = (root.kind === 193 && !(ts.getCombinedNodeFlags(root) & 1)) || root.kind === 128;
                 if (root.kind === 167) {
                     emitAssignmentExpression(root);
                 }
                 else {
+                    ts.Debug.assert(!isAssignmentExpressionStatement);
                     emitBindingElement(root, value);
                 }
                 function emitAssignment(name, value) {
@@ -20587,7 +25318,7 @@ var ts;
                 }
                 function ensureIdentifier(expr) {
                     if (expr.kind !== 64) {
-                        var identifier = createTempVariable(root);
+                        var identifier = createTempVariable(lowestNonSynthesizedAncestor || root);
                         if (!isDeclaration) {
                             recordTempDeclaration(identifier);
                         }
@@ -20645,7 +25376,7 @@ var ts;
                     }
                     for (var i = 0; i < properties.length; i++) {
                         var p = properties[i];
-                        if (p.kind === 217 || p.kind === 218) {
+                        if (p.kind === 218 || p.kind === 219) {
                             var propName = (p.name);
                             emitDestructuringAssignment(p.initializer || propName, createPropertyAccess(value, propName));
                         }
@@ -20690,7 +25421,7 @@ var ts;
                 function emitAssignmentExpression(root) {
                     var target = root.left;
                     var value = root.right;
-                    if (root.parent.kind === 177) {
+                    if (isAssignmentExpressionStatement) {
                         emitDestructuringAssignment(target, value);
                     }
                     else {
@@ -20747,7 +25478,7 @@ var ts;
             function emitVariableDeclaration(node) {
                 if (ts.isBindingPattern(node.name)) {
                     if (languageVersion < 2) {
-                        emitDestructuring(node);
+                        emitDestructuring(node, false);
                     }
                     else {
                         emit(node.name);
@@ -20755,15 +25486,12 @@ var ts;
                     }
                 }
                 else {
-                    var isLet = renameNonTopLevelLetAndConst(node.name);
+                    renameNonTopLevelLetAndConst(node.name);
                     emitModuleMemberName(node);
                     var initializer = node.initializer;
                     if (!initializer && languageVersion < 2) {
-                        var isUninitializedLet = (resolver.getNodeCheckFlags(node) & 256) &&
-                            (getCombinedFlagsForIdentifier(node.name) & 4096);
-                        if (isUninitializedLet &&
-                            node.parent.parent.kind !== 182 &&
-                            node.parent.parent.kind !== 183) {
+                        var isUninitializedLet = (resolver.getNodeCheckFlags(node) & 256) && (getCombinedFlagsForIdentifier(node.name) & 4096);
+                        if (isUninitializedLet && node.parent.parent.kind !== 182 && node.parent.parent.kind !== 183) {
                             initializer = createVoidZero();
                         }
                     }
@@ -20779,29 +25507,6 @@ var ts;
                     ts.forEach(name.elements, emitExportVariableAssignments);
                 }
             }
-            function getEnclosingBlockScopeContainer(node) {
-                var current = node;
-                while (current) {
-                    if (ts.isFunctionLike(current)) {
-                        return current;
-                    }
-                    switch (current.kind) {
-                        case 220:
-                        case 91:
-                        case 216:
-                        case 200:
-                        case 181:
-                        case 182:
-                        case 183:
-                            return current;
-                        case 174:
-                            if (!ts.isFunctionLike(current.parent)) {
-                                return current;
-                            }
-                    }
-                    current = current.parent;
-                }
-            }
             function getCombinedFlagsForIdentifier(node) {
                 if (!node.parent || (node.parent.kind !== 193 && node.parent.kind !== 150)) {
                     return 0;
@@ -20809,10 +25514,7 @@ var ts;
                 return ts.getCombinedNodeFlags(node.parent);
             }
             function renameNonTopLevelLetAndConst(node) {
-                if (languageVersion >= 2 ||
-                    ts.nodeIsSynthesized(node) ||
-                    node.kind !== 64 ||
-                    (node.parent.kind !== 193 && node.parent.kind !== 150)) {
+                if (languageVersion >= 2 || ts.nodeIsSynthesized(node) || node.kind !== 64 || (node.parent.kind !== 193 && node.parent.kind !== 150)) {
                     return;
                 }
                 var combinedFlags = getCombinedFlagsForIdentifier(node);
@@ -20820,13 +25522,11 @@ var ts;
                     return;
                 }
                 var list = ts.getAncestor(node, 194);
-                if (list.parent.kind === 175 && list.parent.parent.kind === 220) {
+                if (list.parent.kind === 175 && list.parent.parent.kind === 221) {
                     return;
                 }
-                var blockScopeContainer = getEnclosingBlockScopeContainer(node);
-                var parent = blockScopeContainer.kind === 220
-                    ? blockScopeContainer
-                    : blockScopeContainer.parent;
+                var blockScopeContainer = ts.getEnclosingBlockScopeContainer(node);
+                var parent = blockScopeContainer.kind === 221 ? blockScopeContainer : blockScopeContainer.parent;
                 var generatedName = generateUniqueNameForLocation(parent, node.text);
                 var variableId = resolver.getBlockScopedVariableId(node);
                 if (!generatedBlockScopeNames) {
@@ -20873,7 +25573,7 @@ var ts;
                         if (ts.isBindingPattern(p.name)) {
                             writeLine();
                             write("var ");
-                            emitDestructuring(p, tempParameters[tempIndex]);
+                            emitDestructuring(p, false, tempParameters[tempIndex]);
                             write(";");
                             tempIndex++;
                         }
@@ -20881,14 +25581,14 @@ var ts;
                             writeLine();
                             emitStart(p);
                             write("if (");
-                            emitNode(p.name);
+                            emitNodeWithoutSourceMap(p.name);
                             write(" === void 0)");
                             emitEnd(p);
                             write(" { ");
                             emitStart(p);
-                            emitNode(p.name);
+                            emitNodeWithoutSourceMap(p.name);
                             write(" = ");
-                            emitNode(p.initializer);
+                            emitNodeWithoutSourceMap(p.initializer);
                             emitEnd(p);
                             write("; }");
                         }
@@ -20904,7 +25604,7 @@ var ts;
                     emitLeadingComments(restParam);
                     emitStart(restParam);
                     write("var ");
-                    emitNode(restParam.name);
+                    emitNodeWithoutSourceMap(restParam.name);
                     write(" = [];");
                     emitEnd(restParam);
                     emitTrailingComments(restParam);
@@ -20925,7 +25625,7 @@ var ts;
                     increaseIndent();
                     writeLine();
                     emitStart(restParam);
-                    emitNode(restParam.name);
+                    emitNodeWithoutSourceMap(restParam.name);
                     write("[" + tempName + " - " + restIndex + "] = arguments[" + tempName + "];");
                     emitEnd(restParam);
                     decreaseIndent();
@@ -20943,7 +25643,7 @@ var ts;
             }
             function emitDeclarationName(node) {
                 if (node.name) {
-                    emitNode(node.name);
+                    emitNodeWithoutSourceMap(node.name);
                 }
                 else {
                     write(resolver.getGeneratedNameForNode(node));
@@ -21060,11 +25760,11 @@ var ts;
                 emitFunctionBodyPreamble(node);
                 var preambleEmitted = writer.getTextPos() !== outPos;
                 decreaseIndent();
-                if (!preambleEmitted && nodeStartPositionsAreOnSameLine(node, body)) {
+                if (preserveNewLines && !preambleEmitted && nodeStartPositionsAreOnSameLine(node, body)) {
                     write(" ");
                     emitStart(body);
                     write("return ");
-                    emitNode(body, true);
+                    emitWithoutComments(body);
                     emitEnd(body);
                     write(";");
                     emitTempDeclarations(false);
@@ -21075,7 +25775,7 @@ var ts;
                     writeLine();
                     emitLeadingComments(node.body);
                     write("return ");
-                    emit(node.body, true);
+                    emitWithoutComments(node.body);
                     write(";");
                     emitTrailingComments(node.body);
                     emitTempDeclarations(true);
@@ -21097,7 +25797,7 @@ var ts;
                 emitFunctionBodyPreamble(node);
                 decreaseIndent();
                 var preambleEmitted = writer.getTextPos() !== initialTextPos;
-                if (!preambleEmitted && nodeEndIsOnSameLineAsNodeStart(body, body)) {
+                if (preserveNewLines && !preambleEmitted && nodeEndIsOnSameLineAsNodeStart(body, body)) {
                     for (var i = 0, n = body.statements.length; i < n; i++) {
                         write(" ");
                         emit(body.statements[i]);
@@ -21138,7 +25838,7 @@ var ts;
                         emitStart(param);
                         emitStart(param.name);
                         write("this.");
-                        emitNode(param.name);
+                        emitNodeWithoutSourceMap(param.name);
                         emitEnd(param.name);
                         write(" = ");
                         emit(param.name);
@@ -21150,7 +25850,7 @@ var ts;
             function emitMemberAccessForPropertyName(memberName) {
                 if (memberName.kind === 8 || memberName.kind === 7) {
                     write("[");
-                    emitNode(memberName);
+                    emitNodeWithoutSourceMap(memberName);
                     write("]");
                 }
                 else if (memberName.kind === 126) {
@@ -21158,7 +25858,7 @@ var ts;
                 }
                 else {
                     write(".");
-                    emitNode(memberName);
+                    emitNodeWithoutSourceMap(memberName);
                 }
             }
             function emitMemberAssignments(node, staticFlag) {
@@ -21587,8 +26287,7 @@ var ts;
                     emitImportDeclaration(node);
                     return;
                 }
-                if (resolver.isReferencedAliasDeclaration(node) ||
-                    (!ts.isExternalModule(currentSourceFile) && resolver.isTopLevelValueImportEqualsWithEntityName(node))) {
+                if (resolver.isReferencedAliasDeclaration(node) || (!ts.isExternalModule(currentSourceFile) && resolver.isTopLevelValueImportEqualsWithEntityName(node))) {
                     emitLeadingComments(node);
                     emitStart(node);
                     if (!(node.flags & 1))
@@ -21617,11 +26316,11 @@ var ts;
                             emitStart(specifier);
                             emitContainingModuleName(specifier);
                             write(".");
-                            emitNode(specifier.name);
+                            emitNodeWithoutSourceMap(specifier.name);
                             write(" = ");
                             write(generatedName);
                             write(".");
-                            emitNode(specifier.propertyName || specifier.name);
+                            emitNodeWithoutSourceMap(specifier.propertyName || specifier.name);
                             write(";");
                             emitEnd(specifier);
                         });
@@ -21639,15 +26338,15 @@ var ts;
                 }
             }
             function createExternalImportInfo(node) {
-                if (node.kind === 202) {
-                    if (node.moduleReference.kind === 212) {
+                if (node.kind === 203) {
+                    if (node.moduleReference.kind === 213) {
                         return {
                             rootNode: node,
                             declarationNode: node
                         };
                     }
                 }
-                else if (node.kind === 203) {
+                else if (node.kind === 204) {
                     var importClause = node.importClause;
                     if (importClause) {
                         if (importClause.name) {
@@ -21656,7 +26355,7 @@ var ts;
                                 declarationNode: importClause
                             };
                         }
-                        if (importClause.namedBindings.kind === 205) {
+                        if (importClause.namedBindings.kind === 206) {
                             return {
                                 rootNode: node,
                                 declarationNode: importClause.namedBindings
@@ -21672,7 +26371,7 @@ var ts;
                         rootNode: node
                     };
                 }
-                else if (node.kind === 209) {
+                else if (node.kind === 210) {
                     if (node.moduleSpecifier) {
                         return {
                             rootNode: node
@@ -21685,7 +26384,7 @@ var ts;
                 exportSpecifiers = {};
                 exportDefault = undefined;
                 ts.forEach(sourceFile.statements, function (node) {
-                    if (node.kind === 209 && !node.moduleSpecifier) {
+                    if (node.kind === 210 && !node.moduleSpecifier) {
                         ts.forEach(node.exportClause.elements, function (specifier) {
                             if (specifier.name.text === "default") {
                                 exportDefault = exportDefault || specifier;
@@ -21694,7 +26393,7 @@ var ts;
                             (exportSpecifiers[name] || (exportSpecifiers[name] = [])).push(specifier);
                         });
                     }
-                    else if (node.kind === 208) {
+                    else if (node.kind === 209) {
                         exportDefault = exportDefault || node;
                     }
                     else if (node.kind === 195 || node.kind === 196) {
@@ -21724,7 +26423,7 @@ var ts;
             }
             function getFirstExportAssignment(sourceFile) {
                 return ts.forEach(sourceFile.statements, function (node) {
-                    if (node.kind === 208) {
+                    if (node.kind === 209) {
                         return node;
                     }
                 });
@@ -21802,10 +26501,10 @@ var ts;
                     writeLine();
                     emitStart(exportDefault);
                     write(emitAsReturn ? "return " : "module.exports = ");
-                    if (exportDefault.kind === 208) {
+                    if (exportDefault.kind === 209) {
                         emit(exportDefault.expression);
                     }
-                    else if (exportDefault.kind === 211) {
+                    else if (exportDefault.kind === 212) {
                         emit(exportDefault.propertyName);
                     }
                     else {
@@ -21829,8 +26528,7 @@ var ts;
                 }
                 return statements.length;
             }
-            function emitSourceFile(node) {
-                currentSourceFile = node;
+            function emitSourceFileNode(node) {
                 writeLine();
                 emitDetachedComments(node);
                 var startIndex = emitDirectivePrologues(node.statements, false);
@@ -21870,14 +26568,14 @@ var ts;
                 }
                 emitLeadingComments(node.endOfFileToken);
             }
-            function emitNode(node, disableComments) {
+            function emitNodeWithoutSourceMapWithComments(node) {
                 if (!node) {
                     return;
                 }
                 if (node.flags & 2) {
                     return emitPinnedOrTripleSlashComments(node);
                 }
-                var emitComments = !disableComments && shouldEmitLeadingAndTrailingComments(node);
+                var emitComments = shouldEmitLeadingAndTrailingComments(node);
                 if (emitComments) {
                     emitLeadingComments(node);
                 }
@@ -21886,14 +26584,23 @@ var ts;
                     emitTrailingComments(node);
                 }
             }
+            function emitNodeWithoutSourceMapWithoutComments(node) {
+                if (!node) {
+                    return;
+                }
+                if (node.flags & 2) {
+                    return emitPinnedOrTripleSlashComments(node);
+                }
+                emitJavaScriptWorker(node);
+            }
             function shouldEmitLeadingAndTrailingComments(node) {
                 switch (node.kind) {
                     case 197:
                     case 195:
+                    case 204:
                     case 203:
-                    case 202:
                     case 198:
-                    case 208:
+                    case 209:
                         return false;
                     case 200:
                         return shouldEmitModuleDeclaration(node);
@@ -21948,9 +26655,9 @@ var ts;
                         return emitArrayLiteral(node);
                     case 152:
                         return emitObjectLiteral(node);
-                    case 217:
-                        return emitPropertyAssignment(node);
                     case 218:
+                        return emitPropertyAssignment(node);
+                    case 219:
                         return emitShorthandPropertyAssignment(node);
                     case 126:
                         return emitComputedPropertyName(node);
@@ -22019,8 +26726,8 @@ var ts;
                         return emitWithStatement(node);
                     case 188:
                         return emitSwitchStatement(node);
-                    case 213:
                     case 214:
+                    case 215:
                         return emitCaseOrDefaultClause(node);
                     case 189:
                         return emitLabelledStatement(node);
@@ -22028,7 +26735,7 @@ var ts;
                         return emitThrowStatement(node);
                     case 191:
                         return emitTryStatement(node);
-                    case 216:
+                    case 217:
                         return emitCatchClause(node);
                     case 192:
                         return emitDebuggerStatement(node);
@@ -22040,18 +26747,18 @@ var ts;
                         return emitInterfaceDeclaration(node);
                     case 199:
                         return emitEnumDeclaration(node);
-                    case 219:
+                    case 220:
                         return emitEnumMember(node);
                     case 200:
                         return emitModuleDeclaration(node);
-                    case 203:
+                    case 204:
                         return emitImportDeclaration(node);
-                    case 202:
+                    case 203:
                         return emitImportEqualsDeclaration(node);
-                    case 209:
+                    case 210:
                         return emitExportDeclaration(node);
-                    case 220:
-                        return emitSourceFile(node);
+                    case 221:
+                        return emitSourceFileNode(node);
                 }
             }
             function hasDetachedComments(pos) {
@@ -22069,7 +26776,7 @@ var ts;
             }
             function getLeadingCommentsToEmit(node) {
                 if (node.parent) {
-                    if (node.parent.kind === 220 || node.pos !== node.parent.pos) {
+                    if (node.parent.kind === 221 || node.pos !== node.parent.pos) {
                         var leadingComments;
                         if (hasDetachedComments(node.pos)) {
                             leadingComments = getLeadingCommentsWithoutDetachedComments();
@@ -22088,7 +26795,7 @@ var ts;
             }
             function emitTrailingDeclarationComments(node) {
                 if (node.parent) {
-                    if (node.parent.kind === 220 || node.end !== node.parent.end) {
+                    if (node.parent.kind === 221 || node.end !== node.parent.end) {
                         var trailingComments = ts.getTrailingCommentRanges(currentSourceFile.text, node.end);
                         emitComments(currentSourceFile, writer, trailingComments, false, newLine, writeComment);
                     }
@@ -22102,7 +26809,10 @@ var ts;
                 else {
                     leadingComments = ts.getLeadingCommentRanges(currentSourceFile.text, pos);
                 }
-                emitNewLineBeforeLeadingComments(currentSourceFile, writer, { pos: pos, end: pos }, leadingComments);
+                emitNewLineBeforeLeadingComments(currentSourceFile, writer, {
+                    pos: pos,
+                    end: pos
+                }, leadingComments);
                 emitComments(currentSourceFile, writer, leadingComments, true, newLine, writeComment);
             }
             function emitDetachedCommentsAtPosition(node) {
@@ -22127,27 +26837,29 @@ var ts;
                         if (nodeLine >= lastCommentLine + 2) {
                             emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments);
                             emitComments(currentSourceFile, writer, detachedComments, true, newLine, writeComment);
-                            var currentDetachedCommentInfo = { nodePos: node.pos, detachedCommentEndPos: detachedComments[detachedComments.length - 1].end };
+                            var currentDetachedCommentInfo = {
+                                nodePos: node.pos,
+                                detachedCommentEndPos: detachedComments[detachedComments.length - 1].end
+                            };
                             if (detachedCommentsInfo) {
                                 detachedCommentsInfo.push(currentDetachedCommentInfo);
                             }
                             else {
-                                detachedCommentsInfo = [currentDetachedCommentInfo];
+                                detachedCommentsInfo = [
+                                    currentDetachedCommentInfo
+                                ];
                             }
                         }
                     }
                 }
             }
-            function emitPinnedOrTripleSlashCommentsOfNode(node) {
+            function emitPinnedOrTripleSlashComments(node) {
                 var pinnedComments = ts.filter(getLeadingCommentsToEmit(node), isPinnedOrTripleSlashComment);
                 function isPinnedOrTripleSlashComment(comment) {
                     if (currentSourceFile.text.charCodeAt(comment.pos + 1) === 42) {
                         return currentSourceFile.text.charCodeAt(comment.pos + 2) === 33;
                     }
-                    else if (currentSourceFile.text.charCodeAt(comment.pos + 1) === 47 &&
-                        comment.pos + 2 < comment.end &&
-                        currentSourceFile.text.charCodeAt(comment.pos + 2) === 47 &&
-                        currentSourceFile.text.substring(comment.pos, comment.end).match(ts.fullTripleSlashReferencePathRegEx)) {
+                    else if (currentSourceFile.text.charCodeAt(comment.pos + 1) === 47 && comment.pos + 2 < comment.end && currentSourceFile.text.charCodeAt(comment.pos + 2) === 47 && currentSourceFile.text.substring(comment.pos, comment.end).match(ts.fullTripleSlashReferencePathRegEx)) {
                         return true;
                     }
                 }
@@ -22184,6 +26896,7 @@ var ts;
 (function (ts) {
     ts.emitTime = 0;
     ts.ioReadTime = 0;
+    ts.version = "1.5.0.0";
     function createCompilerHost(options) {
         var currentDirectory;
         var existingDirectories = {};
@@ -22199,9 +26912,7 @@ var ts;
             }
             catch (e) {
                 if (onError) {
-                    onError(e.number === unsupportedFileEncodingErrorCode
-                        ? ts.createCompilerDiagnostic(ts.Diagnostics.Unsupported_file_encoding).messageText
-                        : e.message);
+                    onError(e.number === unsupportedFileEncodingErrorCode ? ts.createCompilerDiagnostic(ts.Diagnostics.Unsupported_file_encoding).messageText : e.message);
                 }
                 text = "";
             }
@@ -22237,12 +26948,20 @@ var ts;
         }
         return {
             getSourceFile: getSourceFile,
-            getDefaultLibFileName: function (options) { return ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(ts.sys.getExecutingFilePath())), ts.getDefaultLibFileName(options)); },
+            getDefaultLibFileName: function (options) {
+                return ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(ts.sys.getExecutingFilePath())), ts.getDefaultLibFileName(options));
+            },
             writeFile: writeFile,
-            getCurrentDirectory: function () { return currentDirectory || (currentDirectory = ts.sys.getCurrentDirectory()); },
-            useCaseSensitiveFileNames: function () { return ts.sys.useCaseSensitiveFileNames; },
+            getCurrentDirectory: function () {
+                return currentDirectory || (currentDirectory = ts.sys.getCurrentDirectory());
+            },
+            useCaseSensitiveFileNames: function () {
+                return ts.sys.useCaseSensitiveFileNames;
+            },
             getCanonicalFileName: getCanonicalFileName,
-            getNewLine: function () { return ts.sys.newLine; }
+            getNewLine: function () {
+                return ts.sys.newLine;
+            }
         };
     }
     ts.createCompilerHost = createCompilerHost;
@@ -22282,7 +27001,9 @@ var ts;
         var seenNoDefaultLib = options.noLib;
         var commonSourceDirectory;
         host = host || createCompilerHost(options);
-        ts.forEach(rootNames, function (name) { return processRootFile(name, false); });
+        ts.forEach(rootNames, function (name) {
+            return processRootFile(name, false);
+        });
         if (!seenNoDefaultLib) {
             processRootFile(host.getDefaultLibFileName(options), true);
         }
@@ -22291,21 +27012,35 @@ var ts;
         var noDiagnosticsTypeChecker;
         program = {
             getSourceFile: getSourceFile,
-            getSourceFiles: function () { return files; },
-            getCompilerOptions: function () { return options; },
+            getSourceFiles: function () {
+                return files;
+            },
+            getCompilerOptions: function () {
+                return options;
+            },
             getSyntacticDiagnostics: getSyntacticDiagnostics,
             getGlobalDiagnostics: getGlobalDiagnostics,
             getSemanticDiagnostics: getSemanticDiagnostics,
             getDeclarationDiagnostics: getDeclarationDiagnostics,
             getTypeChecker: getTypeChecker,
             getDiagnosticsProducingTypeChecker: getDiagnosticsProducingTypeChecker,
-            getCommonSourceDirectory: function () { return commonSourceDirectory; },
+            getCommonSourceDirectory: function () {
+                return commonSourceDirectory;
+            },
             emit: emit,
             getCurrentDirectory: host.getCurrentDirectory,
-            getNodeCount: function () { return getDiagnosticsProducingTypeChecker().getNodeCount(); },
-            getIdentifierCount: function () { return getDiagnosticsProducingTypeChecker().getIdentifierCount(); },
-            getSymbolCount: function () { return getDiagnosticsProducingTypeChecker().getSymbolCount(); },
-            getTypeCount: function () { return getDiagnosticsProducingTypeChecker().getTypeCount(); }
+            getNodeCount: function () {
+                return getDiagnosticsProducingTypeChecker().getNodeCount();
+            },
+            getIdentifierCount: function () {
+                return getDiagnosticsProducingTypeChecker().getIdentifierCount();
+            },
+            getSymbolCount: function () {
+                return getDiagnosticsProducingTypeChecker().getSymbolCount();
+            },
+            getTypeCount: function () {
+                return getDiagnosticsProducingTypeChecker().getTypeCount();
+            }
         };
         return program;
         function getEmitHost(writeFileCallback) {
@@ -22332,7 +27067,11 @@ var ts;
         }
         function emit(sourceFile, writeFileCallback) {
             if (options.noEmitOnError && getPreEmitDiagnostics(this).length > 0) {
-                return { diagnostics: [], sourceMaps: undefined, emitSkipped: true };
+                return {
+                    diagnostics: [],
+                    sourceMaps: undefined,
+                    emitSkipped: true
+                };
             }
             var emitResolver = getDiagnosticsProducingTypeChecker().getEmitResolver(sourceFile);
             var start = new Date().getTime();
@@ -22474,7 +27213,7 @@ var ts;
         }
         function processImportedModules(file, basePath) {
             ts.forEach(file.statements, function (node) {
-                if (node.kind === 203 || node.kind === 202 || node.kind === 209) {
+                if (node.kind === 204 || node.kind === 203 || node.kind === 210) {
                     var moduleNameExpr = ts.getExternalModuleName(node);
                     if (moduleNameExpr && moduleNameExpr.kind === 8) {
                         var moduleNameText = moduleNameExpr.text;
@@ -22496,8 +27235,7 @@ var ts;
                 }
                 else if (node.kind === 200 && node.name.kind === 8 && (node.flags & 2 || ts.isDeclarationFile(file))) {
                     ts.forEachChild(node.body, function (node) {
-                        if (ts.isExternalModuleImportEqualsDeclaration(node) &&
-                            ts.getExternalModuleImportEqualsDeclarationExpression(node).kind === 8) {
+                        if (ts.isExternalModuleImportEqualsDeclaration(node) && ts.getExternalModuleImportEqualsDeclarationExpression(node).kind === 8) {
                             var nameLiteral = ts.getExternalModuleImportEqualsDeclarationExpression(node);
                             var moduleName = nameLiteral.text;
                             if (moduleName) {
@@ -22525,19 +27263,17 @@ var ts;
                 }
                 return;
             }
-            var firstExternalModuleSourceFile = ts.forEach(files, function (f) { return ts.isExternalModule(f) ? f : undefined; });
+            var firstExternalModuleSourceFile = ts.forEach(files, function (f) {
+                return ts.isExternalModule(f) ? f : undefined;
+            });
             if (firstExternalModuleSourceFile && !options.module) {
                 var span = ts.getErrorSpanForNode(firstExternalModuleSourceFile, firstExternalModuleSourceFile.externalModuleIndicator);
                 diagnostics.add(ts.createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_external_modules_unless_the_module_flag_is_provided));
             }
-            if (options.outDir ||
-                options.sourceRoot ||
-                (options.mapRoot &&
-                    (!options.out || firstExternalModuleSourceFile !== undefined))) {
+            if (options.outDir || options.sourceRoot || (options.mapRoot && (!options.out || firstExternalModuleSourceFile !== undefined))) {
                 var commonPathComponents;
                 ts.forEach(files, function (sourceFile) {
-                    if (!(sourceFile.flags & 2048)
-                        && !ts.fileExtensionIs(sourceFile.fileName, ".js")) {
+                    if (!(sourceFile.flags & 2048) && !ts.fileExtensionIs(sourceFile.fileName, ".js")) {
                         var sourcePathComponents = ts.getNormalizedPathComponents(sourceFile.fileName, host.getCurrentDirectory());
                         sourcePathComponents.pop();
                         if (commonPathComponents) {
@@ -22715,10 +27451,20 @@ var ts;
             description: ts.Diagnostics.Do_not_emit_declarations_for_code_that_has_an_internal_annotation,
             experimental: true
         },
+        {
+            name: "preserveNewLines",
+            type: "boolean",
+            description: ts.Diagnostics.Preserve_new_lines_when_emitting_code,
+            experimental: true
+        },
         {
             name: "target",
             shortName: "t",
-            type: { "es3": 0, "es5": 1, "es6": 2 },
+            type: {
+                "es3": 0,
+                "es5": 1,
+                "es6": 2
+            },
             description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES6_experimental,
             paramType: ts.Diagnostics.VERSION,
             error: ts.Diagnostics.Argument_for_target_option_must_be_es3_es5_or_es6
@@ -22898,7 +27644,9 @@ var ts;
             var files = [];
             if (ts.hasProperty(json, "files")) {
                 if (json["files"] instanceof Array) {
-                    var files = ts.map(json["files"], function (s) { return ts.combinePaths(basePath, s); });
+                    var files = ts.map(json["files"], function (s) {
+                        return ts.combinePaths(basePath, s);
+                    });
                 }
             }
             else {
@@ -22948,14 +27696,7 @@ var ts;
                             var parent = n.parent;
                             var openBrace = ts.findChildOfKind(n, 14, sourceFile);
                             var closeBrace = ts.findChildOfKind(n, 15, sourceFile);
-                            if (parent.kind === 179 ||
-                                parent.kind === 182 ||
-                                parent.kind === 183 ||
-                                parent.kind === 181 ||
-                                parent.kind === 178 ||
-                                parent.kind === 180 ||
-                                parent.kind === 187 ||
-                                parent.kind === 216) {
+                            if (parent.kind === 179 || parent.kind === 182 || parent.kind === 183 || parent.kind === 181 || parent.kind === 178 || parent.kind === 180 || parent.kind === 187 || parent.kind === 217) {
                                 addOutliningSpan(parent, openBrace, closeBrace, autoCollapse(n));
                                 break;
                             }
@@ -22991,7 +27732,7 @@ var ts;
                     case 197:
                     case 199:
                     case 152:
-                    case 188:
+                    case 202:
                         var openBrace = ts.findChildOfKind(n, 14, sourceFile);
                         var closeBrace = ts.findChildOfKind(n, 15, sourceFile);
                         addOutliningSpan(n, openBrace, closeBrace, autoCollapse(n));
@@ -23042,7 +27783,13 @@ var ts;
                         }
                         var fileName = sourceFile.fileName;
                         var matchKind = bestMatchKind(matches);
-                        rawItems.push({ name: name, fileName: fileName, matchKind: matchKind, isCaseSensitive: allMatchesAreCaseSensitive(matches), declaration: declaration });
+                        rawItems.push({
+                            name: name,
+                            fileName: fileName,
+                            matchKind: matchKind,
+                            isCaseSensitive: allMatchesAreCaseSensitive(matches),
+                            declaration: declaration
+                        });
                     }
                 }
             });
@@ -23076,9 +27823,7 @@ var ts;
                 return undefined;
             }
             function getTextOfIdentifierOrLiteral(node) {
-                if (node.kind === 64 ||
-                    node.kind === 8 ||
-                    node.kind === 7) {
+                if (node.kind === 64 || node.kind === 8 || node.kind === 7) {
                     return node.text;
                 }
                 return undefined;
@@ -23142,11 +27887,11 @@ var ts;
                 }
                 return bestMatchKind;
             }
-            var baseSensitivity = { sensitivity: "base" };
+            var baseSensitivity = {
+                sensitivity: "base"
+            };
             function compareNavigateToItems(i1, i2) {
-                return i1.matchKind - i2.matchKind ||
-                    i1.name.localeCompare(i2.name, undefined, baseSensitivity) ||
-                    i1.name.localeCompare(i2.name);
+                return i1.matchKind - i2.matchKind || i1.name.localeCompare(i2.name, undefined, baseSensitivity) || i1.name.localeCompare(i2.name);
             }
             function createNavigateToItem(rawItem) {
                 var declaration = rawItem.declaration;
@@ -23204,19 +27949,19 @@ var ts;
                         case 149:
                             ts.forEach(node.elements, visit);
                             break;
-                        case 209:
+                        case 210:
                             if (node.exportClause) {
                                 ts.forEach(node.exportClause.elements, visit);
                             }
                             break;
-                        case 203:
+                        case 204:
                             var importClause = node.importClause;
                             if (importClause) {
                                 if (importClause.name) {
                                     childNodes.push(importClause);
                                 }
                                 if (importClause.namedBindings) {
-                                    if (importClause.namedBindings.kind === 205) {
+                                    if (importClause.namedBindings.kind === 206) {
                                         childNodes.push(importClause.namedBindings);
                                     }
                                     else {
@@ -23236,9 +27981,9 @@ var ts;
                         case 197:
                         case 200:
                         case 195:
-                        case 202:
-                        case 207:
-                        case 211:
+                        case 203:
+                        case 208:
+                        case 212:
                             childNodes.push(node);
                             break;
                     }
@@ -23296,7 +28041,9 @@ var ts;
             function isTopLevelFunctionDeclaration(functionDeclaration) {
                 if (functionDeclaration.kind === 195) {
                     if (functionDeclaration.body && functionDeclaration.body.kind === 174) {
-                        if (ts.forEach(functionDeclaration.body.statements, function (s) { return s.kind === 195 && !isEmpty(s.name.text); })) {
+                        if (ts.forEach(functionDeclaration.body.statements, function (s) {
+                            return s.kind === 195 && !isEmpty(s.name.text);
+                        })) {
                             return true;
                         }
                         if (!ts.isFunctionBlock(functionDeclaration.parent)) {
@@ -23366,7 +28113,7 @@ var ts;
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberSetAccessorElement);
                     case 138:
                         return createItem(node, "[]", ts.ScriptElementKind.indexSignatureElement);
-                    case 219:
+                    case 220:
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberVariableElement);
                     case 136:
                         return createItem(node, "()", ts.ScriptElementKind.callSignatureElement);
@@ -23405,16 +28152,18 @@ var ts;
                         }
                     case 133:
                         return createItem(node, "constructor", ts.ScriptElementKind.constructorImplementationElement);
-                    case 211:
-                    case 207:
-                    case 202:
-                    case 204:
+                    case 212:
+                    case 208:
+                    case 203:
                     case 205:
+                    case 206:
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.alias);
                 }
                 return undefined;
                 function createItem(node, name, scriptElementKind) {
-                    return getNavigationBarItem(name, scriptElementKind, ts.getNodeModifiers(node), [getNodeSpan(node)]);
+                    return getNavigationBarItem(name, scriptElementKind, ts.getNodeModifiers(node), [
+                        getNodeSpan(node)
+                    ]);
                 }
             }
             function isEmpty(text) {
@@ -23439,7 +28188,7 @@ var ts;
             }
             function createTopLevelItem(node) {
                 switch (node.kind) {
-                    case 220:
+                    case 221:
                         return createSourceFileItem(node);
                     case 196:
                         return createClassItem(node);
@@ -23468,12 +28217,16 @@ var ts;
                 function createModuleItem(node) {
                     var moduleName = getModuleName(node);
                     var childItems = getItemsWorker(getChildNodes(getInnermostModule(node).body.statements), createChildItem);
-                    return getNavigationBarItem(moduleName, ts.ScriptElementKind.moduleElement, ts.getNodeModifiers(node), [getNodeSpan(node)], childItems, getIndent(node));
+                    return getNavigationBarItem(moduleName, ts.ScriptElementKind.moduleElement, ts.getNodeModifiers(node), [
+                        getNodeSpan(node)
+                    ], childItems, getIndent(node));
                 }
                 function createFunctionItem(node) {
                     if (node.name && node.body && node.body.kind === 174) {
                         var childItems = getItemsWorker(sortNodes(node.body.statements), createChildItem);
-                        return getNavigationBarItem(node.name.text, ts.ScriptElementKind.functionElement, ts.getNodeModifiers(node), [getNodeSpan(node)], childItems, getIndent(node));
+                        return getNavigationBarItem(node.name.text, ts.ScriptElementKind.functionElement, ts.getNodeModifiers(node), [
+                            getNodeSpan(node)
+                        ], childItems, getIndent(node));
                     }
                     return undefined;
                 }
@@ -23483,10 +28236,10 @@ var ts;
                         return undefined;
                     }
                     hasGlobalNode = true;
-                    var rootName = ts.isExternalModule(node)
-                        ? "\"" + ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(node.fileName)))) + "\""
-                        : "<global>";
-                    return getNavigationBarItem(rootName, ts.ScriptElementKind.moduleElement, ts.ScriptElementKindModifier.none, [getNodeSpan(node)], childItems);
+                    var rootName = ts.isExternalModule(node) ? "\"" + ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(node.fileName)))) + "\"" : "<global>";
+                    return getNavigationBarItem(rootName, ts.ScriptElementKind.moduleElement, ts.ScriptElementKindModifier.none, [
+                        getNodeSpan(node)
+                    ], childItems);
                 }
                 function createClassItem(node) {
                     if (!node.name) {
@@ -23499,26 +28252,38 @@ var ts;
                         });
                         var nodes = removeDynamicallyNamedProperties(node);
                         if (constructor) {
-                            nodes.push.apply(nodes, ts.filter(constructor.parameters, function (p) { return !ts.isBindingPattern(p.name); }));
+                            nodes.push.apply(nodes, ts.filter(constructor.parameters, function (p) {
+                                return !ts.isBindingPattern(p.name);
+                            }));
                         }
                         var childItems = getItemsWorker(sortNodes(nodes), createChildItem);
                     }
-                    return getNavigationBarItem(node.name.text, ts.ScriptElementKind.classElement, ts.getNodeModifiers(node), [getNodeSpan(node)], childItems, getIndent(node));
+                    return getNavigationBarItem(node.name.text, ts.ScriptElementKind.classElement, ts.getNodeModifiers(node), [
+                        getNodeSpan(node)
+                    ], childItems, getIndent(node));
                 }
                 function createEnumItem(node) {
                     var childItems = getItemsWorker(sortNodes(removeComputedProperties(node)), createChildItem);
-                    return getNavigationBarItem(node.name.text, ts.ScriptElementKind.enumElement, ts.getNodeModifiers(node), [getNodeSpan(node)], childItems, getIndent(node));
+                    return getNavigationBarItem(node.name.text, ts.ScriptElementKind.enumElement, ts.getNodeModifiers(node), [
+                        getNodeSpan(node)
+                    ], childItems, getIndent(node));
                 }
                 function createIterfaceItem(node) {
                     var childItems = getItemsWorker(sortNodes(removeDynamicallyNamedProperties(node)), createChildItem);
-                    return getNavigationBarItem(node.name.text, ts.ScriptElementKind.interfaceElement, ts.getNodeModifiers(node), [getNodeSpan(node)], childItems, getIndent(node));
+                    return getNavigationBarItem(node.name.text, ts.ScriptElementKind.interfaceElement, ts.getNodeModifiers(node), [
+                        getNodeSpan(node)
+                    ], childItems, getIndent(node));
                 }
             }
             function removeComputedProperties(node) {
-                return ts.filter(node.members, function (member) { return member.name === undefined || member.name.kind !== 126; });
+                return ts.filter(node.members, function (member) {
+                    return member.name === undefined || member.name.kind !== 126;
+                });
             }
             function removeDynamicallyNamedProperties(node) {
-                return ts.filter(node.members, function (member) { return !ts.hasDynamicName(member); });
+                return ts.filter(node.members, function (member) {
+                    return !ts.hasDynamicName(member);
+                });
             }
             function getInnermostModule(node) {
                 while (node.body.kind === 200) {
@@ -23527,9 +28292,7 @@ var ts;
                 return node;
             }
             function getNodeSpan(node) {
-                return node.kind === 220
-                    ? ts.createTextSpanFromBounds(node.getFullStart(), node.getEnd())
-                    : ts.createTextSpanFromBounds(node.getStart(), node.getEnd());
+                return node.kind === 221 ? ts.createTextSpanFromBounds(node.getFullStart(), node.getEnd()) : ts.createTextSpanFromBounds(node.getStart(), node.getEnd());
             }
             function getTextOfNode(node) {
                 return ts.getTextOfNodeFromSourceText(sourceFile.text, node);
@@ -23559,7 +28322,9 @@ var ts;
         var stringToWordSpans = {};
         pattern = pattern.trim();
         var fullPatternSegment = createSegment(pattern);
-        var dotSeparatedSegments = pattern.split(".").map(function (p) { return createSegment(p.trim()); });
+        var dotSeparatedSegments = pattern.split(".").map(function (p) {
+            return createSegment(p.trim());
+        });
         var invalidPattern = dotSeparatedSegments.length === 0 || ts.forEach(dotSeparatedSegments, segmentIsInvalid);
         return {
             getMatches: getMatches,
@@ -23667,7 +28432,9 @@ var ts;
             if (!containsSpaceOrAsterisk(segment.totalTextChunk.text)) {
                 var match = matchTextChunk(candidate, segment.totalTextChunk, false);
                 if (match) {
-                    return [match];
+                    return [
+                        match
+                    ];
                 }
             }
             var subWordTextChunks = segment.subWordTextChunks;
@@ -23734,8 +28501,7 @@ var ts;
                 for (; currentChunkSpan < chunkCharacterSpans.length; currentChunkSpan++) {
                     var chunkCharacterSpan = chunkCharacterSpans[currentChunkSpan];
                     if (gotOneMatchThisCandidate) {
-                        if (!isUpperCaseLetter(chunk.text.charCodeAt(chunkCharacterSpans[currentChunkSpan - 1].start)) ||
-                            !isUpperCaseLetter(chunk.text.charCodeAt(chunkCharacterSpans[currentChunkSpan].start))) {
+                        if (!isUpperCaseLetter(chunk.text.charCodeAt(chunkCharacterSpans[currentChunkSpan - 1].start)) || !isUpperCaseLetter(chunk.text.charCodeAt(chunkCharacterSpans[currentChunkSpan].start))) {
                             break;
                         }
                     }
@@ -23756,10 +28522,7 @@ var ts;
     }
     ts.createPatternMatcher = createPatternMatcher;
     function patternMatchCompareTo(match1, match2) {
-        return compareType(match1, match2) ||
-            compareCamelCase(match1, match2) ||
-            compareCase(match1, match2) ||
-            comparePunctuation(match1, match2);
+        return compareType(match1, match2) || compareCamelCase(match1, match2) || compareCase(match1, match2) || comparePunctuation(match1, match2);
     }
     function comparePunctuation(result1, result2) {
         if (result1.punctuationStripped !== result2.punctuationStripped) {
@@ -23908,11 +28671,7 @@ var ts;
             var currentIsDigit = isDigit(identifier.charCodeAt(i));
             var hasTransitionFromLowerToUpper = transitionFromLowerToUpper(identifier, word, i);
             var hasTransitionFromUpperToLower = transitionFromUpperToLower(identifier, word, i, wordStart);
-            if (charIsPunctuation(identifier.charCodeAt(i - 1)) ||
-                charIsPunctuation(identifier.charCodeAt(i)) ||
-                lastIsDigit != currentIsDigit ||
-                hasTransitionFromLowerToUpper ||
-                hasTransitionFromUpperToLower) {
+            if (charIsPunctuation(identifier.charCodeAt(i - 1)) || charIsPunctuation(identifier.charCodeAt(i)) || lastIsDigit != currentIsDigit || hasTransitionFromLowerToUpper || hasTransitionFromUpperToLower) {
                 if (!isAllPunctuation(identifier, wordStart, i)) {
                     result.push(ts.createTextSpan(wordStart, i - wordStart));
                 }
@@ -23964,8 +28723,7 @@ var ts;
     }
     function transitionFromUpperToLower(identifier, word, index, wordStart) {
         if (word) {
-            if (index != wordStart &&
-                index + 1 < identifier.length) {
+            if (index != wordStart && index + 1 < identifier.length) {
                 var currentIsUpper = isUpperCaseLetter(identifier.charCodeAt(index));
                 var nextIsLower = isLowerCaseLetter(identifier.charCodeAt(index + 1));
                 if (currentIsUpper && nextIsLower) {
@@ -23983,9 +28741,7 @@ var ts;
     function transitionFromLowerToUpper(identifier, word, index) {
         var lastIsUpper = isUpperCaseLetter(identifier.charCodeAt(index - 1));
         var currentIsUpper = isUpperCaseLetter(identifier.charCodeAt(index));
-        var transition = word
-            ? (currentIsUpper && !lastIsUpper)
-            : currentIsUpper;
+        var transition = word ? (currentIsUpper && !lastIsUpper) : currentIsUpper;
         return transition;
     }
 })(ts || (ts = {}));
@@ -24021,8 +28777,7 @@ var ts;
             function getImmediatelyContainingArgumentInfo(node) {
                 if (node.parent.kind === 155 || node.parent.kind === 156) {
                     var callExpression = node.parent;
-                    if (node.kind === 24 ||
-                        node.kind === 16) {
+                    if (node.kind === 24 || node.kind === 16) {
                         var list = getChildListThatStartsWithOpenerToken(callExpression, node, sourceFile);
                         var isTypeArgList = callExpression.typeArguments && callExpression.typeArguments.pos === list.pos;
                         ts.Debug.assert(list !== undefined);
@@ -24031,15 +28786,15 @@ var ts;
                             invocation: callExpression,
                             argumentsSpan: getApplicableSpanForArguments(list),
                             argumentIndex: 0,
-                            argumentCount: getCommaBasedArgCount(list)
+                            argumentCount: getArgumentCount(list)
                         };
                     }
                     var listItemInfo = ts.findListItemInfo(node);
                     if (listItemInfo) {
                         var list = listItemInfo.list;
                         var isTypeArgList = callExpression.typeArguments && callExpression.typeArguments.pos === list.pos;
-                        var argumentIndex = (listItemInfo.listItemIndex + 1) >> 1;
-                        var argumentCount = getCommaBasedArgCount(list);
+                        var argumentIndex = getArgumentIndex(list, node);
+                        var argumentCount = getArgumentCount(list);
                         ts.Debug.assert(argumentIndex === 0 || argumentIndex < argumentCount, "argumentCount < argumentIndex, " + argumentCount + " < " + argumentIndex);
                         return {
                             kind: isTypeArgList ? 0 : 1,
@@ -24076,10 +28831,29 @@ var ts;
                 }
                 return undefined;
             }
-            function getCommaBasedArgCount(argumentsList) {
-                return argumentsList.getChildCount() === 0
-                    ? 0
-                    : 1 + ts.countWhere(argumentsList.getChildren(), function (arg) { return arg.kind === 23; });
+            function getArgumentIndex(argumentsList, node) {
+                var argumentIndex = 0;
+                var listChildren = argumentsList.getChildren();
+                for (var i = 0, n = listChildren.length; i < n; i++) {
+                    var child = listChildren[i];
+                    if (child === node) {
+                        break;
+                    }
+                    if (child.kind !== 23) {
+                        argumentIndex++;
+                    }
+                }
+                return argumentIndex;
+            }
+            function getArgumentCount(argumentsList) {
+                var listChildren = argumentsList.getChildren();
+                var argumentCount = ts.countWhere(listChildren, function (arg) {
+                    return arg.kind !== 23;
+                });
+                if (listChildren.length > 0 && ts.lastOrUndefined(listChildren).kind === 23) {
+                    argumentCount++;
+                }
+                return argumentCount;
             }
             function getArgumentIndexForTemplatePiece(spanIndex, node) {
                 ts.Debug.assert(position >= node.getStart(), "Assumed 'position' could not occur before node.");
@@ -24092,9 +28866,7 @@ var ts;
                 return spanIndex + 1;
             }
             function getArgumentListInfoForTemplate(tagExpression, argumentIndex) {
-                var argumentCount = tagExpression.template.kind === 10
-                    ? 1
-                    : tagExpression.template.templateSpans.length + 1;
+                var argumentCount = tagExpression.template.kind === 10 ? 1 : tagExpression.template.templateSpans.length + 1;
                 ts.Debug.assert(argumentIndex === 0 || argumentIndex < argumentCount, "argumentCount < argumentIndex, " + argumentCount + " < " + argumentIndex);
                 return {
                     kind: 2,
@@ -24122,7 +28894,7 @@ var ts;
                 return ts.createTextSpan(applicableSpanStart, applicableSpanEnd - applicableSpanStart);
             }
             function getContainingArgumentInfo(node) {
-                for (var n = node; n.kind !== 220; n = n.parent) {
+                for (var n = node; n.kind !== 221; n = n.parent) {
                     if (ts.isFunctionBlock(n)) {
                         return undefined;
                     }
@@ -24199,7 +28971,10 @@ var ts;
                         isVariadic: candidateSignature.hasRestParameter,
                         prefixDisplayParts: prefixDisplayParts,
                         suffixDisplayParts: suffixDisplayParts,
-                        separatorDisplayParts: [ts.punctuationPart(23), ts.spacePart()],
+                        separatorDisplayParts: [
+                            ts.punctuationPart(23),
+                            ts.spacePart()
+                        ],
                         parameters: signatureHelpParameters,
                         documentation: candidateSignature.getDocumentationComment()
                     };
@@ -24308,24 +29083,31 @@ var ts;
     }
     ts.findListItemInfo = findListItemInfo;
     function findChildOfKind(n, kind, sourceFile) {
-        return ts.forEach(n.getChildren(sourceFile), function (c) { return c.kind === kind && c; });
+        return ts.forEach(n.getChildren(sourceFile), function (c) {
+            return c.kind === kind && c;
+        });
     }
     ts.findChildOfKind = findChildOfKind;
     function findContainingList(node) {
         var syntaxList = ts.forEach(node.parent.getChildren(), function (c) {
-            if (c.kind === 221 && c.pos <= node.pos && c.end >= node.end) {
+            if (c.kind === 222 && c.pos <= node.pos && c.end >= node.end) {
                 return c;
             }
         });
+        ts.Debug.assert(!syntaxList || ts.contains(syntaxList.getChildren(), node));
         return syntaxList;
     }
     ts.findContainingList = findContainingList;
     function getTouchingWord(sourceFile, position) {
-        return getTouchingToken(sourceFile, position, function (n) { return isWord(n.kind); });
+        return getTouchingToken(sourceFile, position, function (n) {
+            return isWord(n.kind);
+        });
     }
     ts.getTouchingWord = getTouchingWord;
     function getTouchingPropertyName(sourceFile, position) {
-        return getTouchingToken(sourceFile, position, function (n) { return isPropertyName(n.kind); });
+        return getTouchingToken(sourceFile, position, function (n) {
+            return isPropertyName(n.kind);
+        });
     }
     ts.getTouchingPropertyName = getTouchingPropertyName;
     function getTouchingToken(sourceFile, position, includeItemAtEndPosition) {
@@ -24379,8 +29161,7 @@ var ts;
             var children = n.getChildren();
             for (var i = 0, len = children.length; i < len; ++i) {
                 var child = children[i];
-                var shouldDiveInChildNode = (child.pos <= previousToken.pos && child.end > previousToken.end) ||
-                    (child.pos === previousToken.end);
+                var shouldDiveInChildNode = (child.pos <= previousToken.pos && child.end > previousToken.end) || (child.pos === previousToken.end);
                 if (shouldDiveInChildNode && nodeHasTokens(child)) {
                     return find(child);
                 }
@@ -24418,7 +29199,7 @@ var ts;
                     }
                 }
             }
-            ts.Debug.assert(startNode !== undefined || n.kind === 220);
+            ts.Debug.assert(startNode !== undefined || n.kind === 221);
             if (children.length) {
                 var candidate = findRightmostChildNodeWithTokens(children, children.length);
                 return candidate && findRightmostToken(candidate);
@@ -24483,8 +29264,7 @@ var ts;
     }
     ts.isPunctuation = isPunctuation;
     function isInsideTemplateLiteral(node, position) {
-        return ts.isTemplateLiteralKind(node.kind)
-            && (node.getStart() < position && position < node.getEnd()) || (!!node.isUnterminated && position === node.getEnd());
+        return ts.isTemplateLiteralKind(node.kind) && (node.getStart() < position && position < node.getEnd()) || (!!node.isUnterminated && position === node.getEnd());
     }
     ts.isInsideTemplateLiteral = isInsideTemplateLiteral;
     function compareDataObjects(dst, src) {
@@ -24517,19 +29297,38 @@ var ts;
         var indent;
         resetWriter();
         return {
-            displayParts: function () { return displayParts; },
-            writeKeyword: function (text) { return writeKind(text, 5); },
-            writeOperator: function (text) { return writeKind(text, 12); },
-            writePunctuation: function (text) { return writeKind(text, 15); },
-            writeSpace: function (text) { return writeKind(text, 16); },
-            writeStringLiteral: function (text) { return writeKind(text, 8); },
-            writeParameter: function (text) { return writeKind(text, 13); },
+            displayParts: function () {
+                return displayParts;
+            },
+            writeKeyword: function (text) {
+                return writeKind(text, 5);
+            },
+            writeOperator: function (text) {
+                return writeKind(text, 12);
+            },
+            writePunctuation: function (text) {
+                return writeKind(text, 15);
+            },
+            writeSpace: function (text) {
+                return writeKind(text, 16);
+            },
+            writeStringLiteral: function (text) {
+                return writeKind(text, 8);
+            },
+            writeParameter: function (text) {
+                return writeKind(text, 13);
+            },
             writeSymbol: writeSymbol,
             writeLine: writeLine,
-            increaseIndent: function () { indent++; },
-            decreaseIndent: function () { indent--; },
+            increaseIndent: function () {
+                indent++;
+            },
+            decreaseIndent: function () {
+                indent--;
+            },
             clear: resetWriter,
-            trackSymbol: function () { }
+            trackSymbol: function () {
+            }
         };
         function writeIndent() {
             if (lineStart) {
@@ -24690,7 +29489,9 @@ var ts;
                 advance: advance,
                 readTokenInfo: readTokenInfo,
                 isOnToken: isOnToken,
-                lastTrailingTriviaWasNewLine: function () { return wasNewLine; },
+                lastTrailingTriviaWasNewLine: function () {
+                    return wasNewLine;
+                },
                 close: function () {
                     lastTokenInfo = undefined;
                     scanner.setText(undefined);
@@ -24751,8 +29552,7 @@ var ts;
                 return container.kind === 9;
             }
             function shouldRescanTemplateToken(container) {
-                return container.kind === 12 ||
-                    container.kind === 13;
+                return container.kind === 12 || container.kind === 13;
             }
             function startsWithSlashToken(t) {
                 return t === 36 || t === 56;
@@ -24765,13 +29565,7 @@ var ts;
                         token: undefined
                     };
                 }
-                var expectedScanAction = shouldRescanGreaterThanToken(n)
-                    ? 1
-                    : shouldRescanSlashToken(n)
-                        ? 2
-                        : shouldRescanTemplateToken(n)
-                            ? 3
-                            : 0;
+                var expectedScanAction = shouldRescanGreaterThanToken(n) ? 1 : shouldRescanSlashToken(n) ? 2 : shouldRescanTemplateToken(n) ? 3 : 0;
                 if (lastTokenInfo && expectedScanAction === lastScanAction) {
                     return fixTokenKind(lastTokenInfo, n);
                 }
@@ -24951,9 +29745,7 @@ var ts;
                 this.Flag = Flag;
             }
             Rule.prototype.toString = function () {
-                return "[desc=" + this.Descriptor + "," +
-                    "operation=" + this.Operation + "," +
-                    "flag=" + this.Flag + "]";
+                return "[desc=" + this.Descriptor + "," + "operation=" + this.Operation + "," + "flag=" + this.Flag + "]";
             };
             return Rule;
         })();
@@ -24983,8 +29775,7 @@ var ts;
                 this.RightTokenRange = RightTokenRange;
             }
             RuleDescriptor.prototype.toString = function () {
-                return "[leftRange=" + this.LeftTokenRange + "," +
-                    "rightRange=" + this.RightTokenRange + "]";
+                return "[leftRange=" + this.LeftTokenRange + "," + "rightRange=" + this.RightTokenRange + "]";
             };
             RuleDescriptor.create1 = function (left, right) {
                 return RuleDescriptor.create4(formatting.Shared.TokenRange.FromToken(left), formatting.Shared.TokenRange.FromToken(right));
@@ -25024,8 +29815,7 @@ var ts;
                 this.Action = null;
             }
             RuleOperation.prototype.toString = function () {
-                return "[context=" + this.Context + "," +
-                    "action=" + this.Action + "]";
+                return "[context=" + this.Context + "," + "action=" + this.Action + "]";
             };
             RuleOperation.create1 = function (action) {
                 return RuleOperation.create2(formatting.RuleOperationContext.Any, action);
@@ -25091,7 +29881,12 @@ var ts;
                 this.SpaceAfterCloseBrace = new formatting.Rule(formatting.RuleDescriptor.create3(15, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsAfterCodeBlockContext), 2));
                 this.SpaceBetweenCloseBraceAndElse = new formatting.Rule(formatting.RuleDescriptor.create1(15, 75), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
                 this.SpaceBetweenCloseBraceAndWhile = new formatting.Rule(formatting.RuleDescriptor.create1(15, 99), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
-                this.NoSpaceAfterCloseBrace = new formatting.Rule(formatting.RuleDescriptor.create3(15, formatting.Shared.TokenRange.FromTokens([17, 19, 23, 22])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
+                this.NoSpaceAfterCloseBrace = new formatting.Rule(formatting.RuleDescriptor.create3(15, formatting.Shared.TokenRange.FromTokens([
+                    17,
+                    19,
+                    23,
+                    22
+                ])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
                 this.NoSpaceBeforeDot = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 20), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
                 this.NoSpaceAfterDot = new formatting.Rule(formatting.RuleDescriptor.create3(20, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
                 this.NoSpaceBeforeOpenBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 18), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
@@ -25100,9 +29895,19 @@ var ts;
                 this.NoSpaceAfterCloseBracket = new formatting.Rule(formatting.RuleDescriptor.create3(19, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
                 this.FunctionOpenBraceLeftTokenRange = formatting.Shared.TokenRange.AnyIncludingMultilineComments;
                 this.SpaceBeforeOpenBraceInFunction = new formatting.Rule(formatting.RuleDescriptor.create2(this.FunctionOpenBraceLeftTokenRange, 14), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext, Rules.IsBeforeBlockContext, Rules.IsNotFormatOnEnter, Rules.IsSameLineTokenOrBeforeMultilineBlockContext), 2), 1);
-                this.TypeScriptOpenBraceLeftTokenRange = formatting.Shared.TokenRange.FromTokens([64, 3]);
+                this.TypeScriptOpenBraceLeftTokenRange = formatting.Shared.TokenRange.FromTokens([
+                    64,
+                    3
+                ]);
                 this.SpaceBeforeOpenBraceInTypeScriptDeclWithBlock = new formatting.Rule(formatting.RuleDescriptor.create2(this.TypeScriptOpenBraceLeftTokenRange, 14), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsTypeScriptDeclWithBlockContext, Rules.IsNotFormatOnEnter, Rules.IsSameLineTokenOrBeforeMultilineBlockContext), 2), 1);
-                this.ControlOpenBraceLeftTokenRange = formatting.Shared.TokenRange.FromTokens([17, 3, 74, 95, 80, 75]);
+                this.ControlOpenBraceLeftTokenRange = formatting.Shared.TokenRange.FromTokens([
+                    17,
+                    3,
+                    74,
+                    95,
+                    80,
+                    75
+                ]);
                 this.SpaceBeforeOpenBraceInControl = new formatting.Rule(formatting.RuleDescriptor.create2(this.ControlOpenBraceLeftTokenRange, 14), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsControlDeclContext, Rules.IsNotFormatOnEnter, Rules.IsSameLineTokenOrBeforeMultilineBlockContext), 2), 1);
                 this.SpaceAfterOpenBrace = new formatting.Rule(formatting.RuleDescriptor.create3(14, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSingleLineBlockContext), 2));
                 this.SpaceBeforeCloseBrace = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 15), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSingleLineBlockContext), 2));
@@ -25121,79 +29926,151 @@ var ts;
                 this.SpaceAfterSubtractWhenFollowedByUnaryMinus = new formatting.Rule(formatting.RuleDescriptor.create1(34, 34), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2));
                 this.SpaceAfterSubtractWhenFollowedByPredecrement = new formatting.Rule(formatting.RuleDescriptor.create1(34, 39), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2));
                 this.NoSpaceBeforeComma = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 23), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.SpaceAfterCertainKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([97, 93, 87, 73, 89, 96]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
-                this.SpaceAfterLetConstInVariableDeclaration = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([104, 69]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsStartOfVariableDeclarationList), 2));
+                this.SpaceAfterCertainKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([
+                    97,
+                    93,
+                    87,
+                    73,
+                    89,
+                    96
+                ]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
+                this.SpaceAfterLetConstInVariableDeclaration = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([
+                    104,
+                    69
+                ]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsStartOfVariableDeclarationList), 2));
                 this.NoSpaceBeforeOpenParenInFuncCall = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsFunctionCallOrNewContext, Rules.IsPreviousTokenNotComma), 8));
                 this.SpaceAfterFunctionInFuncDecl = new formatting.Rule(formatting.RuleDescriptor.create3(82, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2));
                 this.NoSpaceBeforeOpenParenInFuncDecl = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsFunctionDeclContext), 8));
                 this.SpaceAfterVoidOperator = new formatting.Rule(formatting.RuleDescriptor.create3(98, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsVoidOpContext), 2));
                 this.NoSpaceBetweenReturnAndSemicolon = new formatting.Rule(formatting.RuleDescriptor.create1(89, 22), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.SpaceBetweenStatements = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([17, 74, 75, 66]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotForContext), 2));
-                this.SpaceAfterTryFinally = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([95, 80]), 14), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
-                this.SpaceAfterGetSetInMember = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([115, 119]), 64), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2));
+                this.SpaceBetweenStatements = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([
+                    17,
+                    74,
+                    75,
+                    66
+                ]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotForContext), 2));
+                this.SpaceAfterTryFinally = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([
+                    95,
+                    80
+                ]), 14), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
+                this.SpaceAfterGetSetInMember = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([
+                    115,
+                    119
+                ]), 64), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2));
                 this.SpaceBeforeBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryKeywordOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2));
                 this.SpaceAfterBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.BinaryKeywordOperators, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2));
                 this.NoSpaceAfterConstructor = new formatting.Rule(formatting.RuleDescriptor.create1(113, 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.NoSpaceAfterModuleImport = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([116, 117]), 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.SpaceAfterCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([68, 114, 76, 77, 78, 115, 102, 84, 103, 116, 106, 108, 119, 109]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
-                this.SpaceBeforeCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([78, 102])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
+                this.NoSpaceAfterModuleImport = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([
+                    116,
+                    117
+                ]), 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
+                this.SpaceAfterCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([
+                    68,
+                    114,
+                    76,
+                    77,
+                    78,
+                    115,
+                    102,
+                    84,
+                    103,
+                    116,
+                    106,
+                    108,
+                    119,
+                    109
+                ]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
+                this.SpaceBeforeCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([
+                    78,
+                    102
+                ])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
                 this.SpaceAfterModuleName = new formatting.Rule(formatting.RuleDescriptor.create1(8, 14), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsModuleDeclContext), 2));
                 this.SpaceAfterArrow = new formatting.Rule(formatting.RuleDescriptor.create3(32, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
                 this.NoSpaceAfterEllipsis = new formatting.Rule(formatting.RuleDescriptor.create1(21, 64), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.NoSpaceAfterOptionalParameters = new formatting.Rule(formatting.RuleDescriptor.create3(50, formatting.Shared.TokenRange.FromTokens([17, 23])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBinaryOpContext), 8));
+                this.NoSpaceAfterOptionalParameters = new formatting.Rule(formatting.RuleDescriptor.create3(50, formatting.Shared.TokenRange.FromTokens([
+                    17,
+                    23
+                ])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBinaryOpContext), 8));
                 this.NoSpaceBeforeOpenAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.TypeNames, 24), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterContext), 8));
                 this.NoSpaceBetweenCloseParenAndAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create1(17, 24), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterContext), 8));
                 this.NoSpaceAfterOpenAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create3(24, formatting.Shared.TokenRange.TypeNames), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterContext), 8));
                 this.NoSpaceBeforeCloseAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 25), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterContext), 8));
-                this.NoSpaceAfterCloseAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create3(25, formatting.Shared.TokenRange.FromTokens([16, 18, 25, 23])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterContext), 8));
+                this.NoSpaceAfterCloseAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create3(25, formatting.Shared.TokenRange.FromTokens([
+                    16,
+                    18,
+                    25,
+                    23
+                ])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterContext), 8));
                 this.NoSpaceBetweenEmptyInterfaceBraceBrackets = new formatting.Rule(formatting.RuleDescriptor.create1(14, 15), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsObjectTypeContext), 8));
-                this.HighPriorityCommonRules =
-                    [
-                        this.IgnoreBeforeComment, this.IgnoreAfterLineComment,
-                        this.NoSpaceBeforeColon, this.SpaceAfterColon, this.NoSpaceBeforeQuestionMark, this.SpaceAfterQuestionMarkInConditionalOperator,
-                        this.NoSpaceAfterQuestionMark,
-                        this.NoSpaceBeforeDot, this.NoSpaceAfterDot,
-                        this.NoSpaceAfterUnaryPrefixOperator,
-                        this.NoSpaceAfterUnaryPreincrementOperator, this.NoSpaceAfterUnaryPredecrementOperator,
-                        this.NoSpaceBeforeUnaryPostincrementOperator, this.NoSpaceBeforeUnaryPostdecrementOperator,
-                        this.SpaceAfterPostincrementWhenFollowedByAdd,
-                        this.SpaceAfterAddWhenFollowedByUnaryPlus, this.SpaceAfterAddWhenFollowedByPreincrement,
-                        this.SpaceAfterPostdecrementWhenFollowedBySubtract,
-                        this.SpaceAfterSubtractWhenFollowedByUnaryMinus, this.SpaceAfterSubtractWhenFollowedByPredecrement,
-                        this.NoSpaceAfterCloseBrace,
-                        this.SpaceAfterOpenBrace, this.SpaceBeforeCloseBrace, this.NewLineBeforeCloseBraceInBlockContext,
-                        this.SpaceAfterCloseBrace, this.SpaceBetweenCloseBraceAndElse, this.SpaceBetweenCloseBraceAndWhile, this.NoSpaceBetweenEmptyBraceBrackets,
-                        this.SpaceAfterFunctionInFuncDecl, this.NewLineAfterOpenBraceInBlockContext, this.SpaceAfterGetSetInMember,
-                        this.NoSpaceBetweenReturnAndSemicolon,
-                        this.SpaceAfterCertainKeywords,
-                        this.SpaceAfterLetConstInVariableDeclaration,
-                        this.NoSpaceBeforeOpenParenInFuncCall,
-                        this.SpaceBeforeBinaryKeywordOperator, this.SpaceAfterBinaryKeywordOperator,
-                        this.SpaceAfterVoidOperator,
-                        this.NoSpaceAfterConstructor, this.NoSpaceAfterModuleImport,
-                        this.SpaceAfterCertainTypeScriptKeywords, this.SpaceBeforeCertainTypeScriptKeywords,
-                        this.SpaceAfterModuleName,
-                        this.SpaceAfterArrow,
-                        this.NoSpaceAfterEllipsis,
-                        this.NoSpaceAfterOptionalParameters,
-                        this.NoSpaceBetweenEmptyInterfaceBraceBrackets,
-                        this.NoSpaceBeforeOpenAngularBracket,
-                        this.NoSpaceBetweenCloseParenAndAngularBracket,
-                        this.NoSpaceAfterOpenAngularBracket,
-                        this.NoSpaceBeforeCloseAngularBracket,
-                        this.NoSpaceAfterCloseAngularBracket
-                    ];
-                this.LowPriorityCommonRules =
-                    [
-                        this.NoSpaceBeforeSemicolon,
-                        this.SpaceBeforeOpenBraceInControl, this.SpaceBeforeOpenBraceInFunction, this.SpaceBeforeOpenBraceInTypeScriptDeclWithBlock,
-                        this.NoSpaceBeforeComma,
-                        this.NoSpaceBeforeOpenBracket, this.NoSpaceAfterOpenBracket,
-                        this.NoSpaceBeforeCloseBracket, this.NoSpaceAfterCloseBracket,
-                        this.SpaceAfterSemicolon,
-                        this.NoSpaceBeforeOpenParenInFuncDecl,
-                        this.SpaceBetweenStatements, this.SpaceAfterTryFinally
-                    ];
+                this.HighPriorityCommonRules = [
+                    this.IgnoreBeforeComment,
+                    this.IgnoreAfterLineComment,
+                    this.NoSpaceBeforeColon,
+                    this.SpaceAfterColon,
+                    this.NoSpaceBeforeQuestionMark,
+                    this.SpaceAfterQuestionMarkInConditionalOperator,
+                    this.NoSpaceAfterQuestionMark,
+                    this.NoSpaceBeforeDot,
+                    this.NoSpaceAfterDot,
+                    this.NoSpaceAfterUnaryPrefixOperator,
+                    this.NoSpaceAfterUnaryPreincrementOperator,
+                    this.NoSpaceAfterUnaryPredecrementOperator,
+                    this.NoSpaceBeforeUnaryPostincrementOperator,
+                    this.NoSpaceBeforeUnaryPostdecrementOperator,
+                    this.SpaceAfterPostincrementWhenFollowedByAdd,
+                    this.SpaceAfterAddWhenFollowedByUnaryPlus,
+                    this.SpaceAfterAddWhenFollowedByPreincrement,
+                    this.SpaceAfterPostdecrementWhenFollowedBySubtract,
+                    this.SpaceAfterSubtractWhenFollowedByUnaryMinus,
+                    this.SpaceAfterSubtractWhenFollowedByPredecrement,
+                    this.NoSpaceAfterCloseBrace,
+                    this.SpaceAfterOpenBrace,
+                    this.SpaceBeforeCloseBrace,
+                    this.NewLineBeforeCloseBraceInBlockContext,
+                    this.SpaceAfterCloseBrace,
+                    this.SpaceBetweenCloseBraceAndElse,
+                    this.SpaceBetweenCloseBraceAndWhile,
+                    this.NoSpaceBetweenEmptyBraceBrackets,
+                    this.SpaceAfterFunctionInFuncDecl,
+                    this.NewLineAfterOpenBraceInBlockContext,
+                    this.SpaceAfterGetSetInMember,
+                    this.NoSpaceBetweenReturnAndSemicolon,
+                    this.SpaceAfterCertainKeywords,
+                    this.SpaceAfterLetConstInVariableDeclaration,
+                    this.NoSpaceBeforeOpenParenInFuncCall,
+                    this.SpaceBeforeBinaryKeywordOperator,
+                    this.SpaceAfterBinaryKeywordOperator,
+                    this.SpaceAfterVoidOperator,
+                    this.NoSpaceAfterConstructor,
+                    this.NoSpaceAfterModuleImport,
+                    this.SpaceAfterCertainTypeScriptKeywords,
+                    this.SpaceBeforeCertainTypeScriptKeywords,
+                    this.SpaceAfterModuleName,
+                    this.SpaceAfterArrow,
+                    this.NoSpaceAfterEllipsis,
+                    this.NoSpaceAfterOptionalParameters,
+                    this.NoSpaceBetweenEmptyInterfaceBraceBrackets,
+                    this.NoSpaceBeforeOpenAngularBracket,
+                    this.NoSpaceBetweenCloseParenAndAngularBracket,
+                    this.NoSpaceAfterOpenAngularBracket,
+                    this.NoSpaceBeforeCloseAngularBracket,
+                    this.NoSpaceAfterCloseAngularBracket
+                ];
+                this.LowPriorityCommonRules = [
+                    this.NoSpaceBeforeSemicolon,
+                    this.SpaceBeforeOpenBraceInControl,
+                    this.SpaceBeforeOpenBraceInFunction,
+                    this.SpaceBeforeOpenBraceInTypeScriptDeclWithBlock,
+                    this.NoSpaceBeforeComma,
+                    this.NoSpaceBeforeOpenBracket,
+                    this.NoSpaceAfterOpenBracket,
+                    this.NoSpaceBeforeCloseBracket,
+                    this.NoSpaceAfterCloseBracket,
+                    this.SpaceAfterSemicolon,
+                    this.NoSpaceBeforeOpenParenInFuncDecl,
+                    this.SpaceBetweenStatements,
+                    this.SpaceAfterTryFinally
+                ];
                 this.SpaceAfterComma = new formatting.Rule(formatting.RuleDescriptor.create3(23, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
                 this.NoSpaceAfterComma = new formatting.Rule(formatting.RuleDescriptor.create3(23, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
                 this.SpaceBeforeBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2));
@@ -25235,10 +30112,10 @@ var ts;
                     case 167:
                     case 168:
                         return true;
-                    case 202:
+                    case 203:
                     case 193:
                     case 128:
-                    case 219:
+                    case 220:
                     case 130:
                     case 129:
                         return context.currentTokenSpan.kind === 52 || context.nextTokenSpan.kind === 52;
@@ -25281,7 +30158,7 @@ var ts;
                 }
                 switch (node.kind) {
                     case 174:
-                    case 188:
+                    case 202:
                     case 152:
                     case 201:
                         return true;
@@ -25324,7 +30201,7 @@ var ts;
                     case 200:
                     case 199:
                     case 174:
-                    case 216:
+                    case 217:
                     case 201:
                     case 188:
                         return true;
@@ -25342,7 +30219,7 @@ var ts;
                     case 191:
                     case 179:
                     case 187:
-                    case 216:
+                    case 217:
                         return true;
                     default:
                         return false;
@@ -25367,8 +30244,7 @@ var ts;
                 return context.TokensAreOnSameLine();
             };
             Rules.IsStartOfVariableDeclarationList = function (context) {
-                return context.currentTokenParent.kind === 194 &&
-                    context.currentTokenParent.getStart(context.sourceFile) === context.currentTokenSpan.pos;
+                return context.currentTokenParent.kind === 194 && context.currentTokenParent.getStart(context.sourceFile) === context.currentTokenSpan.pos;
             };
             Rules.IsNotFormatOnEnter = function (context) {
                 return context.formattingRequestKind != 2;
@@ -25402,8 +30278,7 @@ var ts;
                 }
             };
             Rules.IsTypeArgumentOrParameterContext = function (context) {
-                return Rules.IsTypeArgumentOrParameter(context.currentTokenSpan, context.currentTokenParent) ||
-                    Rules.IsTypeArgumentOrParameter(context.nextTokenSpan, context.nextTokenParent);
+                return Rules.IsTypeArgumentOrParameter(context.currentTokenSpan, context.currentTokenParent) || Rules.IsTypeArgumentOrParameter(context.nextTokenSpan, context.nextTokenParent);
             };
             Rules.IsVoidOpContext = function (context) {
                 return context.currentTokenSpan.kind === 98 && context.currentTokenParent.kind === 164;
@@ -25446,8 +30321,7 @@ var ts;
             };
             RulesMap.prototype.FillRule = function (rule, rulesBucketConstructionStateList) {
                 var _this = this;
-                var specificRule = rule.Descriptor.LeftTokenRange != formatting.Shared.TokenRange.Any &&
-                    rule.Descriptor.RightTokenRange != formatting.Shared.TokenRange.Any;
+                var specificRule = rule.Descriptor.LeftTokenRange != formatting.Shared.TokenRange.Any && rule.Descriptor.RightTokenRange != formatting.Shared.TokenRange.Any;
                 rule.Descriptor.LeftTokenRange.GetTokens().forEach(function (left) {
                     rule.Descriptor.RightTokenRange.GetTokens().forEach(function (right) {
                         var rulesBucketIndex = _this.GetRuleBucketIndex(left, right);
@@ -25521,19 +30395,13 @@ var ts;
             RulesBucket.prototype.AddRule = function (rule, specificTokens, constructionState, rulesBucketIndex) {
                 var position;
                 if (rule.Operation.Action == 1) {
-                    position = specificTokens ?
-                        0 :
-                        RulesPosition.IgnoreRulesAny;
+                    position = specificTokens ? 0 : RulesPosition.IgnoreRulesAny;
                 }
                 else if (!rule.Operation.Context.IsAny()) {
-                    position = specificTokens ?
-                        RulesPosition.ContextRulesSpecific :
-                        RulesPosition.ContextRulesAny;
+                    position = specificTokens ? RulesPosition.ContextRulesSpecific : RulesPosition.ContextRulesAny;
                 }
                 else {
-                    position = specificTokens ?
-                        RulesPosition.NoContextRulesSpecific :
-                        RulesPosition.NoContextRulesAny;
+                    position = specificTokens ? RulesPosition.NoContextRulesSpecific : RulesPosition.NoContextRulesAny;
                 }
                 var state = constructionState[rulesBucketIndex];
                 if (state === undefined) {
@@ -25590,7 +30458,9 @@ var ts;
                     this.token = token;
                 }
                 TokenSingleValueAccess.prototype.GetTokens = function () {
-                    return [this.token];
+                    return [
+                        this.token
+                    ];
                 };
                 TokenSingleValueAccess.prototype.Contains = function (tokenValue) {
                     return tokenValue == this.token;
@@ -25644,18 +30514,68 @@ var ts;
                     return this.tokenAccess.toString();
                 };
                 TokenRange.Any = TokenRange.AllTokens();
-                TokenRange.AnyIncludingMultilineComments = TokenRange.FromTokens(TokenRange.Any.GetTokens().concat([3]));
+                TokenRange.AnyIncludingMultilineComments = TokenRange.FromTokens(TokenRange.Any.GetTokens().concat([
+                    3
+                ]));
                 TokenRange.Keywords = TokenRange.FromRange(65, 124);
                 TokenRange.BinaryOperators = TokenRange.FromRange(24, 63);
-                TokenRange.BinaryKeywordOperators = TokenRange.FromTokens([85, 86, 124]);
-                TokenRange.UnaryPrefixOperators = TokenRange.FromTokens([38, 39, 47, 46]);
-                TokenRange.UnaryPrefixExpressions = TokenRange.FromTokens([7, 64, 16, 18, 14, 92, 87]);
-                TokenRange.UnaryPreincrementExpressions = TokenRange.FromTokens([64, 16, 92, 87]);
-                TokenRange.UnaryPostincrementExpressions = TokenRange.FromTokens([64, 17, 19, 87]);
-                TokenRange.UnaryPredecrementExpressions = TokenRange.FromTokens([64, 16, 92, 87]);
-                TokenRange.UnaryPostdecrementExpressions = TokenRange.FromTokens([64, 17, 19, 87]);
-                TokenRange.Comments = TokenRange.FromTokens([2, 3]);
-                TokenRange.TypeNames = TokenRange.FromTokens([64, 118, 120, 112, 121, 98, 111]);
+                TokenRange.BinaryKeywordOperators = TokenRange.FromTokens([
+                    85,
+                    86,
+                    124
+                ]);
+                TokenRange.UnaryPrefixOperators = TokenRange.FromTokens([
+                    38,
+                    39,
+                    47,
+                    46
+                ]);
+                TokenRange.UnaryPrefixExpressions = TokenRange.FromTokens([
+                    7,
+                    64,
+                    16,
+                    18,
+                    14,
+                    92,
+                    87
+                ]);
+                TokenRange.UnaryPreincrementExpressions = TokenRange.FromTokens([
+                    64,
+                    16,
+                    92,
+                    87
+                ]);
+                TokenRange.UnaryPostincrementExpressions = TokenRange.FromTokens([
+                    64,
+                    17,
+                    19,
+                    87
+                ]);
+                TokenRange.UnaryPredecrementExpressions = TokenRange.FromTokens([
+                    64,
+                    16,
+                    92,
+                    87
+                ]);
+                TokenRange.UnaryPostdecrementExpressions = TokenRange.FromTokens([
+                    64,
+                    17,
+                    19,
+                    87
+                ]);
+                TokenRange.Comments = TokenRange.FromTokens([
+                    2,
+                    3
+                ]);
+                TokenRange.TypeNames = TokenRange.FromTokens([
+                    64,
+                    118,
+                    120,
+                    112,
+                    121,
+                    98,
+                    111
+                ]);
                 return TokenRange;
             })();
             Shared.TokenRange = TokenRange;
@@ -25804,16 +30724,11 @@ var ts;
         }
         function findOutermostParent(position, expectedTokenKind, sourceFile) {
             var precedingToken = ts.findPrecedingToken(position, sourceFile);
-            if (!precedingToken ||
-                precedingToken.kind !== expectedTokenKind ||
-                position !== precedingToken.getEnd()) {
+            if (!precedingToken || precedingToken.kind !== expectedTokenKind || position !== precedingToken.getEnd()) {
                 return undefined;
             }
             var current = precedingToken;
-            while (current &&
-                current.parent &&
-                current.parent.end === precedingToken.end &&
-                !isListElement(current.parent, current)) {
+            while (current && current.parent && current.parent.end === precedingToken.end && !isListElement(current.parent, current)) {
                 current = current.parent;
             }
             return current;
@@ -25826,11 +30741,11 @@ var ts;
                 case 200:
                     var body = parent.body;
                     return body && body.kind === 174 && ts.rangeContainsRange(body.statements, node);
-                case 220:
+                case 221:
                 case 174:
                 case 201:
                     return ts.rangeContainsRange(parent.statements, node);
-                case 216:
+                case 217:
                     return ts.rangeContainsRange(parent.block.statements, node);
             }
             return false;
@@ -25838,7 +30753,9 @@ var ts;
         function findEnclosingNode(range, sourceFile) {
             return find(sourceFile);
             function find(n) {
-                var candidate = ts.forEachChild(n, function (c) { return ts.startEndContainsRange(c.getStart(sourceFile), c.end, range) && c; });
+                var candidate = ts.forEachChild(n, function (c) {
+                    return ts.startEndContainsRange(c.getStart(sourceFile), c.end, range) && c;
+                });
                 if (candidate) {
                     var result = find(candidate);
                     if (result) {
@@ -25852,9 +30769,11 @@ var ts;
             if (!errors.length) {
                 return rangeHasNoErrors;
             }
-            var sorted = errors
-                .filter(function (d) { return ts.rangeOverlapsWithStartEnd(originalRange, d.start, d.start + d.length); })
-                .sort(function (e1, e2) { return e1.start - e2.start; });
+            var sorted = errors.filter(function (d) {
+                return ts.rangeOverlapsWithStartEnd(originalRange, d.start, d.start + d.length);
+            }).sort(function (e1, e2) {
+                return e1.start - e2.start;
+            });
             if (!sorted.length) {
                 return rangeHasNoErrors;
             }
@@ -25948,10 +30867,7 @@ var ts;
                 var indentation = inheritedIndentation;
                 if (indentation === -1) {
                     if (isSomeBlock(node.kind)) {
-                        if (isSomeBlock(parent.kind) ||
-                            parent.kind === 220 ||
-                            parent.kind === 213 ||
-                            parent.kind === 214) {
+                        if (isSomeBlock(parent.kind) || parent.kind === 221 || parent.kind === 214 || parent.kind === 215) {
                             indentation = parentDynamicIndentation.getIndentation() + parentDynamicIndentation.getDelta();
                         }
                         else {
@@ -26000,8 +30916,12 @@ var ts;
                                 return nodeStartLine !== line ? indentation + delta : indentation;
                         }
                     },
-                    getIndentation: function () { return indentation; },
-                    getDelta: function () { return delta; },
+                    getIndentation: function () {
+                        return indentation;
+                    },
+                    getDelta: function () {
+                        return delta;
+                    },
                     recomputeIndentation: function (lineAdded) {
                         if (node.parent && formatting.SmartIndenter.shouldIndentChildNode(node.parent.kind, node.kind)) {
                             if (lineAdded) {
@@ -26194,8 +31114,7 @@ var ts;
                         trimTrailingWhitespacesForLines(originalStart.line, rangeStart.line);
                     }
                     else {
-                        lineAdded =
-                            processPair(range, rangeStart.line, parent, previousRange, previousRangeStartLine, previousParent, contextNode, dynamicIndentation);
+                        lineAdded = processPair(range, rangeStart.line, parent, previousRange, previousRangeStartLine, previousParent, contextNode, dynamicIndentation);
                     }
                 }
                 previousRange = range;
@@ -26223,9 +31142,7 @@ var ts;
                             dynamicIndentation.recomputeIndentation(true);
                         }
                     }
-                    trimTrailingWhitespaces =
-                        (rule.Operation.Action & (4 | 2)) &&
-                            rule.Flag !== 1;
+                    trimTrailingWhitespaces = (rule.Operation.Action & (4 | 2)) && rule.Flag !== 1;
                 }
                 else {
                     trimTrailingWhitespaces = true;
@@ -26262,10 +31179,16 @@ var ts;
                     var startPos = commentRange.pos;
                     for (var line = startLine; line < endLine; ++line) {
                         var endOfLine = ts.getEndLinePosition(line, sourceFile);
-                        parts.push({ pos: startPos, end: endOfLine });
+                        parts.push({
+                            pos: startPos,
+                            end: endOfLine
+                        });
                         startPos = ts.getStartPositionOfLine(line + 1, sourceFile);
                     }
-                    parts.push({ pos: startPos, end: commentRange.end });
+                    parts.push({
+                        pos: startPos,
+                        end: commentRange.end
+                    });
                 }
                 var startLinePos = ts.getStartPositionOfLine(startLine, sourceFile);
                 var nonWhitespaceColumnInFirstPart = formatting.SmartIndenter.findFirstNonWhitespaceCharacterAndColumn(startLinePos, parts[0].pos, sourceFile, options);
@@ -26280,9 +31203,7 @@ var ts;
                 var delta = indentation - nonWhitespaceColumnInFirstPart.column;
                 for (var i = startIndex, len = parts.length; i < len; ++i, ++startLine) {
                     var startLinePos = ts.getStartPositionOfLine(startLine, sourceFile);
-                    var nonWhitespaceCharacterAndColumn = i === 0
-                        ? nonWhitespaceColumnInFirstPart
-                        : formatting.SmartIndenter.findFirstNonWhitespaceCharacterAndColumn(parts[i].pos, parts[i].end, sourceFile, options);
+                    var nonWhitespaceCharacterAndColumn = i === 0 ? nonWhitespaceColumnInFirstPart : formatting.SmartIndenter.findFirstNonWhitespaceCharacterAndColumn(parts[i].pos, parts[i].end, sourceFile, options);
                     var newIndentation = nonWhitespaceCharacterAndColumn.column + delta;
                     if (newIndentation > 0) {
                         var indentationString = getIndentationString(newIndentation, options);
@@ -26311,7 +31232,10 @@ var ts;
                 }
             }
             function newTextChange(start, len, newText) {
-                return { span: ts.createTextSpan(start, len), newText: newText };
+                return {
+                    span: ts.createTextSpan(start, len),
+                    newText: newText
+                };
             }
             function recordDelete(start, len) {
                 if (len) {
@@ -26465,12 +31389,7 @@ var ts;
                 if (!precedingToken) {
                     return 0;
                 }
-                var precedingTokenIsLiteral = precedingToken.kind === 8 ||
-                    precedingToken.kind === 9 ||
-                    precedingToken.kind === 10 ||
-                    precedingToken.kind === 11 ||
-                    precedingToken.kind === 12 ||
-                    precedingToken.kind === 13;
+                var precedingTokenIsLiteral = precedingToken.kind === 8 || precedingToken.kind === 9 || precedingToken.kind === 10 || precedingToken.kind === 11 || precedingToken.kind === 12 || precedingToken.kind === 13;
                 if (precedingTokenIsLiteral && precedingToken.getStart(sourceFile) <= position && precedingToken.end > position) {
                     return 0;
                 }
@@ -26530,8 +31449,7 @@ var ts;
                         }
                     }
                     parentStart = getParentStart(parent, current, sourceFile);
-                    var parentAndChildShareLine = parentStart.line === currentStart.line ||
-                        childStartsOnTheSameLineWithElseInIfStatement(parent, current, currentStart.line, sourceFile);
+                    var parentAndChildShareLine = parentStart.line === currentStart.line || childStartsOnTheSameLineWithElseInIfStatement(parent, current, currentStart.line, sourceFile);
                     if (useActualIndentation) {
                         var actualIndentation = getActualIndentationForNode(current, parent, currentStart, parentAndChildShareLine, sourceFile, options);
                         if (actualIndentation !== -1) {
@@ -26564,8 +31482,7 @@ var ts;
                 }
             }
             function getActualIndentationForNode(current, parent, currentLineAndChar, parentAndChildShareLine, sourceFile, options) {
-                var useActualIndentation = (ts.isDeclaration(current) || ts.isStatement(current)) &&
-                    (parent.kind === 220 || !parentAndChildShareLine);
+                var useActualIndentation = (ts.isDeclaration(current) || ts.isStatement(current)) && (parent.kind === 221 || !parentAndChildShareLine);
                 if (!useActualIndentation) {
                     return -1;
                 }
@@ -26605,8 +31522,7 @@ var ts;
                 if (node.parent) {
                     switch (node.parent.kind) {
                         case 139:
-                            if (node.parent.typeArguments &&
-                                ts.rangeContainsStartEnd(node.parent.typeArguments, node.getStart(sourceFile), node.getEnd())) {
+                            if (node.parent.typeArguments && ts.rangeContainsStartEnd(node.parent.typeArguments, node.getStart(sourceFile), node.getEnd())) {
                                 return node.parent.typeArguments;
                             }
                             break;
@@ -26622,8 +31538,7 @@ var ts;
                         case 136:
                         case 137:
                             var start = node.getStart(sourceFile);
-                            if (node.parent.typeParameters &&
-                                ts.rangeContainsStartEnd(node.parent.typeParameters, start, node.getEnd())) {
+                            if (node.parent.typeParameters && ts.rangeContainsStartEnd(node.parent.typeParameters, start, node.getEnd())) {
                                 return node.parent.typeParameters;
                             }
                             if (ts.rangeContainsStartEnd(node.parent.parameters, start, node.getEnd())) {
@@ -26633,12 +31548,10 @@ var ts;
                         case 156:
                         case 155:
                             var start = node.getStart(sourceFile);
-                            if (node.parent.typeArguments &&
-                                ts.rangeContainsStartEnd(node.parent.typeArguments, start, node.getEnd())) {
+                            if (node.parent.typeArguments && ts.rangeContainsStartEnd(node.parent.typeArguments, start, node.getEnd())) {
                                 return node.parent.typeArguments;
                             }
-                            if (node.parent.arguments &&
-                                ts.rangeContainsStartEnd(node.parent.arguments, start, node.getEnd())) {
+                            if (node.parent.arguments && ts.rangeContainsStartEnd(node.parent.arguments, start, node.getEnd())) {
                                 return node.parent.arguments;
                             }
                             break;
@@ -26690,7 +31603,10 @@ var ts;
                     }
                     character++;
                 }
-                return { column: column, character: character };
+                return {
+                    column: column,
+                    character: character
+                };
             }
             SmartIndenter.findFirstNonWhitespaceCharacterAndColumn = findFirstNonWhitespaceCharacterAndColumn;
             function findFirstNonWhitespaceColumn(startPos, endPos, sourceFile, options) {
@@ -26707,15 +31623,15 @@ var ts;
                     case 201:
                     case 152:
                     case 143:
-                    case 188:
+                    case 202:
+                    case 215:
                     case 214:
-                    case 213:
                     case 159:
                     case 155:
                     case 156:
                     case 175:
                     case 193:
-                    case 208:
+                    case 209:
                     case 186:
                     case 168:
                         return true;
@@ -26771,9 +31687,9 @@ var ts;
                     case 152:
                     case 174:
                     case 201:
-                    case 188:
+                    case 202:
                         return nodeEndsWith(n, 15, sourceFile);
-                    case 216:
+                    case 217:
                         return isCompletedNode(n.block, sourceFile);
                     case 159:
                     case 136:
@@ -26797,9 +31713,15 @@ var ts;
                         return isCompletedNode(n.expression, sourceFile);
                     case 151:
                         return nodeEndsWith(n, 19, sourceFile);
-                    case 213:
                     case 214:
+                    case 215:
                         return false;
+                    case 181:
+                        return isCompletedNode(n.statement, sourceFile);
+                    case 182:
+                        return isCompletedNode(n.statement, sourceFile);
+                    case 183:
+                        return isCompletedNode(n.statement, sourceFile);
                     case 180:
                         return isCompletedNode(n.statement, sourceFile);
                     case 179:
@@ -26898,7 +31820,7 @@ var ts;
             return pos;
         };
         NodeObject.prototype.createSyntaxList = function (nodes) {
-            var list = createNode(221, nodes.pos, nodes.end, 1024, this);
+            var list = createNode(222, nodes.pos, nodes.end, 1024, this);
             list._children = [];
             var pos = nodes.pos;
             for (var i = 0, len = nodes.length; i < len; i++) {
@@ -27067,10 +31989,7 @@ var ts;
                 return pos;
             }
             function isName(pos, end, sourceFile, name) {
-                return pos + name.length < end &&
-                    sourceFile.text.substr(pos, name.length) === name &&
-                    (ts.isWhiteSpace(sourceFile.text.charCodeAt(pos + name.length)) ||
-                        ts.isLineBreak(sourceFile.text.charCodeAt(pos + name.length)));
+                return pos + name.length < end && sourceFile.text.substr(pos, name.length) === name && (ts.isWhiteSpace(sourceFile.text.charCodeAt(pos + name.length)) || ts.isLineBreak(sourceFile.text.charCodeAt(pos + name.length)));
             }
             function isParamTag(pos, end, sourceFile) {
                 return isName(pos, end, sourceFile, paramTag);
@@ -27286,7 +32205,9 @@ var ts;
         };
         SignatureObject.prototype.getDocumentationComment = function () {
             if (this.documentationComment === undefined) {
-                this.documentationComment = this.declaration ? getJsDocCommentsFromDeclarations([this.declaration], undefined, false) : [];
+                this.documentationComment = this.declaration ? getJsDocCommentsFromDeclarations([
+                    this.declaration
+                ], undefined, false) : [];
             }
             return this.documentationComment;
         };
@@ -27320,9 +32241,7 @@ var ts;
                         case 131:
                             var functionDeclaration = node;
                             if (functionDeclaration.name && functionDeclaration.name.getFullWidth() > 0) {
-                                var lastDeclaration = namedDeclarations.length > 0 ?
-                                    namedDeclarations[namedDeclarations.length - 1] :
-                                    undefined;
+                                var lastDeclaration = namedDeclarations.length > 0 ? namedDeclarations[namedDeclarations.length - 1] : undefined;
                                 if (lastDeclaration && functionDeclaration.symbol === lastDeclaration.symbol) {
                                     if (functionDeclaration.body && !lastDeclaration.body) {
                                         namedDeclarations[namedDeclarations.length - 1] = functionDeclaration;
@@ -27339,12 +32258,12 @@ var ts;
                         case 198:
                         case 199:
                         case 200:
-                        case 202:
-                        case 211:
-                        case 207:
-                        case 202:
-                        case 204:
+                        case 203:
+                        case 212:
+                        case 208:
+                        case 203:
                         case 205:
+                        case 206:
                         case 134:
                         case 135:
                         case 143:
@@ -27374,24 +32293,24 @@ var ts;
                                 ts.forEachChild(node.name, visit);
                                 break;
                             }
-                        case 219:
+                        case 220:
                         case 130:
                         case 129:
                             namedDeclarations.push(node);
                             break;
-                        case 209:
+                        case 210:
                             if (node.exportClause) {
                                 ts.forEach(node.exportClause.elements, visit);
                             }
                             break;
-                        case 203:
+                        case 204:
                             var importClause = node.importClause;
                             if (importClause) {
                                 if (importClause.name) {
                                     namedDeclarations.push(importClause);
                                 }
                                 if (importClause.namedBindings) {
-                                    if (importClause.namedBindings.kind === 205) {
+                                    if (importClause.namedBindings.kind === 206) {
                                         namedDeclarations.push(importClause.namedBindings);
                                     }
                                     else {
@@ -27536,7 +32455,9 @@ var ts;
     ts.ClassificationTypeNames = ClassificationTypeNames;
     function displayPartsToString(displayParts) {
         if (displayParts) {
-            return ts.map(displayParts, function (displayPart) { return displayPart.text; }).join("");
+            return ts.map(displayParts, function (displayPart) {
+                return displayPart.text;
+            }).join("");
         }
         return "";
     }
@@ -27553,7 +32474,7 @@ var ts;
                 return false;
             }
             for (var parent = declaration.parent; !ts.isFunctionBlock(parent); parent = parent.parent) {
-                if (parent.kind === 220 || parent.kind === 201) {
+                if (parent.kind === 221 || parent.kind === 201) {
                     return false;
                 }
             }
@@ -27713,7 +32634,9 @@ var ts;
             return bucket;
         }
         function reportStats() {
-            var bucketInfoArray = Object.keys(buckets).filter(function (name) { return name && name.charAt(0) === '_'; }).map(function (name) {
+            var bucketInfoArray = Object.keys(buckets).filter(function (name) {
+                return name && name.charAt(0) === '_';
+            }).map(function (name) {
                 var entries = ts.lookUp(buckets, name);
                 var sourceFiles = [];
                 for (var i in entries) {
@@ -27724,7 +32647,9 @@ var ts;
                         references: entry.owners.slice(0)
                     });
                 }
-                sourceFiles.sort(function (x, y) { return y.refCount - x.refCount; });
+                sourceFiles.sort(function (x, y) {
+                    return y.refCount - x.refCount;
+                });
                 return {
                     bucket: name,
                     sourceFiles: sourceFiles
@@ -27913,7 +32838,11 @@ var ts;
             processImport();
         }
         processTripleSlashDirectives();
-        return { referencedFiles: referencedFiles, importedFiles: importedFiles, isLibFile: isNoDefaultLib };
+        return {
+            referencedFiles: referencedFiles,
+            importedFiles: importedFiles,
+            isLibFile: isNoDefaultLib
+        };
     }
     ts.preProcessFile = preProcessFile;
     function getTargetLabel(referenceNode, labelName) {
@@ -27926,14 +32855,10 @@ var ts;
         return undefined;
     }
     function isJumpStatementTarget(node) {
-        return node.kind === 64 &&
-            (node.parent.kind === 185 || node.parent.kind === 184) &&
-            node.parent.label === node;
+        return node.kind === 64 && (node.parent.kind === 185 || node.parent.kind === 184) && node.parent.label === node;
     }
     function isLabelOfLabeledStatement(node) {
-        return node.kind === 64 &&
-            node.parent.kind === 189 &&
-            node.parent.label === node;
+        return node.kind === 64 && node.parent.kind === 189 && node.parent.label === node;
     }
     function isLabeledBy(node, labelName) {
         for (var owner = node.parent; owner.kind === 189; owner = owner.parent) {
@@ -27968,20 +32893,18 @@ var ts;
         return node.parent.kind === 200 && node.parent.name === node;
     }
     function isNameOfFunctionDeclaration(node) {
-        return node.kind === 64 &&
-            ts.isFunctionLike(node.parent) && node.parent.name === node;
+        return node.kind === 64 && ts.isFunctionLike(node.parent) && node.parent.name === node;
     }
     function isNameOfPropertyAssignment(node) {
-        return (node.kind === 64 || node.kind === 8 || node.kind === 7) &&
-            (node.parent.kind === 217 || node.parent.kind === 218) && node.parent.name === node;
+        return (node.kind === 64 || node.kind === 8 || node.kind === 7) && (node.parent.kind === 218 || node.parent.kind === 219) && node.parent.name === node;
     }
     function isLiteralNameOfPropertyDeclarationOrIndexAccess(node) {
         if (node.kind === 8 || node.kind === 7) {
             switch (node.parent.kind) {
                 case 130:
                 case 129:
-                case 217:
-                case 219:
+                case 218:
+                case 220:
                 case 132:
                 case 131:
                 case 134:
@@ -27996,15 +32919,12 @@ var ts;
     }
     function isNameOfExternalModuleImportOrDeclaration(node) {
         if (node.kind === 8) {
-            return isNameOfModuleDeclaration(node) ||
-                (ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) && ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node);
+            return isNameOfModuleDeclaration(node) || (ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) && ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node);
         }
         return false;
     }
     function isInsideComment(sourceFile, token, position) {
-        return position <= token.getStart(sourceFile) &&
-            (isInsideCommentRange(ts.getTrailingCommentRanges(sourceFile.text, token.getFullStart())) ||
-                isInsideCommentRange(ts.getLeadingCommentRanges(sourceFile.text, token.getFullStart())));
+        return position <= token.getStart(sourceFile) && (isInsideCommentRange(ts.getTrailingCommentRanges(sourceFile.text, token.getFullStart())) || isInsideCommentRange(ts.getLeadingCommentRanges(sourceFile.text, token.getFullStart())));
         function isInsideCommentRange(comments) {
             return ts.forEach(comments, function (comment) {
                 if (comment.pos < position && position < comment.end) {
@@ -28017,8 +32937,7 @@ var ts;
                         return true;
                     }
                     else {
-                        return !(text.charCodeAt(comment.end - 1) === 47 &&
-                            text.charCodeAt(comment.end - 2) === 42);
+                        return !(text.charCodeAt(comment.end - 1) === 47 && text.charCodeAt(comment.end - 2) === 42);
                     }
                 }
                 return false;
@@ -28055,7 +32974,7 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                case 220:
+                case 221:
                 case 132:
                 case 131:
                 case 195:
@@ -28073,38 +32992,49 @@ var ts;
     ts.getContainerNode = getContainerNode;
     function getNodeKind(node) {
         switch (node.kind) {
-            case 200: return ScriptElementKind.moduleElement;
-            case 196: return ScriptElementKind.classElement;
-            case 197: return ScriptElementKind.interfaceElement;
-            case 198: return ScriptElementKind.typeElement;
-            case 199: return ScriptElementKind.enumElement;
+            case 200:
+                return ScriptElementKind.moduleElement;
+            case 196:
+                return ScriptElementKind.classElement;
+            case 197:
+                return ScriptElementKind.interfaceElement;
+            case 198:
+                return ScriptElementKind.typeElement;
+            case 199:
+                return ScriptElementKind.enumElement;
             case 193:
-                return ts.isConst(node)
-                    ? ScriptElementKind.constElement
-                    : ts.isLet(node)
-                        ? ScriptElementKind.letElement
-                        : ScriptElementKind.variableElement;
-            case 195: return ScriptElementKind.functionElement;
-            case 134: return ScriptElementKind.memberGetAccessorElement;
-            case 135: return ScriptElementKind.memberSetAccessorElement;
+                return ts.isConst(node) ? ScriptElementKind.constElement : ts.isLet(node) ? ScriptElementKind.letElement : ScriptElementKind.variableElement;
+            case 195:
+                return ScriptElementKind.functionElement;
+            case 134:
+                return ScriptElementKind.memberGetAccessorElement;
+            case 135:
+                return ScriptElementKind.memberSetAccessorElement;
             case 132:
             case 131:
                 return ScriptElementKind.memberFunctionElement;
             case 130:
             case 129:
                 return ScriptElementKind.memberVariableElement;
-            case 138: return ScriptElementKind.indexSignatureElement;
-            case 137: return ScriptElementKind.constructSignatureElement;
-            case 136: return ScriptElementKind.callSignatureElement;
-            case 133: return ScriptElementKind.constructorImplementationElement;
-            case 127: return ScriptElementKind.typeParameterElement;
-            case 219: return ScriptElementKind.variableElement;
-            case 128: return (node.flags & 112) ? ScriptElementKind.memberVariableElement : ScriptElementKind.parameterElement;
-            case 202:
-            case 207:
-            case 204:
-            case 211:
+            case 138:
+                return ScriptElementKind.indexSignatureElement;
+            case 137:
+                return ScriptElementKind.constructSignatureElement;
+            case 136:
+                return ScriptElementKind.callSignatureElement;
+            case 133:
+                return ScriptElementKind.constructorImplementationElement;
+            case 127:
+                return ScriptElementKind.typeParameterElement;
+            case 220:
+                return ScriptElementKind.variableElement;
+            case 128:
+                return (node.flags & 112) ? ScriptElementKind.memberVariableElement : ScriptElementKind.parameterElement;
+            case 203:
+            case 208:
             case 205:
+            case 212:
+            case 206:
                 return ScriptElementKind.alias;
         }
         return ScriptElementKind.unknown;
@@ -28155,13 +33085,26 @@ var ts;
             var changesInCompilationSettingsAffectSyntax = oldSettings && oldSettings.target !== newSettings.target;
             var newProgram = ts.createProgram(hostCache.getRootFileNames(), newSettings, {
                 getSourceFile: getOrCreateSourceFile,
-                getCancellationToken: function () { return cancellationToken; },
-                getCanonicalFileName: function (fileName) { return useCaseSensitivefileNames ? fileName : fileName.toLowerCase(); },
-                useCaseSensitiveFileNames: function () { return useCaseSensitivefileNames; },
-                getNewLine: function () { return host.getNewLine ? host.getNewLine() : "\r\n"; },
-                getDefaultLibFileName: function (options) { return host.getDefaultLibFileName(options); },
-                writeFile: function (fileName, data, writeByteOrderMark) { },
-                getCurrentDirectory: function () { return host.getCurrentDirectory(); }
+                getCancellationToken: function () {
+                    return cancellationToken;
+                },
+                getCanonicalFileName: function (fileName) {
+                    return useCaseSensitivefileNames ? fileName : fileName.toLowerCase();
+                },
+                useCaseSensitiveFileNames: function () {
+                    return useCaseSensitivefileNames;
+                },
+                getNewLine: function () {
+                    return host.getNewLine ? host.getNewLine() : "\r\n";
+                },
+                getDefaultLibFileName: function (options) {
+                    return host.getDefaultLibFileName(options);
+                },
+                writeFile: function (fileName, data, writeByteOrderMark) {
+                },
+                getCurrentDirectory: function () {
+                    return host.getCurrentDirectory();
+                }
             });
             if (program) {
                 var oldSourceFiles = program.getSourceFiles();
@@ -28248,8 +33191,7 @@ var ts;
                 if ((symbol.flags & 1536) && (firstCharCode === 39 || firstCharCode === 34)) {
                     return undefined;
                 }
-                if (displayName && displayName.length >= 2 && firstCharCode === displayName.charCodeAt(displayName.length - 1) &&
-                    (firstCharCode === 39 || firstCharCode === 34)) {
+                if (displayName && displayName.length >= 2 && firstCharCode === displayName.charCodeAt(displayName.length - 1) && (firstCharCode === 39 || firstCharCode === 34)) {
                     displayName = displayName.substring(1, displayName.length - 1);
                 }
                 var isValid = ts.isIdentifierStart(displayName.charCodeAt(0), target);
@@ -28365,11 +33307,11 @@ var ts;
                         getCompletionEntriesFromSymbols(filteredMembers, activeCompletionSession);
                     }
                 }
-                else if (ts.getAncestor(previousToken, 204)) {
+                else if (ts.getAncestor(previousToken, 205)) {
                     isMemberCompletion = true;
                     isNewIdentifierLocation = true;
                     if (showCompletionsInImportsClause(previousToken)) {
-                        var importDeclaration = ts.getAncestor(previousToken, 203);
+                        var importDeclaration = ts.getAncestor(previousToken, 204);
                         ts.Debug.assert(importDeclaration !== undefined);
                         var exports = typeInfoResolver.getExportsOfExternalModule(importDeclaration);
                         var filteredExports = filterModuleExports(exports, importDeclaration);
@@ -28410,16 +33352,14 @@ var ts;
             }
             function isCompletionListBlocker(previousToken) {
                 var start = new Date().getTime();
-                var result = isInStringOrRegularExpressionOrTemplateLiteral(previousToken) ||
-                    isIdentifierDefinitionLocation(previousToken) ||
-                    isRightOfIllegalDot(previousToken);
+                var result = isInStringOrRegularExpressionOrTemplateLiteral(previousToken) || isIdentifierDefinitionLocation(previousToken) || isRightOfIllegalDot(previousToken);
                 log("getCompletionsAtPosition: isCompletionListBlocker: " + (new Date().getTime() - start));
                 return result;
             }
             function showCompletionsInImportsClause(node) {
                 if (node) {
                     if (node.kind === 14 || node.kind === 23) {
-                        return node.parent.kind === 206;
+                        return node.parent.kind === 207;
                     }
                 }
                 return false;
@@ -28429,16 +33369,9 @@ var ts;
                     var containingNodeKind = previousToken.parent.kind;
                     switch (previousToken.kind) {
                         case 23:
-                            return containingNodeKind === 155
-                                || containingNodeKind === 133
-                                || containingNodeKind === 156
-                                || containingNodeKind === 151
-                                || containingNodeKind === 167;
+                            return containingNodeKind === 155 || containingNodeKind === 133 || containingNodeKind === 156 || containingNodeKind === 151 || containingNodeKind === 167;
                         case 16:
-                            return containingNodeKind === 155
-                                || containingNodeKind === 133
-                                || containingNodeKind === 156
-                                || containingNodeKind === 159;
+                            return containingNodeKind === 155 || containingNodeKind === 133 || containingNodeKind === 156 || containingNodeKind === 159;
                         case 18:
                             return containingNodeKind === 151;
                         case 116:
@@ -28448,8 +33381,7 @@ var ts;
                         case 14:
                             return containingNodeKind === 196;
                         case 52:
-                            return containingNodeKind === 193
-                                || containingNodeKind === 167;
+                            return containingNodeKind === 193 || containingNodeKind === 167;
                         case 11:
                             return containingNodeKind === 169;
                         case 12:
@@ -28469,9 +33401,7 @@ var ts;
                 return false;
             }
             function isInStringOrRegularExpressionOrTemplateLiteral(previousToken) {
-                if (previousToken.kind === 8
-                    || previousToken.kind === 9
-                    || ts.isTemplateLiteralKind(previousToken.kind)) {
+                if (previousToken.kind === 8 || previousToken.kind === 9 || ts.isTemplateLiteralKind(previousToken.kind)) {
                     var start = previousToken.getStart();
                     var end = previousToken.getEnd();
                     if (start < position && position < end) {
@@ -28518,43 +33448,23 @@ var ts;
                     var containingNodeKind = previousToken.parent.kind;
                     switch (previousToken.kind) {
                         case 23:
-                            return containingNodeKind === 193 ||
-                                containingNodeKind === 194 ||
-                                containingNodeKind === 175 ||
-                                containingNodeKind === 199 ||
-                                isFunction(containingNodeKind) ||
-                                containingNodeKind === 196 ||
-                                containingNodeKind === 195 ||
-                                containingNodeKind === 197 ||
-                                containingNodeKind === 149 ||
-                                containingNodeKind === 148;
+                            return containingNodeKind === 193 || containingNodeKind === 194 || containingNodeKind === 175 || containingNodeKind === 199 || isFunction(containingNodeKind) || containingNodeKind === 196 || containingNodeKind === 195 || containingNodeKind === 197 || containingNodeKind === 149 || containingNodeKind === 148;
                         case 20:
                             return containingNodeKind === 149;
                         case 18:
                             return containingNodeKind === 149;
                         case 16:
-                            return containingNodeKind === 216 ||
-                                isFunction(containingNodeKind);
+                            return containingNodeKind === 217 || isFunction(containingNodeKind);
                         case 14:
-                            return containingNodeKind === 199 ||
-                                containingNodeKind === 197 ||
-                                containingNodeKind === 143 ||
-                                containingNodeKind === 148;
+                            return containingNodeKind === 199 || containingNodeKind === 197 || containingNodeKind === 143 || containingNodeKind === 148;
                         case 22:
-                            return containingNodeKind === 129 &&
-                                (previousToken.parent.parent.kind === 197 ||
-                                    previousToken.parent.parent.kind === 143);
+                            return containingNodeKind === 129 && (previousToken.parent.parent.kind === 197 || previousToken.parent.parent.kind === 143);
                         case 24:
-                            return containingNodeKind === 196 ||
-                                containingNodeKind === 195 ||
-                                containingNodeKind === 197 ||
-                                isFunction(containingNodeKind);
+                            return containingNodeKind === 196 || containingNodeKind === 195 || containingNodeKind === 197 || isFunction(containingNodeKind);
                         case 109:
                             return containingNodeKind === 130;
                         case 21:
-                            return containingNodeKind === 128 ||
-                                containingNodeKind === 133 ||
-                                (previousToken.parent.parent.kind === 149);
+                            return containingNodeKind === 128 || containingNodeKind === 133 || (previousToken.parent.parent.kind === 149);
                         case 108:
                         case 106:
                         case 107:
@@ -28599,8 +33509,7 @@ var ts;
                 if (!importDeclaration.importClause) {
                     return exports;
                 }
-                if (importDeclaration.importClause.namedBindings &&
-                    importDeclaration.importClause.namedBindings.kind === 206) {
+                if (importDeclaration.importClause.namedBindings && importDeclaration.importClause.namedBindings.kind === 207) {
                     ts.forEach(importDeclaration.importClause.namedBindings.elements, function (el) {
                         var name = el.propertyName || el.name;
                         exisingImports[name.text] = true;
@@ -28609,7 +33518,9 @@ var ts;
                 if (ts.isEmpty(exisingImports)) {
                     return exports;
                 }
-                return ts.filter(exports, function (e) { return !ts.lookUp(exisingImports, e.name); });
+                return ts.filter(exports, function (e) {
+                    return !ts.lookUp(exisingImports, e.name);
+                });
             }
             function filterContextualMembersList(contextualMemberSymbols, existingMembers) {
                 if (!existingMembers || existingMembers.length === 0) {
@@ -28617,7 +33528,7 @@ var ts;
                 }
                 var existingMemberNames = {};
                 ts.forEach(existingMembers, function (m) {
-                    if (m.kind !== 217 && m.kind !== 218) {
+                    if (m.kind !== 218 && m.kind !== 219) {
                         return;
                     }
                     if (m.getStart() <= position && position <= m.getEnd()) {
@@ -28659,7 +33570,9 @@ var ts;
                     name: entryName,
                     kind: ScriptElementKind.keyword,
                     kindModifiers: ScriptElementKindModifier.none,
-                    displayParts: [ts.displayPart(entryName, 5)],
+                    displayParts: [
+                        ts.displayPart(entryName, 5)
+                    ],
                     documentation: undefined
                 };
             }
@@ -28757,9 +33670,7 @@ var ts;
             return ScriptElementKind.unknown;
         }
         function getSymbolModifiers(symbol) {
-            return symbol && symbol.declarations && symbol.declarations.length > 0
-                ? ts.getNodeModifiers(symbol.declarations[0])
-                : ScriptElementKindModifier.none;
+            return symbol && symbol.declarations && symbol.declarations.length > 0 ? ts.getNodeModifiers(symbol.declarations[0]) : ScriptElementKindModifier.none;
         }
         function getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, sourceFile, enclosingDeclaration, typeResolver, location, semanticMeaning) {
             if (semanticMeaning === void 0) { semanticMeaning = getMeaningFromLocation(location); }
@@ -28842,8 +33753,7 @@ var ts;
                             hasAddedSymbolInfo = true;
                         }
                     }
-                    else if ((isNameOfFunctionDeclaration(location) && !(symbol.flags & 98304)) ||
-                        (location.kind === 113 && location.parent.kind === 133)) {
+                    else if ((isNameOfFunctionDeclaration(location) && !(symbol.flags & 98304)) || (location.kind === 113 && location.parent.kind === 133)) {
                         var signature;
                         var functionDeclaration = location.parent;
                         var allSignatures = functionDeclaration.kind === 133 ? type.getConstructSignatures() : type.getCallSignatures();
@@ -28858,8 +33768,7 @@ var ts;
                             addPrefixForAnyFunctionOrVar(type.symbol, symbolKind);
                         }
                         else {
-                            addPrefixForAnyFunctionOrVar(functionDeclaration.kind === 136 &&
-                                !(type.symbol.flags & 2048 || type.symbol.flags & 4096) ? type.symbol : symbol, symbolKind);
+                            addPrefixForAnyFunctionOrVar(functionDeclaration.kind === 136 && !(type.symbol.flags & 2048 || type.symbol.flags & 4096) ? type.symbol : symbol, symbolKind);
                         }
                         addSignatureDisplayParts(signature, allSignatures);
                         hasAddedSymbolInfo = true;
@@ -28935,7 +33844,7 @@ var ts;
             if (symbolFlags & 8) {
                 addPrefixForAnyFunctionOrVar(symbol, "enum member");
                 var declaration = symbol.declarations[0];
-                if (declaration.kind === 219) {
+                if (declaration.kind === 220) {
                     var constantValue = typeResolver.getConstantValue(declaration);
                     if (constantValue !== undefined) {
                         displayParts.push(ts.spacePart());
@@ -28951,7 +33860,7 @@ var ts;
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 ts.forEach(symbol.declarations, function (declaration) {
-                    if (declaration.kind === 202) {
+                    if (declaration.kind === 203) {
                         var importEqualsDeclaration = declaration;
                         if (ts.isExternalModuleImportEqualsDeclaration(importEqualsDeclaration)) {
                             displayParts.push(ts.spacePart());
@@ -28979,9 +33888,7 @@ var ts;
                 if (symbolKind !== ScriptElementKind.unknown) {
                     if (type) {
                         addPrefixForAnyFunctionOrVar(symbol, symbolKind);
-                        if (symbolKind === ScriptElementKind.memberVariableElement ||
-                            symbolFlags & 3 ||
-                            symbolKind === ScriptElementKind.localVariableElement) {
+                        if (symbolKind === ScriptElementKind.memberVariableElement || symbolFlags & 3 || symbolKind === ScriptElementKind.localVariableElement) {
                             displayParts.push(ts.punctuationPart(51));
                             displayParts.push(ts.spacePart());
                             if (type.symbol && type.symbol.flags & 262144) {
@@ -28994,12 +33901,7 @@ var ts;
                                 displayParts.push.apply(displayParts, ts.typeToDisplayParts(typeResolver, type, enclosingDeclaration));
                             }
                         }
-                        else if (symbolFlags & 16 ||
-                            symbolFlags & 8192 ||
-                            symbolFlags & 16384 ||
-                            symbolFlags & 131072 ||
-                            symbolFlags & 98304 ||
-                            symbolKind === ScriptElementKind.memberFunctionElement) {
+                        else if (symbolFlags & 16 || symbolFlags & 8192 || symbolFlags & 16384 || symbolFlags & 131072 || symbolFlags & 98304 || symbolKind === ScriptElementKind.memberFunctionElement) {
                             var allSignatures = type.getCallSignatures();
                             addSignatureDisplayParts(allSignatures[0], allSignatures);
                         }
@@ -29012,7 +33914,11 @@ var ts;
             if (!documentation) {
                 documentation = symbol.getDocumentationComment();
             }
-            return { displayParts: displayParts, documentation: documentation, symbolKind: symbolKind };
+            return {
+                displayParts: displayParts,
+                documentation: documentation,
+                symbolKind: symbolKind
+            };
             function addNewLineIfDisplayPartsExist() {
                 if (displayParts.length) {
                     displayParts.push(ts.lineBreakPart());
@@ -29099,20 +34005,26 @@ var ts;
             if (isJumpStatementTarget(node)) {
                 var labelName = node.text;
                 var label = getTargetLabel(node.parent, node.text);
-                return label ? [getDefinitionInfo(label, ScriptElementKind.label, labelName, undefined)] : undefined;
+                return label ? [
+                    getDefinitionInfo(label, ScriptElementKind.label, labelName, undefined)
+                ] : undefined;
             }
-            var comment = ts.forEach(sourceFile.referencedFiles, function (r) { return (r.pos <= position && position < r.end) ? r : undefined; });
+            var comment = ts.forEach(sourceFile.referencedFiles, function (r) {
+                return (r.pos <= position && position < r.end) ? r : undefined;
+            });
             if (comment) {
                 var referenceFile = ts.tryResolveScriptReference(program, sourceFile, comment);
                 if (referenceFile) {
-                    return [{
+                    return [
+                        {
                             fileName: referenceFile.fileName,
                             textSpan: ts.createTextSpanFromBounds(0, 0),
                             kind: ScriptElementKind.scriptElement,
                             name: comment.fileName,
                             containerName: undefined,
                             containerKind: undefined
-                        }];
+                        }
+                    ];
                 }
                 return undefined;
             }
@@ -29127,7 +34039,7 @@ var ts;
                 }
             }
             var result = [];
-            if (node.parent.kind === 218) {
+            if (node.parent.kind === 219) {
                 var shorthandSymbol = typeInfoResolver.getShorthandAssignmentValueSymbol(symbol.valueDeclaration);
                 var shorthandDeclarations = shorthandSymbol.getDeclarations();
                 var shorthandSymbolKind = getSymbolKind(shorthandSymbol, typeInfoResolver, node);
@@ -29143,8 +34055,7 @@ var ts;
             var symbolKind = getSymbolKind(symbol, typeInfoResolver, node);
             var containerSymbol = symbol.parent;
             var containerName = containerSymbol ? typeInfoResolver.symbolToString(containerSymbol, node) : "";
-            if (!tryAddConstructSignature(symbol, node, symbolKind, symbolName, containerName, result) &&
-                !tryAddCallSignature(symbol, node, symbolKind, symbolName, containerName, result)) {
+            if (!tryAddConstructSignature(symbol, node, symbolKind, symbolName, containerName, result) && !tryAddCallSignature(symbol, node, symbolKind, symbolName, containerName, result)) {
                 ts.forEach(declarations, function (declaration) {
                     result.push(getDefinitionInfo(declaration, symbolKind, symbolName, containerName));
                 });
@@ -29164,8 +34075,7 @@ var ts;
                 var declarations = [];
                 var definition;
                 ts.forEach(signatureDeclarations, function (d) {
-                    if ((selectConstructors && d.kind === 133) ||
-                        (!selectConstructors && (d.kind === 195 || d.kind === 132 || d.kind === 131))) {
+                    if ((selectConstructors && d.kind === 133) || (!selectConstructors && (d.kind === 195 || d.kind === 132 || d.kind === 131))) {
                         declarations.push(d);
                         if (d.body)
                             definition = d;
@@ -29205,9 +34115,10 @@ var ts;
             if (!node) {
                 return undefined;
             }
-            if (node.kind === 64 || node.kind === 92 || node.kind === 90 ||
-                isLiteralNameOfPropertyDeclarationOrIndexAccess(node) || isNameOfExternalModuleImportOrDeclaration(node)) {
-                return getReferencesForNode(node, [sourceFile], true, false, false);
+            if (node.kind === 64 || node.kind === 92 || node.kind === 90 || isLiteralNameOfPropertyDeclarationOrIndexAccess(node) || isNameOfExternalModuleImportOrDeclaration(node)) {
+                return getReferencesForNode(node, [
+                    sourceFile
+                ], true, false, false);
             }
             switch (node.kind) {
                 case 83:
@@ -29244,8 +34155,8 @@ var ts;
                     break;
                 case 66:
                 case 72:
-                    if (hasKind(parent(parent(node)), 188)) {
-                        return getSwitchCaseDefaultOccurrences(node.parent.parent);
+                    if (hasKind(parent(parent(parent(node))), 188)) {
+                        return getSwitchCaseDefaultOccurrences(node.parent.parent.parent);
                     }
                     break;
                 case 65:
@@ -29255,9 +34166,7 @@ var ts;
                     }
                     break;
                 case 81:
-                    if (hasKind(node.parent, 181) ||
-                        hasKind(node.parent, 182) ||
-                        hasKind(node.parent, 183)) {
+                    if (hasKind(node.parent, 181) || hasKind(node.parent, 182) || hasKind(node.parent, 183)) {
                         return getLoopBreakContinueOccurrences(node.parent);
                     }
                     break;
@@ -29278,8 +34187,7 @@ var ts;
                         return getGetAndSetOccurrences(node.parent);
                     }
                 default:
-                    if (ts.isModifier(node.kind) && node.parent &&
-                        (ts.isDeclaration(node.parent) || node.parent.kind === 175)) {
+                    if (ts.isModifier(node.kind) && node.parent && (ts.isDeclaration(node.parent) || node.parent.kind === 175)) {
                         return getModifierOccurrences(node.kind, node.parent);
                     }
             }
@@ -29388,7 +34296,7 @@ var ts;
                 var child = throwStatement;
                 while (child.parent) {
                     var parent = child.parent;
-                    if (ts.isFunctionBlock(parent) || parent.kind === 220) {
+                    if (ts.isFunctionBlock(parent) || parent.kind === 221) {
                         return parent;
                     }
                     if (parent.kind === 191) {
@@ -29436,7 +34344,7 @@ var ts;
             function getSwitchCaseDefaultOccurrences(switchStatement) {
                 var keywords = [];
                 pushKeywordIf(keywords, switchStatement.getFirstToken(), 91);
-                ts.forEach(switchStatement.clauses, function (clause) {
+                ts.forEach(switchStatement.caseBlock.clauses, function (clause) {
                     pushKeywordIf(keywords, clause.getFirstToken(), 66, 72);
                     var breaksAndContinues = aggregateAllBreakAndContinueStatements(clause);
                     ts.forEach(breaksAndContinues, function (statement) {
@@ -29524,15 +34432,16 @@ var ts;
                 function tryPushAccessorKeyword(accessorSymbol, accessorKind) {
                     var accessor = ts.getDeclarationOfKind(accessorSymbol, accessorKind);
                     if (accessor) {
-                        ts.forEach(accessor.getChildren(), function (child) { return pushKeywordIf(keywords, child, 115, 119); });
+                        ts.forEach(accessor.getChildren(), function (child) {
+                            return pushKeywordIf(keywords, child, 115, 119);
+                        });
                     }
                 }
             }
             function getModifierOccurrences(modifier, declaration) {
                 var container = declaration.parent;
                 if (declaration.flags & 112) {
-                    if (!(container.kind === 196 ||
-                        (declaration.kind === 128 && hasKind(container, 133)))) {
+                    if (!(container.kind === 196 || (declaration.kind === 128 && hasKind(container, 133)))) {
                         return undefined;
                     }
                 }
@@ -29542,7 +34451,7 @@ var ts;
                     }
                 }
                 else if (declaration.flags & (1 | 2)) {
-                    if (!(container.kind === 201 || container.kind === 220)) {
+                    if (!(container.kind === 201 || container.kind === 221)) {
                         return undefined;
                     }
                 }
@@ -29554,7 +34463,7 @@ var ts;
                 var nodes;
                 switch (container.kind) {
                     case 201:
-                    case 220:
+                    case 221:
                         nodes = container.statements;
                         break;
                     case 133:
@@ -29576,7 +34485,9 @@ var ts;
                 }
                 ts.forEach(nodes, function (node) {
                     if (node.modifiers && node.flags & modifierFlag) {
-                        ts.forEach(node.modifiers, function (child) { return pushKeywordIf(keywords, child, modifier); });
+                        ts.forEach(node.modifiers, function (child) {
+                            return pushKeywordIf(keywords, child, modifier);
+                        });
                     }
                 });
                 return ts.map(keywords, getReferenceEntryFromNode);
@@ -29630,9 +34541,7 @@ var ts;
             if (!node) {
                 return undefined;
             }
-            if (node.kind !== 64 &&
-                !isLiteralNameOfPropertyDeclarationOrIndexAccess(node) &&
-                !isNameOfExternalModuleImportOrDeclaration(node)) {
+            if (node.kind !== 64 && !isLiteralNameOfPropertyDeclarationOrIndexAccess(node) && !isNameOfExternalModuleImportOrDeclaration(node)) {
                 return undefined;
             }
             ts.Debug.assert(node.kind === 64 || node.kind === 7 || node.kind === 8);
@@ -29642,7 +34551,9 @@ var ts;
             if (isLabelName(node)) {
                 if (isJumpStatementTarget(node)) {
                     var labelDefinition = getTargetLabel(node.parent, node.text);
-                    return labelDefinition ? getLabelReferencesInNode(labelDefinition.parent, labelDefinition) : [getReferenceEntryFromNode(node)];
+                    return labelDefinition ? getLabelReferencesInNode(labelDefinition.parent, labelDefinition) : [
+                        getReferenceEntryFromNode(node)
+                    ];
                 }
                 else {
                     return getLabelReferencesInNode(node.parent, node);
@@ -29656,7 +34567,9 @@ var ts;
             }
             var symbol = typeInfoResolver.getSymbolAtLocation(node);
             if (!symbol) {
-                return [getReferenceEntryFromNode(node)];
+                return [
+                    getReferenceEntryFromNode(node)
+                ];
             }
             var declarations = symbol.declarations;
             if (!declarations || !declarations.length) {
@@ -29690,17 +34603,17 @@ var ts;
             }
             return result;
             function isImportOrExportSpecifierName(location) {
-                return location.parent &&
-                    (location.parent.kind === 207 || location.parent.kind === 211) &&
-                    location.parent.propertyName === location;
+                return location.parent && (location.parent.kind === 208 || location.parent.kind === 212) && location.parent.propertyName === location;
             }
             function isImportOrExportSpecifierImportSymbol(symbol) {
                 return (symbol.flags & 8388608) && ts.forEach(symbol.declarations, function (declaration) {
-                    return declaration.kind === 207 || declaration.kind === 211;
+                    return declaration.kind === 208 || declaration.kind === 212;
                 });
             }
             function getDeclaredName(symbol, location) {
-                var functionExpression = ts.forEach(symbol.declarations, function (d) { return d.kind === 160 ? d : undefined; });
+                var functionExpression = ts.forEach(symbol.declarations, function (d) {
+                    return d.kind === 160 ? d : undefined;
+                });
                 if (functionExpression && functionExpression.name) {
                     var name = functionExpression.name.text;
                 }
@@ -29714,7 +34627,9 @@ var ts;
                 if (isImportOrExportSpecifierName(location)) {
                     return location.getText();
                 }
-                var functionExpression = ts.forEach(declarations, function (d) { return d.kind === 160 ? d : undefined; });
+                var functionExpression = ts.forEach(declarations, function (d) {
+                    return d.kind === 160 ? d : undefined;
+                });
                 if (functionExpression && functionExpression.name) {
                     var name = functionExpression.name.text;
                 }
@@ -29733,7 +34648,9 @@ var ts;
             }
             function getSymbolScope(symbol) {
                 if (symbol.flags & (4 | 8192)) {
-                    var privateDeclaration = ts.forEach(symbol.getDeclarations(), function (d) { return (d.flags & 32) ? d : undefined; });
+                    var privateDeclaration = ts.forEach(symbol.getDeclarations(), function (d) {
+                        return (d.flags & 32) ? d : undefined;
+                    });
                     if (privateDeclaration) {
                         return ts.getAncestor(privateDeclaration, 196);
                     }
@@ -29755,7 +34672,7 @@ var ts;
                         if (scope && scope !== container) {
                             return undefined;
                         }
-                        if (container.kind === 220 && !ts.isExternalModule(container)) {
+                        if (container.kind === 221 && !ts.isExternalModule(container)) {
                             return undefined;
                         }
                         scope = container;
@@ -29777,8 +34694,7 @@ var ts;
                     if (position > end)
                         break;
                     var endPosition = position + symbolNameLength;
-                    if ((position === 0 || !ts.isIdentifierPart(text.charCodeAt(position - 1), 2)) &&
-                        (endPosition === sourceLength || !ts.isIdentifierPart(text.charCodeAt(endPosition), 2))) {
+                    if ((position === 0 || !ts.isIdentifierPart(text.charCodeAt(position - 1), 2)) && (endPosition === sourceLength || !ts.isIdentifierPart(text.charCodeAt(endPosition), 2))) {
                         positions.push(position);
                     }
                     position = text.indexOf(symbolName, position + symbolNameLength + 1);
@@ -29796,8 +34712,7 @@ var ts;
                     if (!node || node.getWidth() !== labelName.length) {
                         return;
                     }
-                    if (node === targetLabel ||
-                        (isJumpStatementTarget(node) && getTargetLabel(node, labelName) === targetLabel)) {
+                    if (node === targetLabel || (isJumpStatementTarget(node) && getTargetLabel(node, labelName) === targetLabel)) {
                         result.push(getReferenceEntryFromNode(node));
                     }
                 });
@@ -29809,8 +34724,7 @@ var ts;
                         case 64:
                             return node.getWidth() === searchSymbolName.length;
                         case 8:
-                            if (isLiteralNameOfPropertyDeclarationOrIndexAccess(node) ||
-                                isNameOfExternalModuleImportOrDeclaration(node)) {
+                            if (isLiteralNameOfPropertyDeclarationOrIndexAccess(node) || isNameOfExternalModuleImportOrDeclaration(node)) {
                                 return node.getWidth() === searchSymbolName.length + 2;
                             }
                             break;
@@ -29833,8 +34747,7 @@ var ts;
                         cancellationToken.throwIfCancellationRequested();
                         var referenceLocation = ts.getTouchingPropertyName(sourceFile, position);
                         if (!isValidReferencePosition(referenceLocation, searchText)) {
-                            if ((findInStrings && isInString(position)) ||
-                                (findInComments && isInComment(position))) {
+                            if ((findInStrings && isInString(position)) || (findInComments && isInComment(position))) {
                                 result.push({
                                     fileName: sourceFile.fileName,
                                     textSpan: ts.createTextSpan(position, searchText.length),
@@ -29932,7 +34845,7 @@ var ts;
                         staticFlag &= searchSpaceNode.flags;
                         searchSpaceNode = searchSpaceNode.parent;
                         break;
-                    case 220:
+                    case 221:
                         if (ts.isExternalModule(searchSpaceNode)) {
                             return undefined;
                         }
@@ -29943,7 +34856,7 @@ var ts;
                         return undefined;
                 }
                 var result = [];
-                if (searchSpaceNode.kind === 220) {
+                if (searchSpaceNode.kind === 221) {
                     ts.forEach(sourceFiles, function (sourceFile) {
                         var possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "this", sourceFile.getStart(), sourceFile.getEnd());
                         getThisReferencesInFile(sourceFile, sourceFile, possiblePositions, result);
@@ -29981,8 +34894,8 @@ var ts;
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
-                            case 220:
-                                if (container.kind === 220 && !ts.isExternalModule(container)) {
+                            case 221:
+                                if (container.kind === 221 && !ts.isExternalModule(container)) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
@@ -29991,7 +34904,9 @@ var ts;
                 }
             }
             function populateSearchSymbolSet(symbol, location) {
-                var result = [symbol];
+                var result = [
+                    symbol
+                ];
                 if (isImportOrExportSpecifierImportSymbol(symbol)) {
                     result.push(typeInfoResolver.getAliasedSymbol(symbol));
                 }
@@ -30044,13 +34959,14 @@ var ts;
                 if (searchSymbols.indexOf(referenceSymbol) >= 0) {
                     return true;
                 }
-                if (isImportOrExportSpecifierImportSymbol(referenceSymbol) &&
-                    searchSymbols.indexOf(typeInfoResolver.getAliasedSymbol(referenceSymbol)) >= 0) {
+                if (isImportOrExportSpecifierImportSymbol(referenceSymbol) && searchSymbols.indexOf(typeInfoResolver.getAliasedSymbol(referenceSymbol)) >= 0) {
                     return true;
                 }
                 if (isNameOfPropertyAssignment(referenceLocation)) {
                     return ts.forEach(getPropertySymbolsFromContextualType(referenceLocation), function (contextualSymbol) {
-                        return ts.forEach(typeInfoResolver.getRootSymbols(contextualSymbol), function (s) { return searchSymbols.indexOf(s) >= 0; });
+                        return ts.forEach(typeInfoResolver.getRootSymbols(contextualSymbol), function (s) {
+                            return searchSymbols.indexOf(s) >= 0;
+                        });
                     });
                 }
                 return ts.forEach(typeInfoResolver.getRootSymbols(referenceSymbol), function (rootSymbol) {
@@ -30060,7 +34976,9 @@ var ts;
                     if (rootSymbol.parent && rootSymbol.parent.flags & (32 | 64)) {
                         var result = [];
                         getPropertySymbolsFromBaseTypes(rootSymbol.parent, rootSymbol.getName(), result);
-                        return ts.forEach(result, function (s) { return searchSymbols.indexOf(s) >= 0; });
+                        return ts.forEach(result, function (s) {
+                            return searchSymbols.indexOf(s) >= 0;
+                        });
                     }
                     return false;
                 });
@@ -30074,7 +34992,9 @@ var ts;
                         if (contextualType.flags & 16384) {
                             var unionProperty = contextualType.getProperty(name);
                             if (unionProperty) {
-                                return [unionProperty];
+                                return [
+                                    unionProperty
+                                ];
                             }
                             else {
                                 var result = [];
@@ -30090,7 +35010,9 @@ var ts;
                         else {
                             var symbol = contextualType.getProperty(name);
                             if (symbol) {
-                                return [symbol];
+                                return [
+                                    symbol
+                                ];
                             }
                         }
                     }
@@ -30146,7 +35068,9 @@ var ts;
             return ts.NavigateTo.getNavigateToItems(program, cancellationToken, searchValue, maxResultCount);
         }
         function containErrors(diagnostics) {
-            return ts.forEach(diagnostics, function (diagnostic) { return diagnostic.category === 1; });
+            return ts.forEach(diagnostics, function (diagnostic) {
+                return diagnostic.category === 1;
+            });
         }
         function getEmitOutput(fileName) {
             synchronizeHostData();
@@ -30172,9 +35096,9 @@ var ts;
                 case 150:
                 case 130:
                 case 129:
-                case 217:
                 case 218:
                 case 219:
+                case 220:
                 case 132:
                 case 131:
                 case 133:
@@ -30183,7 +35107,7 @@ var ts;
                 case 195:
                 case 160:
                 case 161:
-                case 216:
+                case 217:
                     return 1;
                 case 127:
                 case 197:
@@ -30203,14 +35127,14 @@ var ts;
                     else {
                         return 4;
                     }
-                case 206:
                 case 207:
-                case 202:
-                case 203:
                 case 208:
+                case 203:
+                case 204:
                 case 209:
+                case 210:
                     return 1 | 2 | 4;
-                case 220:
+                case 221:
                     return 4 | 1;
             }
             return 1 | 2 | 4;
@@ -30240,15 +35164,13 @@ var ts;
         }
         function getMeaningFromRightHandSideOfImportEquals(node) {
             ts.Debug.assert(node.kind === 64);
-            if (node.parent.kind === 125 &&
-                node.parent.right === node &&
-                node.parent.parent.kind === 202) {
+            if (node.parent.kind === 125 && node.parent.right === node && node.parent.parent.kind === 203) {
                 return 1 | 2 | 4;
             }
             return 4;
         }
         function getMeaningFromLocation(node) {
-            if (node.parent.kind === 208) {
+            if (node.parent.kind === 209) {
                 return 1 | 2 | 4;
             }
             else if (isInRightSideOfImport(node)) {
@@ -30301,8 +35223,7 @@ var ts;
                     nodeForStartPos = nodeForStartPos.parent;
                 }
                 else if (isNameOfModuleDeclaration(nodeForStartPos)) {
-                    if (nodeForStartPos.parent.parent.kind === 200 &&
-                        nodeForStartPos.parent.parent.body === nodeForStartPos.parent) {
+                    if (nodeForStartPos.parent.parent.kind === 200 && nodeForStartPos.parent.parent.body === nodeForStartPos.parent) {
                         nodeForStartPos = nodeForStartPos.parent.parent.name;
                     }
                     else {
@@ -30349,8 +35270,7 @@ var ts;
                     }
                 }
                 else if (flags & 1536) {
-                    if (meaningAtPosition & 4 ||
-                        (meaningAtPosition & 1 && hasValueSideModule(symbol))) {
+                    if (meaningAtPosition & 4 || (meaningAtPosition & 1 && hasValueSideModule(symbol))) {
                         return ClassificationTypeNames.moduleName;
                     }
                 }
@@ -30475,16 +35395,11 @@ var ts;
                 if (ts.isPunctuation(tokenKind)) {
                     if (token) {
                         if (tokenKind === 52) {
-                            if (token.parent.kind === 193 ||
-                                token.parent.kind === 130 ||
-                                token.parent.kind === 128) {
+                            if (token.parent.kind === 193 || token.parent.kind === 130 || token.parent.kind === 128) {
                                 return ClassificationTypeNames.operator;
                             }
                         }
-                        if (token.parent.kind === 167 ||
-                            token.parent.kind === 165 ||
-                            token.parent.kind === 166 ||
-                            token.parent.kind === 168) {
+                        if (token.parent.kind === 167 || token.parent.kind === 165 || token.parent.kind === 166 || token.parent.kind === 168) {
                             return ClassificationTypeNames.operator;
                         }
                     }
@@ -30582,14 +35497,22 @@ var ts;
             return result;
             function getMatchingTokenKind(token) {
                 switch (token.kind) {
-                    case 14: return 15;
-                    case 16: return 17;
-                    case 18: return 19;
-                    case 24: return 25;
-                    case 15: return 14;
-                    case 17: return 16;
-                    case 19: return 18;
-                    case 25: return 24;
+                    case 14:
+                        return 15;
+                    case 16:
+                        return 17;
+                    case 18:
+                        return 19;
+                    case 24:
+                        return 25;
+                    case 15:
+                        return 14;
+                    case 17:
+                        return 16;
+                    case 19:
+                        return 18;
+                    case 25:
+                        return 24;
                 }
                 return undefined;
             }
@@ -30670,7 +35593,9 @@ var ts;
                 var multiLineCommentStart = /(?:\/\*+\s*)/.source;
                 var anyNumberOfSpacesAndAsterixesAtStartOfLine = /(?:^(?:\s|\*)*)/.source;
                 var preamble = "(" + anyNumberOfSpacesAndAsterixesAtStartOfLine + "|" + singleLineCommentStart + "|" + multiLineCommentStart + ")";
-                var literals = "(?:" + ts.map(descriptors, function (d) { return "(" + escapeRegExp(d.text) + ")"; }).join("|") + ")";
+                var literals = "(?:" + ts.map(descriptors, function (d) {
+                    return "(" + escapeRegExp(d.text) + ")";
+                }).join("|") + ")";
                 var endOfLineOrEndOfComment = /(?:$|\*\/)/.source;
                 var messageRemainder = /(?:.*?)/.source;
                 var messagePortion = "(" + literals + messageRemainder + ")";
@@ -30678,9 +35603,7 @@ var ts;
                 return new RegExp(regExpString, "gim");
             }
             function isLetterOrDigit(char) {
-                return (char >= 97 && char <= 122) ||
-                    (char >= 65 && char <= 90) ||
-                    (char >= 48 && char <= 57);
+                return (char >= 97 && char <= 122) || (char >= 65 && char <= 90) || (char >= 48 && char <= 57);
             }
         }
         function getRenameInfo(fileName, position) {
@@ -30781,9 +35704,7 @@ var ts;
                     break;
                 case 8:
                 case 7:
-                    if (ts.isDeclarationName(node) ||
-                        node.parent.kind === 212 ||
-                        isArgumentOfElementAccessExpression(node)) {
+                    if (ts.isDeclarationName(node) || node.parent.kind === 213 || isArgumentOfElementAccessExpression(node)) {
                         nameTable[node.text] = node.text;
                     }
                     break;
@@ -30793,10 +35714,7 @@ var ts;
         }
     }
     function isArgumentOfElementAccessExpression(node) {
-        return node &&
-            node.parent &&
-            node.parent.kind === 154 &&
-            node.parent.argumentExpression === node;
+        return node && node.parent && node.parent.kind === 154 && node.parent.argumentExpression === node;
     }
     function createClassifier() {
         var scanner = ts.createScanner(2, false);
@@ -30825,10 +35743,7 @@ var ts;
         }
         function canFollow(keyword1, keyword2) {
             if (isAccessibilityModifier(keyword1)) {
-                if (keyword2 === 115 ||
-                    keyword2 === 119 ||
-                    keyword2 === 113 ||
-                    keyword2 === 109) {
+                if (keyword2 === 115 || keyword2 === 119 || keyword2 === 113 || keyword2 === 109) {
                     return true;
                 }
                 return false;
@@ -30886,18 +35801,13 @@ var ts;
                     else if (isKeyword(lastNonTriviaToken) && isKeyword(token) && !canFollow(lastNonTriviaToken, token)) {
                         token = 64;
                     }
-                    else if (lastNonTriviaToken === 64 &&
-                        token === 24) {
+                    else if (lastNonTriviaToken === 64 && token === 24) {
                         angleBracketStack++;
                     }
                     else if (token === 25 && angleBracketStack > 0) {
                         angleBracketStack--;
                     }
-                    else if (token === 111 ||
-                        token === 120 ||
-                        token === 118 ||
-                        token === 112 ||
-                        token === 121) {
+                    else if (token === 111 || token === 120 || token === 118 || token === 112 || token === 121) {
                         if (angleBracketStack > 0 && !syntacticClassifierAbsent) {
                             token = 64;
                         }
@@ -30948,9 +35858,7 @@ var ts;
                             }
                             if (numBackslashes & 1) {
                                 var quoteChar = tokenText.charCodeAt(0);
-                                result.finalLexState = quoteChar === 34
-                                    ? 3
-                                    : 2;
+                                result.finalLexState = quoteChar === 34 ? 3 : 2;
                             }
                         }
                     }
@@ -30982,7 +35890,10 @@ var ts;
                     if (result.entries.length === 0) {
                         length -= offset;
                     }
-                    result.entries.push({ length: length, classification: classification });
+                    result.entries.push({
+                        length: length,
+                        classification: classification
+                    });
                 }
             }
         }
@@ -31077,7 +35988,9 @@ var ts;
                     return 5;
             }
         }
-        return { getClassificationsForLine: getClassificationsForLine };
+        return {
+            getClassificationsForLine: getClassificationsForLine
+        };
     }
     ts.createClassifier = createClassifier;
     function getDefaultLibFilePath(options) {
@@ -31092,7 +36005,7 @@ var ts;
             getNodeConstructor: function (kind) {
                 function Node() {
                 }
-                var proto = kind === 220 ? new SourceFileObject() : new NodeObject();
+                var proto = kind === 221 ? new SourceFileObject() : new NodeObject();
                 proto.kind = kind;
                 proto.pos = 0;
                 proto.end = 0;
@@ -31101,9 +36014,15 @@ var ts;
                 Node.prototype = proto;
                 return Node;
             },
-            getSymbolConstructor: function () { return SymbolObject; },
-            getTypeConstructor: function () { return TypeObject; },
-            getSignatureConstructor: function () { return SignatureObject; }
+            getSymbolConstructor: function () {
+                return SymbolObject;
+            },
+            getTypeConstructor: function () {
+                return TypeObject;
+            },
+            getSignatureConstructor: function () {
+                return SignatureObject;
+            }
         };
     }
     initializeServices();
@@ -31183,7 +36102,7 @@ var ts;
                             }
                         case 201:
                             return spanInBlock(node);
-                        case 216:
+                        case 217:
                             return spanInBlock(node.block);
                         case 177:
                             return textSpan(node.expression);
@@ -31209,20 +36128,20 @@ var ts;
                             return textSpan(node, ts.findNextToken(node.expression, node));
                         case 188:
                             return textSpan(node, ts.findNextToken(node.expression, node));
-                        case 213:
                         case 214:
+                        case 215:
                             return spanInNode(node.statements[0]);
                         case 191:
                             return spanInBlock(node.tryBlock);
                         case 190:
                             return textSpan(node, node.expression);
-                        case 208:
-                            return textSpan(node, node.expression);
-                        case 202:
-                            return textSpan(node, node.moduleReference);
-                        case 203:
-                            return textSpan(node, node.moduleSpecifier);
                         case 209:
+                            return textSpan(node, node.expression);
+                        case 203:
+                            return textSpan(node, node.moduleReference);
+                        case 204:
+                            return textSpan(node, node.moduleSpecifier);
+                        case 210:
                             return textSpan(node, node.moduleSpecifier);
                         case 200:
                             if (ts.getModuleInstanceState(node) !== 1) {
@@ -31230,7 +36149,7 @@ var ts;
                             }
                         case 196:
                         case 199:
-                        case 219:
+                        case 220:
                         case 155:
                         case 156:
                             return textSpan(node);
@@ -31264,7 +36183,7 @@ var ts;
                         case 80:
                             return spanInNextNode(node);
                         default:
-                            if (node.parent.kind === 217 && node.parent.name === node) {
+                            if (node.parent.kind === 218 && node.parent.name === node) {
                                 return spanInNode(node.parent.initializer);
                             }
                             if (node.parent.kind === 158 && node.parent.type === node) {
@@ -31277,17 +36196,12 @@ var ts;
                     }
                 }
                 function spanInVariableDeclaration(variableDeclaration) {
-                    if (variableDeclaration.parent.parent.kind === 182 ||
-                        variableDeclaration.parent.parent.kind === 183) {
+                    if (variableDeclaration.parent.parent.kind === 182 || variableDeclaration.parent.parent.kind === 183) {
                         return spanInNode(variableDeclaration.parent.parent);
                     }
                     var isParentVariableStatement = variableDeclaration.parent.parent.kind === 175;
                     var isDeclarationOfForStatement = variableDeclaration.parent.parent.kind === 181 && ts.contains(variableDeclaration.parent.parent.initializer.declarations, variableDeclaration);
-                    var declarations = isParentVariableStatement
-                        ? variableDeclaration.parent.parent.declarationList.declarations
-                        : isDeclarationOfForStatement
-                            ? variableDeclaration.parent.parent.initializer.declarations
-                            : undefined;
+                    var declarations = isParentVariableStatement ? variableDeclaration.parent.parent.declarationList.declarations : isDeclarationOfForStatement ? variableDeclaration.parent.parent.initializer.declarations : undefined;
                     if (variableDeclaration.initializer || (variableDeclaration.flags & 1)) {
                         if (declarations && declarations[0] === variableDeclaration) {
                             if (isParentVariableStatement) {
@@ -31308,8 +36222,7 @@ var ts;
                     }
                 }
                 function canHaveSpanInParameterDeclaration(parameter) {
-                    return !!parameter.initializer || parameter.dotDotDotToken !== undefined ||
-                        !!(parameter.flags & 16) || !!(parameter.flags & 32);
+                    return !!parameter.initializer || parameter.dotDotDotToken !== undefined || !!(parameter.flags & 16) || !!(parameter.flags & 32);
                 }
                 function spanInParameterDeclaration(parameter) {
                     if (canHaveSpanInParameterDeclaration(parameter)) {
@@ -31327,8 +36240,7 @@ var ts;
                     }
                 }
                 function canFunctionHaveSpanInWholeDeclaration(functionDeclaration) {
-                    return !!(functionDeclaration.flags & 1) ||
-                        (functionDeclaration.parent.kind === 196 && functionDeclaration.kind !== 133);
+                    return !!(functionDeclaration.flags & 1) || (functionDeclaration.parent.kind === 196 && functionDeclaration.kind !== 133);
                 }
                 function spanInFunctionDeclaration(functionDeclaration) {
                     if (!functionDeclaration.body) {
@@ -31389,8 +36301,8 @@ var ts;
                         case 196:
                             var classDeclaration = node.parent;
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), classDeclaration.members.length ? classDeclaration.members[0] : classDeclaration.getLastToken(sourceFile));
-                        case 188:
-                            return spanInNodeIfStartsOnSameLine(node.parent, node.parent.clauses[0]);
+                        case 202:
+                            return spanInNodeIfStartsOnSameLine(node.parent.parent, node.parent.clauses[0]);
                     }
                     return spanInNode(node.parent);
                 }
@@ -31407,12 +36319,12 @@ var ts;
                             if (ts.isFunctionBlock(node.parent)) {
                                 return textSpan(node);
                             }
-                        case 216:
+                        case 217:
                             return spanInNode(node.parent.statements[node.parent.statements.length - 1]);
                             ;
-                        case 188:
-                            var switchStatement = node.parent;
-                            var lastClause = switchStatement.clauses[switchStatement.clauses.length - 1];
+                        case 202:
+                            var caseBlock = node.parent;
+                            var lastClause = caseBlock.clauses[caseBlock.clauses.length - 1];
                             if (lastClause) {
                                 return spanInNode(lastClause.statements[lastClause.statements.length - 1]);
                             }
@@ -31447,7 +36359,7 @@ var ts;
                     return spanInNode(node.parent);
                 }
                 function spanInColonToken(node) {
-                    if (ts.isFunctionLike(node.parent) || node.parent.kind === 217) {
+                    if (ts.isFunctionLike(node.parent) || node.parent.kind === 218) {
                         return spanInPreviousNode(node);
                     }
                     return spanInNode(node.parent);
@@ -31580,15 +36492,21 @@ var ts;
     function forwardJSONCall(logger, actionDescription, action) {
         try {
             var result = simpleForwardCall(logger, actionDescription, action);
-            return JSON.stringify({ result: result });
+            return JSON.stringify({
+                result: result
+            });
         }
         catch (err) {
             if (err instanceof ts.OperationCanceledException) {
-                return JSON.stringify({ canceled: true });
+                return JSON.stringify({
+                    canceled: true
+                });
             }
             logInternalError(logger, err);
             err.description = actionDescription;
-            return JSON.stringify({ error: err });
+            return JSON.stringify({
+                error: err
+            });
         }
     }
     var ShimBase = (function () {
@@ -31638,7 +36556,9 @@ var ts;
         LanguageServiceShimObject.prototype.realizeDiagnostics = function (diagnostics) {
             var _this = this;
             var newLine = this.getNewLine();
-            return diagnostics.map(function (d) { return _this.realizeDiagnostic(d, newLine); });
+            return diagnostics.map(function (d) {
+                return _this.realizeDiagnostic(d, newLine);
+            });
         };
         LanguageServiceShimObject.prototype.realizeDiagnostic = function (diagnostic, newLine) {
             return {
diff --git a/bin/typescriptServices_internal.d.ts b/bin/typescriptServices_internal.d.ts
index 2cd2257c3e1..a899c1e240b 100644
--- a/bin/typescriptServices_internal.d.ts
+++ b/bin/typescriptServices_internal.d.ts
@@ -171,6 +171,7 @@ declare module ts {
     function unescapeIdentifier(identifier: string): string;
     function makeIdentifierFromModuleName(moduleName: string): string;
     function isBlockOrCatchScoped(declaration: Declaration): boolean;
+    function getEnclosingBlockScopeContainer(node: Node): Node;
     function isCatchClauseVariableDeclaration(declaration: Declaration): boolean;
     function declarationNameToString(name: DeclarationName): string;
     function createDiagnosticForNode(node: Node, message: DiagnosticMessage, arg0?: any, arg1?: any, arg2?: any): Diagnostic;
@@ -270,7 +271,6 @@ declare module ts {
     function nodeIsSynthesized(node: Node): boolean;
     function createSynthesizedNode(kind: SyntaxKind, startsOnNewLine?: boolean): Node;
     function generateUniqueName(baseName: string, isExistingName: (name: string) => boolean): string;
-    function createDiagnosticCollection(): DiagnosticCollection;
     /**
      * Based heavily on the abstract 'Quote'/'QuoteJSONString' operation from ECMA-262 (24.3.2.2),
      * but augmented for a few select characters (e.g. lineSeparator, paragraphSeparator, nextLine)
diff --git a/bin/typescript_internal.d.ts b/bin/typescript_internal.d.ts
index e2e18df5726..d01fe853505 100644
--- a/bin/typescript_internal.d.ts
+++ b/bin/typescript_internal.d.ts
@@ -171,6 +171,7 @@ declare module "typescript" {
     function unescapeIdentifier(identifier: string): string;
     function makeIdentifierFromModuleName(moduleName: string): string;
     function isBlockOrCatchScoped(declaration: Declaration): boolean;
+    function getEnclosingBlockScopeContainer(node: Node): Node;
     function isCatchClauseVariableDeclaration(declaration: Declaration): boolean;
     function declarationNameToString(name: DeclarationName): string;
     function createDiagnosticForNode(node: Node, message: DiagnosticMessage, arg0?: any, arg1?: any, arg2?: any): Diagnostic;
@@ -270,7 +271,6 @@ declare module "typescript" {
     function nodeIsSynthesized(node: Node): boolean;
     function createSynthesizedNode(kind: SyntaxKind, startsOnNewLine?: boolean): Node;
     function generateUniqueName(baseName: string, isExistingName: (name: string) => boolean): string;
-    function createDiagnosticCollection(): DiagnosticCollection;
     /**
      * Based heavily on the abstract 'Quote'/'QuoteJSONString' operation from ECMA-262 (24.3.2.2),
      * but augmented for a few select characters (e.g. lineSeparator, paragraphSeparator, nextLine)
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index 2e17d8bf3a1..d0d6005d979 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -1,7 +1,7 @@
 /// <reference path="parser.ts"/>
 
 module ts {
-    /* @internal */ export var bindTime = 0;
+    /* @internal */ export let bindTime = 0;
 
     export const enum ModuleInstanceState {
         NonInstantiated = 0,
@@ -25,7 +25,7 @@ module ts {
         }
         // 4. other uninstantiated module declarations.
         else if (node.kind === SyntaxKind.ModuleBlock) {
-            var state = ModuleInstanceState.NonInstantiated;
+            let state = ModuleInstanceState.NonInstantiated;
             forEachChild(node, n => {
                 switch (getModuleInstanceState(n)) {
                     case ModuleInstanceState.NonInstantiated:
@@ -52,18 +52,18 @@ module ts {
     }
 
     export function bindSourceFile(file: SourceFile): void {
-        var start = new Date().getTime();
+        let start = new Date().getTime();
         bindSourceFileWorker(file);
         bindTime += new Date().getTime() - start;
     }
 
     function bindSourceFileWorker(file: SourceFile): void {
         var parent: Node;
-        var container: Node;
-        var blockScopeContainer: Node;
-        var lastContainer: Node;
-        var symbolCount = 0;
-        var Symbol = objectAllocator.getSymbolConstructor();
+        let container: Node;
+        let blockScopeContainer: Node;
+        let lastContainer: Node;
+        let symbolCount = 0;
+        let Symbol = objectAllocator.getSymbolConstructor();
 
         if (!file.locals) {
             file.locals = {};
@@ -103,7 +103,7 @@ module ts {
                     return '"' + (<LiteralExpression>node.name).text + '"';
                 }
                 if (node.name.kind === SyntaxKind.ComputedPropertyName) {
-                    var nameExpression = (<ComputedPropertyName>node.name).expression;
+                    let nameExpression = (<ComputedPropertyName>node.name).expression;
                     Debug.assert(isWellKnownSymbolSyntactically(nameExpression));
                     return getPropertyNameForKnownSymbolName((<PropertyAccessExpression>nameExpression).name.text);
                 }
@@ -138,10 +138,11 @@ module ts {
             Debug.assert(!hasDynamicName(node));
 
             // The exported symbol for an export default function/class node is always named "default"
-            var name = node.flags & NodeFlags.Default && parent ? "default" : getDeclarationName(node);
+            let name = node.flags & NodeFlags.Default && parent ? "default" : getDeclarationName(node);
 
+            let symbol: Symbol;
             if (name !== undefined) {
-                var symbol = hasProperty(symbols, name) ? symbols[name] : (symbols[name] = createSymbol(0, name));
+                symbol = hasProperty(symbols, name) ? symbols[name] : (symbols[name] = createSymbol(0, name));
                 if (symbol.flags & excludes) {
                     if (node.name) {
                         node.name.parent = node;
@@ -149,7 +150,7 @@ module ts {
 
                     // Report errors every position with duplicate declaration
                     // Report errors on previous encountered declarations
-                    var message = symbol.flags & SymbolFlags.BlockScopedVariable
+                    let message = symbol.flags & SymbolFlags.BlockScopedVariable
                         ? Diagnostics.Cannot_redeclare_block_scoped_variable_0 
                         : Diagnostics.Duplicate_identifier_0;
 
@@ -172,7 +173,7 @@ module ts {
                 // Every class automatically contains a static property member named 'prototype', 
                 // the type of which is an instantiation of the class type with type Any supplied as a type argument for each type parameter.
                 // It is an error to explicitly declare a static property member with the name 'prototype'.
-                var prototypeSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Prototype, "prototype");
+                let prototypeSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Prototype, "prototype");
                 if (hasProperty(symbol.exports, prototypeSymbol.name)) {
                     if (node.name) {
                         node.name.parent = node;
@@ -196,7 +197,7 @@ module ts {
         }
 
         function declareModuleMember(node: Declaration, symbolKind: SymbolFlags, symbolExcludes: SymbolFlags) {
-            var hasExportModifier = getCombinedNodeFlags(node) & NodeFlags.Export;
+            let hasExportModifier = getCombinedNodeFlags(node) & NodeFlags.Export;
             if (symbolKind & SymbolFlags.Alias) {
                 if (node.kind === SyntaxKind.ExportSpecifier || (node.kind === SyntaxKind.ImportEqualsDeclaration && hasExportModifier)) {
                     declareSymbol(container.symbol.exports, container.symbol, node, symbolKind, symbolExcludes);
@@ -218,10 +219,10 @@ module ts {
                 //      but return the export symbol (by calling getExportSymbolOfValueSymbolIfExported). That way
                 //      when the emitter comes back to it, it knows not to qualify the name if it was found in a containing scope.
                 if (hasExportModifier || isAmbientContext(container)) {
-                    var exportKind = (symbolKind & SymbolFlags.Value ? SymbolFlags.ExportValue : 0) |
+                    let exportKind = (symbolKind & SymbolFlags.Value ? SymbolFlags.ExportValue : 0) |
                         (symbolKind & SymbolFlags.Type ? SymbolFlags.ExportType : 0) |
                         (symbolKind & SymbolFlags.Namespace ? SymbolFlags.ExportNamespace : 0);
-                    var local = declareSymbol(container.locals, undefined, node, exportKind, symbolExcludes);
+                    let local = declareSymbol(container.locals, undefined, node, exportKind, symbolExcludes);
                     local.exportSymbol = declareSymbol(container.symbol.exports, container.symbol, node, symbolKind, symbolExcludes);
                     node.localSymbol = local;
                 }
@@ -238,9 +239,9 @@ module ts {
                 node.locals = {};
             }
 
-            var saveParent = parent;
-            var saveContainer = container;
-            var savedBlockScopeContainer = blockScopeContainer;
+            let saveParent = parent;
+            let saveContainer = container;
+            let savedBlockScopeContainer = blockScopeContainer;
             parent = node;
             if (symbolKind & SymbolFlags.IsContainer) {
                 container = node;
@@ -315,7 +316,7 @@ module ts {
                 bindDeclaration(node, SymbolFlags.ValueModule, SymbolFlags.ValueModuleExcludes, /*isBlockScopeContainer*/ true);
             }
             else {
-                var state = getModuleInstanceState(node);
+                let state = getModuleInstanceState(node);
                 if (state === ModuleInstanceState.NonInstantiated) {
                     bindDeclaration(node, SymbolFlags.NamespaceModule, SymbolFlags.NamespaceModuleExcludes, /*isBlockScopeContainer*/ true);
                 }
@@ -341,18 +342,18 @@ module ts {
             // symbol as its sole member. To the rest of the system, this symbol will be  indistinguishable 
             // from an actual type literal symbol you would have gotten had you used the long form.
 
-            var symbol = createSymbol(SymbolFlags.Signature, getDeclarationName(node));
+            let symbol = createSymbol(SymbolFlags.Signature, getDeclarationName(node));
             addDeclarationToSymbol(symbol, node, SymbolFlags.Signature);
             bindChildren(node, SymbolFlags.Signature, /*isBlockScopeContainer:*/ false);
 
-            var typeLiteralSymbol = createSymbol(SymbolFlags.TypeLiteral, "__type");
+            let typeLiteralSymbol = createSymbol(SymbolFlags.TypeLiteral, "__type");
             addDeclarationToSymbol(typeLiteralSymbol, node, SymbolFlags.TypeLiteral);
             typeLiteralSymbol.members = {};
             typeLiteralSymbol.members[node.kind === SyntaxKind.FunctionType ? "__call" : "__new"] = symbol
         }
 
         function bindAnonymousDeclaration(node: Declaration, symbolKind: SymbolFlags, name: string, isBlockScopeContainer: boolean) {
-            var symbol = createSymbol(symbolKind, name);
+            let symbol = createSymbol(symbolKind, name);
             addDeclarationToSymbol(symbol, node, symbolKind);
             bindChildren(node, symbolKind, isBlockScopeContainer);
         }
@@ -525,20 +526,20 @@ module ts {
                     // Otherwise this won't be considered as redeclaration of a block scoped local:
                     // function foo() {
                     //  let x;
-                    //  var x;
+                    //  let x;
                     // }
-                    // 'var x' will be placed into the function locals and 'let x' - into the locals of the block
+                    // 'let x' will be placed into the function locals and 'let x' - into the locals of the block
                     bindChildren(node, 0, /*isBlockScopeContainer*/ !isFunctionLike(node.parent));
                     break;
                 case SyntaxKind.CatchClause:
                 case SyntaxKind.ForStatement:
                 case SyntaxKind.ForInStatement:
                 case SyntaxKind.ForOfStatement:
-                case SyntaxKind.SwitchStatement:
+                case SyntaxKind.CaseBlock:
                     bindChildren(node, 0, /*isBlockScopeContainer*/ true);
                     break;
                 default:
-                    var saveParent = parent;
+                    let saveParent = parent;
                     parent = node;
                     forEachChild(node, bind);
                     parent = saveParent;
@@ -559,7 +560,7 @@ module ts {
                 node.parent.kind === SyntaxKind.Constructor &&
                 node.parent.parent.kind === SyntaxKind.ClassDeclaration) {
 
-                var classDeclaration = <ClassDeclaration>node.parent.parent;
+                let classDeclaration = <ClassDeclaration>node.parent.parent;
                 declareSymbol(classDeclaration.symbol.members, classDeclaration.symbol, node, SymbolFlags.Property, SymbolFlags.PropertyExcludes);
             }
         }
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 8908501593c..97611288ba8 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -1,28 +1,28 @@
 /// <reference path="binder.ts"/>
 
 module ts {
-    var nextSymbolId = 1;
-    var nextNodeId = 1;
-    var nextMergeId = 1;
+    let nextSymbolId = 1;
+    let nextNodeId = 1;
+    let nextMergeId = 1;
 
-    /* @internal */ export var checkTime = 0;
+    /* @internal */ export let checkTime = 0;
 
     export function createTypeChecker(host: TypeCheckerHost, produceDiagnostics: boolean): TypeChecker {
-        var Symbol = objectAllocator.getSymbolConstructor();
-        var Type = objectAllocator.getTypeConstructor();
-        var Signature = objectAllocator.getSignatureConstructor();
+        let Symbol = objectAllocator.getSymbolConstructor();
+        let Type = objectAllocator.getTypeConstructor();
+        let Signature = objectAllocator.getSignatureConstructor();
 
-        var typeCount = 0;
+        let typeCount = 0;
 
-        var emptyArray: any[] = [];
-        var emptySymbols: SymbolTable = {};
+        let emptyArray: any[] = [];
+        let emptySymbols: SymbolTable = {};
 
-        var compilerOptions = host.getCompilerOptions();
-        var languageVersion = compilerOptions.target || ScriptTarget.ES3;
+        let compilerOptions = host.getCompilerOptions();
+        let languageVersion = compilerOptions.target || ScriptTarget.ES3;
 
-        var emitResolver = createResolver();
+        let emitResolver = createResolver();
 
-        var checker: TypeChecker = {
+        let checker: TypeChecker = {
             getNodeCount: () => sum(host.getSourceFiles(), "nodeCount"),
             getIdentifierCount: () => sum(host.getSourceFiles(), "identifierCount"),
             getSymbolCount: () => sum(host.getSourceFiles(), "symbolCount"),
@@ -61,59 +61,59 @@ module ts {
 
         var undefinedSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "undefined");
         var argumentsSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "arguments");
-        var unknownSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "unknown");
-        var resolvingSymbol = createSymbol(SymbolFlags.Transient, "__resolving__");
+        let unknownSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "unknown");
+        let resolvingSymbol = createSymbol(SymbolFlags.Transient, "__resolving__");
 
-        var anyType = createIntrinsicType(TypeFlags.Any, "any");
-        var stringType = createIntrinsicType(TypeFlags.String, "string");
-        var numberType = createIntrinsicType(TypeFlags.Number, "number");
-        var booleanType = createIntrinsicType(TypeFlags.Boolean, "boolean");
-        var esSymbolType = createIntrinsicType(TypeFlags.ESSymbol, "symbol");
-        var voidType = createIntrinsicType(TypeFlags.Void, "void");
-        var undefinedType = createIntrinsicType(TypeFlags.Undefined | TypeFlags.ContainsUndefinedOrNull, "undefined");
-        var nullType = createIntrinsicType(TypeFlags.Null | TypeFlags.ContainsUndefinedOrNull, "null");
-        var unknownType = createIntrinsicType(TypeFlags.Any, "unknown");
-        var resolvingType = createIntrinsicType(TypeFlags.Any, "__resolving__");
+        let anyType = createIntrinsicType(TypeFlags.Any, "any");
+        let stringType = createIntrinsicType(TypeFlags.String, "string");
+        let numberType = createIntrinsicType(TypeFlags.Number, "number");
+        let booleanType = createIntrinsicType(TypeFlags.Boolean, "boolean");
+        let esSymbolType = createIntrinsicType(TypeFlags.ESSymbol, "symbol");
+        let voidType = createIntrinsicType(TypeFlags.Void, "void");
+        let undefinedType = createIntrinsicType(TypeFlags.Undefined | TypeFlags.ContainsUndefinedOrNull, "undefined");
+        let nullType = createIntrinsicType(TypeFlags.Null | TypeFlags.ContainsUndefinedOrNull, "null");
+        let unknownType = createIntrinsicType(TypeFlags.Any, "unknown");
+        let resolvingType = createIntrinsicType(TypeFlags.Any, "__resolving__");
 
-        var emptyObjectType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
-        var anyFunctionType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
-        var noConstraintType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
-        var inferenceFailureType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
+        let emptyObjectType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
+        let anyFunctionType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
+        let noConstraintType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
+        let inferenceFailureType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
 
-        var anySignature = createSignature(undefined, undefined, emptyArray, anyType, 0, false, false);
-        var unknownSignature = createSignature(undefined, undefined, emptyArray, unknownType, 0, false, false);
+        let anySignature = createSignature(undefined, undefined, emptyArray, anyType, 0, false, false);
+        let unknownSignature = createSignature(undefined, undefined, emptyArray, unknownType, 0, false, false);
 
-        var globals: SymbolTable = {};
+        let globals: SymbolTable = {};
 
-        var globalArraySymbol: Symbol;
-        var globalESSymbolConstructorSymbol: Symbol;
+        let globalArraySymbol: Symbol;
+        let globalESSymbolConstructorSymbol: Symbol;
 
-        var globalObjectType: ObjectType;
-        var globalFunctionType: ObjectType;
-        var globalArrayType: ObjectType;
-        var globalStringType: ObjectType;
-        var globalNumberType: ObjectType;
-        var globalBooleanType: ObjectType;
-        var globalRegExpType: ObjectType;
-        var globalTemplateStringsArrayType: ObjectType;
-        var globalESSymbolType: ObjectType;
-        var globalIterableType: ObjectType;
+        let globalObjectType: ObjectType;
+        let globalFunctionType: ObjectType;
+        let globalArrayType: ObjectType;
+        let globalStringType: ObjectType;
+        let globalNumberType: ObjectType;
+        let globalBooleanType: ObjectType;
+        let globalRegExpType: ObjectType;
+        let globalTemplateStringsArrayType: ObjectType;
+        let globalESSymbolType: ObjectType;
+        let globalIterableType: ObjectType;
 
-        var anyArrayType: Type;
+        let anyArrayType: Type;
 
-        var tupleTypes: Map<TupleType> = {};
-        var unionTypes: Map<UnionType> = {};
-        var stringLiteralTypes: Map<StringLiteralType> = {};
-        var emitExtends = false;
+        let tupleTypes: Map<TupleType> = {};
+        let unionTypes: Map<UnionType> = {};
+        let stringLiteralTypes: Map<StringLiteralType> = {};
+        let emitExtends = false;
 
-        var mergedSymbols: Symbol[] = [];
-        var symbolLinks: SymbolLinks[] = [];
-        var nodeLinks: NodeLinks[] = [];
-        var potentialThisCollisions: Node[] = [];
+        let mergedSymbols: Symbol[] = [];
+        let symbolLinks: SymbolLinks[] = [];
+        let nodeLinks: NodeLinks[] = [];
+        let potentialThisCollisions: Node[] = [];
 
-        var diagnostics = createDiagnosticCollection();
+        let diagnostics = createDiagnosticCollection();
 
-        var primitiveTypeInfo: Map<{ type: Type; flags: TypeFlags }> = {
+        let primitiveTypeInfo: Map<{ type: Type; flags: TypeFlags }> = {
             "string": {
                 type: stringType,
                 flags: TypeFlags.StringLike
@@ -140,7 +140,7 @@ module ts {
         }
 
         function error(location: Node, message: DiagnosticMessage, arg0?: any, arg1?: any, arg2?: any): void {
-            var diagnostic = location
+            let diagnostic = location
                 ? createDiagnosticForNode(location, message, arg0, arg1, arg2)
                 : createCompilerDiagnostic(message, arg0, arg1, arg2);
             diagnostics.add(diagnostic);
@@ -151,7 +151,7 @@ module ts {
         }
 
         function getExcludedSymbolFlags(flags: SymbolFlags): SymbolFlags {
-            var result: SymbolFlags = 0;
+            let result: SymbolFlags = 0;
             if (flags & SymbolFlags.BlockScopedVariable) result |= SymbolFlags.BlockScopedVariableExcludes;
             if (flags & SymbolFlags.FunctionScopedVariable) result |= SymbolFlags.FunctionScopedVariableExcludes;
             if (flags & SymbolFlags.Property) result |= SymbolFlags.PropertyExcludes;
@@ -177,7 +177,7 @@ module ts {
         }
 
         function cloneSymbol(symbol: Symbol): Symbol {
-            var result = createSymbol(symbol.flags | SymbolFlags.Merged, symbol.name);
+            let result = createSymbol(symbol.flags | SymbolFlags.Merged, symbol.name);
             result.declarations = symbol.declarations.slice(0);
             result.parent = symbol.parent;
             if (symbol.valueDeclaration) result.valueDeclaration = symbol.valueDeclaration;
@@ -210,7 +210,7 @@ module ts {
                 recordMergedSymbol(target, source);
             }
             else {
-                var message = target.flags & SymbolFlags.BlockScopedVariable || source.flags & SymbolFlags.BlockScopedVariable
+                let message = target.flags & SymbolFlags.BlockScopedVariable || source.flags & SymbolFlags.BlockScopedVariable
                     ? Diagnostics.Cannot_redeclare_block_scoped_variable_0 : Diagnostics.Duplicate_identifier_0;
                 forEach(source.declarations, node => {
                     error(node.name ? node.name : node, message, symbolToString(source));
@@ -222,8 +222,8 @@ module ts {
         }
 
         function cloneSymbolTable(symbolTable: SymbolTable): SymbolTable {
-            var result: SymbolTable = {};
-            for (var id in symbolTable) {
+            let result: SymbolTable = {};
+            for (let id in symbolTable) {
                 if (hasProperty(symbolTable, id)) {
                     result[id] = symbolTable[id];
                 }
@@ -232,13 +232,13 @@ module ts {
         }
 
         function mergeSymbolTable(target: SymbolTable, source: SymbolTable) {
-            for (var id in source) {
+            for (let id in source) {
                 if (hasProperty(source, id)) {
                     if (!hasProperty(target, id)) {
                         target[id] = source[id];
                     }
                     else {
-                        var symbol = target[id];
+                        let symbol = target[id];
                         if (!(symbol.flags & SymbolFlags.Merged)) {
                             target[id] = symbol = cloneSymbol(symbol);
                         }
@@ -269,14 +269,14 @@ module ts {
 
         function getSymbol(symbols: SymbolTable, name: string, meaning: SymbolFlags): Symbol {
             if (meaning && hasProperty(symbols, name)) {
-                var symbol = symbols[name];
+                let symbol = symbols[name];
                 Debug.assert((symbol.flags & SymbolFlags.Instantiated) === 0, "Should never get an instantiated symbol here.");
                 if (symbol.flags & meaning) {
                     return symbol;
                 }
 
                 if (symbol.flags & SymbolFlags.Alias) {
-                    var target = resolveAlias(symbol);
+                    let target = resolveAlias(symbol);
                     // Unknown symbol means an error occurred in alias resolution, treat it as positive answer to avoid cascading errors
                     if (target === unknownSymbol || target.flags & meaning) {
                         return symbol;
@@ -289,8 +289,8 @@ module ts {
 
         /** Returns true if node1 is defined before node 2**/
         function isDefinedBefore(node1: Node, node2: Node): boolean {
-            var file1 = getSourceFileOfNode(node1);
-            var file2 = getSourceFileOfNode(node2);
+            let file1 = getSourceFileOfNode(node1);
+            let file2 = getSourceFileOfNode(node2);
             if (file1 === file2) {
                 return node1.pos <= node2.pos;
             }
@@ -299,7 +299,7 @@ module ts {
                 return true;
             }
 
-            var sourceFiles = host.getSourceFiles();
+            let sourceFiles = host.getSourceFiles();
             return sourceFiles.indexOf(file1) <= sourceFiles.indexOf(file2);
         }
 
@@ -307,10 +307,10 @@ module ts {
         // the nameNotFoundMessage argument is not undefined. Returns the resolved symbol, or undefined if no symbol with
         // the given name can be found.
         function resolveName(location: Node, name: string, meaning: SymbolFlags, nameNotFoundMessage: DiagnosticMessage, nameArg: string | Identifier): Symbol {
-            var result: Symbol;
-            var lastLocation: Node;
-            var propertyWithInvalidInitializer: Node;
-            var errorLocation = location;
+            let result: Symbol;
+            let lastLocation: Node;
+            let propertyWithInvalidInitializer: Node;
+            let errorLocation = location;
 
             loop: while (location) {
                 // Locals of a source file are not in scope (because they get merged into the global symbol table)
@@ -338,13 +338,13 @@ module ts {
                     case SyntaxKind.PropertyDeclaration:
                     case SyntaxKind.PropertySignature:
                         // TypeScript 1.0 spec (April 2014): 8.4.1
-                        // Initializer expressions for instance member variables are evaluated in the scope 
-                        // of the class constructor body but are not permitted to reference parameters or 
-                        // local variables of the constructor. This effectively means that entities from outer scopes 
-                        // by the same name as a constructor parameter or local variable are inaccessible 
+                        // Initializer expressions for instance member variables are evaluated in the scope
+                        // of the class constructor body but are not permitted to reference parameters or
+                        // local variables of the constructor. This effectively means that entities from outer scopes
+                        // by the same name as a constructor parameter or local variable are inaccessible
                         // in initializer expressions for instance member variables.
                         if (location.parent.kind === SyntaxKind.ClassDeclaration && !(location.flags & NodeFlags.Static)) {
-                            var ctor = findConstructorDeclaration(<ClassDeclaration>location.parent);
+                            let ctor = findConstructorDeclaration(<ClassDeclaration>location.parent);
                             if (ctor && ctor.locals) {
                                 if (getSymbol(ctor.locals, name, meaning & SymbolFlags.Value)) {
                                     // Remember the property node, it will be used later to report appropriate error
@@ -376,7 +376,7 @@ module ts {
                     //   }
                     //
                     case SyntaxKind.ComputedPropertyName:
-                        var grandparent = location.parent.parent;
+                        let 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)) {
@@ -402,7 +402,7 @@ module ts {
                             result = argumentsSymbol;
                             break loop;
                         }
-                        var id = (<FunctionExpression>location).name;
+                        let id = (<FunctionExpression>location).name;
                         if (id && name === id.text) {
                             result = location.symbol;
                             break loop;
@@ -429,24 +429,73 @@ module ts {
                 if (propertyWithInvalidInitializer) {
                     // We have a match, but the reference occurred within a property initializer and the identifier also binds
                     // to a local variable in the constructor where the code will be emitted.
-                    var propertyName = (<PropertyDeclaration>propertyWithInvalidInitializer).name;
+                    let propertyName = (<PropertyDeclaration>propertyWithInvalidInitializer).name;
                     error(errorLocation, Diagnostics.Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor,
                         declarationNameToString(propertyName), typeof nameArg === "string" ? nameArg : declarationNameToString(nameArg));
                     return undefined;
                 }
                 if (result.flags & SymbolFlags.BlockScopedVariable) {
-                    // Block-scoped variables cannot be used before their definition
-                    var declaration = forEach(result.declarations, d => isBlockOrCatchScoped(d) ? d : undefined);
-
-                    Debug.assert(declaration !== undefined, "Block-scoped variable declaration is undefined");
-                    if (!isDefinedBefore(declaration, errorLocation)) {
-                        error(errorLocation, Diagnostics.Block_scoped_variable_0_used_before_its_declaration, declarationNameToString(declaration.name));
-                    }
+                    checkResolvedBlockScopedVariable(result, errorLocation);
                 }
             }
             return result;
         }
 
+        function checkResolvedBlockScopedVariable(result: Symbol, errorLocation: Node): void {
+            Debug.assert((result.flags & SymbolFlags.BlockScopedVariable) !== 0)
+            // Block-scoped variables cannot be used before their definition
+            let declaration = forEach(result.declarations, d => isBlockOrCatchScoped(d) ? d : undefined);
+
+            Debug.assert(declaration !== undefined, "Block-scoped variable declaration is undefined");
+                    
+            // first check if usage is lexically located after the declaration
+            let isUsedBeforeDeclaration = !isDefinedBefore(declaration, errorLocation);
+            if (!isUsedBeforeDeclaration) {
+                // lexical check succeeded however code still can be illegal.
+                // - block scoped variables cannot be used in its initializers
+                //   let x = x; // illegal but usage is lexically after definition
+                // - in ForIn/ForOf statements variable cannot be contained in expression part
+                //   for (let x in x)
+                //   for (let x of x)
+
+                // climb up to the variable declaration skipping binding patterns
+                let variableDeclaration = <VariableDeclaration>getAncestor(declaration, SyntaxKind.VariableDeclaration);
+                let container = getEnclosingBlockScopeContainer(variableDeclaration);
+
+                if (variableDeclaration.parent.parent.kind === SyntaxKind.VariableStatement ||
+                    variableDeclaration.parent.parent.kind === SyntaxKind.ForStatement) {
+                    // variable statement/for statement case, 
+                    // use site should not be inside variable declaration (initializer of declaration or binding element)
+                    isUsedBeforeDeclaration = isSameScopeDescendentOf(errorLocation, variableDeclaration, container);
+                }
+                else if (variableDeclaration.parent.parent.kind === SyntaxKind.ForOfStatement ||
+                    variableDeclaration.parent.parent.kind === SyntaxKind.ForInStatement) {
+                    // ForIn/ForOf case - use site should not be used in expression part
+                    let expression = (<ForInStatement | ForOfStatement>variableDeclaration.parent.parent).expression;
+                    isUsedBeforeDeclaration = isSameScopeDescendentOf(errorLocation, expression, container);
+                }
+            }
+            if (isUsedBeforeDeclaration) {
+                error(errorLocation, Diagnostics.Block_scoped_variable_0_used_before_its_declaration, declarationNameToString(declaration.name));
+            }
+        }
+
+        /* Starting from 'initial' node walk up the parent chain until 'stopAt' node is reached.
+         * If at any point current node is equal to 'parent' node - return true.
+         * Return false if 'stopAt' node is reached or isFunctionLike(current) === true.
+         */
+        function isSameScopeDescendentOf(initial: Node, parent: Node, stopAt: Node): boolean {
+            if (!parent) {
+                return false;
+            }
+            for (let current = initial; current && current !== stopAt && !isFunctionLike(current); current = current.parent) {
+                if (current === parent) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
         // An alias symbol is created by one of the following declarations:
         // import <symbol> = ...
         // import <symbol> from ...
@@ -469,17 +518,17 @@ module ts {
 
         function getTargetOfImportEqualsDeclaration(node: ImportEqualsDeclaration): Symbol {
             if (node.moduleReference.kind === SyntaxKind.ExternalModuleReference) {
-                var moduleSymbol = resolveExternalModuleName(node, getExternalModuleImportEqualsDeclarationExpression(node));
-                var exportAssignmentSymbol = moduleSymbol && getResolvedExportAssignmentSymbol(moduleSymbol);
+                let moduleSymbol = resolveExternalModuleName(node, getExternalModuleImportEqualsDeclarationExpression(node));
+                let exportAssignmentSymbol = moduleSymbol && getResolvedExportAssignmentSymbol(moduleSymbol);
                 return exportAssignmentSymbol || moduleSymbol;
             }
             return getSymbolOfPartOfRightHandSideOfImportEquals(<EntityName>node.moduleReference, node);
         }
 
         function getTargetOfImportClause(node: ImportClause): Symbol {
-            var moduleSymbol = resolveExternalModuleName(node, (<ImportDeclaration>node.parent).moduleSpecifier);
+            let moduleSymbol = resolveExternalModuleName(node, (<ImportDeclaration>node.parent).moduleSpecifier);
             if (moduleSymbol) {
-                var exportAssignmentSymbol = getResolvedExportAssignmentSymbol(moduleSymbol);
+                let exportAssignmentSymbol = getResolvedExportAssignmentSymbol(moduleSymbol);
                 if (!exportAssignmentSymbol) {
                     error(node.name, Diagnostics.External_module_0_has_no_default_export_or_export_assignment, symbolToString(moduleSymbol));
                 }
@@ -492,11 +541,11 @@ module ts {
         }
 
         function getExternalModuleMember(node: ImportDeclaration | ExportDeclaration, specifier: ImportOrExportSpecifier): Symbol {
-            var moduleSymbol = resolveExternalModuleName(node, node.moduleSpecifier);
+            let moduleSymbol = resolveExternalModuleName(node, node.moduleSpecifier);
             if (moduleSymbol) {
-                var name = specifier.propertyName || specifier.name;
+                let name = specifier.propertyName || specifier.name;
                 if (name.text) {
-                    var symbol = getSymbol(getExportsOfSymbol(moduleSymbol), name.text, SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace);
+                    let symbol = getSymbol(getExportsOfSymbol(moduleSymbol), name.text, SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace);
                     if (!symbol) {
                         error(name, Diagnostics.Module_0_has_no_exported_member_1, getFullyQualifiedName(moduleSymbol), declarationNameToString(name));
                         return;
@@ -539,11 +588,11 @@ module ts {
 
         function resolveAlias(symbol: Symbol): Symbol {
             Debug.assert((symbol.flags & SymbolFlags.Alias) !== 0, "Should only get Alias here.");
-            var links = getSymbolLinks(symbol);
+            let links = getSymbolLinks(symbol);
             if (!links.target) {
                 links.target = resolvingSymbol;
-                var node = getDeclarationOfAliasSymbol(symbol);
-                var target = getTargetOfImportDeclaration(node);
+                let node = getDeclarationOfAliasSymbol(symbol);
+                let target = getTargetOfImportDeclaration(node);
                 if (links.target === resolvingSymbol) {
                     links.target = target || unknownSymbol;
                 }
@@ -558,8 +607,8 @@ module ts {
         }
 
         function markExportAsReferenced(node: ImportEqualsDeclaration | ExportAssignment | ExportSpecifier) {
-            var symbol = getSymbolOfNode(node);
-            var target = resolveAlias(symbol);
+            let symbol = getSymbolOfNode(node);
+            let target = resolveAlias(symbol);
             if (target && target !== unknownSymbol && target.flags & SymbolFlags.Value && !isConstEnumOrConstEnumOnlyModule(target)) {
                 markAliasSymbolAsReferenced(symbol);
             }
@@ -569,10 +618,10 @@ module ts {
         // we reach a non-alias or an exported entity (which is always considered referenced). We do this by checking the target of
         // the alias as an expression (which recursively takes us back here if the target references another alias).
         function markAliasSymbolAsReferenced(symbol: Symbol) {
-            var links = getSymbolLinks(symbol);
+            let links = getSymbolLinks(symbol);
             if (!links.referenced) {
                 links.referenced = true;
-                var node = getDeclarationOfAliasSymbol(symbol);
+                let node = getDeclarationOfAliasSymbol(symbol);
                 if (node.kind === SyntaxKind.ExportAssignment) {
                     // export default <symbol>
                     checkExpressionCached((<ExportAssignment>node).expression);
@@ -631,11 +680,11 @@ module ts {
                 }
             }
             else if (name.kind === SyntaxKind.QualifiedName) {
-                var namespace = resolveEntityName((<QualifiedName>name).left, SymbolFlags.Namespace);
+                let namespace = resolveEntityName((<QualifiedName>name).left, SymbolFlags.Namespace);
                 if (!namespace || namespace === unknownSymbol || getFullWidth((<QualifiedName>name).right) === 0) {
                     return undefined;
                 }
-                var right = (<QualifiedName>name).right;
+                let right = (<QualifiedName>name).right;
                 var symbol = getSymbol(getExportsOfSymbol(namespace), right.text, meaning);
                 if (!symbol) {
                     error(right, Diagnostics.Module_0_has_no_exported_member_1, getFullyQualifiedName(namespace), declarationNameToString(right));
@@ -657,26 +706,26 @@ module ts {
                 return;
             }
 
-            var moduleReferenceLiteral = <LiteralExpression>moduleReferenceExpression;
-            var searchPath = getDirectoryPath(getSourceFile(location).fileName);
+            let moduleReferenceLiteral = <LiteralExpression>moduleReferenceExpression;
+            let searchPath = getDirectoryPath(getSourceFile(location).fileName);
 
             // Module names are escaped in our symbol table.  However, string literal values aren't.
             // Escape the name in the "require(...)" clause to ensure we find the right symbol.
-            var moduleName = escapeIdentifier(moduleReferenceLiteral.text);
+            let moduleName = escapeIdentifier(moduleReferenceLiteral.text);
 
             if (!moduleName) return;
-            var isRelative = isExternalModuleNameRelative(moduleName);
+            let isRelative = isExternalModuleNameRelative(moduleName);
             if (!isRelative) {
-                var symbol = getSymbol(globals, '"' + moduleName + '"', SymbolFlags.ValueModule);
+                let symbol = getSymbol(globals, '"' + moduleName + '"', SymbolFlags.ValueModule);
                 if (symbol) {
                     return symbol;
                 }
             }
             while (true) {
-                var fileName = normalizePath(combinePaths(searchPath, moduleName));
+                let fileName = normalizePath(combinePaths(searchPath, moduleName));
                 var sourceFile = host.getSourceFile(fileName + ".ts") || host.getSourceFile(fileName + ".d.ts");
                 if (sourceFile || isRelative) break;
-                var parentPath = getDirectoryPath(searchPath);
+                let parentPath = getDirectoryPath(searchPath);
                 if (parentPath === searchPath) break;
                 searchPath = parentPath;
             }
@@ -695,7 +744,7 @@ module ts {
         }
 
         function getResolvedExportAssignmentSymbol(moduleSymbol: Symbol): Symbol {
-            var symbol = getExportAssignmentSymbol(moduleSymbol);
+            let symbol = getExportAssignmentSymbol(moduleSymbol);
             if (symbol) {
                 if (symbol.flags & (SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace)) {
                     return symbol;
@@ -711,12 +760,12 @@ module ts {
         }
 
         function getExportsOfModule(moduleSymbol: Symbol): SymbolTable {
-            var links = getSymbolLinks(moduleSymbol);
+            let links = getSymbolLinks(moduleSymbol);
             return links.resolvedExports || (links.resolvedExports = getExportsForModule(moduleSymbol));
         }
 
         function extendExportSymbols(target: SymbolTable, source: SymbolTable) {
-            for (var id in source) {
+            for (let id in source) {
                 if (id !== "default" && !hasProperty(target, id)) {
                     target[id] = source[id];
                 }
@@ -726,15 +775,15 @@ module ts {
         function getExportsForModule(moduleSymbol: Symbol): SymbolTable {
             if (compilerOptions.target < ScriptTarget.ES6) {
                 // A default export hides all other exports in CommonJS and AMD modules
-                var defaultSymbol = getExportAssignmentSymbol(moduleSymbol);
+                let defaultSymbol = getExportAssignmentSymbol(moduleSymbol);
                 if (defaultSymbol) {
                     return {
                         "default": defaultSymbol
                     };
                 }
             }
-            var result: SymbolTable;
-            var visitedSymbols: Symbol[] = [];
+            let result: SymbolTable;
+            let visitedSymbols: Symbol[] = [];
             visit(moduleSymbol);
             return result || moduleSymbol.exports;
 
@@ -750,7 +799,7 @@ module ts {
                         extendExportSymbols(result, symbol.exports);
                     }
                     // All export * declarations are collected in an __export symbol by the binder
-                    var exportStars = symbol.exports["__export"];
+                    let exportStars = symbol.exports["__export"];
                     if (exportStars) {
                         forEach(exportStars.declarations, node => {
                             visit(resolveExternalModuleName(node, (<ExportDeclaration>node).moduleSpecifier));
@@ -761,7 +810,7 @@ module ts {
         }
 
         function getMergedSymbol(symbol: Symbol): Symbol {
-            var merged: Symbol;
+            let merged: Symbol;
             return symbol && symbol.mergeId && (merged = mergedSymbols[symbol.mergeId]) ? merged : symbol;
         }
 
@@ -800,9 +849,8 @@ module ts {
         }
 
         function findConstructorDeclaration(node: ClassDeclaration): ConstructorDeclaration {
-            var members = node.members;
-            for (var i = 0; i < members.length; i++) {
-                var member = members[i];
+            let members = node.members;
+            for (let member of members) {
                 if (member.kind === SyntaxKind.Constructor && nodeIsPresent((<ConstructorDeclaration>member).body)) {
                     return <ConstructorDeclaration>member;
                 }
@@ -810,19 +858,19 @@ module ts {
         }
 
         function createType(flags: TypeFlags): Type {
-            var result = new Type(checker, flags);
+            let result = new Type(checker, flags);
             result.id = typeCount++;
             return result;
         }
 
         function createIntrinsicType(kind: TypeFlags, intrinsicName: string): IntrinsicType {
-            var type = <IntrinsicType>createType(kind);
+            let type = <IntrinsicType>createType(kind);
             type.intrinsicName = intrinsicName;
             return type;
         }
 
         function createObjectType(kind: TypeFlags, symbol?: Symbol): ObjectType {
-            var type = <ObjectType>createType(kind);
+            let type = <ObjectType>createType(kind);
             type.symbol = symbol;
             return type;
         }
@@ -839,12 +887,12 @@ module ts {
         }
 
         function getNamedMembers(members: SymbolTable): Symbol[] {
-            var result: Symbol[];
-            for (var id in members) {
+            let result: Symbol[];
+            for (let id in members) {
                 if (hasProperty(members, id)) {
                     if (!isReservedMemberName(id)) {
                         if (!result) result = [];
-                        var symbol = members[id];
+                        let symbol = members[id];
                         if (symbolIsValue(symbol)) {
                             result.push(symbol);
                         }
@@ -870,8 +918,8 @@ module ts {
         }
 
         function forEachSymbolTableInScope<T>(enclosingDeclaration: Node, callback: (symbolTable: SymbolTable) => T): T {
-            var result: T;
-            for (var location = enclosingDeclaration; location; location = location.parent) {
+            let result: T;
+            for (let location = enclosingDeclaration; location; location = location.parent) {
                 // Locals of a source file are not in scope (because they get merged into the global symbol table)
                 if (location.locals && !isGlobalSourceFile(location)) {
                     if (result = callback(location.locals)) {
@@ -914,14 +962,14 @@ module ts {
                     }
 
                     // If symbol needs qualification, make sure that parent is accessible, if it is then this symbol is accessible too
-                    var accessibleParent = getAccessibleSymbolChain(symbolFromSymbolTable.parent, enclosingDeclaration, getQualifiedLeftMeaning(meaning), useOnlyExternalAliasing);
+                    let accessibleParent = getAccessibleSymbolChain(symbolFromSymbolTable.parent, enclosingDeclaration, getQualifiedLeftMeaning(meaning), useOnlyExternalAliasing);
                     return !!accessibleParent;
                 }
 
                 function isAccessible(symbolFromSymbolTable: Symbol, resolvedAliasSymbol?: Symbol) {
                     if (symbol === (resolvedAliasSymbol || symbolFromSymbolTable)) {
                         // if the symbolFromSymbolTable is not external module (it could be if it was determined as ambient external module and would be in globals table)
-                        // and if symbolfrom symbolTable or alias resolution matches the symbol, 
+                        // and if symbolfrom symbolTable or alias resolution matches the symbol,
                         // check the symbol can be qualified, it is only then this symbol is accessible
                         return !forEach(symbolFromSymbolTable.declarations, hasExternalModuleSymbol) &&
                             canQualifySymbol(symbolFromSymbolTable, meaning);
@@ -940,14 +988,14 @@ module ts {
                             // Is this external alias, then use it to name
                             ts.forEach(symbolFromSymbolTable.declarations, isExternalModuleImportEqualsDeclaration)) {
 
-                            var resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable);
+                            let resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable);
                             if (isAccessible(symbolFromSymbolTable, resolveAlias(symbolFromSymbolTable))) {
                                 return [symbolFromSymbolTable];
                             }
 
                             // Look in the exported members, if we can find accessibleSymbolChain, symbol is accessible using this chain
                             // but only if the symbolFromSymbolTable can be qualified
-                            var accessibleSymbolsFromExports = resolvedImportedSymbol.exports ? getAccessibleSymbolChainFromSymbolTable(resolvedImportedSymbol.exports) : undefined;
+                            let accessibleSymbolsFromExports = resolvedImportedSymbol.exports ? getAccessibleSymbolChainFromSymbolTable(resolvedImportedSymbol.exports) : undefined;
                             if (accessibleSymbolsFromExports && canQualifySymbol(symbolFromSymbolTable, getQualifiedLeftMeaning(meaning))) {
                                 return [symbolFromSymbolTable].concat(accessibleSymbolsFromExports);
                             }
@@ -962,7 +1010,7 @@ module ts {
         }
 
         function needsQualification(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags) {
-            var qualify = false;
+            let qualify = false;
             forEachSymbolTableInScope(enclosingDeclaration, symbolTable => {
                 // If symbol of this name is not available in the symbol table we are ok
                 if (!hasProperty(symbolTable, symbol.name)) {
@@ -970,7 +1018,7 @@ module ts {
                     return false;
                 }
                 // If the symbol with this name is present it should refer to the symbol
-                var symbolFromSymbolTable = symbolTable[symbol.name];
+                let symbolFromSymbolTable = symbolTable[symbol.name];
                 if (symbolFromSymbolTable === symbol) {
                     // No need to qualify
                     return true;
@@ -992,13 +1040,13 @@ module ts {
 
         function isSymbolAccessible(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags): SymbolAccessiblityResult {
             if (symbol && enclosingDeclaration && !(symbol.flags & SymbolFlags.TypeParameter)) {
-                var initialSymbol = symbol;
-                var meaningToLook = meaning;
+                let initialSymbol = symbol;
+                let meaningToLook = meaning;
                 while (symbol) {
                     // Symbol is accessible if it by itself is accessible
-                    var accessibleSymbolChain = getAccessibleSymbolChain(symbol, enclosingDeclaration, meaningToLook, /*useOnlyExternalAliasing*/ false);
+                    let accessibleSymbolChain = getAccessibleSymbolChain(symbol, enclosingDeclaration, meaningToLook, /*useOnlyExternalAliasing*/ false);
                     if (accessibleSymbolChain) {
-                        var hasAccessibleDeclarations = hasVisibleDeclarations(accessibleSymbolChain[0]);
+                        let hasAccessibleDeclarations = hasVisibleDeclarations(accessibleSymbolChain[0]);
                         if (!hasAccessibleDeclarations) {
                             return <SymbolAccessiblityResult>{
                                 accessibility: SymbolAccessibility.NotAccessible,
@@ -1016,20 +1064,20 @@ module ts {
                     //     export class c {
                     //     }
                     // }
-                    // var x: typeof m.c
+                    // let x: typeof m.c
                     // In the above example when we start with checking if typeof m.c symbol is accessible,
-                    // we are going to see if c can be accessed in scope directly. 
+                    // we are going to see if c can be accessed in scope directly.
                     // But it can't, hence the accessible is going to be undefined, but that doesn't mean m.c is inaccessible
                     // It is accessible if the parent m is accessible because then m.c can be accessed through qualification
                     meaningToLook = getQualifiedLeftMeaning(meaning);
                     symbol = getParentOfSymbol(symbol);
                 }
 
-                // This could be a symbol that is not exported in the external module 
+                // This could be a symbol that is not exported in the external module
                 // or it could be a symbol from different external module that is not aliased and hence cannot be named
-                var symbolExternalModule = forEach(initialSymbol.declarations, getExternalModuleContainer);
+                let symbolExternalModule = forEach(initialSymbol.declarations, getExternalModuleContainer);
                 if (symbolExternalModule) {
-                    var enclosingExternalModule = getExternalModuleContainer(enclosingDeclaration);
+                    let enclosingExternalModule = getExternalModuleContainer(enclosingDeclaration);
                     if (symbolExternalModule !== enclosingExternalModule) {
                         // name from different external module that is not visible
                         return {
@@ -1064,7 +1112,7 @@ module ts {
         }
 
         function hasVisibleDeclarations(symbol: Symbol): SymbolVisibilityResult {
-            var aliasesToMakeVisible: ImportEqualsDeclaration[];
+            let aliasesToMakeVisible: ImportEqualsDeclaration[];
             if (forEach(symbol.declarations, declaration => !getIsDeclarationVisible(declaration))) {
                 return undefined;
             }
@@ -1072,7 +1120,7 @@ module ts {
 
             function getIsDeclarationVisible(declaration: Declaration) {
                 if (!isDeclarationVisible(declaration)) {
-                    // Mark the unexported alias as visible if its parent is visible 
+                    // Mark the unexported alias as visible if its parent is visible
                     // because these kind of aliases can be used to name types in declaration file
                     if (declaration.kind === SyntaxKind.ImportEqualsDeclaration &&
                         !(declaration.flags & NodeFlags.Export) &&
@@ -1099,7 +1147,7 @@ module ts {
 
         function isEntityNameVisible(entityName: EntityName, enclosingDeclaration: Node): SymbolVisibilityResult {
             // get symbol of the first identifier of the entityName
-            var meaning: SymbolFlags;
+            let meaning: SymbolFlags;
             if (entityName.parent.kind === SyntaxKind.TypeQuery) {
                 // Typeof value
                 meaning = SymbolFlags.Value | SymbolFlags.ExportValue;
@@ -1107,7 +1155,7 @@ module ts {
             else if (entityName.kind === SyntaxKind.QualifiedName ||
                 entityName.parent.kind === SyntaxKind.ImportEqualsDeclaration) {
                 // Left identifier from type reference or TypeAlias
-                // Entity name of the import declaration 
+                // Entity name of the import declaration
                 meaning = SymbolFlags.Namespace;
             }
             else {
@@ -1115,8 +1163,8 @@ module ts {
                 meaning = SymbolFlags.Type;
             }
 
-            var firstIdentifier = getFirstIdentifier(entityName);
-            var symbol = resolveName(enclosingDeclaration, (<Identifier>firstIdentifier).text, meaning, /*nodeNotFoundErrorMessage*/ undefined, /*nameArg*/ undefined);
+            let firstIdentifier = getFirstIdentifier(entityName);
+            let symbol = resolveName(enclosingDeclaration, (<Identifier>firstIdentifier).text, meaning, /*nodeNotFoundErrorMessage*/ undefined, /*nameArg*/ undefined);
 
             // Verify if the symbol is accessible
             return (symbol && hasVisibleDeclarations(symbol)) || <SymbolVisibilityResult>{
@@ -1139,23 +1187,23 @@ module ts {
         }
 
         function symbolToString(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags): string {
-            var writer = getSingleLineStringWriter();
+            let writer = getSingleLineStringWriter();
             getSymbolDisplayBuilder().buildSymbolDisplay(symbol, writer, enclosingDeclaration, meaning);
 
-            var result = writer.string();
+            let result = writer.string();
             releaseStringWriter(writer);
 
             return result;
         }
 
         function typeToString(type: Type, enclosingDeclaration?: Node, flags?: TypeFormatFlags): string {
-            var writer = getSingleLineStringWriter();
+            let writer = getSingleLineStringWriter();
             getSymbolDisplayBuilder().buildTypeDisplay(type, writer, enclosingDeclaration, flags);
 
-            var result = writer.string();
+            let result = writer.string();
             releaseStringWriter(writer);
 
-            var maxLength = compilerOptions.noErrorTruncation || flags & TypeFormatFlags.NoTruncation ? undefined : 100;
+            let maxLength = compilerOptions.noErrorTruncation || flags & TypeFormatFlags.NoTruncation ? undefined : 100;
             if (maxLength && result.length >= maxLength) {
                 result = result.substr(0, maxLength - "...".length) + "...";
             }
@@ -1165,7 +1213,7 @@ module ts {
 
         function getTypeAliasForTypeLiteral(type: Type): Symbol {
             if (type.symbol && type.symbol.flags & SymbolFlags.TypeLiteral) {
-                var node = type.symbol.declarations[0].parent;
+                let node = type.symbol.declarations[0].parent;
                 while (node.kind === SyntaxKind.ParenthesizedType) {
                     node = node.parent;
                 }
@@ -1177,7 +1225,7 @@ module ts {
         }
 
         // This is for caching the result of getSymbolDisplayBuilder. Do not access directly.
-        var _displayBuilder: SymbolDisplayBuilder;
+        let _displayBuilder: SymbolDisplayBuilder;
         function getSymbolDisplayBuilder(): SymbolDisplayBuilder {
             /**
              * Writes only the name of the symbol out to the writer. Uses the original source text
@@ -1185,7 +1233,7 @@ module ts {
              */
             function appendSymbolNameOnly(symbol: Symbol, writer: SymbolWriter): void {
                 if (symbol.declarations && symbol.declarations.length > 0) {
-                    var declaration = symbol.declarations[0];
+                    let declaration = symbol.declarations[0];
                     if (declaration.name) {
                         writer.writeSymbol(declarationNameToString(declaration.name), symbol);
                         return;
@@ -1200,7 +1248,7 @@ module ts {
              * Meaning needs to be specified if the enclosing declaration is given
              */
             function buildSymbolDisplay(symbol: Symbol, writer: SymbolWriter, enclosingDeclaration?: Node, meaning?: SymbolFlags, flags?: SymbolFormatFlags, typeFlags?: TypeFormatFlags): void {
-                var parentSymbol: Symbol;
+                let parentSymbol: Symbol;
                 function appendParentTypeArgumentsAndSymbolName(symbol: Symbol): void {
                     if (parentSymbol) {
                         // Write type arguments of instantiated class/interface here
@@ -1219,8 +1267,8 @@ module ts {
                     appendSymbolNameOnly(symbol, writer);
                 }
 
-                // Let the writer know we just wrote out a symbol.  The declaration emitter writer uses 
-                // this to determine if an import it has previously seen (and not written out) needs 
+                // Let the writer know we just wrote out a symbol.  The declaration emitter writer uses
+                // this to determine if an import it has previously seen (and not written out) needs
                 // to be written to the file once the walk of the tree is complete.
                 //
                 // NOTE(cyrusn): This approach feels somewhat unfortunate.  A simple pass over the tree
@@ -1229,7 +1277,7 @@ module ts {
                 writer.trackSymbol(symbol, enclosingDeclaration, meaning);
                 function walkSymbol(symbol: Symbol, meaning: SymbolFlags): void {
                     if (symbol) {
-                        var accessibleSymbolChain = getAccessibleSymbolChain(symbol, enclosingDeclaration, meaning, !!(flags & SymbolFormatFlags.UseOnlyExternalAliasing));
+                        let accessibleSymbolChain = getAccessibleSymbolChain(symbol, enclosingDeclaration, meaning, !!(flags & SymbolFormatFlags.UseOnlyExternalAliasing));
 
                         if (!accessibleSymbolChain ||
                             needsQualification(accessibleSymbolChain[0], enclosingDeclaration, accessibleSymbolChain.length === 1 ? meaning : getQualifiedLeftMeaning(meaning))) {
@@ -1241,8 +1289,8 @@ module ts {
                         }
 
                         if (accessibleSymbolChain) {
-                            for (var i = 0, n = accessibleSymbolChain.length; i < n; i++) {
-                                appendParentTypeArgumentsAndSymbolName(accessibleSymbolChain[i]);
+                            for (let accessibleSymbol of accessibleSymbolChain) {
+                                appendParentTypeArgumentsAndSymbolName(accessibleSymbol);
                             }
                         }
                         else {
@@ -1264,8 +1312,8 @@ module ts {
                 // Get qualified name if the symbol is not a type parameter
                 // and there is an enclosing declaration or we specifically
                 // asked for it
-                var isTypeParameter = symbol.flags & SymbolFlags.TypeParameter;
-                var typeFormatFlag = TypeFormatFlags.UseFullyQualifiedType & typeFlags;
+                let isTypeParameter = symbol.flags & SymbolFlags.TypeParameter;
+                let typeFormatFlag = TypeFormatFlags.UseFullyQualifiedType & typeFlags;
                 if (!isTypeParameter && (enclosingDeclaration || typeFormatFlag)) {
                     walkSymbol(symbol, meaning);
                     return;
@@ -1275,7 +1323,7 @@ module ts {
             }
 
             function buildTypeDisplay(type: Type, writer: SymbolWriter, enclosingDeclaration?: Node, globalFlags?: TypeFormatFlags, typeStack?: Type[]) {
-                var globalFlagsToPass = globalFlags & TypeFormatFlags.WriteOwnNameForAnyLike;
+                let globalFlagsToPass = globalFlags & TypeFormatFlags.WriteOwnNameForAnyLike;
                 return writeType(type, globalFlags);
 
                 function writeType(type: Type, flags: TypeFormatFlags) {
@@ -1316,7 +1364,7 @@ module ts {
                 }
 
                 function writeTypeList(types: Type[], union: boolean) {
-                    for (var i = 0; i < types.length; i++) {
+                    for (let i = 0; i < types.length; i++) {
                         if (i > 0) {
                             if (union) {
                                 writeSpace(writer);
@@ -1369,7 +1417,7 @@ module ts {
                     }
                     else if (typeStack && contains(typeStack, type)) {
                         // If type is an anonymous type literal in a type alias declaration, use type alias name
-                        var typeAlias = getTypeAliasForTypeLiteral(type);
+                        let typeAlias = getTypeAliasForTypeLiteral(type);
                         if (typeAlias) {
                             // The specified symbol flags need to be reinterpreted as type flags
                             buildSymbolDisplay(typeAlias, writer, enclosingDeclaration, SymbolFlags.Type, SymbolFormatFlags.None, flags);
@@ -1390,9 +1438,9 @@ module ts {
 
                     function shouldWriteTypeOfFunctionSymbol() {
                         if (type.symbol) {
-                            var isStaticMethodSymbol = !!(type.symbol.flags & SymbolFlags.Method &&  // typeof static method
+                            let isStaticMethodSymbol = !!(type.symbol.flags & SymbolFlags.Method &&  // typeof static method
                                 ts.forEach(type.symbol.declarations, declaration => declaration.flags & NodeFlags.Static));
-                            var isNonLocalFunctionSymbol = !!(type.symbol.flags & SymbolFlags.Function) &&
+                            let isNonLocalFunctionSymbol = !!(type.symbol.flags & SymbolFlags.Function) &&
                                 (type.symbol.parent || // is exported function symbol
                                     ts.forEach(type.symbol.declarations, declaration =>
                                         declaration.parent.kind === SyntaxKind.SourceFile || declaration.parent.kind === SyntaxKind.ModuleBlock));
@@ -1413,7 +1461,7 @@ module ts {
                 }
 
                 function getIndexerParameterName(type: ObjectType, indexKind: IndexKind, fallbackName: string): string {
-                    var declaration = <SignatureDeclaration>getIndexDeclarationOfSymbol(type.symbol, indexKind);
+                    let declaration = <SignatureDeclaration>getIndexDeclarationOfSymbol(type.symbol, indexKind);
                     if (!declaration) {
                         // declaration might not be found if indexer was added from the contextual type.
                         // in this case use fallback name
@@ -1424,7 +1472,7 @@ module ts {
                 }
 
                 function writeLiteralType(type: ObjectType, flags: TypeFormatFlags) {
-                    var resolved = resolveObjectOrUnionTypeMembers(type);
+                    let resolved = resolveObjectOrUnionTypeMembers(type);
                     if (!resolved.properties.length && !resolved.stringIndexType && !resolved.numberIndexType) {
                         if (!resolved.callSignatures.length && !resolved.constructSignatures.length) {
                             writePunctuation(writer, SyntaxKind.OpenBraceToken);
@@ -1459,21 +1507,21 @@ module ts {
                     writePunctuation(writer, SyntaxKind.OpenBraceToken);
                     writer.writeLine();
                     writer.increaseIndent();
-                    for (var i = 0; i < resolved.callSignatures.length; i++) {
-                        buildSignatureDisplay(resolved.callSignatures[i], writer, enclosingDeclaration, globalFlagsToPass, typeStack);
+                    for (let signature of resolved.callSignatures) {
+                        buildSignatureDisplay(signature, writer, enclosingDeclaration, globalFlagsToPass, typeStack);
                         writePunctuation(writer, SyntaxKind.SemicolonToken);
                         writer.writeLine();
                     }
-                    for (var i = 0; i < resolved.constructSignatures.length; i++) {
+                    for (let signature of resolved.constructSignatures) {
                         writeKeyword(writer, SyntaxKind.NewKeyword);
                         writeSpace(writer);
 
-                        buildSignatureDisplay(resolved.constructSignatures[i], writer, enclosingDeclaration, globalFlagsToPass, typeStack);
+                        buildSignatureDisplay(signature, writer, enclosingDeclaration, globalFlagsToPass, typeStack);
                         writePunctuation(writer, SyntaxKind.SemicolonToken);
                         writer.writeLine();
                     }
                     if (resolved.stringIndexType) {
-                        // [x: string]: 
+                        // [x: string]:
                         writePunctuation(writer, SyntaxKind.OpenBracketToken);
                         writer.writeParameter(getIndexerParameterName(resolved, IndexKind.String, /*fallbackName*/"x"));
                         writePunctuation(writer, SyntaxKind.ColonToken);
@@ -1487,7 +1535,7 @@ module ts {
                         writer.writeLine();
                     }
                     if (resolved.numberIndexType) {
-                        // [x: number]: 
+                        // [x: number]:
                         writePunctuation(writer, SyntaxKind.OpenBracketToken);
                         writer.writeParameter(getIndexerParameterName(resolved, IndexKind.Number, /*fallbackName*/"x"));
                         writePunctuation(writer, SyntaxKind.ColonToken);
@@ -1500,17 +1548,16 @@ module ts {
                         writePunctuation(writer, SyntaxKind.SemicolonToken);
                         writer.writeLine();
                     }
-                    for (var i = 0; i < resolved.properties.length; i++) {
-                        var p = resolved.properties[i];
-                        var t = getTypeOfSymbol(p);
+                    for (let p of resolved.properties) {
+                        let t = getTypeOfSymbol(p);
                         if (p.flags & (SymbolFlags.Function | SymbolFlags.Method) && !getPropertiesOfObjectType(t).length) {
-                            var signatures = getSignaturesOfType(t, SignatureKind.Call);
-                            for (var j = 0; j < signatures.length; j++) {
+                            let signatures = getSignaturesOfType(t, SignatureKind.Call);
+                            for (let signature of signatures) {
                                 buildSymbolDisplay(p, writer);
                                 if (p.flags & SymbolFlags.Optional) {
                                     writePunctuation(writer, SyntaxKind.QuestionToken);
                                 }
-                                buildSignatureDisplay(signatures[j], writer, enclosingDeclaration, globalFlagsToPass, typeStack);
+                                buildSignatureDisplay(signature, writer, enclosingDeclaration, globalFlagsToPass, typeStack);
                                 writePunctuation(writer, SyntaxKind.SemicolonToken);
                                 writer.writeLine();
                             }
@@ -1533,7 +1580,7 @@ module ts {
             }
 
             function buildTypeParameterDisplayFromSymbol(symbol: Symbol, writer: SymbolWriter, enclosingDeclaraiton?: Node, flags?: TypeFormatFlags) {
-                var targetSymbol = getTargetSymbol(symbol);
+                let targetSymbol = getTargetSymbol(symbol);
                 if (targetSymbol.flags & SymbolFlags.Class || targetSymbol.flags & SymbolFlags.Interface) {
                     buildDisplayForTypeParametersAndDelimiters(getTypeParametersOfClassOrInterface(symbol), writer, enclosingDeclaraiton, flags);
                 }
@@ -1541,7 +1588,7 @@ module ts {
 
             function buildTypeParameterDisplay(tp: TypeParameter, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags, typeStack?: Type[]) {
                 appendSymbolNameOnly(tp.symbol, writer);
-                var constraint = getConstraintOfTypeParameter(tp);
+                let constraint = getConstraintOfTypeParameter(tp);
                 if (constraint) {
                     writeSpace(writer);
                     writeKeyword(writer, SyntaxKind.ExtendsKeyword);
@@ -1567,7 +1614,7 @@ module ts {
             function buildDisplayForTypeParametersAndDelimiters(typeParameters: TypeParameter[], writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags, typeStack?: Type[]) {
                 if (typeParameters && typeParameters.length) {
                     writePunctuation(writer, SyntaxKind.LessThanToken);
-                    for (var i = 0; i < typeParameters.length; i++) {
+                    for (let i = 0; i < typeParameters.length; i++) {
                         if (i > 0) {
                             writePunctuation(writer, SyntaxKind.CommaToken);
                             writeSpace(writer);
@@ -1581,7 +1628,7 @@ module ts {
             function buildDisplayForTypeArgumentsAndDelimiters(typeParameters: TypeParameter[], mapper: TypeMapper, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags, typeStack?: Type[]) {
                 if (typeParameters && typeParameters.length) {
                     writePunctuation(writer, SyntaxKind.LessThanToken);
-                    for (var i = 0; i < typeParameters.length; i++) {
+                    for (let i = 0; i < typeParameters.length; i++) {
                         if (i > 0) {
                             writePunctuation(writer, SyntaxKind.CommaToken);
                             writeSpace(writer);
@@ -1594,7 +1641,7 @@ module ts {
 
             function buildDisplayForParametersAndDelimiters(parameters: Symbol[], writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags, typeStack?: Type[]) {
                 writePunctuation(writer, SyntaxKind.OpenParenToken);
-                for (var i = 0; i < parameters.length; i++) {
+                for (let i = 0; i < parameters.length; i++) {
                     if (i > 0) {
                         writePunctuation(writer, SyntaxKind.CommaToken);
                         writeSpace(writer);
@@ -1663,13 +1710,13 @@ module ts {
 
             function isUsedInExportAssignment(node: Node) {
                 // Get source File and see if it is external module and has export assigned symbol
-                var externalModule = getContainingExternalModule(node);
+                let externalModule = getContainingExternalModule(node);
                 if (externalModule) {
                     // This is export assigned symbol node
-                    var externalModuleSymbol = getSymbolOfNode(externalModule);
+                    let externalModuleSymbol = getSymbolOfNode(externalModule);
                     var exportAssignmentSymbol = getExportAssignmentSymbol(externalModuleSymbol);
                     var resolvedExportSymbol: Symbol;
-                    var symbolOfNode = getSymbolOfNode(node);
+                    let symbolOfNode = getSymbolOfNode(node);
                     if (isSymbolUsedInExportAssignment(symbolOfNode)) {
                         return true;
                     }
@@ -1717,7 +1764,7 @@ module ts {
                     case SyntaxKind.FunctionDeclaration:
                     case SyntaxKind.EnumDeclaration:
                     case SyntaxKind.ImportEqualsDeclaration:
-                        var parent = getDeclarationContainer(node);
+                        let parent = getDeclarationContainer(node);
                         // If the node is not exported or it is not ambient module element (except import declaration)
                         if (!(getCombinedNodeFlags(node) & NodeFlags.Export) &&
                             !(node.kind !== SyntaxKind.ImportEqualsDeclaration && parent.kind !== SyntaxKind.SourceFile && isInAmbientContext(parent))) {
@@ -1753,7 +1800,7 @@ module ts {
                     case SyntaxKind.UnionType:
                     case SyntaxKind.ParenthesizedType:
                         return isDeclarationVisible(<Declaration>node.parent);
-                    
+
                     // Type parameters are always visible
                     case SyntaxKind.TypeParameter:
                     // Source file is always visible
@@ -1766,7 +1813,7 @@ module ts {
             }
 
             if (node) {
-                var links = getNodeLinks(node);
+                let links = getNodeLinks(node);
                 if (links.isVisible === undefined) {
                     links.isVisible = !!determineIfDeclarationIsVisible();
                 }
@@ -1784,30 +1831,30 @@ module ts {
         function getDeclarationContainer(node: Node): Node {
             node = getRootDeclaration(node);
 
-            // Parent chain: 
+            // Parent chain:
             // VaribleDeclaration -> VariableDeclarationList -> VariableStatement -> 'Declaration Container'
             return node.kind === SyntaxKind.VariableDeclaration ? node.parent.parent.parent : node.parent;
         }
 
         function getTypeOfPrototypeProperty(prototype: Symbol): Type {
             // TypeScript 1.0 spec (April 2014): 8.4
-            // Every class automatically contains a static property member named 'prototype', 
+            // Every class automatically contains a static property member named 'prototype',
             // the type of which is an instantiation of the class type with type Any supplied as a type argument for each type parameter.
             // It is an error to explicitly declare a static property member with the name 'prototype'.
-            var classType = <InterfaceType>getDeclaredTypeOfSymbol(prototype.parent);
+            let classType = <InterfaceType>getDeclaredTypeOfSymbol(prototype.parent);
             return classType.typeParameters ? createTypeReference(<GenericType>classType, map(classType.typeParameters, _ => anyType)) : classType;
         }
 
         // Return the type of the given property in the given type, or undefined if no such property exists
         function getTypeOfPropertyOfType(type: Type, name: string): Type {
-            var prop = getPropertyOfType(type, name);
+            let prop = getPropertyOfType(type, name);
             return prop ? getTypeOfSymbol(prop) : undefined;
         }
 
         // Return the inferred type for a binding element
         function getTypeForBindingElement(declaration: BindingElement): Type {
-            var pattern = <BindingPattern>declaration.parent;
-            var parentType = getTypeForVariableLikeDeclaration(<VariableLikeDeclaration>pattern.parent);
+            let pattern = <BindingPattern>declaration.parent;
+            let parentType = getTypeForVariableLikeDeclaration(<VariableLikeDeclaration>pattern.parent);
             // If parent has the unknown (error) type, then so does this binding element
             if (parentType === unknownType) {
                 return unknownType;
@@ -1823,7 +1870,7 @@ module ts {
             }
             if (pattern.kind === SyntaxKind.ObjectBindingPattern) {
                 // Use explicitly specified property name ({ p: xxx } form), or otherwise the implied name ({ p } form)
-                var name = declaration.propertyName || <Identifier>declaration.name;
+                let name = declaration.propertyName || <Identifier>declaration.name;
                 // Use type of the specified property, or otherwise, for a numeric name, the type of the numeric index signature,
                 // or otherwise the type of the string index signature.
                 var type = getTypeOfPropertyOfType(parentType, name.text) ||
@@ -1842,10 +1889,15 @@ module ts {
                 }
                 if (!declaration.dotDotDotToken) {
                     // Use specific property type when parent is a tuple or numeric index type when parent is an array
-                    var propName = "" + indexOf(pattern.elements, declaration);
+                    let propName = "" + indexOf(pattern.elements, declaration);
                     var type = isTupleLikeType(parentType) ? getTypeOfPropertyOfType(parentType, propName) : getIndexTypeOfType(parentType, IndexKind.Number);
                     if (!type) {
-                        error(declaration, Diagnostics.Type_0_has_no_property_1, typeToString(parentType), propName);
+                        if (isTupleType(parentType)) {
+                            error(declaration, Diagnostics.Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2, typeToString(parentType), (<TupleType>parentType).elementTypes.length, pattern.elements.length);
+                        }
+                        else {
+                            error(declaration, Diagnostics.Type_0_has_no_property_1, typeToString(parentType), propName);
+                        }
                         return unknownType;
                     }
                 }
@@ -1864,7 +1916,11 @@ module ts {
                 return anyType;
             }
             if (declaration.parent.parent.kind === SyntaxKind.ForOfStatement) {
-                return getTypeForVariableDeclarationInForOfStatement(<ForOfStatement>declaration.parent.parent);
+                // checkRightHandSideOfForOf will return undefined if the for-of expression type was
+                // missing properties/signatures required to get its iteratedType (like
+                // [Symbol.iterator] or next). This may be because we accessed properties from anyType,
+                // or it may have led to an error inside getIteratedType.
+                return checkRightHandSideOfForOf((<ForOfStatement>declaration.parent.parent).expression) || anyType;
             }
             if (isBindingPattern(declaration.parent)) {
                 return getTypeForBindingElement(<BindingElement>declaration);
@@ -1874,16 +1930,16 @@ module ts {
                 return getTypeFromTypeNode(declaration.type);
             }
             if (declaration.kind === SyntaxKind.Parameter) {
-                var func = <FunctionLikeDeclaration>declaration.parent;
+                let func = <FunctionLikeDeclaration>declaration.parent;
                 // For a parameter of a set accessor, use the type of the get accessor if one is present
                 if (func.kind === SyntaxKind.SetAccessor && !hasDynamicName(func)) {
-                    var getter = <AccessorDeclaration>getDeclarationOfKind(declaration.parent.symbol, SyntaxKind.GetAccessor);
+                    let getter = <AccessorDeclaration>getDeclarationOfKind(declaration.parent.symbol, SyntaxKind.GetAccessor);
                     if (getter) {
                         return getReturnTypeOfSignature(getSignatureFromDeclaration(getter));
                     }
                 }
                 // Use contextual parameter type if one is available
-                var type = getContextuallyTypedParameterType(<ParameterDeclaration>declaration);
+                let type = getContextuallyTypedParameterType(<ParameterDeclaration>declaration);
                 if (type) {
                     return type;
                 }
@@ -1915,11 +1971,11 @@ module ts {
 
         // Return the type implied by an object binding pattern
         function getTypeFromObjectBindingPattern(pattern: BindingPattern): Type {
-            var members: SymbolTable = {};
+            let members: SymbolTable = {};
             forEach(pattern.elements, e => {
-                var flags = SymbolFlags.Property | SymbolFlags.Transient | (e.initializer ? SymbolFlags.Optional : 0);
-                var name = e.propertyName || <Identifier>e.name;
-                var symbol = <TransientSymbol>createSymbol(flags, name.text);
+                let flags = SymbolFlags.Property | SymbolFlags.Transient | (e.initializer ? SymbolFlags.Optional : 0);
+                let name = e.propertyName || <Identifier>e.name;
+                let symbol = <TransientSymbol>createSymbol(flags, name.text);
                 symbol.type = getTypeFromBindingElement(e);
                 members[symbol.name] = symbol;
             });
@@ -1928,8 +1984,8 @@ module ts {
 
         // Return the type implied by an array binding pattern
         function getTypeFromArrayBindingPattern(pattern: BindingPattern): Type {
-            var hasSpreadElement: boolean = false;
-            var elementTypes: Type[] = [];
+            let hasSpreadElement: boolean = false;
+            let elementTypes: Type[] = [];
             forEach(pattern.elements, e => {
                 elementTypes.push(e.kind === SyntaxKind.OmittedExpression || e.dotDotDotToken ? anyType : getTypeFromBindingElement(e));
                 if (e.dotDotDotToken) {
@@ -1962,7 +2018,7 @@ module ts {
         // binding pattern [x, s = ""]. Because the contextual type is a tuple type, the resulting type of [1, "one"] is the
         // tuple type [number, string]. Thus, the type inferred for 'x' is number and the type inferred for 's' is string.
         function getWidenedTypeForVariableLikeDeclaration(declaration: VariableLikeDeclaration, reportErrors?: boolean): Type {
-            var type = getTypeForVariableLikeDeclaration(declaration);
+            let type = getTypeForVariableLikeDeclaration(declaration);
             if (type) {
                 if (reportErrors) {
                     reportErrorsFromWidening(declaration, type);
@@ -1981,7 +2037,7 @@ module ts {
             type = declaration.dotDotDotToken ? anyArrayType : anyType;
             // Report implicit any errors unless this is a private property within an ambient declaration
             if (reportErrors && compilerOptions.noImplicitAny) {
-                var root = getRootDeclaration(declaration);
+                let root = getRootDeclaration(declaration);
                 if (!isPrivateWithinAmbient(root) && !(root.kind === SyntaxKind.Parameter && isPrivateWithinAmbient(root.parent))) {
                     reportImplicitAnyError(declaration, type);
                 }
@@ -1990,14 +2046,14 @@ module ts {
         }
 
         function getTypeOfVariableOrParameterOrProperty(symbol: Symbol): Type {
-            var links = getSymbolLinks(symbol);
+            let links = getSymbolLinks(symbol);
             if (!links.type) {
                 // Handle prototype property
                 if (symbol.flags & SymbolFlags.Prototype) {
                     return links.type = getTypeOfPrototypeProperty(symbol);
                 }
                 // Handle catch clause variables
-                var declaration = symbol.valueDeclaration;
+                let declaration = symbol.valueDeclaration;
                 if (declaration.parent.kind === SyntaxKind.CatchClause) {
                     return links.type = anyType;
                 }
@@ -2007,7 +2063,7 @@ module ts {
                 }
                 // Handle variable, parameter or property
                 links.type = resolvingType;
-                var type = getWidenedTypeForVariableLikeDeclaration(<VariableLikeDeclaration>declaration, /*reportErrors*/ true);
+                let type = getWidenedTypeForVariableLikeDeclaration(<VariableLikeDeclaration>declaration, /*reportErrors*/ true);
                 if (links.type === resolvingType) {
                     links.type = type;
                 }
@@ -2015,7 +2071,7 @@ module ts {
             else if (links.type === resolvingType) {
                 links.type = anyType;
                 if (compilerOptions.noImplicitAny) {
-                    var diagnostic = (<VariableLikeDeclaration>symbol.valueDeclaration).type ?
+                    let diagnostic = (<VariableLikeDeclaration>symbol.valueDeclaration).type ?
                         Diagnostics._0_implicitly_has_type_any_because_it_is_referenced_directly_or_indirectly_in_its_own_type_annotation :
                         Diagnostics._0_implicitly_has_type_any_because_it_is_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer;
                     error(symbol.valueDeclaration, diagnostic, symbolToString(symbol));
@@ -2034,7 +2090,7 @@ module ts {
                     return accessor.type && getTypeFromTypeNode(accessor.type);
                 }
                 else {
-                    var setterTypeAnnotation = getSetAccessorTypeAnnotationNode(accessor);
+                    let setterTypeAnnotation = getSetAccessorTypeAnnotationNode(accessor);
                     return setterTypeAnnotation && getTypeFromTypeNode(setterTypeAnnotation);
                 }
             }
@@ -2042,7 +2098,7 @@ module ts {
         }
 
         function getTypeOfAccessors(symbol: Symbol): Type {
-            var links = getSymbolLinks(symbol);
+            let links = getSymbolLinks(symbol);
             checkAndStoreTypeOfAccessors(symbol, links);
             return links.type;
         }
@@ -2051,19 +2107,19 @@ module ts {
             links = links || getSymbolLinks(symbol);
             if (!links.type) {
                 links.type = resolvingType;
-                var getter = <AccessorDeclaration>getDeclarationOfKind(symbol, SyntaxKind.GetAccessor);
-                var setter = <AccessorDeclaration>getDeclarationOfKind(symbol, SyntaxKind.SetAccessor);
+                let getter = <AccessorDeclaration>getDeclarationOfKind(symbol, SyntaxKind.GetAccessor);
+                let setter = <AccessorDeclaration>getDeclarationOfKind(symbol, SyntaxKind.SetAccessor);
 
-                var type: Type;
+                let type: Type;
 
                 // First try to see if the user specified a return type on the get-accessor.
-                var getterReturnType = getAnnotatedAccessorType(getter);
+                let getterReturnType = getAnnotatedAccessorType(getter);
                 if (getterReturnType) {
                     type = getterReturnType;
                 }
                 else {
                     // If the user didn't specify a return type, try to use the set-accessor's parameter type.
-                    var setterParameterType = getAnnotatedAccessorType(setter);
+                    let setterParameterType = getAnnotatedAccessorType(setter);
                     if (setterParameterType) {
                         type = setterParameterType;
                     }
@@ -2090,14 +2146,14 @@ module ts {
             else if (links.type === resolvingType) {
                 links.type = anyType;
                 if (compilerOptions.noImplicitAny) {
-                    var getter = <AccessorDeclaration>getDeclarationOfKind(symbol, SyntaxKind.GetAccessor);
+                    let getter = <AccessorDeclaration>getDeclarationOfKind(symbol, SyntaxKind.GetAccessor);
                     error(getter, Diagnostics._0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions, symbolToString(symbol));
                 }
             }
         }
 
         function getTypeOfFuncClassEnumModule(symbol: Symbol): Type {
-            var links = getSymbolLinks(symbol);
+            let links = getSymbolLinks(symbol);
             if (!links.type) {
                 links.type = createObjectType(TypeFlags.Anonymous, symbol);
             }
@@ -2105,7 +2161,7 @@ module ts {
         }
 
         function getTypeOfEnumMember(symbol: Symbol): Type {
-            var links = getSymbolLinks(symbol);
+            let links = getSymbolLinks(symbol);
             if (!links.type) {
                 links.type = getDeclaredTypeOfEnum(getParentOfSymbol(symbol));
             }
@@ -2113,7 +2169,7 @@ module ts {
         }
 
         function getTypeOfAlias(symbol: Symbol): Type {
-            var links = getSymbolLinks(symbol);
+            let links = getSymbolLinks(symbol);
             if (!links.type) {
                 links.type = getTypeOfSymbol(resolveAlias(symbol));
             }
@@ -2121,7 +2177,7 @@ module ts {
         }
 
         function getTypeOfInstantiatedSymbol(symbol: Symbol): Type {
-            var links = getSymbolLinks(symbol);
+            let links = getSymbolLinks(symbol);
             if (!links.type) {
                 links.type = instantiateType(getTypeOfSymbol(links.target), links.mapper);
             }
@@ -2157,7 +2213,7 @@ module ts {
         function hasBaseType(type: InterfaceType, checkBase: InterfaceType) {
             return check(type);
             function check(type: InterfaceType): boolean {
-                var target = <InterfaceType>getTargetType(type);
+                let target = <InterfaceType>getTargetType(type);
                 return target === checkBase || forEach(target.baseTypes, check);
             }
         }
@@ -2166,13 +2222,13 @@ module ts {
         // the same, but even if they're not we still need the complete list to ensure instantiations supply type arguments
         // for all type parameters.
         function getTypeParametersOfClassOrInterface(symbol: Symbol): TypeParameter[] {
-            var result: TypeParameter[];
+            let result: TypeParameter[];
             forEach(symbol.declarations, node => {
                 if (node.kind === SyntaxKind.InterfaceDeclaration || node.kind === SyntaxKind.ClassDeclaration) {
-                    var declaration = <InterfaceDeclaration>node;
+                    let declaration = <InterfaceDeclaration>node;
                     if (declaration.typeParameters && declaration.typeParameters.length) {
                         forEach(declaration.typeParameters, node => {
-                            var tp = getDeclaredTypeOfTypeParameter(getSymbolOfNode(node));
+                            let tp = getDeclaredTypeOfTypeParameter(getSymbolOfNode(node));
                             if (!result) {
                                 result = [tp];
                             }
@@ -2187,10 +2243,10 @@ module ts {
         }
 
         function getDeclaredTypeOfClass(symbol: Symbol): InterfaceType {
-            var links = getSymbolLinks(symbol);
+            let links = getSymbolLinks(symbol);
             if (!links.declaredType) {
-                var type = links.declaredType = <InterfaceType>createObjectType(TypeFlags.Class, symbol);
-                var typeParameters = getTypeParametersOfClassOrInterface(symbol);
+                let type = links.declaredType = <InterfaceType>createObjectType(TypeFlags.Class, symbol);
+                let typeParameters = getTypeParametersOfClassOrInterface(symbol);
                 if (typeParameters) {
                     type.flags |= TypeFlags.Reference;
                     type.typeParameters = typeParameters;
@@ -2200,10 +2256,10 @@ module ts {
                     (<GenericType>type).typeArguments = type.typeParameters;
                 }
                 type.baseTypes = [];
-                var declaration = <ClassDeclaration>getDeclarationOfKind(symbol, SyntaxKind.ClassDeclaration);
-                var baseTypeNode = getClassBaseTypeNode(declaration);
+                let declaration = <ClassDeclaration>getDeclarationOfKind(symbol, SyntaxKind.ClassDeclaration);
+                let baseTypeNode = getClassBaseTypeNode(declaration);
                 if (baseTypeNode) {
-                    var baseType = getTypeFromTypeReferenceNode(baseTypeNode);
+                    let baseType = getTypeFromTypeReferenceNode(baseTypeNode);
                     if (baseType !== unknownType) {
                         if (getTargetType(baseType).flags & TypeFlags.Class) {
                             if (type !== baseType && !hasBaseType(<InterfaceType>baseType, type)) {
@@ -2228,10 +2284,10 @@ module ts {
         }
 
         function getDeclaredTypeOfInterface(symbol: Symbol): InterfaceType {
-            var links = getSymbolLinks(symbol);
+            let links = getSymbolLinks(symbol);
             if (!links.declaredType) {
-                var type = links.declaredType = <InterfaceType>createObjectType(TypeFlags.Interface, symbol);
-                var typeParameters = getTypeParametersOfClassOrInterface(symbol);
+                let type = links.declaredType = <InterfaceType>createObjectType(TypeFlags.Interface, symbol);
+                let typeParameters = getTypeParametersOfClassOrInterface(symbol);
                 if (typeParameters) {
                     type.flags |= TypeFlags.Reference;
                     type.typeParameters = typeParameters;
@@ -2244,7 +2300,7 @@ module ts {
                 forEach(symbol.declarations, declaration => {
                     if (declaration.kind === SyntaxKind.InterfaceDeclaration && getInterfaceBaseTypeNodes(<InterfaceDeclaration>declaration)) {
                         forEach(getInterfaceBaseTypeNodes(<InterfaceDeclaration>declaration), node => {
-                            var baseType = getTypeFromTypeReferenceNode(node);
+                            let baseType = getTypeFromTypeReferenceNode(node);
                             if (baseType !== unknownType) {
                                 if (getTargetType(baseType).flags & (TypeFlags.Class | TypeFlags.Interface)) {
                                     if (type !== baseType && !hasBaseType(<InterfaceType>baseType, type)) {
@@ -2271,27 +2327,27 @@ module ts {
         }
 
         function getDeclaredTypeOfTypeAlias(symbol: Symbol): Type {
-            var links = getSymbolLinks(symbol);
+            let links = getSymbolLinks(symbol);
             if (!links.declaredType) {
                 links.declaredType = resolvingType;
-                var declaration = <TypeAliasDeclaration>getDeclarationOfKind(symbol, SyntaxKind.TypeAliasDeclaration);
-                var type = getTypeFromTypeNode(declaration.type);
+                let declaration = <TypeAliasDeclaration>getDeclarationOfKind(symbol, SyntaxKind.TypeAliasDeclaration);
+                let type = getTypeFromTypeNode(declaration.type);
                 if (links.declaredType === resolvingType) {
                     links.declaredType = type;
                 }
             }
             else if (links.declaredType === resolvingType) {
                 links.declaredType = unknownType;
-                var declaration = <TypeAliasDeclaration>getDeclarationOfKind(symbol, SyntaxKind.TypeAliasDeclaration);
+                let declaration = <TypeAliasDeclaration>getDeclarationOfKind(symbol, SyntaxKind.TypeAliasDeclaration);
                 error(declaration.name, Diagnostics.Type_alias_0_circularly_references_itself, symbolToString(symbol));
             }
             return links.declaredType;
         }
 
         function getDeclaredTypeOfEnum(symbol: Symbol): Type {
-            var links = getSymbolLinks(symbol);
+            let links = getSymbolLinks(symbol);
             if (!links.declaredType) {
-                var type = createType(TypeFlags.Enum);
+                let type = createType(TypeFlags.Enum);
                 type.symbol = symbol;
                 links.declaredType = type;
             }
@@ -2299,9 +2355,9 @@ module ts {
         }
 
         function getDeclaredTypeOfTypeParameter(symbol: Symbol): TypeParameter {
-            var links = getSymbolLinks(symbol);
+            let links = getSymbolLinks(symbol);
             if (!links.declaredType) {
-                var type = <TypeParameter>createType(TypeFlags.TypeParameter);
+                let type = <TypeParameter>createType(TypeFlags.TypeParameter);
                 type.symbol = symbol;
                 if (!(<TypeParameterDeclaration>getDeclarationOfKind(symbol, SyntaxKind.TypeParameter)).constraint) {
                     type.constraint = noConstraintType;
@@ -2312,7 +2368,7 @@ module ts {
         }
 
         function getDeclaredTypeOfAlias(symbol: Symbol): Type {
-            var links = getSymbolLinks(symbol);
+            let links = getSymbolLinks(symbol);
             if (!links.declaredType) {
                 links.declaredType = getDeclaredTypeOfSymbol(resolveAlias(symbol));
             }
@@ -2343,26 +2399,23 @@ module ts {
         }
 
         function createSymbolTable(symbols: Symbol[]): SymbolTable {
-            var result: SymbolTable = {};
-            for (var i = 0; i < symbols.length; i++) {
-                var symbol = symbols[i];
+            let result: SymbolTable = {};
+            for (let symbol of symbols) {
                 result[symbol.name] = symbol;
             }
             return result;
         }
 
         function createInstantiatedSymbolTable(symbols: Symbol[], mapper: TypeMapper): SymbolTable {
-            var result: SymbolTable = {};
-            for (var i = 0; i < symbols.length; i++) {
-                var symbol = symbols[i];
+            let result: SymbolTable = {};
+            for (let symbol of symbols) {
                 result[symbol.name] = instantiateSymbol(symbol, mapper);
             }
             return result;
         }
 
         function addInheritedMembers(symbols: SymbolTable, baseSymbols: Symbol[]) {
-            for (var i = 0; i < baseSymbols.length; i++) {
-                var s = baseSymbols[i];
+            for (let s of baseSymbols) {
                 if (!hasProperty(symbols, s.name)) {
                     symbols[s.name] = s;
                 }
@@ -2371,18 +2424,18 @@ module ts {
 
         function addInheritedSignatures(signatures: Signature[], baseSignatures: Signature[]) {
             if (baseSignatures) {
-                for (var i = 0; i < baseSignatures.length; i++) {
-                    signatures.push(baseSignatures[i]);
+                for (let signature of baseSignatures) {
+                    signatures.push(signature);
                 }
             }
         }
 
         function resolveClassOrInterfaceMembers(type: InterfaceType): void {
-            var members = type.symbol.members;
-            var callSignatures = type.declaredCallSignatures;
-            var constructSignatures = type.declaredConstructSignatures;
-            var stringIndexType = type.declaredStringIndexType;
-            var numberIndexType = type.declaredNumberIndexType;
+            let members = type.symbol.members;
+            let callSignatures = type.declaredCallSignatures;
+            let constructSignatures = type.declaredConstructSignatures;
+            let stringIndexType = type.declaredStringIndexType;
+            let numberIndexType = type.declaredNumberIndexType;
             if (type.baseTypes.length) {
                 members = createSymbolTable(type.declaredProperties);
                 forEach(type.baseTypes, baseType => {
@@ -2397,15 +2450,15 @@ module ts {
         }
 
         function resolveTypeReferenceMembers(type: TypeReference): void {
-            var target = type.target;
-            var mapper = createTypeMapper(target.typeParameters, type.typeArguments);
-            var members = createInstantiatedSymbolTable(target.declaredProperties, mapper);
-            var callSignatures = instantiateList(target.declaredCallSignatures, mapper, instantiateSignature);
-            var constructSignatures = instantiateList(target.declaredConstructSignatures, mapper, instantiateSignature);
-            var stringIndexType = target.declaredStringIndexType ? instantiateType(target.declaredStringIndexType, mapper) : undefined;
-            var numberIndexType = target.declaredNumberIndexType ? instantiateType(target.declaredNumberIndexType, mapper) : undefined;
+            let target = type.target;
+            let mapper = createTypeMapper(target.typeParameters, type.typeArguments);
+            let members = createInstantiatedSymbolTable(target.declaredProperties, mapper);
+            let callSignatures = instantiateList(target.declaredCallSignatures, mapper, instantiateSignature);
+            let constructSignatures = instantiateList(target.declaredConstructSignatures, mapper, instantiateSignature);
+            let stringIndexType = target.declaredStringIndexType ? instantiateType(target.declaredStringIndexType, mapper) : undefined;
+            let numberIndexType = target.declaredNumberIndexType ? instantiateType(target.declaredNumberIndexType, mapper) : undefined;
             forEach(target.baseTypes, baseType => {
-                var instantiatedBaseType = instantiateType(baseType, mapper);
+                let instantiatedBaseType = instantiateType(baseType, mapper);
                 addInheritedMembers(members, getPropertiesOfObjectType(instantiatedBaseType));
                 callSignatures = concatenate(callSignatures, getSignaturesOfType(instantiatedBaseType, SignatureKind.Call));
                 constructSignatures = concatenate(constructSignatures, getSignaturesOfType(instantiatedBaseType, SignatureKind.Construct));
@@ -2417,7 +2470,7 @@ module ts {
 
         function createSignature(declaration: SignatureDeclaration, typeParameters: TypeParameter[], parameters: Symbol[],
             resolvedReturnType: Type, minArgumentCount: number, hasRestParameter: boolean, hasStringLiterals: boolean): Signature {
-            var sig = new Signature(checker);
+            let sig = new Signature(checker);
             sig.declaration = declaration;
             sig.typeParameters = typeParameters;
             sig.parameters = parameters;
@@ -2435,10 +2488,10 @@ module ts {
 
         function getDefaultConstructSignatures(classType: InterfaceType): Signature[] {
             if (classType.baseTypes.length) {
-                var baseType = classType.baseTypes[0];
-                var baseSignatures = getSignaturesOfType(getTypeOfSymbol(baseType.symbol), SignatureKind.Construct);
+                let baseType = classType.baseTypes[0];
+                let baseSignatures = getSignaturesOfType(getTypeOfSymbol(baseType.symbol), SignatureKind.Construct);
                 return map(baseSignatures, baseSignature => {
-                    var signature = baseType.flags & TypeFlags.Reference ?
+                    let signature = baseType.flags & TypeFlags.Reference ?
                         getSignatureInstantiation(baseSignature, (<TypeReference>baseType).typeArguments) : cloneSignature(baseSignature);
                     signature.typeParameters = classType.typeParameters;
                     signature.resolvedReturnType = classType;
@@ -2449,9 +2502,9 @@ module ts {
         }
 
         function createTupleTypeMemberSymbols(memberTypes: Type[]): SymbolTable {
-            var members: SymbolTable = {};
-            for (var i = 0; i < memberTypes.length; i++) {
-                var symbol = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "" + i);
+            let members: SymbolTable = {};
+            for (let i = 0; i < memberTypes.length; i++) {
+                let symbol = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "" + i);
                 symbol.type = memberTypes[i];
                 members[i] = symbol;
             }
@@ -2459,8 +2512,8 @@ module ts {
         }
 
         function resolveTupleTypeMembers(type: TupleType) {
-            var arrayType = resolveObjectOrUnionTypeMembers(createArrayType(getUnionType(type.elementTypes)));
-            var members = createTupleTypeMemberSymbols(type.elementTypes);
+            let arrayType = resolveObjectOrUnionTypeMembers(createArrayType(getUnionType(type.elementTypes)));
+            let members = createTupleTypeMemberSymbols(type.elementTypes);
             addInheritedMembers(members, arrayType.properties);
             setObjectTypeMembers(type, members, arrayType.callSignatures, arrayType.constructSignatures, arrayType.stringIndexType, arrayType.numberIndexType);
         }
@@ -2469,7 +2522,7 @@ module ts {
             if (s.length !== t.length) {
                 return false;
             }
-            for (var i = 0; i < s.length; i++) {
+            for (let i = 0; i < s.length; i++) {
                 if (!compareSignatures(s[i], t[i], /*compareReturnTypes*/ false, compareTypes)) {
                     return false;
                 }
@@ -2481,21 +2534,21 @@ module ts {
         // and if none of the signatures are generic, return a list of signatures that has substitutes a union of the
         // return types of the corresponding signatures in each resulting signature.
         function getUnionSignatures(types: Type[], kind: SignatureKind): Signature[] {
-            var signatureLists = map(types, t => getSignaturesOfType(t, kind));
-            var signatures = signatureLists[0];
-            for (var i = 0; i < signatures.length; i++) {
-                if (signatures[i].typeParameters) {
+            let signatureLists = map(types, t => getSignaturesOfType(t, kind));
+            let signatures = signatureLists[0];
+            for (let signature of signatures) {
+                if (signature.typeParameters) {
                     return emptyArray;
                 }
             }
-            for (var i = 1; i < signatureLists.length; i++) {
+            for (let i = 1; i < signatureLists.length; i++) {
                 if (!signatureListsIdentical(signatures, signatureLists[i])) {
                     return emptyArray;
                 }
             }
-            var result = map(signatures, cloneSignature);
+            let result = map(signatures, cloneSignature);
             for (var i = 0; i < result.length; i++) {
-                var s = result[i];
+                let s = result[i];
                 // Clear resolved return type we possibly got from cloneSignature
                 s.resolvedReturnType = undefined;
                 s.unionSignatures = map(signatureLists, signatures => signatures[i]);
@@ -2504,9 +2557,9 @@ module ts {
         }
 
         function getUnionIndexType(types: Type[], kind: IndexKind): Type {
-            var indexTypes: Type[] = [];
-            for (var i = 0; i < types.length; i++) {
-                var indexType = getIndexTypeOfType(types[i], kind);
+            let indexTypes: Type[] = [];
+            for (let type of types) {
+                let indexType = getIndexTypeOfType(type, kind);
                 if (!indexType) {
                     return undefined;
                 }
@@ -2518,15 +2571,15 @@ module ts {
         function resolveUnionTypeMembers(type: UnionType) {
             // The members and properties collections are empty for union types. To get all properties of a union
             // type use getPropertiesOfType (only the language service uses this).
-            var callSignatures = getUnionSignatures(type.types, SignatureKind.Call);
-            var constructSignatures = getUnionSignatures(type.types, SignatureKind.Construct);
-            var stringIndexType = getUnionIndexType(type.types, IndexKind.String);
-            var numberIndexType = getUnionIndexType(type.types, IndexKind.Number);
+            let callSignatures = getUnionSignatures(type.types, SignatureKind.Call);
+            let constructSignatures = getUnionSignatures(type.types, SignatureKind.Construct);
+            let stringIndexType = getUnionIndexType(type.types, IndexKind.String);
+            let numberIndexType = getUnionIndexType(type.types, IndexKind.Number);
             setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexType, numberIndexType);
         }
 
         function resolveAnonymousTypeMembers(type: ObjectType) {
-            var symbol = type.symbol;
+            let symbol = type.symbol;
             if (symbol.flags & SymbolFlags.TypeLiteral) {
                 var members = symbol.members;
                 var callSignatures = getSignaturesOfSymbol(members["__call"]);
@@ -2546,7 +2599,7 @@ module ts {
                     callSignatures = getSignaturesOfSymbol(symbol);
                 }
                 if (symbol.flags & SymbolFlags.Class) {
-                    var classType = getDeclaredTypeOfClass(symbol);
+                    let classType = getDeclaredTypeOfClass(symbol);
                     constructSignatures = getSignaturesOfSymbol(symbol.members["__constructor"]);
                     if (!constructSignatures.length) {
                         constructSignatures = getDefaultConstructSignatures(classType);
@@ -2595,9 +2648,9 @@ module ts {
         // the symbol for that property. Otherwise return undefined.
         function getPropertyOfObjectType(type: Type, name: string): Symbol {
             if (type.flags & TypeFlags.ObjectType) {
-                var resolved = resolveObjectOrUnionTypeMembers(<ObjectType>type);
+                let resolved = resolveObjectOrUnionTypeMembers(<ObjectType>type);
                 if (hasProperty(resolved.members, name)) {
-                    var symbol = resolved.members[name];
+                    let symbol = resolved.members[name];
                     if (symbolIsValue(symbol)) {
                         return symbol;
                     }
@@ -2606,9 +2659,9 @@ module ts {
         }
 
         function getPropertiesOfUnionType(type: UnionType): Symbol[] {
-            var result: Symbol[] = [];
+            let result: Symbol[] = [];
             forEach(getPropertiesOfType(type.types[0]), prop => {
-                var unionProp = getPropertyOfUnionType(type, prop.name);
+                let unionProp = getPropertyOfUnionType(type, prop.name);
                 if (unionProp) {
                     result.push(unionProp);
                 }
@@ -2651,12 +2704,12 @@ module ts {
         }
 
         function createUnionProperty(unionType: UnionType, name: string): Symbol {
-            var types = unionType.types;
-            var props: Symbol[];
-            for (var i = 0; i < types.length; i++) {
-                var type = getApparentType(types[i]);
+            let types = unionType.types;
+            let props: Symbol[];
+            for (let current of types) {
+                let type = getApparentType(current);
                 if (type !== unknownType) {
-                    var prop = getPropertyOfType(type, name);
+                    let prop = getPropertyOfType(type, name);
                     if (!prop) {
                         return undefined;
                     }
@@ -2668,16 +2721,15 @@ module ts {
                     }
                 }
             }
-            var propTypes: Type[] = [];
-            var declarations: Declaration[] = [];
-            for (var i = 0; i < props.length; i++) {
-                var prop = props[i];
+            let propTypes: Type[] = [];
+            let declarations: Declaration[] = [];
+            for (let prop of props) {
                 if (prop.declarations) {
                     declarations.push.apply(declarations, prop.declarations);
                 }
                 propTypes.push(getTypeOfSymbol(prop));
             }
-            var result = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | SymbolFlags.UnionProperty, name);
+            let result = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | SymbolFlags.UnionProperty, name);
             result.unionType = unionType;
             result.declarations = declarations;
             result.type = getUnionType(propTypes);
@@ -2685,11 +2737,11 @@ module ts {
         }
 
         function getPropertyOfUnionType(type: UnionType, name: string): Symbol {
-            var properties = type.resolvedProperties || (type.resolvedProperties = {});
+            let properties = type.resolvedProperties || (type.resolvedProperties = {});
             if (hasProperty(properties, name)) {
                 return properties[name];
             }
-            var property = createUnionProperty(type, name);
+            let property = createUnionProperty(type, name);
             if (property) {
                 properties[name] = property;
             }
@@ -2709,15 +2761,15 @@ module ts {
                     return undefined;
                 }
             }
-            var resolved = resolveObjectOrUnionTypeMembers(type);
+            let resolved = resolveObjectOrUnionTypeMembers(type);
             if (hasProperty(resolved.members, name)) {
-                var symbol = resolved.members[name];
+                let symbol = resolved.members[name];
                 if (symbolIsValue(symbol)) {
                     return symbol;
                 }
             }
             if (resolved === anyFunctionType || resolved.callSignatures.length || resolved.constructSignatures.length) {
-                var symbol = getPropertyOfObjectType(globalFunctionType, name);
+                let symbol = getPropertyOfObjectType(globalFunctionType, name);
                 if (symbol) return symbol;
             }
             return getPropertyOfObjectType(globalObjectType, name);
@@ -2725,7 +2777,7 @@ module ts {
 
         function getSignaturesOfObjectOrUnionType(type: Type, kind: SignatureKind): Signature[] {
             if (type.flags & (TypeFlags.ObjectType | TypeFlags.Union)) {
-                var resolved = resolveObjectOrUnionTypeMembers(<ObjectType>type);
+                let resolved = resolveObjectOrUnionTypeMembers(<ObjectType>type);
                 return kind === SignatureKind.Call ? resolved.callSignatures : resolved.constructSignatures;
             }
             return emptyArray;
@@ -2739,7 +2791,7 @@ module ts {
 
         function getIndexTypeOfObjectOrUnionType(type: Type, kind: IndexKind): Type {
             if (type.flags & (TypeFlags.ObjectType | TypeFlags.Union)) {
-                var resolved = resolveObjectOrUnionTypeMembers(<ObjectType>type);
+                let resolved = resolveObjectOrUnionTypeMembers(<ObjectType>type);
                 return kind === IndexKind.String ? resolved.stringIndexType : resolved.numberIndexType;
             }
         }
@@ -2753,9 +2805,9 @@ module ts {
         // Return list of type parameters with duplicates removed (duplicate identifier errors are generated in the actual
         // type checking functions).
         function getTypeParametersFromDeclaration(typeParameterDeclarations: TypeParameterDeclaration[]): TypeParameter[] {
-            var result: TypeParameter[] = [];
+            let result: TypeParameter[] = [];
             forEach(typeParameterDeclarations, node => {
-                var tp = getDeclaredTypeOfTypeParameter(node.symbol);
+                let tp = getDeclaredTypeOfTypeParameter(node.symbol);
                 if (!contains(result, tp)) {
                     result.push(tp);
                 }
@@ -2768,7 +2820,7 @@ module ts {
                 return emptyArray;
             }
 
-            var module = resolveExternalModuleName(node, node.moduleSpecifier);
+            let module = resolveExternalModuleName(node, node.moduleSpecifier);
             if (!module || !module.exports) {
                 return emptyArray;
             }
@@ -2777,16 +2829,16 @@ module ts {
         }
 
         function getSignatureFromDeclaration(declaration: SignatureDeclaration): Signature {
-            var links = getNodeLinks(declaration);
+            let links = getNodeLinks(declaration);
             if (!links.resolvedSignature) {
-                var classType = declaration.kind === SyntaxKind.Constructor ? getDeclaredTypeOfClass((<ClassDeclaration>declaration.parent).symbol) : undefined;
-                var typeParameters = classType ? classType.typeParameters :
+                let classType = declaration.kind === SyntaxKind.Constructor ? getDeclaredTypeOfClass((<ClassDeclaration>declaration.parent).symbol) : undefined;
+                let typeParameters = classType ? classType.typeParameters :
                     declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) : undefined;
-                var parameters: Symbol[] = [];
-                var hasStringLiterals = false;
-                var minArgumentCount = -1;
-                for (var i = 0, n = declaration.parameters.length; i < n; i++) {
-                    var param = declaration.parameters[i];
+                let parameters: Symbol[] = [];
+                let hasStringLiterals = false;
+                let minArgumentCount = -1;
+                for (let i = 0, n = declaration.parameters.length; i < n; i++) {
+                    let param = declaration.parameters[i];
                     parameters.push(param.symbol);
                     if (param.type && param.type.kind === SyntaxKind.StringLiteral) {
                         hasStringLiterals = true;
@@ -2802,7 +2854,7 @@ module ts {
                     minArgumentCount = declaration.parameters.length;
                 }
 
-                var returnType: Type;
+                let returnType: Type;
                 if (classType) {
                     returnType = classType;
                 }
@@ -2813,7 +2865,7 @@ module ts {
                     // TypeScript 1.0 spec (April 2014):
                     // If only one accessor includes a type annotation, the other behaves as if it had the same type annotation.
                     if (declaration.kind === SyntaxKind.GetAccessor && !hasDynamicName(declaration)) {
-                        var setter = <AccessorDeclaration>getDeclarationOfKind(declaration.symbol, SyntaxKind.SetAccessor);
+                        let setter = <AccessorDeclaration>getDeclarationOfKind(declaration.symbol, SyntaxKind.SetAccessor);
                         returnType = getAnnotatedAccessorType(setter);
                     }
 
@@ -2830,9 +2882,9 @@ module ts {
 
         function getSignaturesOfSymbol(symbol: Symbol): Signature[] {
             if (!symbol) return emptyArray;
-            var result: Signature[] = [];
-            for (var i = 0, len = symbol.declarations.length; i < len; i++) {
-                var node = symbol.declarations[i];
+            let result: Signature[] = [];
+            for (let i = 0, len = symbol.declarations.length; i < len; i++) {
+                let node = symbol.declarations[i];
                 switch (node.kind) {
                     case SyntaxKind.FunctionType:
                     case SyntaxKind.ConstructorType:
@@ -2851,7 +2903,7 @@ module ts {
                         // an implementation node if it has a body and the previous node is of the same kind and immediately
                         // precedes the implementation node (i.e. has the same parent and ends where the implementation starts).
                         if (i > 0 && (<FunctionLikeDeclaration>node).body) {
-                            var previous = symbol.declarations[i - 1];
+                            let previous = symbol.declarations[i - 1];
                             if (node.parent === previous.parent && node.kind === previous.kind && node.pos === previous.end) {
                                 break;
                             }
@@ -2881,7 +2933,7 @@ module ts {
             else if (signature.resolvedReturnType === resolvingType) {
                 signature.resolvedReturnType = anyType;
                 if (compilerOptions.noImplicitAny) {
-                    var declaration = <Declaration>signature.declaration;
+                    let declaration = <Declaration>signature.declaration;
                     if (declaration.name) {
                         error(declaration.name, Diagnostics._0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions, declarationNameToString(declaration.name));
                     }
@@ -2895,7 +2947,7 @@ module ts {
 
         function getRestTypeOfSignature(signature: Signature): Type {
             if (signature.hasRestParameter) {
-                var type = getTypeOfSymbol(signature.parameters[signature.parameters.length - 1]);
+                let type = getTypeOfSymbol(signature.parameters[signature.parameters.length - 1]);
                 if (type.flags & TypeFlags.Reference && (<TypeReference>type).target === globalArrayType) {
                     return (<TypeReference>type).typeArguments[0];
                 }
@@ -2926,8 +2978,8 @@ module ts {
             // object type literal or interface (using the new keyword). Each way of declaring a constructor
             // will result in a different declaration kind.
             if (!signature.isolatedSignatureType) {
-                var isConstructor = signature.declaration.kind === SyntaxKind.Constructor || signature.declaration.kind === SyntaxKind.ConstructSignature;
-                var type = <ResolvedType>createObjectType(TypeFlags.Anonymous | TypeFlags.FromSignature);
+                let isConstructor = signature.declaration.kind === SyntaxKind.Constructor || signature.declaration.kind === SyntaxKind.ConstructSignature;
+                let type = <ResolvedType>createObjectType(TypeFlags.Anonymous | TypeFlags.FromSignature);
                 type.members = emptySymbols;
                 type.properties = emptyArray;
                 type.callSignatures = !isConstructor ? [signature] : emptyArray;
@@ -2943,14 +2995,14 @@ module ts {
         }
 
         function getIndexDeclarationOfSymbol(symbol: Symbol, kind: IndexKind): SignatureDeclaration {
-            var syntaxKind = kind === IndexKind.Number ? SyntaxKind.NumberKeyword : SyntaxKind.StringKeyword;
-            var indexSymbol = getIndexSymbol(symbol);
+            let syntaxKind = kind === IndexKind.Number ? SyntaxKind.NumberKeyword : SyntaxKind.StringKeyword;
+            let indexSymbol = getIndexSymbol(symbol);
             if (indexSymbol) {
-                var len = indexSymbol.declarations.length;
-                for (var i = 0; i < len; i++) {
-                    var node = <SignatureDeclaration>indexSymbol.declarations[i];
+                let len = indexSymbol.declarations.length;
+                for (let decl of indexSymbol.declarations) {
+                    let node = <SignatureDeclaration>decl;
                     if (node.parameters.length === 1) {
-                        var parameter = node.parameters[0];
+                        let parameter = node.parameters[0];
                         if (parameter && parameter.type && parameter.type.kind === syntaxKind) {
                             return node;
                         }
@@ -2962,7 +3014,7 @@ module ts {
         }
 
         function getIndexTypeOfSymbol(symbol: Symbol, kind: IndexKind): Type {
-            var declaration = getIndexDeclarationOfSymbol(symbol, kind);
+            let declaration = getIndexDeclarationOfSymbol(symbol, kind);
             return declaration
                 ? declaration.type ? getTypeFromTypeNode(declaration.type) : anyType
                 : undefined;
@@ -2971,7 +3023,7 @@ module ts {
         function getConstraintOfTypeParameter(type: TypeParameter): Type {
             if (!type.constraint) {
                 if (type.target) {
-                    var targetConstraint = getConstraintOfTypeParameter(type.target);
+                    let targetConstraint = getConstraintOfTypeParameter(type.target);
                     type.constraint = targetConstraint ? instantiateType(targetConstraint, type.mapper) : noConstraintType;
                 }
                 else {
@@ -2988,9 +3040,12 @@ module ts {
                 case 2:
                     return types[0].id + "," + types[1].id;
                 default:
-                    var result = "";
-                    for (var i = 0; i < types.length; i++) {
-                        if (i > 0) result += ",";
+                    let result = "";
+                    for (let i = 0; i < types.length; i++) {
+                        if (i > 0) {
+                            result += ",";
+                        }
+
                         result += types[i].id;
                     }
                     return result;
@@ -3001,18 +3056,18 @@ module ts {
         // It is only necessary to do so if a constituent type might be the undefined type, the null type, or the type
         // of an object literal (since those types have widening related information we need to track).
         function getWideningFlagsOfTypes(types: Type[]): TypeFlags {
-            var result: TypeFlags = 0;
-            for (var i = 0; i < types.length; i++) {
-                result |= types[i].flags;
+            let result: TypeFlags = 0;
+            for (let type of types) {
+                result |= type.flags;
             }
             return result & TypeFlags.RequiresWidening;
         }
 
         function createTypeReference(target: GenericType, typeArguments: Type[]): TypeReference {
-            var id = getTypeListId(typeArguments);
-            var type = target.instantiations[id];
+            let id = getTypeListId(typeArguments);
+            let type = target.instantiations[id];
             if (!type) {
-                var flags = TypeFlags.Reference | getWideningFlagsOfTypes(typeArguments);
+                let flags = TypeFlags.Reference | getWideningFlagsOfTypes(typeArguments);
                 type = target.instantiations[id] = <TypeReference>createObjectType(flags, target.symbol);
                 type.target = target;
                 type.typeArguments = typeArguments;
@@ -3021,13 +3076,13 @@ module ts {
         }
 
         function isTypeParameterReferenceIllegalInConstraint(typeReferenceNode: TypeReferenceNode, typeParameterSymbol: Symbol): boolean {
-            var links = getNodeLinks(typeReferenceNode);
+            let links = getNodeLinks(typeReferenceNode);
             if (links.isIllegalTypeReferenceInConstraint !== undefined) {
                 return links.isIllegalTypeReferenceInConstraint;
             }
 
             // bubble up to the declaration
-            var currentNode: Node = typeReferenceNode;
+            let currentNode: Node = typeReferenceNode;
             // forEach === exists
             while (!forEach(typeParameterSymbol.declarations, d => d.parent === currentNode.parent)) {
                 currentNode = currentNode.parent;
@@ -3038,19 +3093,19 @@ module ts {
         }
 
         function checkTypeParameterHasIllegalReferencesInConstraint(typeParameter: TypeParameterDeclaration): void {
-            var typeParameterSymbol: Symbol;
+            let typeParameterSymbol: Symbol;
             function check(n: Node): void {
                 if (n.kind === SyntaxKind.TypeReference && (<TypeReferenceNode>n).typeName.kind === SyntaxKind.Identifier) {
-                    var links = getNodeLinks(n);
+                    let links = getNodeLinks(n);
                     if (links.isIllegalTypeReferenceInConstraint === undefined) {
-                        var symbol = resolveName(typeParameter, (<Identifier>(<TypeReferenceNode>n).typeName).text, SymbolFlags.Type, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined);
+                        let symbol = resolveName(typeParameter, (<Identifier>(<TypeReferenceNode>n).typeName).text, SymbolFlags.Type, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined);
                         if (symbol && (symbol.flags & SymbolFlags.TypeParameter)) {
                             // TypeScript 1.0 spec (April 2014): 3.4.1
-                            // Type parameters declared in a particular type parameter list 
+                            // Type parameters declared in a particular type parameter list
                             // may not be referenced in constraints in that type parameter list
-                            
+
                             // symbol.declaration.parent === typeParameter.parent
-                            // -> typeParameter and symbol.declaration originate from the same type parameter list 
+                            // -> typeParameter and symbol.declaration originate from the same type parameter list
                             // -> illegal for all declarations in symbol
                             // forEach === exists
                             links.isIllegalTypeReferenceInConstraint = forEach(symbol.declarations, d => d.parent == typeParameter.parent);
@@ -3070,14 +3125,14 @@ module ts {
         }
 
         function getTypeFromTypeReferenceNode(node: TypeReferenceNode): Type {
-            var links = getNodeLinks(node);
+            let links = getNodeLinks(node);
             if (!links.resolvedType) {
-                var symbol = resolveEntityName(node.typeName, SymbolFlags.Type);
+                let symbol = resolveEntityName(node.typeName, SymbolFlags.Type);
                 if (symbol) {
                     var type: Type;
                     if ((symbol.flags & SymbolFlags.TypeParameter) && isTypeParameterReferenceIllegalInConstraint(node, symbol)) {
                         // TypeScript 1.0 spec (April 2014): 3.4.1
-                        // Type parameters declared in a particular type parameter list 
+                        // Type parameters declared in a particular type parameter list
                         // may not be referenced in constraints in that type parameter list
                         // Implementation: such type references are resolved to 'unknown' type that usually denotes error
                         type = unknownType;
@@ -3085,7 +3140,7 @@ module ts {
                     else {
                         type = getDeclaredTypeOfSymbol(symbol);
                         if (type.flags & (TypeFlags.Class | TypeFlags.Interface) && type.flags & TypeFlags.Reference) {
-                            var typeParameters = (<InterfaceType>type).typeParameters;
+                            let typeParameters = (<InterfaceType>type).typeParameters;
                             if (node.typeArguments && node.typeArguments.length === typeParameters.length) {
                                 type = createTypeReference(<GenericType>type, map(node.typeArguments, getTypeFromTypeNode));
                             }
@@ -3108,12 +3163,12 @@ module ts {
         }
 
         function getTypeFromTypeQueryNode(node: TypeQueryNode): Type {
-            var links = getNodeLinks(node);
+            let links = getNodeLinks(node);
             if (!links.resolvedType) {
                 // TypeScript 1.0 spec (April 2014): 3.6.3
                 // The expression is processed as an identifier expression (section 4.3)
                 // or property access expression(section 4.10),
-                // the widened type(section 3.9) of which becomes the result. 
+                // the widened type(section 3.9) of which becomes the result.
                 links.resolvedType = getWidenedType(checkExpressionOrQualifiedName(node.exprName));
             }
             return links.resolvedType;
@@ -3122,9 +3177,8 @@ module ts {
         function getTypeOfGlobalSymbol(symbol: Symbol, arity: number): ObjectType {
 
             function getTypeDeclaration(symbol: Symbol): Declaration {
-                var declarations = symbol.declarations;
-                for (var i = 0; i < declarations.length; i++) {
-                    var declaration = declarations[i];
+                let declarations = symbol.declarations;
+                for (let declaration of declarations) {
                     switch (declaration.kind) {
                         case SyntaxKind.ClassDeclaration:
                         case SyntaxKind.InterfaceDeclaration:
@@ -3137,7 +3191,7 @@ module ts {
             if (!symbol) {
                 return emptyObjectType;
             }
-            var type = getDeclaredTypeOfSymbol(symbol);
+            let type = getDeclaredTypeOfSymbol(symbol);
             if (!(type.flags & TypeFlags.ObjectType)) {
                 error(getTypeDeclaration(symbol), Diagnostics.Global_type_0_must_be_a_class_or_interface_type, symbol.name);
                 return emptyObjectType;
@@ -3173,12 +3227,12 @@ module ts {
             // globalArrayType will be undefined if we get here during creation of the Array type. This for example happens if
             // user code augments the Array type with call or construct signatures that have an array type as the return type.
             // We instead use globalArraySymbol to obtain the (not yet fully constructed) Array type.
-            var arrayType = globalArrayType || getDeclaredTypeOfSymbol(globalArraySymbol);
+            let arrayType = globalArrayType || getDeclaredTypeOfSymbol(globalArraySymbol);
             return arrayType !== emptyObjectType ? createTypeReference(<GenericType>arrayType, [elementType]) : emptyObjectType;
         }
 
         function getTypeFromArrayTypeNode(node: ArrayTypeNode): Type {
-            var links = getNodeLinks(node);
+            let links = getNodeLinks(node);
             if (!links.resolvedType) {
                 links.resolvedType = createArrayType(getTypeFromTypeNode(node.elementType));
             }
@@ -3186,8 +3240,8 @@ module ts {
         }
 
         function createTupleType(elementTypes: Type[]) {
-            var id = getTypeListId(elementTypes);
-            var type = tupleTypes[id];
+            let id = getTypeListId(elementTypes);
+            let type = tupleTypes[id];
             if (!type) {
                 type = tupleTypes[id] = <TupleType>createObjectType(TypeFlags.Tuple);
                 type.elementTypes = elementTypes;
@@ -3196,7 +3250,7 @@ module ts {
         }
 
         function getTypeFromTupleTypeNode(node: TupleTypeNode): Type {
-            var links = getNodeLinks(node);
+            let links = getNodeLinks(node);
             if (!links.resolvedType) {
                 links.resolvedType = createTupleType(map(node.elementTypes, getTypeFromTypeNode));
             }
@@ -3208,8 +3262,8 @@ module ts {
                 addTypesToSortedSet(sortedSet, (<UnionType>type).types);
             }
             else {
-                var i = 0;
-                var id = type.id;
+                let i = 0;
+                let id = type.id;
                 while (i < sortedSet.length && sortedSet[i].id < id) {
                     i++;
                 }
@@ -3220,14 +3274,14 @@ module ts {
         }
 
         function addTypesToSortedSet(sortedTypes: Type[], types: Type[]) {
-            for (var i = 0, len = types.length; i < len; i++) {
-                addTypeToSortedSet(sortedTypes, types[i]);
+            for (let type of types) {
+                addTypeToSortedSet(sortedTypes, type);
             }
         }
 
         function isSubtypeOfAny(candidate: Type, types: Type[]): boolean {
-            for (var i = 0, len = types.length; i < len; i++) {
-                if (candidate !== types[i] && isTypeSubtypeOf(candidate, types[i])) {
+            for (let type of types) {
+                if (candidate !== type && isTypeSubtypeOf(candidate, type)) {
                     return true;
                 }
             }
@@ -3235,7 +3289,7 @@ module ts {
         }
 
         function removeSubtypes(types: Type[]) {
-            var i = types.length;
+            let i = types.length;
             while (i > 0) {
                 i--;
                 if (isSubtypeOfAny(types[i], types)) {
@@ -3245,8 +3299,8 @@ module ts {
         }
 
         function containsAnyType(types: Type[]) {
-            for (var i = 0; i < types.length; i++) {
-                if (types[i].flags & TypeFlags.Any) {
+            for (let type of types) {
+                if (type.flags & TypeFlags.Any) {
                     return true;
                 }
             }
@@ -3254,7 +3308,7 @@ module ts {
         }
 
         function removeAllButLast(types: Type[], typeToRemove: Type) {
-            var i = types.length;
+            let i = types.length;
             while (i > 0 && types.length > 1) {
                 i--;
                 if (types[i] === typeToRemove) {
@@ -3267,7 +3321,7 @@ module ts {
             if (types.length === 0) {
                 return emptyObjectType;
             }
-            var sortedTypes: Type[] = [];
+            let sortedTypes: Type[] = [];
             addTypesToSortedSet(sortedTypes, types);
             if (noSubtypeReduction) {
                 if (containsAnyType(sortedTypes)) {
@@ -3282,8 +3336,8 @@ module ts {
             if (sortedTypes.length === 1) {
                 return sortedTypes[0];
             }
-            var id = getTypeListId(sortedTypes);
-            var type = unionTypes[id];
+            let id = getTypeListId(sortedTypes);
+            let type = unionTypes[id];
             if (!type) {
                 type = unionTypes[id] = <UnionType>createObjectType(TypeFlags.Union | getWideningFlagsOfTypes(sortedTypes));
                 type.types = sortedTypes;
@@ -3292,7 +3346,7 @@ module ts {
         }
 
         function getTypeFromUnionTypeNode(node: UnionTypeNode): Type {
-            var links = getNodeLinks(node);
+            let links = getNodeLinks(node);
             if (!links.resolvedType) {
                 links.resolvedType = getUnionType(map(node.types, getTypeFromTypeNode), /*noSubtypeReduction*/ true);
             }
@@ -3300,7 +3354,7 @@ module ts {
         }
 
         function getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node: Node): Type {
-            var links = getNodeLinks(node);
+            let links = getNodeLinks(node);
             if (!links.resolvedType) {
                 // Deferred resolution of members is handled by resolveObjectTypeMembers
                 links.resolvedType = createObjectType(TypeFlags.Anonymous, node.symbol);
@@ -3313,13 +3367,13 @@ module ts {
                 return stringLiteralTypes[node.text];
             }
 
-            var type = stringLiteralTypes[node.text] = <StringLiteralType>createType(TypeFlags.StringLiteral);
+            let type = stringLiteralTypes[node.text] = <StringLiteralType>createType(TypeFlags.StringLiteral);
             type.text = getTextOfNode(node);
             return type;
         }
 
         function getTypeFromStringLiteral(node: LiteralExpression): Type {
-            var links = getNodeLinks(node);
+            let links = getNodeLinks(node);
             if (!links.resolvedType) {
                 links.resolvedType = getStringLiteralType(node);
             }
@@ -3362,7 +3416,7 @@ module ts {
                 // Callers should first ensure this by calling isTypeNode
                 case SyntaxKind.Identifier:
                 case SyntaxKind.QualifiedName:
-                    var symbol = getSymbolInfo(node);
+                    let symbol = getSymbolInfo(node);
                     return symbol && getDeclaredTypeOfSymbol(symbol);
                 default:
                     return unknownType;
@@ -3371,9 +3425,9 @@ module ts {
 
         function instantiateList<T>(items: T[], mapper: TypeMapper, instantiator: (item: T, mapper: TypeMapper) => T): T[] {
             if (items && items.length) {
-                var result: T[] = [];
-                for (var i = 0; i < items.length; i++) {
-                    result.push(instantiator(items[i], mapper));
+                let result: T[] = [];
+                for (let v of items) {
+                    result.push(instantiator(v, mapper));
                 }
                 return result;
             }
@@ -3394,8 +3448,10 @@ module ts {
                 case 2: return createBinaryTypeMapper(sources[0], targets[0], sources[1], targets[1]);
             }
             return t => {
-                for (var i = 0; i < sources.length; i++) {
-                    if (t === sources[i]) return targets[i];
+                for (let i = 0; i < sources.length; i++) {
+                    if (t === sources[i]) {
+                        return targets[i];
+                    }
                 }
                 return t;
             };
@@ -3415,8 +3471,10 @@ module ts {
                 case 2: return createBinaryTypeEraser(sources[0], sources[1]);
             }
             return t => {
-                for (var i = 0; i < sources.length; i++) {
-                    if (t === sources[i]) return anyType;
+                for (let source of sources) {
+                    if (t === source) {
+                        return anyType;
+                    }
                 }
                 return t;
             };
@@ -3424,7 +3482,7 @@ module ts {
 
         function createInferenceMapper(context: InferenceContext): TypeMapper {
             return t => {
-                for (var i = 0; i < context.typeParameters.length; i++) {
+                for (let i = 0; i < context.typeParameters.length; i++) {
                     if (t === context.typeParameters[i]) {
                         return getInferredType(context, i);
                     }
@@ -3442,7 +3500,7 @@ module ts {
         }
 
         function instantiateTypeParameter(typeParameter: TypeParameter, mapper: TypeMapper): TypeParameter {
-            var result = <TypeParameter>createType(TypeFlags.TypeParameter);
+            let result = <TypeParameter>createType(TypeFlags.TypeParameter);
             result.symbol = typeParameter.symbol;
             if (typeParameter.constraint) {
                 result.constraint = instantiateType(typeParameter.constraint, mapper);
@@ -3459,7 +3517,7 @@ module ts {
                 var freshTypeParameters = instantiateList(signature.typeParameters, mapper, instantiateTypeParameter);
                 mapper = combineTypeMappers(createTypeMapper(signature.typeParameters, freshTypeParameters), mapper);
             }
-            var result = createSignature(signature.declaration, freshTypeParameters,
+            let result = createSignature(signature.declaration, freshTypeParameters,
                 instantiateList(signature.parameters, mapper, instantiateSymbol),
                 signature.resolvedReturnType ? instantiateType(signature.resolvedReturnType, mapper) : undefined,
                 signature.minArgumentCount, signature.hasRestParameter, signature.hasStringLiterals);
@@ -3470,7 +3528,7 @@ module ts {
 
         function instantiateSymbol(symbol: Symbol, mapper: TypeMapper): Symbol {
             if (symbol.flags & SymbolFlags.Instantiated) {
-                var links = getSymbolLinks(symbol);
+                let links = getSymbolLinks(symbol);
                 // If symbol being instantiated is itself a instantiation, fetch the original target and combine the
                 // type mappers. This ensures that original type identities are properly preserved and that aliases
                 // always reference a non-aliases.
@@ -3478,9 +3536,9 @@ module ts {
                 mapper = combineTypeMappers(links.mapper, mapper);
             }
 
-            // Keep the flags from the symbol we're instantiating.  Mark that is instantiated, and 
+            // Keep the flags from the symbol we're instantiating.  Mark that is instantiated, and
             // also transient so that we can just store data on it directly.
-            var result = <TransientSymbol>createSymbol(SymbolFlags.Instantiated | SymbolFlags.Transient | symbol.flags, symbol.name);
+            let result = <TransientSymbol>createSymbol(SymbolFlags.Instantiated | SymbolFlags.Transient | symbol.flags, symbol.name);
             result.declarations = symbol.declarations;
             result.parent = symbol.parent;
             result.target = symbol;
@@ -3493,13 +3551,13 @@ module ts {
         }
 
         function instantiateAnonymousType(type: ObjectType, mapper: TypeMapper): ObjectType {
-            var result = <ResolvedType>createObjectType(TypeFlags.Anonymous, type.symbol);
+            let result = <ResolvedType>createObjectType(TypeFlags.Anonymous, type.symbol);
             result.properties = instantiateList(getPropertiesOfObjectType(type), mapper, instantiateSymbol);
             result.members = createSymbolTable(result.properties);
             result.callSignatures = instantiateList(getSignaturesOfType(type, SignatureKind.Call), mapper, instantiateSignature);
             result.constructSignatures = instantiateList(getSignaturesOfType(type, SignatureKind.Construct), mapper, instantiateSignature);
-            var stringIndexType = getIndexTypeOfType(type, IndexKind.String);
-            var numberIndexType = getIndexTypeOfType(type, IndexKind.Number);
+            let stringIndexType = getIndexTypeOfType(type, IndexKind.String);
+            let numberIndexType = getIndexTypeOfType(type, IndexKind.Number);
             if (stringIndexType) result.stringIndexType = instantiateType(stringIndexType, mapper);
             if (numberIndexType) result.numberIndexType = instantiateType(numberIndexType, mapper);
             return result;
@@ -3563,9 +3621,9 @@ module ts {
 
         function getTypeWithoutConstructors(type: Type): Type {
             if (type.flags & TypeFlags.ObjectType) {
-                var resolved = resolveObjectOrUnionTypeMembers(<ObjectType>type);
+                let resolved = resolveObjectOrUnionTypeMembers(<ObjectType>type);
                 if (resolved.constructSignatures.length) {
-                    var result = <ResolvedType>createObjectType(TypeFlags.Anonymous, type.symbol);
+                    let result = <ResolvedType>createObjectType(TypeFlags.Anonymous, type.symbol);
                     result.members = resolved.members;
                     result.properties = resolved.properties;
                     result.callSignatures = resolved.callSignatures;
@@ -3578,9 +3636,9 @@ module ts {
 
         // TYPE CHECKING
 
-        var subtypeRelation: Map<RelationComparisonResult> = {};
-        var assignableRelation: Map<RelationComparisonResult> = {};
-        var identityRelation: Map<RelationComparisonResult> = {};
+        let subtypeRelation: Map<RelationComparisonResult> = {};
+        let assignableRelation: Map<RelationComparisonResult> = {};
+        let identityRelation: Map<RelationComparisonResult> = {};
 
         function isTypeIdenticalTo(source: Type, target: Type): boolean {
             return checkTypeRelatedTo(source, target, identityRelation, /*errorNode*/ undefined);
@@ -3607,8 +3665,8 @@ module ts {
         }
 
         function isSignatureAssignableTo(source: Signature, target: Signature): boolean {
-            var sourceType = getOrCreateTypeFromSignature(source);
-            var targetType = getOrCreateTypeFromSignature(target);
+            let sourceType = getOrCreateTypeFromSignature(source);
+            let targetType = getOrCreateTypeFromSignature(target);
             return checkTypeRelatedTo(sourceType, targetType, assignableRelation, /*errorNode*/ undefined);
         }
 
@@ -3620,17 +3678,17 @@ module ts {
             headMessage?: DiagnosticMessage,
             containingMessageChain?: DiagnosticMessageChain): boolean {
 
-            var errorInfo: DiagnosticMessageChain;
-            var sourceStack: ObjectType[];
-            var targetStack: ObjectType[];
-            var maybeStack: Map<RelationComparisonResult>[];
-            var expandingFlags: number;
-            var depth = 0;
-            var overflow = false;
+            let errorInfo: DiagnosticMessageChain;
+            let sourceStack: ObjectType[];
+            let targetStack: ObjectType[];
+            let maybeStack: Map<RelationComparisonResult>[];
+            let expandingFlags: number;
+            let depth = 0;
+            let overflow = false;
 
             Debug.assert(relation !== identityRelation || !errorNode, "no error reporting in identity checking");
 
-            var result = isRelatedTo(source, target, errorNode !== undefined, headMessage);
+            let result = isRelatedTo(source, target, errorNode !== undefined, headMessage);
             if (overflow) {
                 error(errorNode, Diagnostics.Excessive_stack_depth_comparing_types_0_and_1, typeToString(source), typeToString(target));
             }
@@ -3660,7 +3718,7 @@ module ts {
             // Ternary.Maybe if they are related with assumptions of other relationships, or
             // Ternary.False if they are not related.
             function isRelatedTo(source: Type, target: Type, reportErrors?: boolean, headMessage?: DiagnosticMessage, elaborateErrors = false): Ternary {
-                var result: Ternary;
+                let result: Ternary;
                 // both types are the same - covers 'they are the same primitive type or both are Any' or the same type parameter cases
                 if (source === target) return Ternary.True;
                 if (relation !== identityRelation) {
@@ -3713,7 +3771,7 @@ module ts {
                     }
                 }
                 else {
-                    var saveErrorInfo = errorInfo;
+                    let saveErrorInfo = errorInfo;
                     if (source.flags & TypeFlags.Reference && target.flags & TypeFlags.Reference && (<TypeReference>source).target === (<TypeReference>target).target) {
                         // We have type references to same target type, see if relationship holds for all type arguments
                         if (result = typesRelatedTo((<TypeReference>source).typeArguments, (<TypeReference>target).typeArguments, reportErrors)) {
@@ -3722,9 +3780,9 @@ module ts {
                     }
                     // Even if relationship doesn't hold for type arguments, it may hold in a structural comparison
                     // Report structural errors only if we haven't reported any errors yet
-                    var reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo;
+                    let reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo;
                     // identity relation does not use apparent type
-                    var sourceOrApparentType = relation === identityRelation ? source : getApparentType(source);
+                    let sourceOrApparentType = relation === identityRelation ? source : getApparentType(source);
                     if (sourceOrApparentType.flags & TypeFlags.ObjectType && target.flags & TypeFlags.ObjectType &&
                         (result = objectTypeRelatedTo(sourceOrApparentType, <ObjectType>target, reportStructuralErrors, elaborateErrors))) {
                         errorInfo = saveErrorInfo;
@@ -3733,8 +3791,8 @@ module ts {
                 }
                 if (reportErrors) {
                     headMessage = headMessage || Diagnostics.Type_0_is_not_assignable_to_type_1;
-                    var sourceType = typeToString(source);
-                    var targetType = typeToString(target);
+                    let sourceType = typeToString(source);
+                    let targetType = typeToString(target);
                     if (sourceType === targetType) {
                         sourceType = typeToString(source, /*enclosingDeclaration*/ undefined, TypeFormatFlags.UseFullyQualifiedType);
                         targetType = typeToString(target, /*enclosingDeclaration*/ undefined, TypeFormatFlags.UseFullyQualifiedType);
@@ -3745,10 +3803,10 @@ module ts {
             }
 
             function unionTypeRelatedToUnionType(source: UnionType, target: UnionType): Ternary {
-                var result = Ternary.True;
-                var sourceTypes = source.types;
-                for (var i = 0, len = sourceTypes.length; i < len; i++) {
-                    var related = typeRelatedToUnionType(sourceTypes[i], target, false);
+                let result = Ternary.True;
+                let sourceTypes = source.types;
+                for (let sourceType of sourceTypes) {
+                    let related = typeRelatedToUnionType(sourceType, target, false);
                     if (!related) {
                         return Ternary.False;
                     }
@@ -3758,9 +3816,9 @@ module ts {
             }
 
             function typeRelatedToUnionType(source: Type, target: UnionType, reportErrors: boolean): Ternary {
-                var targetTypes = target.types;
-                for (var i = 0, len = targetTypes.length; i < len; i++) {
-                    var related = isRelatedTo(source, targetTypes[i], reportErrors && i === len - 1);
+                let targetTypes = target.types;
+                for (let i = 0, len = targetTypes.length; i < len; i++) {
+                    let related = isRelatedTo(source, targetTypes[i], reportErrors && i === len - 1);
                     if (related) {
                         return related;
                     }
@@ -3769,10 +3827,10 @@ module ts {
             }
 
             function unionTypeRelatedToType(source: UnionType, target: Type, reportErrors: boolean): Ternary {
-                var result = Ternary.True;
-                var sourceTypes = source.types;
-                for (var i = 0, len = sourceTypes.length; i < len; i++) {
-                    var related = isRelatedTo(sourceTypes[i], target, reportErrors);
+                let result = Ternary.True;
+                let sourceTypes = source.types;
+                for (let sourceType of sourceTypes) {
+                    let related = isRelatedTo(sourceType, target, reportErrors);
                     if (!related) {
                         return Ternary.False;
                     }
@@ -3782,9 +3840,9 @@ module ts {
             }
 
             function typesRelatedTo(sources: Type[], targets: Type[], reportErrors: boolean): Ternary {
-                var result = Ternary.True;
-                for (var i = 0, len = sources.length; i < len; i++) {
-                    var related = isRelatedTo(sources[i], targets[i], reportErrors);
+                let result = Ternary.True;
+                for (let i = 0, len = sources.length; i < len; i++) {
+                    let related = isRelatedTo(sources[i], targets[i], reportErrors);
                     if (!related) {
                         return Ternary.False;
                     }
@@ -3809,7 +3867,7 @@ module ts {
                 }
                 else {
                     while (true) {
-                        var constraint = getConstraintOfTypeParameter(source);
+                        let constraint = getConstraintOfTypeParameter(source);
                         if (constraint === target) return Ternary.True;
                         if (!(constraint && constraint.flags & TypeFlags.TypeParameter)) break;
                         source = <TypeParameter>constraint;
@@ -3827,9 +3885,9 @@ module ts {
                 if (overflow) {
                     return Ternary.False;
                 }
-                var id = relation !== identityRelation || source.id < target.id ? source.id + "," + target.id : target.id + "," + source.id;
-                var related = relation[id];
-                //var related: RelationComparisonResult = undefined; // relation[id];
+                let id = relation !== identityRelation || source.id < target.id ? source.id + "," + target.id : target.id + "," + source.id;
+                let related = relation[id];
+                //let related: RelationComparisonResult = undefined; // relation[id];
                 if (related !== undefined) {
                     // If we computed this relation already and it was failed and reported, or if we're not being asked to elaborate
                     // errors, we can use the cached value. Otherwise, recompute the relation
@@ -3838,7 +3896,7 @@ module ts {
                     }
                 }
                 if (depth > 0) {
-                    for (var i = 0; i < depth; i++) {
+                    for (let i = 0; i < depth; i++) {
                         // If source and target are already being compared, consider them related with assumptions
                         if (maybeStack[i][id]) {
                             return Ternary.Maybe;
@@ -3860,14 +3918,15 @@ module ts {
                 maybeStack[depth] = {};
                 maybeStack[depth][id] = RelationComparisonResult.Succeeded;
                 depth++;
-                var saveExpandingFlags = expandingFlags;
+                let saveExpandingFlags = expandingFlags;
                 if (!(expandingFlags & 1) && isDeeplyNestedGeneric(source, sourceStack)) expandingFlags |= 1;
                 if (!(expandingFlags & 2) && isDeeplyNestedGeneric(target, targetStack)) expandingFlags |= 2;
+                let result: Ternary;
                 if (expandingFlags === 3) {
-                    var result = Ternary.Maybe;
+                    result = Ternary.Maybe;
                 }
                 else {
-                    var result = propertiesRelatedTo(source, target, reportErrors);
+                    result = propertiesRelatedTo(source, target, reportErrors);
                     if (result) {
                         result &= signaturesRelatedTo(source, target, SignatureKind.Call, reportErrors);
                         if (result) {
@@ -3884,9 +3943,9 @@ module ts {
                 expandingFlags = saveExpandingFlags;
                 depth--;
                 if (result) {
-                    var maybeCache = maybeStack[depth];
+                    let maybeCache = maybeStack[depth];
                     // If result is definitely true, copy assumptions to global cache, else copy to next level up
-                    var destinationCache = (result === Ternary.True || depth === 0) ? relation : maybeStack[depth - 1];
+                    let destinationCache = (result === Ternary.True || depth === 0) ? relation : maybeStack[depth - 1];
                     copyMap(maybeCache, destinationCache);
                 }
                 else {
@@ -3904,10 +3963,10 @@ module ts {
             // some level beyond that.
             function isDeeplyNestedGeneric(type: ObjectType, stack: ObjectType[]): boolean {
                 if (type.flags & TypeFlags.Reference && depth >= 10) {
-                    var target = (<TypeReference>type).target;
-                    var count = 0;
-                    for (var i = 0; i < depth; i++) {
-                        var t = stack[i];
+                    let target = (<TypeReference>type).target;
+                    let count = 0;
+                    for (let i = 0; i < depth; i++) {
+                        let t = stack[i];
                         if (t.flags & TypeFlags.Reference && (<TypeReference>t).target === target) {
                             count++;
                             if (count >= 10) return true;
@@ -3921,12 +3980,11 @@ module ts {
                 if (relation === identityRelation) {
                     return propertiesIdenticalTo(source, target);
                 }
-                var result = Ternary.True;
-                var properties = getPropertiesOfObjectType(target);
-                var requireOptionalProperties = relation === subtypeRelation && !(source.flags & TypeFlags.ObjectLiteral);
-                for (var i = 0; i < properties.length; i++) {
-                    var targetProp = properties[i];
-                    var sourceProp = getPropertyOfType(source, targetProp.name);
+                let result = Ternary.True;
+                let properties = getPropertiesOfObjectType(target);
+                let requireOptionalProperties = relation === subtypeRelation && !(source.flags & TypeFlags.ObjectLiteral);
+                for (let targetProp of properties) {
+                    let sourceProp = getPropertyOfType(source, targetProp.name);
                     if (sourceProp !== targetProp) {
                         if (!sourceProp) {
                             if (!(targetProp.flags & SymbolFlags.Optional) || requireOptionalProperties) {
@@ -3937,8 +3995,8 @@ module ts {
                             }
                         }
                         else if (!(targetProp.flags & SymbolFlags.Prototype)) {
-                            var sourceFlags = getDeclarationFlagsFromSymbol(sourceProp);
-                            var targetFlags = getDeclarationFlagsFromSymbol(targetProp);
+                            let sourceFlags = getDeclarationFlagsFromSymbol(sourceProp);
+                            let targetFlags = getDeclarationFlagsFromSymbol(targetProp);
                             if (sourceFlags & NodeFlags.Private || targetFlags & NodeFlags.Private) {
                                 if (sourceProp.valueDeclaration !== targetProp.valueDeclaration) {
                                     if (reportErrors) {
@@ -3955,9 +4013,9 @@ module ts {
                                 }
                             }
                             else if (targetFlags & NodeFlags.Protected) {
-                                var sourceDeclaredInClass = sourceProp.parent && sourceProp.parent.flags & SymbolFlags.Class;
-                                var sourceClass = sourceDeclaredInClass ? <InterfaceType>getDeclaredTypeOfSymbol(sourceProp.parent) : undefined;
-                                var targetClass = <InterfaceType>getDeclaredTypeOfSymbol(targetProp.parent);
+                                let sourceDeclaredInClass = sourceProp.parent && sourceProp.parent.flags & SymbolFlags.Class;
+                                let sourceClass = sourceDeclaredInClass ? <InterfaceType>getDeclaredTypeOfSymbol(sourceProp.parent) : undefined;
+                                let targetClass = <InterfaceType>getDeclaredTypeOfSymbol(targetProp.parent);
                                 if (!sourceClass || !hasBaseType(sourceClass, targetClass)) {
                                     if (reportErrors) {
                                         reportError(Diagnostics.Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2,
@@ -3973,7 +4031,7 @@ module ts {
                                 }
                                 return Ternary.False;
                             }
-                            var related = isRelatedTo(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp), reportErrors);
+                            let related = isRelatedTo(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp), reportErrors);
                             if (!related) {
                                 if (reportErrors) {
                                     reportError(Diagnostics.Types_of_property_0_are_incompatible, symbolToString(targetProp));
@@ -3986,7 +4044,7 @@ module ts {
                                 // S is a subtype of a type T, and T is a supertype of S if ...
                                 // S' and T are object types and, for each member M in T..
                                 // M is a property and S' contains a property N where
-                                // if M is a required property, N is also a required property 
+                                // if M is a required property, N is also a required property
                                 // (M - property in T)
                                 // (N - property in S)
                                 if (reportErrors) {
@@ -4002,19 +4060,18 @@ module ts {
             }
 
             function propertiesIdenticalTo(source: ObjectType, target: ObjectType): Ternary {
-                var sourceProperties = getPropertiesOfObjectType(source);
-                var targetProperties = getPropertiesOfObjectType(target);
+                let sourceProperties = getPropertiesOfObjectType(source);
+                let targetProperties = getPropertiesOfObjectType(target);
                 if (sourceProperties.length !== targetProperties.length) {
                     return Ternary.False;
                 }
-                var result = Ternary.True;
-                for (var i = 0, len = sourceProperties.length; i < len; ++i) {
-                    var sourceProp = sourceProperties[i];
-                    var targetProp = getPropertyOfObjectType(target, sourceProp.name);
+                let result = Ternary.True;
+                for (let sourceProp of sourceProperties) {
+                    let targetProp = getPropertyOfObjectType(target, sourceProp.name);
                     if (!targetProp) {
                         return Ternary.False;
                     }
-                    var related = compareProperties(sourceProp, targetProp, isRelatedTo);
+                    let related = compareProperties(sourceProp, targetProp, isRelatedTo);
                     if (!related) {
                         return Ternary.False;
                     }
@@ -4030,18 +4087,16 @@ module ts {
                 if (target === anyFunctionType || source === anyFunctionType) {
                     return Ternary.True;
                 }
-                var sourceSignatures = getSignaturesOfType(source, kind);
-                var targetSignatures = getSignaturesOfType(target, kind);
-                var result = Ternary.True;
-                var saveErrorInfo = errorInfo;
-                outer: for (var i = 0; i < targetSignatures.length; i++) {
-                    var t = targetSignatures[i];
+                let sourceSignatures = getSignaturesOfType(source, kind);
+                let targetSignatures = getSignaturesOfType(target, kind);
+                let result = Ternary.True;
+                let saveErrorInfo = errorInfo;
+                outer: for (let t of targetSignatures) {
                     if (!t.hasStringLiterals || target.flags & TypeFlags.FromSignature) {
-                        var localErrors = reportErrors;
-                        for (var j = 0; j < sourceSignatures.length; j++) {
-                            var s = sourceSignatures[j];
+                        let localErrors = reportErrors;
+                        for (let s of sourceSignatures) {
                             if (!s.hasStringLiterals || source.flags & TypeFlags.FromSignature) {
-                                var related = signatureRelatedTo(s, t, localErrors);
+                                let related = signatureRelatedTo(s, t, localErrors);
                                 if (related) {
                                     result &= related;
                                     errorInfo = saveErrorInfo;
@@ -4064,9 +4119,9 @@ module ts {
                 if (!target.hasRestParameter && source.minArgumentCount > target.parameters.length) {
                     return Ternary.False;
                 }
-                var sourceMax = source.parameters.length;
-                var targetMax = target.parameters.length;
-                var checkCount: number;
+                let sourceMax = source.parameters.length;
+                let targetMax = target.parameters.length;
+                let checkCount: number;
                 if (source.hasRestParameter && target.hasRestParameter) {
                     checkCount = sourceMax > targetMax ? sourceMax : targetMax;
                     sourceMax--;
@@ -4087,12 +4142,12 @@ module ts {
                 // M and N (the signatures) are instantiated using type Any as the type argument for all type parameters declared by M and N
                 source = getErasedSignature(source);
                 target = getErasedSignature(target);
-                var result = Ternary.True;
-                for (var i = 0; i < checkCount; i++) {
-                    var s = i < sourceMax ? getTypeOfSymbol(source.parameters[i]) : getRestTypeOfSignature(source);
-                    var t = i < targetMax ? getTypeOfSymbol(target.parameters[i]) : getRestTypeOfSignature(target);
-                    var saveErrorInfo = errorInfo;
-                    var related = isRelatedTo(s, t, reportErrors);
+                let result = Ternary.True;
+                for (let i = 0; i < checkCount; i++) {
+                    let s = i < sourceMax ? getTypeOfSymbol(source.parameters[i]) : getRestTypeOfSignature(source);
+                    let t = i < targetMax ? getTypeOfSymbol(target.parameters[i]) : getRestTypeOfSignature(target);
+                    let saveErrorInfo = errorInfo;
+                    let related = isRelatedTo(s, t, reportErrors);
                     if (!related) {
                         related = isRelatedTo(t, s, false);
                         if (!related) {
@@ -4107,21 +4162,21 @@ module ts {
                     }
                     result &= related;
                 }
-                var t = getReturnTypeOfSignature(target);
+                let t = getReturnTypeOfSignature(target);
                 if (t === voidType) return result;
-                var s = getReturnTypeOfSignature(source);
+                let s = getReturnTypeOfSignature(source);
                 return result & isRelatedTo(s, t, reportErrors);
             }
 
             function signaturesIdenticalTo(source: ObjectType, target: ObjectType, kind: SignatureKind): Ternary {
-                var sourceSignatures = getSignaturesOfType(source, kind);
-                var targetSignatures = getSignaturesOfType(target, kind);
+                let sourceSignatures = getSignaturesOfType(source, kind);
+                let targetSignatures = getSignaturesOfType(target, kind);
                 if (sourceSignatures.length !== targetSignatures.length) {
                     return Ternary.False;
                 }
-                var result = Ternary.True;
-                for (var i = 0, len = sourceSignatures.length; i < len; ++i) {
-                    var related = compareSignatures(sourceSignatures[i], targetSignatures[i], /*compareReturnTypes*/ true, isRelatedTo);
+                let result = Ternary.True;
+                for (let i = 0, len = sourceSignatures.length; i < len; ++i) {
+                    let related = compareSignatures(sourceSignatures[i], targetSignatures[i], /*compareReturnTypes*/ true, isRelatedTo);
                     if (!related) {
                         return Ternary.False;
                     }
@@ -4134,16 +4189,16 @@ module ts {
                 if (relation === identityRelation) {
                     return indexTypesIdenticalTo(IndexKind.String, source, target);
                 }
-                var targetType = getIndexTypeOfType(target, IndexKind.String);
+                let targetType = getIndexTypeOfType(target, IndexKind.String);
                 if (targetType) {
-                    var sourceType = getIndexTypeOfType(source, IndexKind.String);
+                    let sourceType = getIndexTypeOfType(source, IndexKind.String);
                     if (!sourceType) {
                         if (reportErrors) {
                             reportError(Diagnostics.Index_signature_is_missing_in_type_0, typeToString(source));
                         }
                         return Ternary.False;
                     }
-                    var related = isRelatedTo(sourceType, targetType, reportErrors);
+                    let related = isRelatedTo(sourceType, targetType, reportErrors);
                     if (!related) {
                         if (reportErrors) {
                             reportError(Diagnostics.Index_signatures_are_incompatible);
@@ -4159,10 +4214,10 @@ module ts {
                 if (relation === identityRelation) {
                     return indexTypesIdenticalTo(IndexKind.Number, source, target);
                 }
-                var targetType = getIndexTypeOfType(target, IndexKind.Number);
+                let targetType = getIndexTypeOfType(target, IndexKind.Number);
                 if (targetType) {
-                    var sourceStringType = getIndexTypeOfType(source, IndexKind.String);
-                    var sourceNumberType = getIndexTypeOfType(source, IndexKind.Number);
+                    let sourceStringType = getIndexTypeOfType(source, IndexKind.String);
+                    let sourceNumberType = getIndexTypeOfType(source, IndexKind.Number);
                     if (!(sourceStringType || sourceNumberType)) {
                         if (reportErrors) {
                             reportError(Diagnostics.Index_signature_is_missing_in_type_0, typeToString(source));
@@ -4188,8 +4243,8 @@ module ts {
             }
 
             function indexTypesIdenticalTo(indexKind: IndexKind, source: ObjectType, target: ObjectType): Ternary {
-                var targetType = getIndexTypeOfType(target, indexKind);
-                var sourceType = getIndexTypeOfType(source, indexKind);
+                let targetType = getIndexTypeOfType(target, indexKind);
+                let sourceType = getIndexTypeOfType(source, indexKind);
                 if (!sourceType && !targetType) {
                     return Ternary.True;
                 }
@@ -4211,8 +4266,8 @@ module ts {
             if (sourceProp === targetProp) {
                 return Ternary.True;
             }
-            var sourcePropAccessibility = getDeclarationFlagsFromSymbol(sourceProp) & (NodeFlags.Private | NodeFlags.Protected);
-            var targetPropAccessibility = getDeclarationFlagsFromSymbol(targetProp) & (NodeFlags.Private | NodeFlags.Protected);
+            let sourcePropAccessibility = getDeclarationFlagsFromSymbol(sourceProp) & (NodeFlags.Private | NodeFlags.Protected);
+            let targetPropAccessibility = getDeclarationFlagsFromSymbol(targetProp) & (NodeFlags.Private | NodeFlags.Protected);
             if (sourcePropAccessibility !== targetPropAccessibility) {
                 return Ternary.False;
             }
@@ -4238,13 +4293,13 @@ module ts {
                 source.hasRestParameter !== target.hasRestParameter) {
                 return Ternary.False;
             }
-            var result = Ternary.True;
+            let result = Ternary.True;
             if (source.typeParameters && target.typeParameters) {
                 if (source.typeParameters.length !== target.typeParameters.length) {
                     return Ternary.False;
                 }
-                for (var i = 0, len = source.typeParameters.length; i < len; ++i) {
-                    var related = compareTypes(source.typeParameters[i], target.typeParameters[i]);
+                for (let i = 0, len = source.typeParameters.length; i < len; ++i) {
+                    let related = compareTypes(source.typeParameters[i], target.typeParameters[i]);
                     if (!related) {
                         return Ternary.False;
                     }
@@ -4258,10 +4313,10 @@ module ts {
             // M and N (the signatures) are instantiated using type Any as the type argument for all type parameters declared by M and N
             source = getErasedSignature(source);
             target = getErasedSignature(target);
-            for (var i = 0, len = source.parameters.length; i < len; i++) {
-                var s = source.hasRestParameter && i === len - 1 ? getRestTypeOfSignature(source) : getTypeOfSymbol(source.parameters[i]);
-                var t = target.hasRestParameter && i === len - 1 ? getRestTypeOfSignature(target) : getTypeOfSymbol(target.parameters[i]);
-                var related = compareTypes(s, t);
+            for (let i = 0, len = source.parameters.length; i < len; i++) {
+                let s = source.hasRestParameter && i === len - 1 ? getRestTypeOfSignature(source) : getTypeOfSymbol(source.parameters[i]);
+                let t = target.hasRestParameter && i === len - 1 ? getRestTypeOfSignature(target) : getTypeOfSymbol(target.parameters[i]);
+                let related = compareTypes(s, t);
                 if (!related) {
                     return Ternary.False;
                 }
@@ -4274,8 +4329,8 @@ module ts {
         }
 
         function isSupertypeOfEach(candidate: Type, types: Type[]): boolean {
-            for (var i = 0, len = types.length; i < len; i++) {
-                if (candidate !== types[i] && !isTypeSubtypeOf(types[i], candidate)) return false;
+            for (let type of types) {
+                if (candidate !== type && !isTypeSubtypeOf(type, candidate)) return false;
             }
             return true;
         }
@@ -4285,14 +4340,14 @@ module ts {
         }
 
         function reportNoCommonSupertypeError(types: Type[], errorLocation: Node, errorMessageChainHead: DiagnosticMessageChain): void {
-            var bestSupertype: Type;
-            var bestSupertypeDownfallType: Type; // The type that caused bestSupertype not to be the common supertype
-            var bestSupertypeScore = 0;
+            let bestSupertype: Type;
+            let bestSupertypeDownfallType: Type; // The type that caused bestSupertype not to be the common supertype
+            let bestSupertypeScore = 0;
 
-            for (var i = 0; i < types.length; i++) {
-                var score = 0;
-                var downfallType: Type = undefined;
-                for (var j = 0; j < types.length; j++) {
+            for (let i = 0; i < types.length; i++) {
+                let score = 0;
+                let downfallType: Type = undefined;
+                for (let j = 0; j < types.length; j++) {
                     if (isTypeSubtypeOf(types[j], types[i])) {
                         score++;
                     }
@@ -4333,14 +4388,22 @@ module ts {
             return !!getPropertyOfType(type, "0");
         }
 
+        /**
+         * Check if a Type was written as a tuple type literal. 
+         * Prefer using isTupleLikeType() unless the use of `elementTypes` is required.
+         */
+        function isTupleType(type: Type) : boolean {
+            return (type.flags & TypeFlags.Tuple) && !!(<TupleType>type).elementTypes;
+        }
+
         function getWidenedTypeOfObjectLiteral(type: Type): Type {
-            var properties = getPropertiesOfObjectType(type);
-            var members: SymbolTable = {};
+            let properties = getPropertiesOfObjectType(type);
+            let members: SymbolTable = {};
             forEach(properties, p => {
-                var propType = getTypeOfSymbol(p);
-                var widenedType = getWidenedType(propType);
+                let propType = getTypeOfSymbol(p);
+                let widenedType = getWidenedType(propType);
                 if (propType !== widenedType) {
-                    var symbol = <TransientSymbol>createSymbol(p.flags | SymbolFlags.Transient, p.name);
+                    let symbol = <TransientSymbol>createSymbol(p.flags | SymbolFlags.Transient, p.name);
                     symbol.declarations = p.declarations;
                     symbol.parent = p.parent;
                     symbol.type = widenedType;
@@ -4350,8 +4413,8 @@ module ts {
                 }
                 members[p.name] = p;
             });
-            var stringIndexType = getIndexTypeOfType(type, IndexKind.String);
-            var numberIndexType = getIndexTypeOfType(type, IndexKind.Number);
+            let stringIndexType = getIndexTypeOfType(type, IndexKind.String);
+            let numberIndexType = getIndexTypeOfType(type, IndexKind.Number);
             if (stringIndexType) stringIndexType = getWidenedType(stringIndexType);
             if (numberIndexType) numberIndexType = getWidenedType(numberIndexType);
             return createAnonymousType(type.symbol, members, emptyArray, emptyArray, stringIndexType, numberIndexType);
@@ -4377,7 +4440,7 @@ module ts {
 
         function reportWideningErrorsInType(type: Type): boolean {
             if (type.flags & TypeFlags.Union) {
-                var errorReported = false;
+                let errorReported = false;
                 forEach((<UnionType>type).types, t => {
                     if (reportWideningErrorsInType(t)) {
                         errorReported = true;
@@ -4389,9 +4452,9 @@ module ts {
                 return reportWideningErrorsInType((<TypeReference>type).typeArguments[0]);
             }
             if (type.flags & TypeFlags.ObjectLiteral) {
-                var errorReported = false;
+                let errorReported = false;
                 forEach(getPropertiesOfObjectType(type), p => {
-                    var t = getTypeOfSymbol(p);
+                    let t = getTypeOfSymbol(p);
                     if (t.flags & TypeFlags.ContainsUndefinedOrNull) {
                         if (!reportWideningErrorsInType(t)) {
                             error(p.valueDeclaration, Diagnostics.Object_literal_s_property_0_implicitly_has_an_1_type, p.name, typeToString(getWidenedType(t)));
@@ -4405,7 +4468,7 @@ module ts {
         }
 
         function reportImplicitAnyError(declaration: Declaration, type: Type) {
-            var typeAsString = typeToString(getWidenedType(type));
+            let typeAsString = typeToString(getWidenedType(type));
             switch (declaration.kind) {
                 case SyntaxKind.PropertyDeclaration:
                 case SyntaxKind.PropertySignature:
@@ -4445,9 +4508,9 @@ module ts {
         }
 
         function forEachMatchingParameterType(source: Signature, target: Signature, callback: (s: Type, t: Type) => void) {
-            var sourceMax = source.parameters.length;
-            var targetMax = target.parameters.length;
-            var count: number;
+            let sourceMax = source.parameters.length;
+            let targetMax = target.parameters.length;
+            let count: number;
             if (source.hasRestParameter && target.hasRestParameter) {
                 count = sourceMax > targetMax ? sourceMax : targetMax;
                 sourceMax--;
@@ -4464,16 +4527,16 @@ module ts {
             else {
                 count = sourceMax < targetMax ? sourceMax : targetMax;
             }
-            for (var i = 0; i < count; i++) {
-                var s = i < sourceMax ? getTypeOfSymbol(source.parameters[i]) : getRestTypeOfSignature(source);
-                var t = i < targetMax ? getTypeOfSymbol(target.parameters[i]) : getRestTypeOfSignature(target);
+            for (let i = 0; i < count; i++) {
+                let s = i < sourceMax ? getTypeOfSymbol(source.parameters[i]) : getRestTypeOfSignature(source);
+                let t = i < targetMax ? getTypeOfSymbol(target.parameters[i]) : getRestTypeOfSignature(target);
                 callback(s, t);
             }
         }
 
         function createInferenceContext(typeParameters: TypeParameter[], inferUnionTypes: boolean): InferenceContext {
-            var inferences: TypeInferences[] = [];
-            for (var i = 0; i < typeParameters.length; i++) {
+            let inferences: TypeInferences[] = [];
+            for (let unused of typeParameters) {
                 inferences.push({ primary: undefined, secondary: undefined });
             }
             return {
@@ -4486,26 +4549,30 @@ module ts {
         }
 
         function inferTypes(context: InferenceContext, source: Type, target: Type) {
-            var sourceStack: Type[];
-            var targetStack: Type[];
-            var depth = 0;
-            var inferiority = 0;
+            let sourceStack: Type[];
+            let targetStack: Type[];
+            let depth = 0;
+            let inferiority = 0;
             inferFromTypes(source, target);
 
             function isInProcess(source: Type, target: Type) {
-                for (var i = 0; i < depth; i++) {
-                    if (source === sourceStack[i] && target === targetStack[i]) return true;
+                for (let i = 0; i < depth; i++) {
+                    if (source === sourceStack[i] && target === targetStack[i]) {
+                        return true;
+                    }
                 }
                 return false;
             }
 
             function isWithinDepthLimit(type: Type, stack: Type[]) {
                 if (depth >= 5) {
-                    var target = (<TypeReference>type).target;
-                    var count = 0;
-                    for (var i = 0; i < depth; i++) {
-                        var t = stack[i];
-                        if (t.flags & TypeFlags.Reference && (<TypeReference>t).target === target) count++;
+                    let target = (<TypeReference>type).target;
+                    let count = 0;
+                    for (let i = 0; i < depth; i++) {
+                        let t = stack[i];
+                        if (t.flags & TypeFlags.Reference && (<TypeReference>t).target === target) {
+                            count++;
+                        }
                     }
                     return count < 5;
                 }
@@ -4518,11 +4585,11 @@ module ts {
                 }
                 if (target.flags & TypeFlags.TypeParameter) {
                     // If target is a type parameter, make an inference
-                    var typeParameters = context.typeParameters;
-                    for (var i = 0; i < typeParameters.length; i++) {
+                    let typeParameters = context.typeParameters;
+                    for (let i = 0; i < typeParameters.length; i++) {
                         if (target === typeParameters[i]) {
-                            var inferences = context.inferences[i];
-                            var candidates = inferiority ?
+                            let inferences = context.inferences[i];
+                            let candidates = inferiority ?
                                 inferences.secondary || (inferences.secondary = []) :
                                 inferences.primary || (inferences.primary = []);
                             if (!contains(candidates, source)) candidates.push(source);
@@ -4532,19 +4599,18 @@ module ts {
                 }
                 else if (source.flags & TypeFlags.Reference && target.flags & TypeFlags.Reference && (<TypeReference>source).target === (<TypeReference>target).target) {
                     // If source and target are references to the same generic type, infer from type arguments
-                    var sourceTypes = (<TypeReference>source).typeArguments;
-                    var targetTypes = (<TypeReference>target).typeArguments;
-                    for (var i = 0; i < sourceTypes.length; i++) {
+                    let sourceTypes = (<TypeReference>source).typeArguments;
+                    let targetTypes = (<TypeReference>target).typeArguments;
+                    for (let i = 0; i < sourceTypes.length; i++) {
                         inferFromTypes(sourceTypes[i], targetTypes[i]);
                     }
                 }
                 else if (target.flags & TypeFlags.Union) {
-                    var targetTypes = (<UnionType>target).types;
-                    var typeParameterCount = 0;
-                    var typeParameter: TypeParameter;
+                    let targetTypes = (<UnionType>target).types;
+                    let typeParameterCount = 0;
+                    let typeParameter: TypeParameter;
                     // First infer to each type in union that isn't a type parameter
-                    for (var i = 0; i < targetTypes.length; i++) {
-                        var t = targetTypes[i];
+                    for (let t of targetTypes) {
                         if (t.flags & TypeFlags.TypeParameter && contains(context.typeParameters, t)) {
                             typeParameter = <TypeParameter>t;
                             typeParameterCount++;
@@ -4562,9 +4628,9 @@ module ts {
                 }
                 else if (source.flags & TypeFlags.Union) {
                     // Source is a union type, infer from each consituent type
-                    var sourceTypes = (<UnionType>source).types;
-                    for (var i = 0; i < sourceTypes.length; i++) {
-                        inferFromTypes(sourceTypes[i], target);
+                    let sourceTypes = (<UnionType>source).types;
+                    for (let sourceType of sourceTypes) {
+                        inferFromTypes(sourceType, target);
                     }
                 }
                 else if (source.flags & TypeFlags.ObjectType && (target.flags & (TypeFlags.Reference | TypeFlags.Tuple) ||
@@ -4590,10 +4656,9 @@ module ts {
             }
 
             function inferFromProperties(source: Type, target: Type) {
-                var properties = getPropertiesOfObjectType(target);
-                for (var i = 0; i < properties.length; i++) {
-                    var targetProp = properties[i];
-                    var sourceProp = getPropertyOfObjectType(source, targetProp.name);
+                let properties = getPropertiesOfObjectType(target);
+                for (let targetProp of properties) {
+                    let sourceProp = getPropertyOfObjectType(source, targetProp.name);
                     if (sourceProp) {
                         inferFromTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
                     }
@@ -4601,12 +4666,12 @@ module ts {
             }
 
             function inferFromSignatures(source: Type, target: Type, kind: SignatureKind) {
-                var sourceSignatures = getSignaturesOfType(source, kind);
-                var targetSignatures = getSignaturesOfType(target, kind);
-                var sourceLen = sourceSignatures.length;
-                var targetLen = targetSignatures.length;
-                var len = sourceLen < targetLen ? sourceLen : targetLen;
-                for (var i = 0; i < len; i++) {
+                let sourceSignatures = getSignaturesOfType(source, kind);
+                let targetSignatures = getSignaturesOfType(target, kind);
+                let sourceLen = sourceSignatures.length;
+                let targetLen = targetSignatures.length;
+                let len = sourceLen < targetLen ? sourceLen : targetLen;
+                for (let i = 0; i < len; i++) {
                     inferFromSignature(getErasedSignature(sourceSignatures[sourceLen - len + i]), getErasedSignature(targetSignatures[targetLen - len + i]));
                 }
             }
@@ -4617,9 +4682,9 @@ module ts {
             }
 
             function inferFromIndexTypes(source: Type, target: Type, sourceKind: IndexKind, targetKind: IndexKind) {
-                var targetIndexType = getIndexTypeOfType(target, targetKind);
+                let targetIndexType = getIndexTypeOfType(target, targetKind);
                 if (targetIndexType) {
-                    var sourceIndexType = getIndexTypeOfType(source, sourceKind);
+                    let sourceIndexType = getIndexTypeOfType(source, sourceKind);
                     if (sourceIndexType) {
                         inferFromTypes(sourceIndexType, targetIndexType);
                     }
@@ -4628,17 +4693,17 @@ module ts {
         }
 
         function getInferenceCandidates(context: InferenceContext, index: number): Type[] {
-            var inferences = context.inferences[index];
+            let inferences = context.inferences[index];
             return inferences.primary || inferences.secondary || emptyArray;
         }
 
         function getInferredType(context: InferenceContext, index: number): Type {
-            var inferredType = context.inferredTypes[index];
+            let inferredType = context.inferredTypes[index];
             if (!inferredType) {
-                var inferences = getInferenceCandidates(context, index);
+                let inferences = getInferenceCandidates(context, index);
                 if (inferences.length) {
                     // Infer widened union or supertype, or the undefined type for no common supertype
-                    var unionOrSuperType = context.inferUnionTypes ? getUnionType(inferences) : getCommonSupertype(inferences);
+                    let unionOrSuperType = context.inferUnionTypes ? getUnionType(inferences) : getCommonSupertype(inferences);
                     inferredType = unionOrSuperType ? getWidenedType(unionOrSuperType) : inferenceFailureType;
                 }
                 else {
@@ -4646,7 +4711,7 @@ module ts {
                     inferredType = emptyObjectType;
                 }
                 if (inferredType !== inferenceFailureType) {
-                    var constraint = getConstraintOfTypeParameter(context.typeParameters[index]);
+                    let constraint = getConstraintOfTypeParameter(context.typeParameters[index]);
                     inferredType = constraint && !isTypeAssignableTo(inferredType, constraint) ? constraint : inferredType;
                 }
                 context.inferredTypes[index] = inferredType;
@@ -4655,7 +4720,7 @@ module ts {
         }
 
         function getInferredTypes(context: InferenceContext): Type[] {
-            for (var i = 0; i < context.inferredTypes.length; i++) {
+            for (let i = 0; i < context.inferredTypes.length; i++) {
                 getInferredType(context, i);
             }
 
@@ -4669,7 +4734,7 @@ module ts {
         // EXPRESSION TYPE CHECKING
 
         function getResolvedSymbol(node: Identifier): Symbol {
-            var links = getNodeLinks(node);
+            let links = getNodeLinks(node);
             if (!links.resolvedSymbol) {
                 links.resolvedSymbol = (getFullWidth(node) > 0 && resolveName(node, node.text, SymbolFlags.Value | SymbolFlags.ExportValue, Diagnostics.Cannot_find_name_0, node)) || unknownSymbol;
             }
@@ -4697,17 +4762,22 @@ module ts {
 
         // For a union type, remove all constituent types that are of the given type kind (when isOfTypeKind is true)
         // or not of the given type kind (when isOfTypeKind is false)
-        function removeTypesFromUnionType(type: Type, typeKind: TypeFlags, isOfTypeKind: boolean): Type {
+        function removeTypesFromUnionType(type: Type, typeKind: TypeFlags, isOfTypeKind: boolean, allowEmptyUnionResult: boolean): Type {
             if (type.flags & TypeFlags.Union) {
-                var types = (<UnionType>type).types;
+                let types = (<UnionType>type).types;
                 if (forEach(types, t => !!(t.flags & typeKind) === isOfTypeKind)) {
                     // Above we checked if we have anything to remove, now use the opposite test to do the removal
-                    var narrowedType = getUnionType(filter(types, t => !(t.flags & typeKind) === isOfTypeKind));
-                    if (narrowedType !== emptyObjectType) {
+                    let narrowedType = getUnionType(filter(types, t => !(t.flags & typeKind) === isOfTypeKind));
+                    if (allowEmptyUnionResult || narrowedType !== emptyObjectType) {
                         return narrowedType;
                     }
                 }
             }
+            else if (allowEmptyUnionResult && !!(type.flags & typeKind) === isOfTypeKind) {
+                // Use getUnionType(emptyArray) instead of emptyObjectType in case the way empty union types
+                // are represented ever changes.
+                return getUnionType(emptyArray);
+            }
             return type;
         }
 
@@ -4717,9 +4787,9 @@ module ts {
 
         // Check if a given variable is assigned within a given syntax node
         function isVariableAssignedWithin(symbol: Symbol, node: Node): boolean {
-            var links = getNodeLinks(node);
+            let links = getNodeLinks(node);
             if (links.assignmentChecks) {
-                var cachedResult = links.assignmentChecks[symbol.id];
+                let cachedResult = links.assignmentChecks[symbol.id];
                 if (cachedResult !== undefined) {
                     return cachedResult;
                 }
@@ -4731,7 +4801,7 @@ module ts {
 
             function isAssignedInBinaryExpression(node: BinaryExpression) {
                 if (node.operatorToken.kind >= SyntaxKind.FirstAssignment && node.operatorToken.kind <= SyntaxKind.LastAssignment) {
-                    var n = node.left;
+                    let n = node.left;
                     while (n.kind === SyntaxKind.ParenthesizedExpression) {
                         n = (<ParenthesizedExpression>n).expression;
                     }
@@ -4800,8 +4870,8 @@ module ts {
         function resolveLocation(node: Node) {
             // Resolve location from top down towards node if it is a context sensitive expression
             // That helps in making sure not assigning types as any when resolved out of order
-            var containerNodes: Node[] = [];
-            for (var parent = node.parent; parent; parent = parent.parent) {
+            let containerNodes: Node[] = [];
+            for (let parent = node.parent; parent; parent = parent.parent) {
                 if ((isExpression(parent) || isObjectLiteralMethod(node)) &&
                     isContextSensitive(<Expression>parent)) {
                     containerNodes.unshift(parent);
@@ -4823,9 +4893,9 @@ module ts {
 
         function getTypeOfSymbolAtLocation(symbol: Symbol, node: Node): Type {
             resolveLocation(node);
-            // Get the narrowed type of symbol at given location instead of just getting 
+            // Get the narrowed type of symbol at given location instead of just getting
             // the type of the symbol.
-            // eg. 
+            // eg.
             // function foo(a: string | number) {
             //     if (typeof a === "string") {
             //         a/**/
@@ -4840,13 +4910,13 @@ module ts {
 
         // Get the narrowed type of a given symbol at a given location
         function getNarrowedTypeOfSymbol(symbol: Symbol, node: Node) {
-            var type = getTypeOfSymbol(symbol);
+            let type = getTypeOfSymbol(symbol);
             // Only narrow when symbol is variable of type any or an object, union, or type parameter type
             if (node && symbol.flags & SymbolFlags.Variable && type.flags & (TypeFlags.Any | TypeFlags.ObjectType | TypeFlags.Union | TypeFlags.TypeParameter)) {
                 loop: while (node.parent) {
-                    var child = node;
+                    let child = node;
                     node = node.parent;
-                    var narrowedType = type;
+                    let narrowedType = type;
                     switch (node.kind) {
                         case SyntaxKind.IfStatement:
                             // In a branch of an if statement, narrow based on controlling expression
@@ -4898,19 +4968,20 @@ module ts {
                 if (expr.left.kind !== SyntaxKind.TypeOfExpression || expr.right.kind !== SyntaxKind.StringLiteral) {
                     return type;
                 }
-                var left = <TypeOfExpression>expr.left;
-                var right = <LiteralExpression>expr.right;
+                let left = <TypeOfExpression>expr.left;
+                let right = <LiteralExpression>expr.right;
                 if (left.expression.kind !== SyntaxKind.Identifier || getResolvedSymbol(<Identifier>left.expression) !== symbol) {
                     return type;
                 }
-                var typeInfo = primitiveTypeInfo[right.text];
+                let typeInfo = primitiveTypeInfo[right.text];
                 if (expr.operatorToken.kind === SyntaxKind.ExclamationEqualsEqualsToken) {
                     assumeTrue = !assumeTrue;
                 }
                 if (assumeTrue) {
                     // Assumed result is true. If check was not for a primitive type, remove all primitive types
                     if (!typeInfo) {
-                        return removeTypesFromUnionType(type, /*typeKind*/ TypeFlags.StringLike | TypeFlags.NumberLike | TypeFlags.Boolean | TypeFlags.ESSymbol, /*isOfTypeKind*/ true);
+                        return removeTypesFromUnionType(type, /*typeKind*/ TypeFlags.StringLike | TypeFlags.NumberLike | TypeFlags.Boolean | TypeFlags.ESSymbol,
+                            /*isOfTypeKind*/ true, /*allowEmptyUnionResult*/ false);
                     }
                     // Check was for a primitive type, return that primitive type if it is a subtype
                     if (isTypeSubtypeOf(typeInfo.type, type)) {
@@ -4918,12 +4989,12 @@ module ts {
                     }
                     // Otherwise, remove all types that aren't of the primitive type kind. This can happen when the type is
                     // union of enum types and other types.
-                    return removeTypesFromUnionType(type, /*typeKind*/ typeInfo.flags, /*isOfTypeKind*/ false);
+                    return removeTypesFromUnionType(type, /*typeKind*/ typeInfo.flags, /*isOfTypeKind*/ false, /*allowEmptyUnionResult*/ false);
                 }
                 else {
                     // Assumed result is false. If check was for a primitive type, remove that primitive type
                     if (typeInfo) {
-                        return removeTypesFromUnionType(type, /*typeKind*/ typeInfo.flags, /*isOfTypeKind*/ true);
+                        return removeTypesFromUnionType(type, /*typeKind*/ typeInfo.flags, /*isOfTypeKind*/ true, /*allowEmptyUnionResult*/ false);
                     }
                     // Otherwise we don't have enough information to do anything.
                     return type;
@@ -4966,16 +5037,16 @@ module ts {
                     return type;
                 }
                 // Check that right operand is a function type with a prototype property
-                var rightType = checkExpression(expr.right);
+                let rightType = checkExpression(expr.right);
                 if (!isTypeSubtypeOf(rightType, globalFunctionType)) {
                     return type;
                 }
                 // Target type is type of prototype property
-                var prototypeProperty = getPropertyOfType(rightType, "prototype");
+                let prototypeProperty = getPropertyOfType(rightType, "prototype");
                 if (!prototypeProperty) {
                     return type;
                 }
-                var targetType = getTypeOfSymbol(prototypeProperty);
+                let targetType = getTypeOfSymbol(prototypeProperty);
                 // Narrow to target type if it is a subtype of current type
                 if (isTypeSubtypeOf(targetType, type)) {
                     return targetType;
@@ -4994,7 +5065,7 @@ module ts {
                     case SyntaxKind.ParenthesizedExpression:
                         return narrowType(type, (<ParenthesizedExpression>expr).expression, assumeTrue);
                     case SyntaxKind.BinaryExpression:
-                        var operator = (<BinaryExpression>expr).operatorToken.kind;
+                        let operator = (<BinaryExpression>expr).operatorToken.kind;
                         if (operator === SyntaxKind.EqualsEqualsEqualsToken || operator === SyntaxKind.ExclamationEqualsEqualsToken) {
                             return narrowTypeByEquality(type, <BinaryExpression>expr, assumeTrue);
                         }
@@ -5019,7 +5090,7 @@ module ts {
         }
 
         function checkIdentifier(node: Identifier): Type {
-            var symbol = getResolvedSymbol(node);
+            let symbol = getResolvedSymbol(node);
 
             // As noted in ECMAScript 6 language spec, arrow functions never have an arguments objects.
             // Although in down-level emit of arrow function, we emit it using function expression which means that
@@ -5043,7 +5114,7 @@ module ts {
         }
 
         function isInsideFunction(node: Node, threshold: Node): boolean {
-            var current = node;
+            let current = node;
             while (current && current !== threshold) {
                 if (isFunctionLike(current)) {
                     return true;
@@ -5067,7 +5138,7 @@ module ts {
 
             // nesting structure:
             // (variable declaration or binding element) -> variable declaration list -> container
-            var container: Node = symbol.valueDeclaration;
+            let container: Node = symbol.valueDeclaration;
             while (container.kind !== SyntaxKind.VariableDeclarationList) {
                 container = container.parent;
             }
@@ -5077,10 +5148,10 @@ module ts {
                 // if parent is variable statement - get its parent
                 container = container.parent;
             }
-            
-            var inFunction = isInsideFunction(node.parent, container);
 
-            var current = container;
+            let inFunction = isInsideFunction(node.parent, container);
+
+            let current = container;
             while (current && !nodeStartsNewLexicalEnvironment(current)) {
                 if (isIterationStatement(current, /*lookInLabeledStatements*/ false)) {
                     if (inFunction) {
@@ -5095,7 +5166,7 @@ module ts {
         }
 
         function captureLexicalThis(node: Node, container: Node): void {
-            var classNode = container.parent && container.parent.kind === SyntaxKind.ClassDeclaration ? container.parent : undefined;
+            let classNode = container.parent && container.parent.kind === SyntaxKind.ClassDeclaration ? container.parent : undefined;
             getNodeLinks(node).flags |= NodeCheckFlags.LexicalThis;
             if (container.kind === SyntaxKind.PropertyDeclaration || container.kind === SyntaxKind.Constructor) {
                 getNodeLinks(classNode).flags |= NodeCheckFlags.CaptureThis;
@@ -5108,8 +5179,8 @@ module ts {
         function checkThisExpression(node: Node): Type {
             // Stop at the first arrow function so that we can
             // tell whether 'this' needs to be captured.
-            var container = getThisContainer(node, /* includeArrowFunctions */ true);
-            var needToCaptureLexicalThis = false;
+            let container = getThisContainer(node, /* includeArrowFunctions */ true);
+            let needToCaptureLexicalThis = false;
 
             // Now skip arrow functions to get the "real" owner of 'this'.
             if (container.kind === SyntaxKind.ArrowFunction) {
@@ -5150,16 +5221,16 @@ module ts {
                 captureLexicalThis(node, container);
             }
 
-            var classNode = container.parent && container.parent.kind === SyntaxKind.ClassDeclaration ? container.parent : undefined;
+            let classNode = container.parent && container.parent.kind === SyntaxKind.ClassDeclaration ? container.parent : undefined;
             if (classNode) {
-                var symbol = getSymbolOfNode(classNode);
+                let symbol = getSymbolOfNode(classNode);
                 return container.flags & NodeFlags.Static ? getTypeOfSymbol(symbol) : getDeclaredTypeOfSymbol(symbol);
             }
             return anyType;
         }
 
         function isInConstructorArgumentInitializer(node: Node, constructorDecl: Node): boolean {
-            for (var n = node; n && n !== constructorDecl; n = n.parent) {
+            for (let n = node; n && n !== constructorDecl; n = n.parent) {
                 if (n.kind === SyntaxKind.Parameter) {
                     return true;
                 }
@@ -5168,11 +5239,11 @@ module ts {
         }
 
         function checkSuperExpression(node: Node): Type {
-            var isCallExpression = node.parent.kind === SyntaxKind.CallExpression && (<CallExpression>node.parent).expression === node;
-            var enclosingClass = <ClassDeclaration>getAncestor(node, SyntaxKind.ClassDeclaration);
-            var baseClass: Type;
+            let isCallExpression = node.parent.kind === SyntaxKind.CallExpression && (<CallExpression>node.parent).expression === node;
+            let enclosingClass = <ClassDeclaration>getAncestor(node, SyntaxKind.ClassDeclaration);
+            let baseClass: Type;
             if (enclosingClass && getClassBaseTypeNode(enclosingClass)) {
-                var classType = <InterfaceType>getDeclaredTypeOfSymbol(getSymbolOfNode(enclosingClass));
+                let classType = <InterfaceType>getDeclaredTypeOfSymbol(getSymbolOfNode(enclosingClass));
                 baseClass = classType.baseTypes.length && classType.baseTypes[0];
             }
 
@@ -5181,10 +5252,10 @@ module ts {
                 return unknownType;
             }
 
-            var container = getSuperContainer(node, /*includeFunctions*/ true);
+            let container = getSuperContainer(node, /*includeFunctions*/ true);
 
             if (container) {
-                var canUseSuperExpression = false;
+                let canUseSuperExpression = false;
                 if (isCallExpression) {
                     // TS 1.0 SPEC (April 2014): 4.8.1
                     // Super calls are only permitted in constructors of derived classes
@@ -5226,7 +5297,7 @@ module ts {
                 }
 
                 if (canUseSuperExpression) {
-                    var returnType: Type;
+                    let returnType: Type;
 
                     if ((container.flags & NodeFlags.Static) || isCallExpression) {
                         getNodeLinks(node).flags |= NodeCheckFlags.SuperStatic;
@@ -5270,14 +5341,14 @@ module ts {
         // Return contextual type of parameter or undefined if no contextual type is available
         function getContextuallyTypedParameterType(parameter: ParameterDeclaration): Type {
             if (isFunctionExpressionOrArrowFunction(parameter.parent)) {
-                var func = <FunctionExpression>parameter.parent;
+                let func = <FunctionExpression>parameter.parent;
                 if (isContextSensitive(func)) {
-                    var contextualSignature = getContextualSignature(func);
+                    let contextualSignature = getContextualSignature(func);
                     if (contextualSignature) {
 
-                        var funcHasRestParameters = hasRestParameters(func);
-                        var len = func.parameters.length - (funcHasRestParameters ? 1 : 0);
-                        var indexOfParameter = indexOf(func.parameters, parameter);
+                        let funcHasRestParameters = hasRestParameters(func);
+                        let len = func.parameters.length - (funcHasRestParameters ? 1 : 0);
+                        let indexOfParameter = indexOf(func.parameters, parameter);
                         if (indexOfParameter < len) {
                             return getTypeAtPosition(contextualSignature, indexOfParameter);
                         }
@@ -5299,13 +5370,13 @@ module ts {
         // of the parameter. Otherwise, in a variable or parameter declaration with a binding pattern name, the contextual
         // type of an initializer expression is the type implied by the binding pattern.
         function getContextualTypeForInitializerExpression(node: Expression): Type {
-            var declaration = <VariableLikeDeclaration>node.parent;
+            let declaration = <VariableLikeDeclaration>node.parent;
             if (node === declaration.initializer) {
                 if (declaration.type) {
                     return getTypeFromTypeNode(declaration.type);
                 }
                 if (declaration.kind === SyntaxKind.Parameter) {
-                    var type = getContextuallyTypedParameterType(<ParameterDeclaration>declaration);
+                    let type = getContextuallyTypedParameterType(<ParameterDeclaration>declaration);
                     if (type) {
                         return type;
                     }
@@ -5318,7 +5389,7 @@ module ts {
         }
 
         function getContextualTypeForReturnExpression(node: Expression): Type {
-            var func = getContainingFunction(node);
+            let func = getContainingFunction(node);
             if (func) {
                 // If the containing function has a return type annotation, is a constructor, or is a get accessor whose
                 // corresponding set accessor has a type annotation, return statements in the function are contextually typed
@@ -5327,7 +5398,7 @@ module ts {
                 }
                 // Otherwise, if the containing function is contextually typed by a function type with exactly one call signature
                 // and that call signature is non-generic, return statements are contextually typed by the return type of the signature
-                var signature = getContextualSignatureForFunctionLikeDeclaration(<FunctionExpression>func);
+                let signature = getContextualSignatureForFunctionLikeDeclaration(<FunctionExpression>func);
                 if (signature) {
                     return getReturnTypeOfSignature(signature);
                 }
@@ -5337,10 +5408,10 @@ module ts {
 
         // In a typed function call, an argument or substitution expression is contextually typed by the type of the corresponding parameter.
         function getContextualTypeForArgument(callTarget: CallLikeExpression, arg: Expression): Type {
-            var args = getEffectiveCallArguments(callTarget);
-            var argIndex = indexOf(args, arg);
+            let args = getEffectiveCallArguments(callTarget);
+            let argIndex = indexOf(args, arg);
             if (argIndex >= 0) {
-                var signature = getResolvedSignature(callTarget);
+                let signature = getResolvedSignature(callTarget);
                 return getTypeAtPosition(signature, argIndex);
             }
             return undefined;
@@ -5355,8 +5426,8 @@ module ts {
         }
 
         function getContextualTypeForBinaryOperand(node: Expression): Type {
-            var binaryExpression = <BinaryExpression>node.parent;
-            var operator = binaryExpression.operatorToken.kind;
+            let binaryExpression = <BinaryExpression>node.parent;
+            let operator = binaryExpression.operatorToken.kind;
             if (operator >= SyntaxKind.FirstAssignment && operator <= SyntaxKind.LastAssignment) {
                 // In an assignment expression, the right operand is contextually typed by the type of the left operand.
                 if (node === binaryExpression.right) {
@@ -5366,7 +5437,7 @@ module ts {
             else if (operator === SyntaxKind.BarBarToken) {
                 // When an || expression has a contextual type, the operands are contextually typed by that type. When an ||
                 // expression has no contextual type, the right operand is contextually typed by the type of the left operand.
-                var type = getContextualType(binaryExpression);
+                let type = getContextualType(binaryExpression);
                 if (!type && node === binaryExpression.right) {
                     type = checkExpression(binaryExpression.left);
                 }
@@ -5382,11 +5453,11 @@ module ts {
             if (!(type.flags & TypeFlags.Union)) {
                 return mapper(type);
             }
-            var types = (<UnionType>type).types;
-            var mappedType: Type;
-            var mappedTypes: Type[];
-            for (var i = 0; i < types.length; i++) {
-                var t = mapper(types[i]);
+            let types = (<UnionType>type).types;
+            let mappedType: Type;
+            let mappedTypes: Type[];
+            for (let current of types) {
+                let t = mapper(current);
                 if (t) {
                     if (!mappedType) {
                         mappedType = t;
@@ -5404,7 +5475,7 @@ module ts {
 
         function getTypeOfPropertyOfContextualType(type: Type, name: string) {
             return applyToContextualType(type, t => {
-                var prop = getPropertyOfObjectType(t, name);
+                let prop = getPropertyOfObjectType(t, name);
                 return prop ? getTypeOfSymbol(prop) : undefined;
             });
         }
@@ -5437,15 +5508,15 @@ module ts {
         }
 
         function getContextualTypeForObjectLiteralElement(element: ObjectLiteralElement) {
-            var objectLiteral = <ObjectLiteralExpression>element.parent;
-            var type = getContextualType(objectLiteral);
+            let objectLiteral = <ObjectLiteralExpression>element.parent;
+            let type = getContextualType(objectLiteral);
             if (type) {
                 if (!hasDynamicName(element)) {
                     // For a (non-symbol) computed property, there is no reason to look up the name
                     // in the type. It will just be "__computed", which does not appear in any
                     // SymbolTable.
-                    var symbolName = getSymbolOfNode(element).name;
-                    var propertyType = getTypeOfPropertyOfContextualType(type, symbolName);
+                    let symbolName = getSymbolOfNode(element).name;
+                    let propertyType = getTypeOfPropertyOfContextualType(type, symbolName);
                     if (propertyType) {
                         return propertyType;
                     }
@@ -5463,10 +5534,10 @@ module ts {
         // it is the type of the numeric index signature in T. Otherwise, in ES6 and higher, the contextual type is the iterated
         // type of T.
         function getContextualTypeForElementExpression(node: Expression): Type {
-            var arrayLiteral = <ArrayLiteralExpression>node.parent;
-            var type = getContextualType(arrayLiteral);
+            let arrayLiteral = <ArrayLiteralExpression>node.parent;
+            let type = getContextualType(arrayLiteral);
             if (type) {
-                var index = indexOf(arrayLiteral.elements, node);
+                let index = indexOf(arrayLiteral.elements, node);
                 return getTypeOfPropertyOfContextualType(type, "" + index)
                     || getIndexTypeOfContextualType(type, IndexKind.Number)
                     || (languageVersion >= ScriptTarget.ES6 ? checkIteratedType(type, /*expressionForError*/ undefined) : undefined);
@@ -5476,7 +5547,7 @@ module ts {
 
         // In a contextually typed conditional expression, the true/false expressions are contextually typed by the same type.
         function getContextualTypeForConditionalOperand(node: Expression): Type {
-            var conditional = <ConditionalExpression>node.parent;
+            let conditional = <ConditionalExpression>node.parent;
             return node === conditional.whenTrue || node === conditional.whenFalse ? getContextualType(conditional) : undefined;
         }
 
@@ -5490,7 +5561,7 @@ module ts {
             if (node.contextualType) {
                 return node.contextualType;
             }
-            var parent = node.parent;
+            let parent = node.parent;
             switch (parent.kind) {
                 case SyntaxKind.VariableDeclaration:
                 case SyntaxKind.Parameter:
@@ -5526,9 +5597,9 @@ module ts {
         // If the given type is an object or union type, if that type has a single signature, and if
         // that signature is non-generic, return the signature. Otherwise return undefined.
         function getNonGenericSignature(type: Type): Signature {
-            var signatures = getSignaturesOfObjectOrUnionType(type, SignatureKind.Call);
+            let signatures = getSignaturesOfObjectOrUnionType(type, SignatureKind.Call);
             if (signatures.length === 1) {
-                var signature = signatures[0];
+                let signature = signatures[0];
                 if (!signature.typeParameters) {
                     return signature;
                 }
@@ -5546,12 +5617,12 @@ module ts {
 
         // Return the contextual signature for a given expression node. A contextual type provides a
         // contextual signature if it has a single call signature and if that call signature is non-generic.
-        // If the contextual type is a union type, get the signature from each type possible and if they are 
-        // all identical ignoring their return type, the result is same signature but with return type as 
+        // If the contextual type is a union type, get the signature from each type possible and if they are
+        // all identical ignoring their return type, the result is same signature but with return type as
         // union type of return types from these signatures
         function getContextualSignature(node: FunctionExpression | MethodDeclaration): Signature {
             Debug.assert(node.kind !== SyntaxKind.MethodDeclaration || isObjectLiteralMethod(node));
-            var type = isObjectLiteralMethod(node)
+            let type = isObjectLiteralMethod(node)
                 ? getContextualTypeForObjectLiteralMethod(<MethodDeclaration>node)
                 : getContextualType(<FunctionExpression>node);
             if (!type) {
@@ -5560,17 +5631,17 @@ module ts {
             if (!(type.flags & TypeFlags.Union)) {
                 return getNonGenericSignature(type);
             }
-            var signatureList: Signature[];
-            var types = (<UnionType>type).types;
-            for (var i = 0; i < types.length; i++) {
+            let signatureList: Signature[];
+            let types = (<UnionType>type).types;
+            for (let current of types) {
                 // The signature set of all constituent type with call signatures should match
                 // So number of signatures allowed is either 0 or 1
                 if (signatureList &&
-                    getSignaturesOfObjectOrUnionType(types[i], SignatureKind.Call).length > 1) {
+                    getSignaturesOfObjectOrUnionType(current, SignatureKind.Call).length > 1) {
                     return undefined;
                 }
 
-                var signature = getNonGenericSignature(types[i]);
+                let signature = getNonGenericSignature(current);
                 if (signature) {
                     if (!signatureList) {
                         // This signature will contribute to contextual union signature
@@ -5588,7 +5659,7 @@ module ts {
             }
 
             // Result is union of signatures collected (return type is union of return types of this signature set)
-            var result: Signature;
+            let result: Signature;
             if (signatureList) {
                 result = cloneSignature(signatureList[0]);
                 // Clear resolved return type we possibly got from cloneSignature
@@ -5608,7 +5679,7 @@ module ts {
         // assignment in an object literal that is an assignment target, or if it is parented by an array literal that is
         // an assignment target. Examples include 'a = xxx', '{ p: a } = xxx', '[{ p: a}] = xxx'.
         function isAssignmentTarget(node: Node): boolean {
-            var parent = node.parent;
+            let parent = node.parent;
             if (parent.kind === SyntaxKind.BinaryExpression && (<BinaryExpression>parent).operatorToken.kind === SyntaxKind.EqualsToken && (<BinaryExpression>parent).left === node) {
                 return true;
             }
@@ -5622,7 +5693,7 @@ module ts {
         }
 
         function checkSpreadElementExpression(node: SpreadElementExpression, contextualMapper?: TypeMapper): Type {
-            var type = checkExpressionCached(node.expression, contextualMapper);
+            let type = checkExpressionCached(node.expression, contextualMapper);
             if (!isArrayLikeType(type)) {
                 error(node.expression, Diagnostics.Type_0_is_not_an_array_type, typeToString(type));
                 return unknownType;
@@ -5631,14 +5702,14 @@ module ts {
         }
 
         function checkArrayLiteral(node: ArrayLiteralExpression, contextualMapper?: TypeMapper): Type {
-            var elements = node.elements;
+            let elements = node.elements;
             if (!elements.length) {
                 return createArrayType(undefinedType);
             }
-            var hasSpreadElement: boolean = false;
-            var elementTypes: Type[] = [];
+            let hasSpreadElement: boolean = false;
+            let elementTypes: Type[] = [];
             forEach(elements, e => {
-                var type = checkExpression(e, contextualMapper);
+                let type = checkExpression(e, contextualMapper);
                 if (e.kind === SyntaxKind.SpreadElementExpression) {
                     elementTypes.push(getIndexTypeOfType(type, IndexKind.Number) || anyType);
                     hasSpreadElement = true;
@@ -5648,7 +5719,7 @@ module ts {
                 }
             });
             if (!hasSpreadElement) {
-                var contextualType = getContextualType(node);
+                let contextualType = getContextualType(node);
                 if (contextualType && contextualTypeIsTupleLikeType(contextualType) || isAssignmentTarget(node)) {
                     return createTupleType(elementTypes);
                 }
@@ -5692,7 +5763,7 @@ module ts {
         }
 
         function checkComputedPropertyName(node: ComputedPropertyName): Type {
-            var links = getNodeLinks(node.expression);
+            let links = getNodeLinks(node.expression);
             if (!links.resolvedType) {
                 links.resolvedType = checkExpression(node.expression);
 
@@ -5713,14 +5784,13 @@ module ts {
             // Grammar checking
             checkGrammarObjectLiteralExpression(node);
 
-            var propertiesTable: SymbolTable = {};
-            var propertiesArray: Symbol[] = [];
-            var contextualType = getContextualType(node);
-            var typeFlags: TypeFlags;
+            let propertiesTable: SymbolTable = {};
+            let propertiesArray: Symbol[] = [];
+            let contextualType = getContextualType(node);
+            let typeFlags: TypeFlags;
 
-            for (var i = 0; i < node.properties.length; i++) {
-                var memberDecl = node.properties[i];
-                var member = memberDecl.symbol;
+            for (let memberDecl of node.properties) {
+                let member = memberDecl.symbol;
                 if (memberDecl.kind === SyntaxKind.PropertyAssignment ||
                     memberDecl.kind === SyntaxKind.ShorthandPropertyAssignment ||
                     isObjectLiteralMethod(memberDecl)) {
@@ -5737,7 +5807,7 @@ module ts {
                             : checkExpression(<Identifier>memberDecl.name, contextualMapper);
                     }
                     typeFlags |= type.flags;
-                    var prop = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | member.flags, member.name);
+                    let prop = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | member.flags, member.name);
                     prop.declarations = member.declarations;
                     prop.parent = member.parent;
                     if (member.valueDeclaration) {
@@ -5750,9 +5820,9 @@ module ts {
                 }
                 else {
                     // TypeScript 1.0 spec (April 2014)
-                    // A get accessor declaration is processed in the same manner as 
+                    // A get accessor declaration is processed in the same manner as
                     // an ordinary function declaration(section 6.1) with no parameters.
-                    // A set accessor declaration is processed in the same manner 
+                    // A set accessor declaration is processed in the same manner
                     // as an ordinary function declaration with a single parameter and a Void return type.
                     Debug.assert(memberDecl.kind === SyntaxKind.GetAccessor || memberDecl.kind === SyntaxKind.SetAccessor);
                     checkAccessorDeclaration(<AccessorDeclaration>memberDecl);
@@ -5764,29 +5834,29 @@ module ts {
                 propertiesArray.push(member);
             }
 
-            var stringIndexType = getIndexType(IndexKind.String);
-            var numberIndexType = getIndexType(IndexKind.Number);
-            var result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexType, numberIndexType);
+            let stringIndexType = getIndexType(IndexKind.String);
+            let numberIndexType = getIndexType(IndexKind.Number);
+            let result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexType, numberIndexType);
             result.flags |= TypeFlags.ObjectLiteral | TypeFlags.ContainsObjectLiteral | (typeFlags & TypeFlags.ContainsUndefinedOrNull);
             return result;
 
             function getIndexType(kind: IndexKind) {
                 if (contextualType && contextualTypeHasIndexSignature(contextualType, kind)) {
-                    var propTypes: Type[] = [];
-                    for (var i = 0; i < propertiesArray.length; i++) {
-                        var propertyDecl = node.properties[i];
+                    let propTypes: Type[] = [];
+                    for (let i = 0; i < propertiesArray.length; i++) {
+                        let propertyDecl = node.properties[i];
                         if (kind === IndexKind.String || isNumericName(propertyDecl.name)) {
                             // Do not call getSymbolOfNode(propertyDecl), as that will get the
                             // original symbol for the node. We actually want to get the symbol
                             // created by checkObjectLiteral, since that will be appropriately
                             // contextually typed and resolved.
-                            var type = getTypeOfSymbol(propertiesArray[i]);
+                            let type = getTypeOfSymbol(propertiesArray[i]);
                             if (!contains(propTypes, type)) {
                                 propTypes.push(type);
                             }
                         }
                     }
-                    var result = propTypes.length ? getUnionType(propTypes) : undefinedType;
+                    let result = propTypes.length ? getUnionType(propTypes) : undefinedType;
                     typeFlags |= result.flags;
                     return result;
                 }
@@ -5805,16 +5875,16 @@ module ts {
         }
 
         function checkClassPropertyAccess(node: PropertyAccessExpression | QualifiedName, left: Expression | QualifiedName, type: Type, prop: Symbol) {
-            var flags = getDeclarationFlagsFromSymbol(prop);
+            let flags = getDeclarationFlagsFromSymbol(prop);
             // Public properties are always accessible
             if (!(flags & (NodeFlags.Private | NodeFlags.Protected))) {
                 return;
             }
             // Property is known to be private or protected at this point
             // Get the declaring and enclosing class instance types
-            var enclosingClassDeclaration = getAncestor(node, SyntaxKind.ClassDeclaration);
-            var enclosingClass = enclosingClassDeclaration ? <InterfaceType>getDeclaredTypeOfSymbol(getSymbolOfNode(enclosingClassDeclaration)) : undefined;
-            var declaringClass = <InterfaceType>getDeclaredTypeOfSymbol(prop.parent);
+            let enclosingClassDeclaration = getAncestor(node, SyntaxKind.ClassDeclaration);
+            let enclosingClass = enclosingClassDeclaration ? <InterfaceType>getDeclaredTypeOfSymbol(getSymbolOfNode(enclosingClassDeclaration)) : undefined;
+            let declaringClass = <InterfaceType>getDeclaredTypeOfSymbol(prop.parent);
             // Private property is accessible if declaring and enclosing class are the same
             if (flags & NodeFlags.Private) {
                 if (declaringClass !== enclosingClass) {
@@ -5851,15 +5921,15 @@ module ts {
         }
 
         function checkPropertyAccessExpressionOrQualifiedName(node: PropertyAccessExpression | QualifiedName, left: Expression | QualifiedName, right: Identifier) {
-            var type = checkExpressionOrQualifiedName(left);
+            let type = checkExpressionOrQualifiedName(left);
             if (type === unknownType) return type;
             if (type !== anyType) {
-                var apparentType = getApparentType(getWidenedType(type));
+                let apparentType = getApparentType(getWidenedType(type));
                 if (apparentType === unknownType) {
                     // handle cases when type is Type parameter with invalid constraint
                     return unknownType;
                 }
-                var prop = getPropertyOfType(apparentType, right.text);
+                let prop = getPropertyOfType(apparentType, right.text);
                 if (!prop) {
                     if (right.text) {
                         error(right, Diagnostics.Property_0_does_not_exist_on_type_1, declarationNameToString(right), typeToString(type));
@@ -5869,11 +5939,11 @@ module ts {
                 getNodeLinks(node).resolvedSymbol = prop;
                 if (prop.parent && prop.parent.flags & SymbolFlags.Class) {
                     // TS 1.0 spec (April 2014): 4.8.2
-                    // - In a constructor, instance member function, instance member accessor, or 
-                    //   instance member variable initializer where this references a derived class instance, 
+                    // - In a constructor, instance member function, instance member accessor, or
+                    //   instance member variable initializer where this references a derived class instance,
                     //   a super property access is permitted and must specify a public instance member function of the base class.
-                    // - In a static member function or static member accessor 
-                    //   where this references the constructor function object of a derived class, 
+                    // - In a static member function or static member accessor
+                    //   where this references the constructor function object of a derived class,
                     //   a super property access is permitted and must specify a public static member function of the base class.
                     if (left.kind === SyntaxKind.SuperKeyword && getDeclarationKindFromSymbol(prop) !== SyntaxKind.MethodDeclaration) {
                         error(right, Diagnostics.Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword);
@@ -5888,19 +5958,19 @@ module ts {
         }
 
         function isValidPropertyAccess(node: PropertyAccessExpression | QualifiedName, propertyName: string): boolean {
-            var left = node.kind === SyntaxKind.PropertyAccessExpression
+            let left = node.kind === SyntaxKind.PropertyAccessExpression
                 ? (<PropertyAccessExpression>node).expression
                 : (<QualifiedName>node).left;
 
-            var type = checkExpressionOrQualifiedName(left);
+            let type = checkExpressionOrQualifiedName(left);
             if (type !== unknownType && type !== anyType) {
-                var prop = getPropertyOfType(getWidenedType(type), propertyName);
+                let prop = getPropertyOfType(getWidenedType(type), propertyName);
                 if (prop && prop.parent && prop.parent.flags & SymbolFlags.Class) {
                     if (left.kind === SyntaxKind.SuperKeyword && getDeclarationKindFromSymbol(prop) !== SyntaxKind.MethodDeclaration) {
                         return false;
                     }
                     else {
-                        var modificationCount = diagnostics.getModificationCount();
+                        let modificationCount = diagnostics.getModificationCount();
                         checkClassPropertyAccess(node, left, type, prop);
                         return diagnostics.getModificationCount() === modificationCount;
                     }
@@ -5912,28 +5982,28 @@ module ts {
         function checkIndexedAccess(node: ElementAccessExpression): Type {
             // Grammar checking
             if (!node.argumentExpression) {
-                var sourceFile = getSourceFile(node);
+                let sourceFile = getSourceFile(node);
                 if (node.parent.kind === SyntaxKind.NewExpression && (<NewExpression>node.parent).expression === node) {
-                    var start = skipTrivia(sourceFile.text, node.expression.end);
-                    var end = node.end;
+                    let start = skipTrivia(sourceFile.text, node.expression.end);
+                    let end = node.end;
                     grammarErrorAtPos(sourceFile, start, end - start, Diagnostics.new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead);
                 }
                 else {
-                    var start = node.end - "]".length;
-                    var end = node.end;
+                    let start = node.end - "]".length;
+                    let end = node.end;
                     grammarErrorAtPos(sourceFile, start, end - start, Diagnostics.Expression_expected);
                 }
             }
 
             // Obtain base constraint such that we can bail out if the constraint is an unknown type
-            var objectType = getApparentType(checkExpression(node.expression));
-            var indexType = node.argumentExpression ? checkExpression(node.argumentExpression) : unknownType;
+            let objectType = getApparentType(checkExpression(node.expression));
+            let indexType = node.argumentExpression ? checkExpression(node.argumentExpression) : unknownType;
 
             if (objectType === unknownType) {
                 return unknownType;
             }
 
-            var isConstEnum = isConstEnumObjectType(objectType);
+            let isConstEnum = isConstEnumObjectType(objectType);
             if (isConstEnum &&
                 (!node.argumentExpression || node.argumentExpression.kind !== SyntaxKind.StringLiteral)) {
                 error(node.argumentExpression, Diagnostics.A_const_enum_member_can_only_be_accessed_using_a_string_literal);
@@ -5941,19 +6011,19 @@ module ts {
             }
 
             // TypeScript 1.0 spec (April 2014): 4.10 Property Access
-            // - If IndexExpr is a string literal or a numeric literal and ObjExpr's apparent type has a property with the name 
+            // - If IndexExpr is a string literal or a numeric literal and ObjExpr's apparent type has a property with the name
             //    given by that literal(converted to its string representation in the case of a numeric literal), the property access is of the type of that property.
-            // - Otherwise, if ObjExpr's apparent type has a numeric index signature and IndexExpr is of type Any, the Number primitive type, or an enum type, 
+            // - Otherwise, if ObjExpr's apparent type has a numeric index signature and IndexExpr is of type Any, the Number primitive type, or an enum type,
             //    the property access is of the type of that index signature.
-            // - Otherwise, if ObjExpr's apparent type has a string index signature and IndexExpr is of type Any, the String or Number primitive type, or an enum type, 
+            // - Otherwise, if ObjExpr's apparent type has a string index signature and IndexExpr is of type Any, the String or Number primitive type, or an enum type,
             //    the property access is of the type of that index signature.
             // - Otherwise, if IndexExpr is of type Any, the String or Number primitive type, or an enum type, the property access is of type Any.
 
             // See if we can index as a property.
             if (node.argumentExpression) {
-                var name = getPropertyNameForIndexedAccess(node.argumentExpression, indexType);
+                let name = getPropertyNameForIndexedAccess(node.argumentExpression, indexType);
                 if (name !== undefined) {
-                    var prop = getPropertyOfType(objectType, name);
+                    let prop = getPropertyOfType(objectType, name);
                     if (prop) {
                         getNodeLinks(node).resolvedSymbol = prop;
                         return getTypeOfSymbol(prop);
@@ -5970,14 +6040,14 @@ module ts {
 
                 // Try to use a number indexer.
                 if (allConstituentTypesHaveKind(indexType, TypeFlags.Any | TypeFlags.NumberLike)) {
-                    var numberIndexType = getIndexTypeOfType(objectType, IndexKind.Number);
+                    let numberIndexType = getIndexTypeOfType(objectType, IndexKind.Number);
                     if (numberIndexType) {
                         return numberIndexType;
                     }
                 }
 
                 // Try to use string indexing.
-                var stringIndexType = getIndexTypeOfType(objectType, IndexKind.String);
+                let stringIndexType = getIndexTypeOfType(objectType, IndexKind.String);
                 if (stringIndexType) {
                     return stringIndexType;
                 }
@@ -6007,7 +6077,7 @@ module ts {
                 return (<LiteralExpression>indexArgumentExpression).text;
             }
             if (checkThatExpressionIsProperSymbolReference(indexArgumentExpression, indexArgumentType, /*reportError*/ false)) {
-                var rightHandSideName = (<Identifier>(<PropertyAccessExpression>indexArgumentExpression).name).text;
+                let rightHandSideName = (<Identifier>(<PropertyAccessExpression>indexArgumentExpression).name).text;
                 return getPropertyNameForKnownSymbolName(rightHandSideName);
             }
 
@@ -6041,13 +6111,13 @@ module ts {
 
             // The name is Symbol.<someName>, so make sure Symbol actually resolves to the
             // global Symbol object
-            var leftHandSide = <Identifier>(<PropertyAccessExpression>expression).expression;
-            var leftHandSideSymbol = getResolvedSymbol(leftHandSide);
+            let leftHandSide = <Identifier>(<PropertyAccessExpression>expression).expression;
+            let leftHandSideSymbol = getResolvedSymbol(leftHandSide);
             if (!leftHandSideSymbol) {
                 return false;
             }
 
-            var globalESSymbol = getGlobalESSymbolConstructorSymbol();
+            let globalESSymbol = getGlobalESSymbolConstructorSymbol();
             if (!globalESSymbol) {
                 // Already errored when we tried to look up the symbol
                 return false;
@@ -6086,20 +6156,19 @@ module ts {
         // so order how inherited signatures are processed is still preserved.
         // interface A { (x: string): void }
         // interface B extends A { (x: 'foo'): string }
-        // var b: B;
+        // let b: B;
         // b('foo') // <- here overloads should be processed as [(x:'foo'): string, (x: string): void]
         function reorderCandidates(signatures: Signature[], result: Signature[]): void {
-            var lastParent: Node;
-            var lastSymbol: Symbol;
-            var cutoffIndex: number = 0;
-            var index: number;
-            var specializedIndex: number = -1;
-            var spliceIndex: number;
+            let lastParent: Node;
+            let lastSymbol: Symbol;
+            let cutoffIndex: number = 0;
+            let index: number;
+            let specializedIndex: number = -1;
+            let spliceIndex: number;
             Debug.assert(!result.length);
-            for (var i = 0; i < signatures.length; i++) {
-                var signature = signatures[i];
-                var symbol = signature.declaration && getSymbolOfNode(signature.declaration);
-                var parent = signature.declaration && signature.declaration.parent;
+            for (let signature of signatures) {
+                let symbol = signature.declaration && getSymbolOfNode(signature.declaration);
+                let parent = signature.declaration && signature.declaration.parent;
                 if (!lastSymbol || symbol === lastSymbol) {
                     if (lastParent && parent === lastParent) {
                         index++;
@@ -6136,7 +6205,7 @@ module ts {
         }
 
         function getSpreadArgumentIndex(args: Expression[]): number {
-            for (var i = 0; i < args.length; i++) {
+            for (let i = 0; i < args.length; i++) {
                 if (args[i].kind === SyntaxKind.SpreadElementExpression) {
                     return i;
                 }
@@ -6145,12 +6214,12 @@ module ts {
         }
 
         function hasCorrectArity(node: CallLikeExpression, args: Expression[], signature: Signature) {
-            var adjustedArgCount: number;            // Apparent number of arguments we will have in this call
-            var typeArguments: NodeArray<TypeNode>;  // Type arguments (undefined if none)
-            var callIsIncomplete: boolean;           // In incomplete call we want to be lenient when we have too few arguments
+            let adjustedArgCount: number;            // Apparent number of arguments we will have in this call
+            let typeArguments: NodeArray<TypeNode>;  // Type arguments (undefined if none)
+            let callIsIncomplete: boolean;           // In incomplete call we want to be lenient when we have too few arguments
 
             if (node.kind === SyntaxKind.TaggedTemplateExpression) {
-                var tagExpression = <TaggedTemplateExpression>node;
+                let tagExpression = <TaggedTemplateExpression>node;
 
                 // Even if the call is incomplete, we'll have a missing expression as our last argument,
                 // so we can say the count is just the arg list length
@@ -6160,8 +6229,8 @@ module ts {
                 if (tagExpression.template.kind === SyntaxKind.TemplateExpression) {
                     // If a tagged template expression lacks a tail literal, the call is incomplete.
                     // Specifically, a template only can end in a TemplateTail or a Missing literal.
-                    var templateExpression = <TemplateExpression>tagExpression.template;
-                    var lastSpan = lastOrUndefined(templateExpression.templateSpans);
+                    let templateExpression = <TemplateExpression>tagExpression.template;
+                    let lastSpan = lastOrUndefined(templateExpression.templateSpans);
                     Debug.assert(lastSpan !== undefined); // we should always have at least one span.
                     callIsIncomplete = getFullWidth(lastSpan.literal) === 0 || !!lastSpan.literal.isUnterminated;
                 }
@@ -6169,20 +6238,20 @@ module ts {
                     // If the template didn't end in a backtick, or its beginning occurred right prior to EOF,
                     // then this might actually turn out to be a TemplateHead in the future;
                     // so we consider the call to be incomplete.
-                    var templateLiteral = <LiteralExpression>tagExpression.template;
+                    let templateLiteral = <LiteralExpression>tagExpression.template;
                     Debug.assert(templateLiteral.kind === SyntaxKind.NoSubstitutionTemplateLiteral);
                     callIsIncomplete = !!templateLiteral.isUnterminated;
                 }
             }
             else {
-                var callExpression = <CallExpression>node;
+                let callExpression = <CallExpression>node;
                 if (!callExpression.arguments) {
                     // This only happens when we have something of the form: 'new C'
                     Debug.assert(callExpression.kind === SyntaxKind.NewExpression);
 
                     return signature.minArgumentCount === 0;
                 }
-                
+
                 // For IDE scenarios we may have an incomplete call, so a trailing comma is tantamount to adding another argument.
                 adjustedArgCount = callExpression.arguments.hasTrailingComma ? args.length + 1 : args.length;
 
@@ -6194,7 +6263,7 @@ module ts {
 
             // If the user supplied type arguments, but the number of type arguments does not match
             // the declared number of type parameters, the call has an incorrect arity.
-            var hasRightNumberOfTypeArgs = !typeArguments ||
+            let hasRightNumberOfTypeArgs = !typeArguments ||
                 (signature.typeParameters && typeArguments.length === signature.typeParameters.length);
             if (!hasRightNumberOfTypeArgs) {
                 return false;
@@ -6202,7 +6271,7 @@ module ts {
 
             // If spread arguments are present, check that they correspond to a rest parameter. If so, no
             // further checking is necessary.
-            var spreadArgIndex = getSpreadArgumentIndex(args);
+            let spreadArgIndex = getSpreadArgumentIndex(args);
             if (spreadArgIndex >= 0) {
                 return signature.hasRestParameter && spreadArgIndex >= signature.parameters.length - 1;
             }
@@ -6213,14 +6282,14 @@ module ts {
             }
 
             // If the call is incomplete, we should skip the lower bound check.
-            var hasEnoughArguments = adjustedArgCount >= signature.minArgumentCount;
+            let hasEnoughArguments = adjustedArgCount >= signature.minArgumentCount;
             return callIsIncomplete || hasEnoughArguments;
         }
 
         // If type has a single call signature and no other members, return that signature. Otherwise, return undefined.
         function getSingleCallSignature(type: Type): Signature {
             if (type.flags & TypeFlags.ObjectType) {
-                var resolved = resolveObjectOrUnionTypeMembers(<ObjectType>type);
+                let resolved = resolveObjectOrUnionTypeMembers(<ObjectType>type);
                 if (resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0 &&
                     resolved.properties.length === 0 && !resolved.stringIndexType && !resolved.numberIndexType) {
                     return resolved.callSignatures[0];
@@ -6231,7 +6300,7 @@ module ts {
 
         // Instantiate a generic signature in the context of a non-generic signature (section 3.8.5 in TypeScript spec)
         function instantiateSignatureInContextOf(signature: Signature, contextualSignature: Signature, contextualMapper: TypeMapper): Signature {
-            var context = createInferenceContext(signature.typeParameters, /*inferUnionTypes*/ true);
+            let context = createInferenceContext(signature.typeParameters, /*inferUnionTypes*/ true);
             forEachMatchingParameterType(contextualSignature, signature, (source, target) => {
                 // Type parameters from outer context referenced by source type are fixed by instantiation of the source type
                 inferTypes(context, instantiateType(source, contextualMapper), target);
@@ -6240,23 +6309,23 @@ module ts {
         }
 
         function inferTypeArguments(signature: Signature, args: Expression[], excludeArgument: boolean[]): InferenceContext {
-            var typeParameters = signature.typeParameters;
-            var context = createInferenceContext(typeParameters, /*inferUnionTypes*/ false);
-            var inferenceMapper = createInferenceMapper(context);
+            let typeParameters = signature.typeParameters;
+            let context = createInferenceContext(typeParameters, /*inferUnionTypes*/ false);
+            let inferenceMapper = createInferenceMapper(context);
 
             // We perform two passes over the arguments. In the first pass we infer from all arguments, but use
             // wildcards for all context sensitive function expressions.
-            for (var i = 0; i < args.length; i++) {
-                var arg = args[i];
+            for (let i = 0; i < args.length; i++) {
+                let arg = args[i];
                 if (arg.kind !== SyntaxKind.OmittedExpression) {
-                    var paramType = getTypeAtPosition(signature, arg.kind === SyntaxKind.SpreadElementExpression ? -1 : i);
+                    let paramType = getTypeAtPosition(signature, arg.kind === SyntaxKind.SpreadElementExpression ? -1 : i);
                     if (i === 0 && args[i].parent.kind === SyntaxKind.TaggedTemplateExpression) {
                         var argType = globalTemplateStringsArrayType;
                     }
                     else {
                         // For context sensitive arguments we pass the identityMapper, which is a signal to treat all
                         // context sensitive function expressions as wildcards
-                        var mapper = excludeArgument && excludeArgument[i] !== undefined ? identityMapper : inferenceMapper;
+                        let mapper = excludeArgument && excludeArgument[i] !== undefined ? identityMapper : inferenceMapper;
                         var argType = checkExpressionWithContextualType(arg, paramType, mapper);
                     }
                     inferTypes(context, argType, paramType);
@@ -6267,22 +6336,22 @@ module ts {
             // time treating function expressions normally (which may cause previously inferred type arguments to be fixed
             // as we construct types for contextually typed parameters)
             if (excludeArgument) {
-                for (var i = 0; i < args.length; i++) {
+                for (let i = 0; i < args.length; i++) {
                     // No need to check for omitted args and template expressions, their exlusion value is always undefined
                     if (excludeArgument[i] === false) {
-                        var arg = args[i];
-                        var paramType = getTypeAtPosition(signature, arg.kind === SyntaxKind.SpreadElementExpression ? -1 : i);
+                        let arg = args[i];
+                        let paramType = getTypeAtPosition(signature, arg.kind === SyntaxKind.SpreadElementExpression ? -1 : i);
                         inferTypes(context, checkExpressionWithContextualType(arg, paramType, inferenceMapper), paramType);
                     }
                 }
             }
 
-            var inferredTypes = getInferredTypes(context);
+            let inferredTypes = getInferredTypes(context);
             // Inference has failed if the inferenceFailureType type is in list of inferences
             context.failedTypeParameterIndex = indexOf(inferredTypes, inferenceFailureType);
 
             // Wipe out the inferenceFailureType from the array so that error recovery can work properly
-            for (var i = 0; i < inferredTypes.length; i++) {
+            for (let i = 0; i < inferredTypes.length; i++) {
                 if (inferredTypes[i] === inferenceFailureType) {
                     inferredTypes[i] = unknownType;
                 }
@@ -6292,15 +6361,15 @@ module ts {
         }
 
         function checkTypeArguments(signature: Signature, typeArguments: TypeNode[], typeArgumentResultTypes: Type[], reportErrors: boolean): boolean {
-            var typeParameters = signature.typeParameters;
-            var typeArgumentsAreAssignable = true;
-            for (var i = 0; i < typeParameters.length; i++) {
-                var typeArgNode = typeArguments[i];
-                var typeArgument = getTypeFromTypeNode(typeArgNode);
+            let typeParameters = signature.typeParameters;
+            let typeArgumentsAreAssignable = true;
+            for (let i = 0; i < typeParameters.length; i++) {
+                let typeArgNode = typeArguments[i];
+                let typeArgument = getTypeFromTypeNode(typeArgNode);
                 // Do not push on this array! It has a preallocated length
                 typeArgumentResultTypes[i] = typeArgument;
                 if (typeArgumentsAreAssignable /* so far */) {
-                    var constraint = getConstraintOfTypeParameter(typeParameters[i]);
+                    let constraint = getConstraintOfTypeParameter(typeParameters[i]);
                     if (constraint) {
                         typeArgumentsAreAssignable = checkTypeAssignableTo(typeArgument, constraint, reportErrors ? typeArgNode : undefined,
                             Diagnostics.Type_0_does_not_satisfy_the_constraint_1);
@@ -6311,14 +6380,14 @@ module ts {
         }
 
         function checkApplicableSignature(node: CallLikeExpression, args: Expression[], signature: Signature, relation: Map<RelationComparisonResult>, excludeArgument: boolean[], reportErrors: boolean) {
-            for (var i = 0; i < args.length; i++) {
-                var arg = args[i];
+            for (let i = 0; i < args.length; i++) {
+                let arg = args[i];
                 if (arg.kind !== SyntaxKind.OmittedExpression) {
                     // Check spread elements against rest type (from arity check we know spread argument corresponds to a rest parameter)
-                    var paramType = getTypeAtPosition(signature, arg.kind === SyntaxKind.SpreadElementExpression ? -1 : i);
+                    let paramType = getTypeAtPosition(signature, arg.kind === SyntaxKind.SpreadElementExpression ? -1 : i);
                     // A tagged template expression provides a special first argument, and string literals get string literal types
                     // unless we're reporting errors
-                    var argType = i === 0 && node.kind === SyntaxKind.TaggedTemplateExpression ? globalTemplateStringsArrayType :
+                    let argType = i === 0 && node.kind === SyntaxKind.TaggedTemplateExpression ? globalTemplateStringsArrayType :
                         arg.kind === SyntaxKind.StringLiteral && !reportErrors ? getStringLiteralType(<LiteralExpression>arg) :
                             checkExpressionWithContextualType(arg, paramType, excludeArgument && excludeArgument[i] ? identityMapper : undefined);
                     // Use argument expression as error location when reporting errors
@@ -6339,9 +6408,9 @@ module ts {
          *    expressions, where the first element of the list is the template for error reporting purposes.
          */
         function getEffectiveCallArguments(node: CallLikeExpression): Expression[] {
-            var args: Expression[];
+            let args: Expression[];
             if (node.kind === SyntaxKind.TaggedTemplateExpression) {
-                var template = (<TaggedTemplateExpression>node).template;
+                let template = (<TaggedTemplateExpression>node).template;
                 args = [template];
 
                 if (template.kind === SyntaxKind.TemplateExpression) {
@@ -6369,8 +6438,8 @@ module ts {
          */
         function getEffectiveTypeArguments(callExpression: CallExpression): TypeNode[] {
             if (callExpression.expression.kind === SyntaxKind.SuperKeyword) {
-                var containingClass = <ClassDeclaration>getAncestor(callExpression, SyntaxKind.ClassDeclaration);
-                var baseClassTypeNode = containingClass && getClassBaseTypeNode(containingClass);
+                let containingClass = <ClassDeclaration>getAncestor(callExpression, SyntaxKind.ClassDeclaration);
+                let baseClassTypeNode = containingClass && getClassBaseTypeNode(containingClass);
                 return baseClassTypeNode && baseClassTypeNode.typeArguments;
             }
             else {
@@ -6380,9 +6449,9 @@ module ts {
         }
 
         function resolveCall(node: CallLikeExpression, signatures: Signature[], candidatesOutArray: Signature[]): Signature {
-            var isTaggedTemplate = node.kind === SyntaxKind.TaggedTemplateExpression;
+            let isTaggedTemplate = node.kind === SyntaxKind.TaggedTemplateExpression;
 
-            var typeArguments: TypeNode[];
+            let typeArguments: TypeNode[];
 
             if (!isTaggedTemplate) {
                 typeArguments = getEffectiveTypeArguments(<CallExpression>node);
@@ -6393,7 +6462,7 @@ module ts {
                 }
             }
 
-            var candidates = candidatesOutArray || [];
+            let candidates = candidatesOutArray || [];
             // reorderCandidates fills up the candidates array directly
             reorderCandidates(signatures, candidates);
             if (!candidates.length) {
@@ -6401,8 +6470,8 @@ module ts {
                 return resolveErrorCall(node);
             }
 
-            var args = getEffectiveCallArguments(node);
-            
+            let args = getEffectiveCallArguments(node);
+
             // The following applies to any value of 'excludeArgument[i]':
             //    - true:      the argument at 'i' is susceptible to a one-time permanent contextual typing.
             //    - undefined: the argument at 'i' is *not* susceptible to permanent contextual typing.
@@ -6414,8 +6483,8 @@ module ts {
             //
             // For a tagged template, then the first argument be 'undefined' if necessary
             // because it represents a TemplateStringsArray.
-            var excludeArgument: boolean[];
-            for (var i = isTaggedTemplate ? 1 : 0; i < args.length; i++) {
+            let excludeArgument: boolean[];
+            for (let i = isTaggedTemplate ? 1 : 0; i < args.length; i++) {
                 if (isContextSensitive(args[i])) {
                     if (!excludeArgument) {
                         excludeArgument = new Array(args.length);
@@ -6445,10 +6514,10 @@ module ts {
             //     function foo() {}
             //     foo(0, true);
             //
-            var candidateForArgumentError: Signature;
-            var candidateForTypeArgumentError: Signature;
-            var resultOfFailedInference: InferenceContext;
-            var result: Signature;
+            let candidateForArgumentError: Signature;
+            let candidateForTypeArgumentError: Signature;
+            let resultOfFailedInference: InferenceContext;
+            let result: Signature;
 
             // Section 4.12.1:
             // if the candidate list contains one or more signatures for which the type of each argument
@@ -6492,10 +6561,10 @@ module ts {
                 }
                 else {
                     Debug.assert(resultOfFailedInference.failedTypeParameterIndex >= 0);
-                    var failedTypeParameter = candidateForTypeArgumentError.typeParameters[resultOfFailedInference.failedTypeParameterIndex];
-                    var inferenceCandidates = getInferenceCandidates(resultOfFailedInference, resultOfFailedInference.failedTypeParameterIndex);
+                    let failedTypeParameter = candidateForTypeArgumentError.typeParameters[resultOfFailedInference.failedTypeParameterIndex];
+                    let inferenceCandidates = getInferenceCandidates(resultOfFailedInference, resultOfFailedInference.failedTypeParameterIndex);
 
-                    var diagnosticChainHead = chainDiagnosticMessages(/*details*/ undefined, // details will be provided by call to reportNoCommonSupertypeError
+                    let diagnosticChainHead = chainDiagnosticMessages(/*details*/ undefined, // details will be provided by call to reportNoCommonSupertypeError
                         Diagnostics.The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_type_arguments_explicitly,
                         typeToString(failedTypeParameter));
 
@@ -6512,9 +6581,9 @@ module ts {
             //  declare function f(a: { xa: number; xb: number; });
             //  f({ |
             if (!produceDiagnostics) {
-                for (var i = 0, n = candidates.length; i < n; i++) {
-                    if (hasCorrectArity(node, args, candidates[i])) {
-                        return candidates[i];
+                for (let candidate of candidates) {
+                    if (hasCorrectArity(node, args, candidate)) {
+                        return candidate;
                     }
                 }
             }
@@ -6522,18 +6591,18 @@ module ts {
             return resolveErrorCall(node);
 
             function chooseOverload(candidates: Signature[], relation: Map<RelationComparisonResult>) {
-                for (var i = 0; i < candidates.length; i++) {
-                    if (!hasCorrectArity(node, args, candidates[i])) {
+                for (let current of candidates) {
+                    if (!hasCorrectArity(node, args, current)) {
                         continue;
                     }
 
-                    var originalCandidate = candidates[i];
-                    var inferenceResult: InferenceContext;
+                    let originalCandidate = current;
+                    let inferenceResult: InferenceContext;
 
                     while (true) {
                         var candidate = originalCandidate;
                         if (candidate.typeParameters) {
-                            var typeArgumentTypes: Type[];
+                            let typeArgumentTypes: Type[];
                             var typeArgumentsAreValid: boolean;
                             if (typeArguments) {
                                 typeArgumentTypes = new Array<Type>(candidate.typeParameters.length);
@@ -6552,7 +6621,7 @@ module ts {
                         if (!checkApplicableSignature(node, args, candidate, relation, excludeArgument, /*reportErrors*/ false)) {
                             break;
                         }
-                        var index = excludeArgument ? indexOf(excludeArgument, true) : -1;
+                        let index = excludeArgument ? indexOf(excludeArgument, true) : -1;
                         if (index < 0) {
                             return candidate;
                         }
@@ -6565,7 +6634,7 @@ module ts {
                     // report an error based on the arguments. If there was an issue with type
                     // arguments, then we can only report an error based on the type arguments.
                     if (originalCandidate.typeParameters) {
-                        var instantiatedCandidate = candidate;
+                        let instantiatedCandidate = candidate;
                         if (typeArgumentsAreValid) {
                             candidateForArgumentError = instantiatedCandidate;
                         }
@@ -6589,15 +6658,15 @@ module ts {
 
         function resolveCallExpression(node: CallExpression, candidatesOutArray: Signature[]): Signature {
             if (node.expression.kind === SyntaxKind.SuperKeyword) {
-                var superType = checkSuperExpression(node.expression);
+                let superType = checkSuperExpression(node.expression);
                 if (superType !== unknownType) {
                     return resolveCall(node, getSignaturesOfType(superType, SignatureKind.Construct), candidatesOutArray);
                 }
                 return resolveUntypedCall(node);
             }
 
-            var funcType = checkExpression(node.expression);
-            var apparentType = getApparentType(funcType);
+            let funcType = checkExpression(node.expression);
+            let apparentType = getApparentType(funcType);
 
             if (apparentType === unknownType) {
                 // Another error has already been reported
@@ -6608,9 +6677,9 @@ module ts {
             // but we are not including call signatures that may have been added to the Object or
             // Function interface, since they have none by default. This is a bit of a leap of faith
             // that the user will not add any.
-            var callSignatures = getSignaturesOfType(apparentType, SignatureKind.Call);
+            let callSignatures = getSignaturesOfType(apparentType, SignatureKind.Call);
 
-            var constructSignatures = getSignaturesOfType(apparentType, SignatureKind.Construct);
+            let constructSignatures = getSignaturesOfType(apparentType, SignatureKind.Construct);
             // TS 1.0 spec: 4.12
             // If FuncExpr is of type Any, or of an object type that has no call or construct signatures
             // but is a subtype of the Function interface, the call is an untyped function call. In an
@@ -6641,13 +6710,13 @@ module ts {
 
         function resolveNewExpression(node: NewExpression, candidatesOutArray: Signature[]): Signature {
             if (node.arguments && languageVersion < ScriptTarget.ES6) {
-                var spreadIndex = getSpreadArgumentIndex(node.arguments);
+                let spreadIndex = getSpreadArgumentIndex(node.arguments);
                 if (spreadIndex >= 0) {
                     error(node.arguments[spreadIndex], Diagnostics.Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_6_and_higher);
                 }
             }
 
-            var expressionType = checkExpression(node.expression);
+            let expressionType = checkExpression(node.expression);
             // TS 1.0 spec: 4.11
             // If ConstructExpr is of type Any, Args can be any argument
             // list and the result of the operation is of type Any.
@@ -6673,7 +6742,7 @@ module ts {
             // but we are not including construct signatures that may have been added to the Object or
             // Function interface, since they have none by default. This is a bit of a leap of faith
             // that the user will not add any.
-            var constructSignatures = getSignaturesOfType(expressionType, SignatureKind.Construct);
+            let constructSignatures = getSignaturesOfType(expressionType, SignatureKind.Construct);
             if (constructSignatures.length) {
                 return resolveCall(node, constructSignatures, candidatesOutArray);
             }
@@ -6682,9 +6751,9 @@ module ts {
             // one or more call signatures, the expression is processed as a function call. A compile-time
             // error occurs if the result of the function call is not Void. The type of the result of the
             // operation is Any.
-            var callSignatures = getSignaturesOfType(expressionType, SignatureKind.Call);
+            let callSignatures = getSignaturesOfType(expressionType, SignatureKind.Call);
             if (callSignatures.length) {
-                var signature = resolveCall(node, callSignatures, candidatesOutArray);
+                let signature = resolveCall(node, callSignatures, candidatesOutArray);
                 if (getReturnTypeOfSignature(signature) !== voidType) {
                     error(node, Diagnostics.Only_a_void_function_can_be_called_with_the_new_keyword);
                 }
@@ -6696,15 +6765,15 @@ module ts {
         }
 
         function resolveTaggedTemplateExpression(node: TaggedTemplateExpression, candidatesOutArray: Signature[]): Signature {
-            var tagType = checkExpression(node.tag);
-            var apparentType = getApparentType(tagType);
+            let tagType = checkExpression(node.tag);
+            let apparentType = getApparentType(tagType);
 
             if (apparentType === unknownType) {
                 // Another error has already been reported
                 return resolveErrorCall(node);
             }
 
-            var callSignatures = getSignaturesOfType(apparentType, SignatureKind.Call);
+            let callSignatures = getSignaturesOfType(apparentType, SignatureKind.Call);
 
             if (tagType === anyType || (!callSignatures.length && !(tagType.flags & TypeFlags.Union) && isTypeAssignableTo(tagType, globalFunctionType))) {
                 return resolveUntypedCall(node);
@@ -6721,7 +6790,7 @@ module ts {
         // candidatesOutArray is passed by signature help in the language service, and collectCandidates
         // must fill it up with the appropriate candidate signatures
         function getResolvedSignature(node: CallLikeExpression, candidatesOutArray?: Signature[]): Signature {
-            var links = getNodeLinks(node);
+            let links = getNodeLinks(node);
             // If getResolvedSignature has already been called, we will have cached the resolvedSignature.
             // However, it is possible that either candidatesOutArray was not passed in the first time,
             // or that a different candidatesOutArray was passed in. Therefore, we need to redo the work
@@ -6749,12 +6818,12 @@ module ts {
             // Grammar checking; stop grammar-checking if checkGrammarTypeArguments return true
             checkGrammarTypeArguments(node, node.typeArguments) || checkGrammarArguments(node, node.arguments);
 
-            var signature = getResolvedSignature(node);
+            let signature = getResolvedSignature(node);
             if (node.expression.kind === SyntaxKind.SuperKeyword) {
                 return voidType;
             }
             if (node.kind === SyntaxKind.NewExpression) {
-                var declaration = signature.declaration;
+                let declaration = signature.declaration;
                 if (declaration &&
                     declaration.kind !== SyntaxKind.Constructor &&
                     declaration.kind !== SyntaxKind.ConstructSignature &&
@@ -6775,10 +6844,10 @@ module ts {
         }
 
         function checkTypeAssertion(node: TypeAssertion): Type {
-            var exprType = checkExpression(node.expression);
-            var targetType = getTypeFromTypeNode(node.type);
+            let exprType = checkExpression(node.expression);
+            let targetType = getTypeFromTypeNode(node.type);
             if (produceDiagnostics && targetType !== unknownType) {
-                var widenedType = getWidenedType(exprType);
+                let widenedType = getWidenedType(exprType);
                 if (!(isTypeAssignableTo(targetType, widenedType))) {
                     checkTypeAssignableTo(exprType, targetType, node, Diagnostics.Neither_type_0_nor_type_1_is_assignable_to_the_other);
                 }
@@ -6798,30 +6867,31 @@ module ts {
         }
 
         function assignContextualParameterTypes(signature: Signature, context: Signature, mapper: TypeMapper) {
-            var len = signature.parameters.length - (signature.hasRestParameter ? 1 : 0);
-            for (var i = 0; i < len; i++) {
-                var parameter = signature.parameters[i];
-                var links = getSymbolLinks(parameter);
+            let len = signature.parameters.length - (signature.hasRestParameter ? 1 : 0);
+            for (let i = 0; i < len; i++) {
+                let parameter = signature.parameters[i];
+                let links = getSymbolLinks(parameter);
                 links.type = instantiateType(getTypeAtPosition(context, i), mapper);
             }
             if (signature.hasRestParameter && context.hasRestParameter && signature.parameters.length >= context.parameters.length) {
-                var parameter = signature.parameters[signature.parameters.length - 1];
-                var links = getSymbolLinks(parameter);
+                let parameter = signature.parameters[signature.parameters.length - 1];
+                let links = getSymbolLinks(parameter);
                 links.type = instantiateType(getTypeOfSymbol(context.parameters[context.parameters.length - 1]), mapper);
             }
         }
 
         function getReturnTypeFromBody(func: FunctionLikeDeclaration, contextualMapper?: TypeMapper): Type {
-            var contextualSignature = getContextualSignatureForFunctionLikeDeclaration(func);
+            let contextualSignature = getContextualSignatureForFunctionLikeDeclaration(func);
             if (!func.body) {
                 return unknownType;
             }
+
             if (func.body.kind !== SyntaxKind.Block) {
                 var type = checkExpressionCached(<Expression>func.body, contextualMapper);
             }
             else {
                 // Aggregate the types of expressions within all the return statements.
-                var types = checkAndAggregateReturnExpressionTypes(<Block>func.body, contextualMapper);
+                let types = checkAndAggregateReturnExpressionTypes(<Block>func.body, contextualMapper);
                 if (types.length === 0) {
                     return voidType;
                 }
@@ -6841,12 +6911,12 @@ module ts {
 
         /// Returns a set of types relating to every return expression relating to a function block.
         function checkAndAggregateReturnExpressionTypes(body: Block, contextualMapper?: TypeMapper): Type[] {
-            var aggregatedTypes: Type[] = [];
+            let aggregatedTypes: Type[] = [];
 
             forEachReturnStatement(body, returnStatement => {
-                var expr = returnStatement.expression;
+                let expr = returnStatement.expression;
                 if (expr) {
-                    var type = checkExpressionCached(expr, contextualMapper);
+                    let type = checkExpressionCached(expr, contextualMapper);
                     if (!contains(aggregatedTypes, type)) {
                         aggregatedTypes.push(type);
                     }
@@ -6885,7 +6955,7 @@ module ts {
                 return;
             }
 
-            var bodyBlock = <Block>func.body;
+            let bodyBlock = <Block>func.body;
 
             // Ensure the body has at least one return expression.
             if (bodyContainsAReturnStatement(bodyBlock)) {
@@ -6907,7 +6977,7 @@ module ts {
             Debug.assert(node.kind !== SyntaxKind.MethodDeclaration || isObjectLiteralMethod(node));
 
             // Grammar checking
-            var hasGrammarError = checkGrammarFunctionLikeDeclaration(node);
+            let hasGrammarError = checkGrammarFunctionLikeDeclaration(node);
             if (!hasGrammarError && node.kind === SyntaxKind.FunctionExpression) {
                 checkGrammarFunctionName(node.name) || checkGrammarForGenerator(node);
             }
@@ -6916,24 +6986,24 @@ module ts {
             if (contextualMapper === identityMapper && isContextSensitive(node)) {
                 return anyFunctionType;
             }
-            var links = getNodeLinks(node);
-            var type = getTypeOfSymbol(node.symbol);
+            let links = getNodeLinks(node);
+            let type = getTypeOfSymbol(node.symbol);
             // Check if function expression is contextually typed and assign parameter types if so
             if (!(links.flags & NodeCheckFlags.ContextChecked)) {
-                var contextualSignature = getContextualSignature(node);
+                let contextualSignature = getContextualSignature(node);
                 // If a type check is started at a function expression that is an argument of a function call, obtaining the
                 // contextual type may recursively get back to here during overload resolution of the call. If so, we will have
                 // already assigned contextual types.
                 if (!(links.flags & NodeCheckFlags.ContextChecked)) {
                     links.flags |= NodeCheckFlags.ContextChecked;
                     if (contextualSignature) {
-                        var signature = getSignaturesOfType(type, SignatureKind.Call)[0];
+                        let signature = getSignaturesOfType(type, SignatureKind.Call)[0];
                         if (isContextSensitive(node)) {
                             assignContextualParameterTypes(signature, contextualSignature, contextualMapper || identityMapper);
                         }
                         if (!node.type) {
                             signature.resolvedReturnType = resolvingType;
-                            var returnType = getReturnTypeFromBody(node, contextualMapper);
+                            let returnType = getReturnTypeFromBody(node, contextualMapper);
                             if (signature.resolvedReturnType === resolvingType) {
                                 signature.resolvedReturnType = returnType;
                             }
@@ -6962,7 +7032,7 @@ module ts {
                     checkSourceElement(node.body);
                 }
                 else {
-                    var exprType = checkExpression(<Expression>node.body);
+                    let exprType = checkExpression(<Expression>node.body);
                     if (node.type) {
                         checkTypeAssignableTo(exprType, getTypeFromTypeNode(node.type), node.body, /*headMessage*/ undefined);
                     }
@@ -6981,7 +7051,7 @@ module ts {
 
         function checkReferenceExpression(n: Node, invalidReferenceMessage: DiagnosticMessage, constantVariableMessage: DiagnosticMessage): boolean {
             function findSymbol(n: Node): Symbol {
-                var symbol = getNodeLinks(n).resolvedSymbol;
+                let symbol = getNodeLinks(n).resolvedSymbol;
                 // Because we got the symbol from the resolvedSymbol property, it might be of kind
                 // SymbolFlags.ExportValue. In this case it is necessary to get the actual export
                 // symbol, which will have the correct flags set on it.
@@ -6990,16 +7060,16 @@ module ts {
 
             function isReferenceOrErrorExpression(n: Node): boolean {
                 // TypeScript 1.0 spec (April 2014):
-                // Expressions are classified as values or references. 
+                // Expressions are classified as values or references.
                 // References are the subset of expressions that are permitted as the target of an assignment.
-                // Specifically, references are combinations of identifiers(section 4.3), parentheses(section 4.7), 
+                // Specifically, references are combinations of identifiers(section 4.3), parentheses(section 4.7),
                 // and property accesses(section 4.10).
                 // All other expression constructs described in this chapter are classified as values.
                 switch (n.kind) {
                     case SyntaxKind.Identifier:
                         var symbol = findSymbol(n);
                         // TypeScript 1.0 spec (April 2014): 4.3
-                        // An identifier expression that references a variable or parameter is classified as a reference. 
+                        // An identifier expression that references a variable or parameter is classified as a reference.
                         // An identifier expression that references any other kind of entity is classified as a value(and therefore cannot be the target of an assignment).
                         return !symbol || symbol === unknownSymbol || symbol === argumentsSymbol || (symbol.flags & SymbolFlags.Variable) !== 0;
                     case SyntaxKind.PropertyAccessExpression:
@@ -7025,12 +7095,12 @@ module ts {
                         var symbol = findSymbol(n);
                         return symbol && (symbol.flags & SymbolFlags.Variable) !== 0 && (getDeclarationFlagsFromSymbol(symbol) & NodeFlags.Const) !== 0;
                     case SyntaxKind.ElementAccessExpression:
-                        var index = (<ElementAccessExpression>n).argumentExpression;
+                        let index = (<ElementAccessExpression>n).argumentExpression;
                         var symbol = findSymbol((<ElementAccessExpression>n).expression);
 
                         if (symbol && index && index.kind === SyntaxKind.StringLiteral) {
-                            var name = (<LiteralExpression>index).text;
-                            var prop = getPropertyOfType(getTypeOfSymbol(symbol), name);
+                            let name = (<LiteralExpression>index).text;
+                            let prop = getPropertyOfType(getTypeOfSymbol(symbol), name);
                             return prop && (prop.flags & SymbolFlags.Variable) !== 0 && (getDeclarationFlagsFromSymbol(prop) & NodeFlags.Const) !== 0;
                         }
                         return false;
@@ -7060,17 +7130,17 @@ module ts {
                 grammarErrorOnNode(node.expression, Diagnostics.delete_cannot_be_called_on_an_identifier_in_strict_mode);
             }
 
-            var operandType = checkExpression(node.expression);
+            let operandType = checkExpression(node.expression);
             return booleanType;
         }
 
         function checkTypeOfExpression(node: TypeOfExpression): Type {
-            var operandType = checkExpression(node.expression);
+            let operandType = checkExpression(node.expression);
             return stringType;
         }
 
         function checkVoidExpression(node: VoidExpression): Type {
-            var operandType = checkExpression(node.expression);
+            let operandType = checkExpression(node.expression);
             return undefinedType;
         }
 
@@ -7083,7 +7153,7 @@ module ts {
                 checkGrammarEvalOrArgumentsInStrictMode(node, <Identifier>node.operand);
             }
 
-            var operandType = checkExpression(node.operand);
+            let operandType = checkExpression(node.operand);
             switch (node.operator) {
                 case SyntaxKind.PlusToken:
                 case SyntaxKind.MinusToken:
@@ -7096,7 +7166,7 @@ module ts {
                     return booleanType;
                 case SyntaxKind.PlusPlusToken:
                 case SyntaxKind.MinusMinusToken:
-                    var ok = checkArithmeticOperandType(node.operand, operandType, Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
+                    let ok = checkArithmeticOperandType(node.operand, operandType, Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
                     if (ok) {
                         // run check only if former checks succeeded to avoid reporting cascading errors
                         checkReferenceExpression(node.operand,
@@ -7115,8 +7185,8 @@ module ts {
             // operated upon by a Prefix Increment(11.4.4) or a Prefix Decrement(11.4.5) operator.
             checkGrammarEvalOrArgumentsInStrictMode(node, <Identifier>node.operand);
 
-            var operandType = checkExpression(node.operand);
-            var ok = checkArithmeticOperandType(node.operand, operandType, Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
+            let operandType = checkExpression(node.operand);
+            let ok = checkArithmeticOperandType(node.operand, operandType, Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
             if (ok) {
                 // run check only if former checks succeeded to avoid reporting cascading errors
                 checkReferenceExpression(node.operand,
@@ -7133,9 +7203,9 @@ module ts {
                 return true;
             }
             if (type.flags & TypeFlags.Union) {
-                var types = (<UnionType>type).types;
-                for (var i = 0; i < types.length; i++) {
-                    if (types[i].flags & kind) {
+                let types = (<UnionType>type).types;
+                for (let current of types) {
+                    if (current.flags & kind) {
                         return true;
                     }
                 }
@@ -7150,9 +7220,9 @@ module ts {
                 return true;
             }
             if (type.flags & TypeFlags.Union) {
-                var types = (<UnionType>type).types;
-                for (var i = 0; i < types.length; i++) {
-                    if (!(types[i].flags & kind)) {
+                let types = (<UnionType>type).types;
+                for (let current of types) {
+                    if (!(current.flags & kind)) {
                         return false;
                     }
                 }
@@ -7172,7 +7242,7 @@ module ts {
         function checkInstanceOfExpression(node: BinaryExpression, leftType: Type, rightType: Type): Type {
             // TypeScript 1.0 spec (April 2014): 4.15.4
             // The instanceof operator requires the left operand to be of type Any, an object type, or a type parameter type,
-            // and the right operand to be of type Any or a subtype of the 'Function' interface type. 
+            // and the right operand to be of type Any or a subtype of the 'Function' interface type.
             // The result is always of the Boolean primitive type.
             // NOTE: do not raise error if leftType is unknown as related error was already reported
             if (allConstituentTypesHaveKind(leftType, TypeFlags.Primitive)) {
@@ -7200,13 +7270,12 @@ module ts {
         }
 
         function checkObjectLiteralAssignment(node: ObjectLiteralExpression, sourceType: Type, contextualMapper?: TypeMapper): Type {
-            var properties = node.properties;
-            for (var i = 0; i < properties.length; i++) {
-                var p = properties[i];
+            let properties = node.properties;
+            for (let p of properties) {
                 if (p.kind === SyntaxKind.PropertyAssignment || p.kind === SyntaxKind.ShorthandPropertyAssignment) {
                     // TODO(andersh): Computed property support
-                    var name = <Identifier>(<PropertyAssignment>p).name;
-                    var type = sourceType.flags & TypeFlags.Any ? sourceType :
+                    let name = <Identifier>(<PropertyAssignment>p).name;
+                    let type = sourceType.flags & TypeFlags.Any ? sourceType :
                         getTypeOfPropertyOfType(sourceType, name.text) ||
                         isNumericLiteralName(name.text) && getIndexTypeOfType(sourceType, IndexKind.Number) ||
                         getIndexTypeOfType(sourceType, IndexKind.String);
@@ -7230,20 +7299,25 @@ module ts {
                 error(node, Diagnostics.Type_0_is_not_an_array_type, typeToString(sourceType));
                 return sourceType;
             }
-            var elements = node.elements;
-            for (var i = 0; i < elements.length; i++) {
-                var e = elements[i];
+            let elements = node.elements;
+            for (let i = 0; i < elements.length; i++) {
+                let e = elements[i];
                 if (e.kind !== SyntaxKind.OmittedExpression) {
                     if (e.kind !== SyntaxKind.SpreadElementExpression) {
-                        var propName = "" + i;
-                        var type = sourceType.flags & TypeFlags.Any ? sourceType :
+                        let propName = "" + i;
+                        let type = sourceType.flags & TypeFlags.Any ? sourceType :
                             isTupleLikeType(sourceType) ? getTypeOfPropertyOfType(sourceType, propName) :
                                 getIndexTypeOfType(sourceType, IndexKind.Number);
                         if (type) {
                             checkDestructuringAssignment(e, type, contextualMapper);
                         }
                         else {
-                            error(e, Diagnostics.Type_0_has_no_property_1, typeToString(sourceType), propName);
+                            if (isTupleType(sourceType)) {
+                                error(e, Diagnostics.Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2, typeToString(sourceType), (<TupleType>sourceType).elementTypes.length, elements.length);
+                            }
+                            else {
+                                error(e, Diagnostics.Type_0_has_no_property_1, typeToString(sourceType), propName);
+                            }
                         }
                     }
                     else {
@@ -7274,7 +7348,7 @@ module ts {
         }
 
         function checkReferenceAssignment(target: Expression, sourceType: Type, contextualMapper?: TypeMapper): Type {
-            var targetType = checkExpression(target, contextualMapper);
+            let targetType = checkExpression(target, contextualMapper);
             if (checkReferenceExpression(target, Diagnostics.Invalid_left_hand_side_of_assignment_expression, Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant)) {
                 checkTypeAssignableTo(sourceType, targetType, target, /*headMessage*/ undefined);
             }
@@ -7289,12 +7363,12 @@ module ts {
                 checkGrammarEvalOrArgumentsInStrictMode(node, <Identifier>node.left);
             }
 
-            var operator = node.operatorToken.kind;
+            let operator = node.operatorToken.kind;
             if (operator === SyntaxKind.EqualsToken && (node.left.kind === SyntaxKind.ObjectLiteralExpression || node.left.kind === SyntaxKind.ArrayLiteralExpression)) {
                 return checkDestructuringAssignment(node.left, checkExpression(node.right, contextualMapper), contextualMapper);
             }
-            var leftType = checkExpression(node.left, contextualMapper);
-            var rightType = checkExpression(node.right, contextualMapper);
+            let leftType = checkExpression(node.left, contextualMapper);
+            let rightType = checkExpression(node.right, contextualMapper);
             switch (operator) {
                 case SyntaxKind.AsteriskToken:
                 case SyntaxKind.AsteriskEqualsToken:
@@ -7318,15 +7392,15 @@ module ts {
                 case SyntaxKind.AmpersandEqualsToken:
                     // TypeScript 1.0 spec (April 2014): 4.15.1
                     // These operators require their operands to be of type Any, the Number primitive type,
-                    // or an enum type. Operands of an enum type are treated 
+                    // or an enum type. Operands of an enum type are treated
                     // as having the primitive type Number. If one operand is the null or undefined value,
                     // it is treated as having the type of the other operand.
                     // The result is always of the Number primitive type.
                     if (leftType.flags & (TypeFlags.Undefined | TypeFlags.Null)) leftType = rightType;
                     if (rightType.flags & (TypeFlags.Undefined | TypeFlags.Null)) rightType = leftType;
 
-                    var suggestedOperator: SyntaxKind;
-                    // if a user tries to apply a bitwise operator to 2 boolean operands 
+                    let suggestedOperator: SyntaxKind;
+                    // if a user tries to apply a bitwise operator to 2 boolean operands
                     // try and return them a helpful suggestion
                     if ((leftType.flags & TypeFlags.Boolean) &&
                         (rightType.flags & TypeFlags.Boolean) &&
@@ -7334,9 +7408,9 @@ module ts {
                         error(node, Diagnostics.The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead, tokenToString(node.operatorToken.kind), tokenToString(suggestedOperator));
                     }
                     else {
-                        // otherwise just check each operand separately and report errors as normal 
-                        var leftOk = checkArithmeticOperandType(node.left, leftType, Diagnostics.The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type);
-                        var rightOk = checkArithmeticOperandType(node.right, rightType, Diagnostics.The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type);
+                        // otherwise just check each operand separately and report errors as normal
+                        let leftOk = checkArithmeticOperandType(node.left, leftType, Diagnostics.The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type);
+                        let rightOk = checkArithmeticOperandType(node.right, rightType, Diagnostics.The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type);
                         if (leftOk && rightOk) {
                             checkAssignmentOperator(numberType);
                         }
@@ -7353,7 +7427,7 @@ module ts {
                     if (leftType.flags & (TypeFlags.Undefined | TypeFlags.Null)) leftType = rightType;
                     if (rightType.flags & (TypeFlags.Undefined | TypeFlags.Null)) rightType = leftType;
 
-                    var resultType: Type;
+                    let resultType: Type;
                     if (allConstituentTypesHaveKind(leftType, TypeFlags.NumberLike) && allConstituentTypesHaveKind(rightType, TypeFlags.NumberLike)) {
                         // Operands of an enum type are treated as having the primitive type Number.
                         // If both operands are of the Number primitive type, the result is of the Number primitive type.
@@ -7418,7 +7492,7 @@ module ts {
 
             // Return true if there was no error, false if there was an error.
             function checkForDisallowedESSymbolOperand(operator: SyntaxKind): boolean {
-                var offendingSymbolOperand =
+                let offendingSymbolOperand =
                     someConstituentTypeHasKind(leftType, TypeFlags.ESSymbol) ? node.left :
                     someConstituentTypeHasKind(rightType, TypeFlags.ESSymbol) ? node.right :
                     undefined;
@@ -7452,9 +7526,9 @@ module ts {
                     // An assignment of the form
                     //    VarExpr = ValueExpr
                     // requires VarExpr to be classified as a reference
-                    // A compound assignment furthermore requires VarExpr to be classified as a reference (section 4.1) 
+                    // A compound assignment furthermore requires VarExpr to be classified as a reference (section 4.1)
                     // and the type of the non - compound operation to be assignable to the type of VarExpr.
-                    var ok = checkReferenceExpression(node.left, Diagnostics.Invalid_left_hand_side_of_assignment_expression, Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant);
+                    let ok = checkReferenceExpression(node.left, Diagnostics.Invalid_left_hand_side_of_assignment_expression, Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant);
                     // Use default messages
                     if (ok) {
                         // to avoid cascading errors check assignability only if 'isReference' check succeeded and no errors were reported
@@ -7480,8 +7554,8 @@ module ts {
 
         function checkConditionalExpression(node: ConditionalExpression, contextualMapper?: TypeMapper): Type {
             checkExpression(node.condition);
-            var type1 = checkExpression(node.whenTrue, contextualMapper);
-            var type2 = checkExpression(node.whenFalse, contextualMapper);
+            let type1 = checkExpression(node.whenTrue, contextualMapper);
+            let type2 = checkExpression(node.whenFalse, contextualMapper);
             return getUnionType([type1, type2]);
         }
 
@@ -7499,15 +7573,15 @@ module ts {
         }
 
         function checkExpressionWithContextualType(node: Expression, contextualType: Type, contextualMapper?: TypeMapper): Type {
-            var saveContextualType = node.contextualType;
+            let saveContextualType = node.contextualType;
             node.contextualType = contextualType;
-            var result = checkExpression(node, contextualMapper);
+            let result = checkExpression(node, contextualMapper);
             node.contextualType = saveContextualType;
             return result;
         }
 
         function checkExpressionCached(node: Expression, contextualMapper?: TypeMapper): Type {
-            var links = getNodeLinks(node);
+            let links = getNodeLinks(node);
             if (!links.resolvedType) {
                 links.resolvedType = checkExpression(node, contextualMapper);
             }
@@ -7536,17 +7610,17 @@ module ts {
                 checkComputedPropertyName(<ComputedPropertyName>node.name);
             }
 
-            var uninstantiatedType = checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper);
+            let uninstantiatedType = checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper);
             return instantiateTypeWithSingleGenericCallSignature(node, uninstantiatedType, contextualMapper);
         }
 
         function instantiateTypeWithSingleGenericCallSignature(node: Expression | MethodDeclaration, type: Type, contextualMapper?: TypeMapper) {
             if (contextualMapper && contextualMapper !== identityMapper) {
-                var signature = getSingleCallSignature(type);
+                let signature = getSingleCallSignature(type);
                 if (signature && signature.typeParameters) {
-                    var contextualType = getContextualType(<Expression>node);
+                    let contextualType = getContextualType(<Expression>node);
                     if (contextualType) {
-                        var contextualSignature = getSingleCallSignature(contextualType);
+                        let contextualSignature = getSingleCallSignature(contextualType);
                         if (contextualSignature && !contextualSignature.typeParameters) {
                             return getOrCreateTypeFromSignature(instantiateSignatureInContextOf(signature, contextualSignature, contextualMapper));
                         }
@@ -7569,21 +7643,21 @@ module ts {
         // have the wildcard function type; this form of type check is used during overload resolution to exclude
         // contextually typed function and arrow expressions in the initial phase.
         function checkExpressionOrQualifiedName(node: Expression | QualifiedName, contextualMapper?: TypeMapper): Type {
-            var type: Type;
+            let type: Type;
             if (node.kind == SyntaxKind.QualifiedName) {
                 type = checkQualifiedName(<QualifiedName>node);
             }
             else {
-                var uninstantiatedType = checkExpressionWorker(<Expression>node, contextualMapper);
+                let uninstantiatedType = checkExpressionWorker(<Expression>node, contextualMapper);
                 type = instantiateTypeWithSingleGenericCallSignature(<Expression>node, uninstantiatedType, contextualMapper);
             }
 
             if (isConstEnumObjectType(type)) {
                 // enum object type for const enums are only permitted in:
-                // - 'left' in property access 
+                // - 'left' in property access
                 // - 'object' in indexed access
                 // - target in rhs of import statement
-                var ok =
+                let ok =
                     (node.parent.kind === SyntaxKind.PropertyAccessExpression && (<PropertyAccessExpression>node.parent).expression === node) ||
                     (node.parent.kind === SyntaxKind.ElementAccessExpression && (<ElementAccessExpression>node.parent).expression === node) ||
                     ((node.kind === SyntaxKind.Identifier || node.kind === SyntaxKind.QualifiedName) && isInRightSideOfImportOrExportAssignment(<Identifier>node));
@@ -7696,7 +7770,7 @@ module ts {
             checkGrammarModifiers(node) || checkGrammarEvalOrArgumentsInStrictMode(node, <Identifier>node.name);
 
             checkVariableLikeDeclaration(node);
-            var func = getContainingFunction(node);
+            let func = getContainingFunction(node);
             if (node.flags & NodeFlags.AccessibilityModifier) {
                 func = getContainingFunction(node);
                 if (!(func.kind === SyntaxKind.Constructor && nodeIsPresent(func.body))) {
@@ -7752,7 +7826,7 @@ module ts {
 
         function checkTypeForDuplicateIndexSignatures(node: Node) {
             if (node.kind === SyntaxKind.InterfaceDeclaration) {
-                var nodeSymbol = getSymbolOfNode(node);
+                let nodeSymbol = getSymbolOfNode(node);
                 // in case of merging interface declaration it is possible that we'll enter this check procedure several times for every declaration
                 // to prevent this run check only for the first declaration of a given kind
                 if (nodeSymbol.declarations.length > 0 && nodeSymbol.declarations[0] !== node) {
@@ -7763,12 +7837,12 @@ module ts {
             // TypeScript 1.0 spec (April 2014)
             // 3.7.4: An object type can contain at most one string index signature and one numeric index signature.
             // 8.5: A class declaration can have at most one string index member declaration and one numeric index member declaration
-            var indexSymbol = getIndexSymbol(getSymbolOfNode(node));
+            let indexSymbol = getIndexSymbol(getSymbolOfNode(node));
             if (indexSymbol) {
-                var seenNumericIndexer = false;
-                var seenStringIndexer = false;
-                for (var i = 0, len = indexSymbol.declarations.length; i < len; ++i) {
-                    var declaration = <SignatureDeclaration>indexSymbol.declarations[i];
+                let seenNumericIndexer = false;
+                let seenStringIndexer = false;
+                for (let decl of indexSymbol.declarations) {
+                    let declaration = <SignatureDeclaration>decl;
                     if (declaration.parameters.length === 1 && declaration.parameters[0].type) {
                         switch (declaration.parameters[0].type.kind) {
                             case SyntaxKind.StringKeyword:
@@ -7816,8 +7890,8 @@ module ts {
 
             checkSourceElement(node.body);
 
-            var symbol = getSymbolOfNode(node);
-            var firstDeclaration = getDeclarationOfKind(symbol, node.kind);
+            let symbol = getSymbolOfNode(node);
+            let firstDeclaration = getDeclarationOfKind(symbol, node.kind);
             // Only type check the symbol once
             if (node === firstDeclaration) {
                 checkFunctionOrConstructorSymbol(symbol);
@@ -7865,21 +7939,21 @@ module ts {
             }
 
             // TS 1.0 spec (April 2014): 8.3.2
-            // Constructors of classes with no extends clause may not contain super calls, whereas 
+            // Constructors of classes with no extends clause may not contain super calls, whereas
             // constructors of derived classes must contain at least one super call somewhere in their function body.
             if (getClassBaseTypeNode(<ClassDeclaration>node.parent)) {
 
                 if (containsSuperCall(node.body)) {
                     // The first statement in the body of a constructor must be a super call if both of the following are true:
                     // - The containing class is a derived class.
-                    // - The constructor declares parameter properties 
+                    // - The constructor declares parameter properties
                     //   or the containing class declares instance member variables with initializers.
-                    var superCallShouldBeFirst =
+                    let superCallShouldBeFirst =
                         forEach((<ClassDeclaration>node.parent).members, isInstancePropertyWithInitializer) ||
                         forEach(node.parameters, p => p.flags & (NodeFlags.Public | NodeFlags.Private | NodeFlags.Protected));
 
                     if (superCallShouldBeFirst) {
-                        var statements = (<Block>node.body).statements;
+                        let statements = (<Block>node.body).statements;
                         if (!statements.length || statements[0].kind !== SyntaxKind.ExpressionStatement || !isSuperCallExpression((<ExpressionStatement>statements[0]).expression)) {
                             error(node, Diagnostics.A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_or_has_parameter_properties);
                         }
@@ -7909,15 +7983,15 @@ module ts {
                 if (!hasDynamicName(node)) {
                     // TypeScript 1.0 spec (April 2014): 8.4.3
                     // Accessors for the same member name must specify the same accessibility.
-                    var otherKind = node.kind === SyntaxKind.GetAccessor ? SyntaxKind.SetAccessor : SyntaxKind.GetAccessor;
-                    var otherAccessor = <AccessorDeclaration>getDeclarationOfKind(node.symbol, otherKind);
+                    let otherKind = node.kind === SyntaxKind.GetAccessor ? SyntaxKind.SetAccessor : SyntaxKind.GetAccessor;
+                    let otherAccessor = <AccessorDeclaration>getDeclarationOfKind(node.symbol, otherKind);
                     if (otherAccessor) {
                         if (((node.flags & NodeFlags.AccessibilityModifier) !== (otherAccessor.flags & NodeFlags.AccessibilityModifier))) {
                             error(node.name, Diagnostics.Getter_and_setter_accessors_do_not_agree_in_visibility);
                         }
 
-                        var currentAccessorType = getAnnotatedAccessorType(node);
-                        var otherAccessorType = getAnnotatedAccessorType(otherAccessor);
+                        let currentAccessorType = getAnnotatedAccessorType(node);
+                        let otherAccessorType = getAnnotatedAccessorType(otherAccessor);
                         // TypeScript 1.0 spec (April 2014): 4.5
                         // If both accessors include type annotations, the specified types must be identical.
                         if (currentAccessorType && otherAccessorType) {
@@ -7938,15 +8012,15 @@ module ts {
             // Grammar checking
             checkGrammarTypeArguments(node, node.typeArguments);
 
-            var type = getTypeFromTypeReferenceNode(node);
+            let type = getTypeFromTypeReferenceNode(node);
             if (type !== unknownType && node.typeArguments) {
                 // Do type argument local checks only if referenced type is successfully resolved
-                var len = node.typeArguments.length;
-                for (var i = 0; i < len; i++) {
+                let len = node.typeArguments.length;
+                for (let i = 0; i < len; i++) {
                     checkSourceElement(node.typeArguments[i]);
-                    var constraint = getConstraintOfTypeParameter((<TypeReference>type).target.typeParameters[i]);
+                    let constraint = getConstraintOfTypeParameter((<TypeReference>type).target.typeParameters[i]);
                     if (produceDiagnostics && constraint) {
-                        var typeArgument = (<TypeReference>type).typeArguments[i];
+                        let typeArgument = (<TypeReference>type).typeArguments[i];
                         checkTypeAssignableTo(typeArgument, constraint, node, Diagnostics.Type_0_does_not_satisfy_the_constraint_1);
                     }
                 }
@@ -7960,7 +8034,7 @@ module ts {
         function checkTypeLiteral(node: TypeLiteralNode) {
             forEach(node.members, checkSourceElement);
             if (produceDiagnostics) {
-                var type = getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
+                let type = getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
                 checkIndexConstraints(type);
                 checkTypeForDuplicateIndexSignatures(node);
             }
@@ -7972,7 +8046,7 @@ module ts {
 
         function checkTupleType(node: TupleTypeNode) {
             // Grammar checking
-            var hasErrorFromDisallowedTrailingComma = checkGrammarForDisallowedTrailingComma(node.elementTypes);
+            let hasErrorFromDisallowedTrailingComma = checkGrammarForDisallowedTrailingComma(node.elementTypes);
             if (!hasErrorFromDisallowedTrailingComma && node.elementTypes.length === 0) {
                 grammarErrorOnNode(node, Diagnostics.A_tuple_type_element_list_cannot_be_empty);
             }
@@ -7992,7 +8066,7 @@ module ts {
             if (!produceDiagnostics) {
                 return;
             }
-            var signature = getSignatureFromDeclaration(signatureDeclarationNode);
+            let signature = getSignatureFromDeclaration(signatureDeclarationNode);
             if (!signature.hasStringLiterals) {
                 return;
             }
@@ -8007,22 +8081,21 @@ module ts {
             // TypeScript 1.0 spec (April 2014): 3.7.2.4
             // Every specialized call or construct signature in an object type must be assignable
             // to at least one non-specialized call or construct signature in the same object type
-            var signaturesToCheck: Signature[];
+            let signaturesToCheck: Signature[];
             // Unnamed (call\construct) signatures in interfaces are inherited and not shadowed so examining just node symbol won't give complete answer.
             // Use declaring type to obtain full list of signatures.
             if (!signatureDeclarationNode.name && signatureDeclarationNode.parent && signatureDeclarationNode.parent.kind === SyntaxKind.InterfaceDeclaration) {
                 Debug.assert(signatureDeclarationNode.kind === SyntaxKind.CallSignature || signatureDeclarationNode.kind === SyntaxKind.ConstructSignature);
-                var signatureKind = signatureDeclarationNode.kind === SyntaxKind.CallSignature ? SignatureKind.Call : SignatureKind.Construct;
-                var containingSymbol = getSymbolOfNode(signatureDeclarationNode.parent);
-                var containingType = getDeclaredTypeOfSymbol(containingSymbol);
+                let signatureKind = signatureDeclarationNode.kind === SyntaxKind.CallSignature ? SignatureKind.Call : SignatureKind.Construct;
+                let containingSymbol = getSymbolOfNode(signatureDeclarationNode.parent);
+                let containingType = getDeclaredTypeOfSymbol(containingSymbol);
                 signaturesToCheck = getSignaturesOfType(containingType, signatureKind);
             }
             else {
                 signaturesToCheck = getSignaturesOfSymbol(getSymbolOfNode(signatureDeclarationNode));
             }
 
-            for (var i = 0; i < signaturesToCheck.length; i++) {
-                var otherSignature = signaturesToCheck[i];
+            for (let otherSignature of signaturesToCheck) {
                 if (!otherSignature.hasStringLiterals && isSignatureAssignableTo(signature, otherSignature)) {
                     return;
                 }
@@ -8032,7 +8105,7 @@ module ts {
         }
 
         function getEffectiveDeclarationFlags(n: Node, flagsToCheck: NodeFlags) {
-            var flags = getCombinedNodeFlags(n);
+            let flags = getCombinedNodeFlags(n);
             if (n.parent.kind !== SyntaxKind.InterfaceDeclaration && isInAmbientContext(n)) {
                 if (!(flags & NodeFlags.Ambient)) {
                     // It is nested in an ambient context, which means it is automatically exported
@@ -8055,19 +8128,19 @@ module ts {
                 // The caveat is that if some overloads are defined in lib.d.ts, we don't want to
                 // report the errors on those. To achieve this, we will say that the implementation is
                 // the canonical signature only if it is in the same container as the first overload
-                var implementationSharesContainerWithFirstOverload = implementation !== undefined && implementation.parent === overloads[0].parent;
+                let implementationSharesContainerWithFirstOverload = implementation !== undefined && implementation.parent === overloads[0].parent;
                 return implementationSharesContainerWithFirstOverload ? implementation : overloads[0];
             }
 
             function checkFlagAgreementBetweenOverloads(overloads: Declaration[], implementation: FunctionLikeDeclaration, flagsToCheck: NodeFlags, someOverloadFlags: NodeFlags, allOverloadFlags: NodeFlags): void {
                 // Error if some overloads have a flag that is not shared by all overloads. To find the
                 // deviations, we XOR someOverloadFlags with allOverloadFlags
-                var someButNotAllOverloadFlags = someOverloadFlags ^ allOverloadFlags;
+                let someButNotAllOverloadFlags = someOverloadFlags ^ allOverloadFlags;
                 if (someButNotAllOverloadFlags !== 0) {
-                    var canonicalFlags = getEffectiveDeclarationFlags(getCanonicalOverload(overloads, implementation), flagsToCheck);
+                    let canonicalFlags = getEffectiveDeclarationFlags(getCanonicalOverload(overloads, implementation), flagsToCheck);
 
                     forEach(overloads, o => {
-                        var deviation = getEffectiveDeclarationFlags(o, flagsToCheck) ^ canonicalFlags;
+                        let deviation = getEffectiveDeclarationFlags(o, flagsToCheck) ^ canonicalFlags;
                         if (deviation & NodeFlags.Export) {
                             error(o.name, Diagnostics.Overload_signatures_must_all_be_exported_or_not_exported);
                         }
@@ -8083,9 +8156,9 @@ module ts {
 
             function checkQuestionTokenAgreementBetweenOverloads(overloads: Declaration[], implementation: FunctionLikeDeclaration, someHaveQuestionToken: boolean, allHaveQuestionToken: boolean): void {
                 if (someHaveQuestionToken !== allHaveQuestionToken) {
-                    var canonicalHasQuestionToken = hasQuestionToken(getCanonicalOverload(overloads, implementation));
+                    let canonicalHasQuestionToken = hasQuestionToken(getCanonicalOverload(overloads, implementation));
                     forEach(overloads, o => {
-                        var deviation = hasQuestionToken(o) !== canonicalHasQuestionToken;
+                        let deviation = hasQuestionToken(o) !== canonicalHasQuestionToken;
                         if (deviation) {
                             error(o.name, Diagnostics.Overload_signatures_must_all_be_optional_or_required);
                         }
@@ -8093,26 +8166,26 @@ module ts {
                 }
             }
 
-            var flagsToCheck: NodeFlags = NodeFlags.Export | NodeFlags.Ambient | NodeFlags.Private | NodeFlags.Protected;
-            var someNodeFlags: NodeFlags = 0;
-            var allNodeFlags = flagsToCheck;
-            var someHaveQuestionToken = false;
-            var allHaveQuestionToken = true;
-            var hasOverloads = false;
-            var bodyDeclaration: FunctionLikeDeclaration;
-            var lastSeenNonAmbientDeclaration: FunctionLikeDeclaration;
-            var previousDeclaration: FunctionLikeDeclaration;
+            let flagsToCheck: NodeFlags = NodeFlags.Export | NodeFlags.Ambient | NodeFlags.Private | NodeFlags.Protected;
+            let someNodeFlags: NodeFlags = 0;
+            let allNodeFlags = flagsToCheck;
+            let someHaveQuestionToken = false;
+            let allHaveQuestionToken = true;
+            let hasOverloads = false;
+            let bodyDeclaration: FunctionLikeDeclaration;
+            let lastSeenNonAmbientDeclaration: FunctionLikeDeclaration;
+            let previousDeclaration: FunctionLikeDeclaration;
 
-            var declarations = symbol.declarations;
-            var isConstructor = (symbol.flags & SymbolFlags.Constructor) !== 0;
+            let declarations = symbol.declarations;
+            let isConstructor = (symbol.flags & SymbolFlags.Constructor) !== 0;
 
             function reportImplementationExpectedError(node: FunctionLikeDeclaration): void {
                 if (node.name && getFullWidth(node.name) === 0) {
                     return;
                 }
 
-                var seen = false;
-                var subsequentNode = forEachChild(node.parent, c => {
+                let seen = false;
+                let subsequentNode = forEachChild(node.parent, c => {
                     if (seen) {
                         return c;
                     }
@@ -8122,13 +8195,13 @@ module ts {
                 });
                 if (subsequentNode) {
                     if (subsequentNode.kind === node.kind) {
-                        var errorNode: Node = (<FunctionLikeDeclaration>subsequentNode).name || subsequentNode;
+                        let errorNode: Node = (<FunctionLikeDeclaration>subsequentNode).name || subsequentNode;
                         // TODO(jfreeman): These are methods, so handle computed name case
                         if (node.name && (<FunctionLikeDeclaration>subsequentNode).name && (<Identifier>node.name).text === (<Identifier>(<FunctionLikeDeclaration>subsequentNode).name).text) {
                             // the only situation when this is possible (same kind\same name but different symbol) - mixed static and instance class members
                             Debug.assert(node.kind === SyntaxKind.MethodDeclaration || node.kind === SyntaxKind.MethodSignature);
                             Debug.assert((node.flags & NodeFlags.Static) !== (subsequentNode.flags & NodeFlags.Static));
-                            var diagnostic = node.flags & NodeFlags.Static ? Diagnostics.Function_overload_must_be_static : Diagnostics.Function_overload_must_not_be_static;
+                            let diagnostic = node.flags & NodeFlags.Static ? Diagnostics.Function_overload_must_be_static : Diagnostics.Function_overload_must_not_be_static;
                             error(errorNode, diagnostic);
                             return;
                         }
@@ -8138,7 +8211,7 @@ module ts {
                         }
                     }
                 }
-                var errorNode: Node = node.name || node;
+                let errorNode: Node = node.name || node;
                 if (isConstructor) {
                     error(errorNode, Diagnostics.Constructor_implementation_is_missing);
                 }
@@ -8149,13 +8222,13 @@ module ts {
 
             // when checking exported function declarations across modules check only duplicate implementations
             // names and consistency of modifiers are verified when we check local symbol
-            var isExportSymbolInsideModule = symbol.parent && symbol.parent.flags & SymbolFlags.Module;
-            var duplicateFunctionDeclaration = false;
-            var multipleConstructorImplementation = false;
-            for (var i = 0; i < declarations.length; i++) {
-                var node = <FunctionLikeDeclaration>declarations[i];
-                var inAmbientContext = isInAmbientContext(node);
-                var inAmbientContextOrInterface = node.parent.kind === SyntaxKind.InterfaceDeclaration || node.parent.kind === SyntaxKind.TypeLiteral || inAmbientContext;
+            let isExportSymbolInsideModule = symbol.parent && symbol.parent.flags & SymbolFlags.Module;
+            let duplicateFunctionDeclaration = false;
+            let multipleConstructorImplementation = false;
+            for (let current of declarations) {
+                let node = <FunctionLikeDeclaration>current;
+                let inAmbientContext = isInAmbientContext(node);
+                let inAmbientContextOrInterface = node.parent.kind === SyntaxKind.InterfaceDeclaration || node.parent.kind === SyntaxKind.TypeLiteral || inAmbientContext;
                 if (inAmbientContextOrInterface) {
                     // check if declarations are consecutive only if they are non-ambient
                     // 1. ambient declarations can be interleaved
@@ -8168,7 +8241,7 @@ module ts {
                 }
 
                 if (node.kind === SyntaxKind.FunctionDeclaration || node.kind === SyntaxKind.MethodDeclaration || node.kind === SyntaxKind.MethodSignature || node.kind === SyntaxKind.Constructor) {
-                    var currentNodeFlags = getEffectiveDeclarationFlags(node, flagsToCheck);
+                    let currentNodeFlags = getEffectiveDeclarationFlags(node, flagsToCheck);
                     someNodeFlags |= currentNodeFlags;
                     allNodeFlags &= currentNodeFlags;
                     someHaveQuestionToken = someHaveQuestionToken || hasQuestionToken(node);
@@ -8224,14 +8297,14 @@ module ts {
                 checkQuestionTokenAgreementBetweenOverloads(declarations, bodyDeclaration, someHaveQuestionToken, allHaveQuestionToken);
 
                 if (bodyDeclaration) {
-                    var signatures = getSignaturesOfSymbol(symbol);
-                    var bodySignature = getSignatureFromDeclaration(bodyDeclaration);
+                    let signatures = getSignaturesOfSymbol(symbol);
+                    let bodySignature = getSignatureFromDeclaration(bodyDeclaration);
                     // If the implementation signature has string literals, we will have reported an error in
                     // checkSpecializedSignatureDeclaration
                     if (!bodySignature.hasStringLiterals) {
                         // TypeScript 1.0 spec (April 2014): 6.1
-                        // If a function declaration includes overloads, the overloads determine the call 
-                        // signatures of the type given to the function object 
+                        // If a function declaration includes overloads, the overloads determine the call
+                        // signatures of the type given to the function object
                         // and the function implementation signature must be assignable to that type
                         //
                         // TypeScript 1.0 spec (April 2014): 3.8.4
@@ -8243,9 +8316,9 @@ module ts {
                         // function g(x: string, y: string) { }
                         //
                         // The implementation is completely unrelated to the specialized signature, yet we do not check this.
-                        for (var i = 0, len = signatures.length; i < len; ++i) {
-                            if (!signatures[i].hasStringLiterals && !isSignatureAssignableTo(bodySignature, signatures[i])) {
-                                error(signatures[i].declaration, Diagnostics.Overload_signature_is_not_compatible_with_function_implementation);
+                        for (let signature of signatures) {
+                            if (!signature.hasStringLiterals && !isSignatureAssignableTo(bodySignature, signature)) {
+                                error(signature.declaration, Diagnostics.Overload_signature_is_not_compatible_with_function_implementation);
                                 break;
                             }
                         }
@@ -8281,12 +8354,12 @@ module ts {
                 return;
             }
 
-            // we use SymbolFlags.ExportValue, SymbolFlags.ExportType and SymbolFlags.ExportNamespace 
+            // we use SymbolFlags.ExportValue, SymbolFlags.ExportType and SymbolFlags.ExportNamespace
             // to denote disjoint declarationSpaces (without making new enum type).
-            var exportedDeclarationSpaces: SymbolFlags = 0;
-            var nonExportedDeclarationSpaces: SymbolFlags = 0;
+            let exportedDeclarationSpaces: SymbolFlags = 0;
+            let nonExportedDeclarationSpaces: SymbolFlags = 0;
             forEach(symbol.declarations, d => {
-                var declarationSpaces = getDeclarationSpaces(d);
+                let declarationSpaces = getDeclarationSpaces(d);
                 if (getEffectiveDeclarationFlags(d, NodeFlags.Export)) {
                     exportedDeclarationSpaces |= declarationSpaces;
                 }
@@ -8295,7 +8368,7 @@ module ts {
                 }
             });
 
-            var commonDeclarationSpace = exportedDeclarationSpaces & nonExportedDeclarationSpaces;
+            let commonDeclarationSpace = exportedDeclarationSpaces & nonExportedDeclarationSpaces;
 
             if (commonDeclarationSpace) {
                 // declaration spaces for exported and non-exported declarations intersect
@@ -8318,8 +8391,8 @@ module ts {
                     case SyntaxKind.EnumDeclaration:
                         return SymbolFlags.ExportType | SymbolFlags.ExportValue;
                     case SyntaxKind.ImportEqualsDeclaration:
-                        var result: SymbolFlags = 0;
-                        var target = resolveAlias(getSymbolOfNode(d));
+                        let result: SymbolFlags = 0;
+                        let target = resolveAlias(getSymbolOfNode(d));
                         forEach(target.declarations, d => { result |= getDeclarationSpaces(d); });
                         return result;
                     default:
@@ -8357,10 +8430,10 @@ module ts {
                 // first we want to check the local symbol that contain this declaration
                 // - if node.localSymbol !== undefined - this is current declaration is exported and localSymbol points to the local symbol
                 // - if node.localSymbol === undefined - this node is non-exported so we can just pick the result of getSymbolOfNode
-                var symbol = getSymbolOfNode(node);
-                var localSymbol = node.localSymbol || symbol;
+                let symbol = getSymbolOfNode(node);
+                let localSymbol = node.localSymbol || symbol;
 
-                var firstDeclaration = getDeclarationOfKind(localSymbol, node.kind);
+                let firstDeclaration = getDeclarationOfKind(localSymbol, node.kind);
                 // Only type check the symbol once
                 if (node === firstDeclaration) {
                     checkFunctionOrConstructorSymbol(localSymbol);
@@ -8432,7 +8505,7 @@ module ts {
                 return false;
             }
 
-            var root = getRootDeclaration(node);
+            let root = getRootDeclaration(node);
             if (root.kind === SyntaxKind.Parameter && nodeIsMissing((<FunctionLikeDeclaration>root.parent).body)) {
                 // just an overload - no codegen impact
                 return false;
@@ -8449,10 +8522,10 @@ module ts {
 
         // this function will run after checking the source file so 'CaptureThis' is correct for all nodes
         function checkIfThisIsCapturedInEnclosingScope(node: Node): void {
-            var current = node;
+            let current = node;
             while (current) {
                 if (getNodeCheckFlags(current) & NodeCheckFlags.CaptureThis) {
-                    var isDeclaration = node.kind !== SyntaxKind.Identifier;
+                    let isDeclaration = node.kind !== SyntaxKind.Identifier;
                     if (isDeclaration) {
                         error((<Declaration>node).name, Diagnostics.Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference);
                     }
@@ -8471,14 +8544,14 @@ module ts {
             }
 
             // bubble up and find containing type
-            var enclosingClass = <ClassDeclaration>getAncestor(node, SyntaxKind.ClassDeclaration);
+            let enclosingClass = <ClassDeclaration>getAncestor(node, SyntaxKind.ClassDeclaration);
             // if containing type was not found or it is ambient - exit (no codegen)
             if (!enclosingClass || isInAmbientContext(enclosingClass)) {
                 return;
             }
 
             if (getClassBaseTypeNode(enclosingClass)) {
-                var isDeclaration = node.kind !== SyntaxKind.Identifier;
+                let isDeclaration = node.kind !== SyntaxKind.Identifier;
                 if (isDeclaration) {
                     error(node, Diagnostics.Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference);
                 }
@@ -8499,7 +8572,7 @@ module ts {
             }
 
             // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent
-            var parent = getDeclarationContainer(node);
+            let parent = getDeclarationContainer(node);
             if (parent.kind === SyntaxKind.SourceFile && isExternalModule(<SourceFile>parent)) {
                 // If the declaration happens to be in external module, report error that require and exports are reserved keywords
                 error(name, Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_an_external_module,
@@ -8509,11 +8582,11 @@ module ts {
 
         function checkVarDeclaredNamesNotShadowed(node: VariableDeclaration | BindingElement) {
             // - ScriptBody : StatementList
-            // It is a Syntax Error if any element of the LexicallyDeclaredNames of StatementList 
+            // It is a Syntax Error if any element of the LexicallyDeclaredNames of StatementList
             // also occurs in the VarDeclaredNames of StatementList.
 
             // - Block : { StatementList }
-            // It is a Syntax Error if any element of the LexicallyDeclaredNames of StatementList 
+            // It is a Syntax Error if any element of the LexicallyDeclaredNames of StatementList
             // also occurs in the VarDeclaredNames of StatementList.
 
             // Variable declarations are hoisted to the top of their function scope. They can shadow
@@ -8522,33 +8595,33 @@ module ts {
             // A non-initialized declaration is a no-op as the block declaration will resolve before the var
             // declaration. the problem is if the declaration has an initializer. this will act as a write to the
             // block declared value. this is fine for let, but not const.
-            // Only consider declarations with initializers, uninitialized var declarations will not 
+            // Only consider declarations with initializers, uninitialized let declarations will not
             // step on a let/const variable.
-            // Do not consider let and const declarations, as duplicate block-scoped declarations 
+            // Do not consider let and const declarations, as duplicate block-scoped declarations
             // are handled by the binder.
-            // We are only looking for var declarations that step on let\const declarations from a 
+            // We are only looking for let declarations that step on let\const declarations from a
             // different scope. e.g.:
             //      {
             //          const x = 0; // localDeclarationSymbol obtained after name resolution will correspond to this declaration
-            //          var x = 0; // symbol for this declaration will be 'symbol'
+            //          let x = 0; // symbol for this declaration will be 'symbol'
             //      }
             if (node.initializer && (getCombinedNodeFlags(node) & NodeFlags.BlockScoped) === 0) {
-                var symbol = getSymbolOfNode(node);
+                let symbol = getSymbolOfNode(node);
                 if (symbol.flags & SymbolFlags.FunctionScopedVariable) {
-                    var localDeclarationSymbol = resolveName(node, (<Identifier>node.name).text, SymbolFlags.Variable, /*nodeNotFoundErrorMessage*/ undefined, /*nameArg*/ undefined);
+                    let localDeclarationSymbol = resolveName(node, (<Identifier>node.name).text, SymbolFlags.Variable, /*nodeNotFoundErrorMessage*/ undefined, /*nameArg*/ undefined);
                     if (localDeclarationSymbol &&
                         localDeclarationSymbol !== symbol &&
                         localDeclarationSymbol.flags & SymbolFlags.BlockScopedVariable) {
                         if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & NodeFlags.BlockScoped) {
 
-                            var varDeclList = getAncestor(localDeclarationSymbol.valueDeclaration, SyntaxKind.VariableDeclarationList);
-                            var container =
+                            let varDeclList = getAncestor(localDeclarationSymbol.valueDeclaration, SyntaxKind.VariableDeclarationList);
+                            let container =
                                 varDeclList.parent.kind === SyntaxKind.VariableStatement &&
                                 varDeclList.parent.parent;
-                            
-                            // names of block-scoped and function scoped variables can collide only 
+
+                            // names of block-scoped and function scoped variables can collide only
                             // if block scoped variable is defined in the function\module\source file scope (because of variable hoisting)
-                            var namesShareScope =
+                            let namesShareScope =
                                 container &&
                                 (container.kind === SyntaxKind.Block && isFunctionLike(container.parent) ||
                                     (container.kind === SyntaxKind.ModuleBlock && container.kind === SyntaxKind.ModuleDeclaration) ||
@@ -8556,10 +8629,10 @@ module ts {
 
                             // here we know that function scoped variable is shadowed by block scoped one
                             // if they are defined in the same scope - binder has already reported redeclaration error
-                            // otherwise if variable has an initializer - show error that initialization will fail 
+                            // otherwise if variable has an initializer - show error that initialization will fail
                             // since LHS will be block scoped name instead of function scoped
                             if (!namesShareScope) {
-                                var name = symbolToString(localDeclarationSymbol);
+                                let name = symbolToString(localDeclarationSymbol);
                                 error(node, Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name, name);
                             }
                         }
@@ -8583,8 +8656,8 @@ module ts {
             }
             function visit(n: Node) {
                 if (n.kind === SyntaxKind.Identifier) {
-                    var referencedSymbol = getNodeLinks(n).resolvedSymbol;
-                    // check FunctionLikeDeclaration.locals (stores parameters\function local variable) 
+                    let referencedSymbol = getNodeLinks(n).resolvedSymbol;
+                    // check FunctionLikeDeclaration.locals (stores parameters\function local variable)
                     // if it contains entry with a specified name and if this entry matches the resolved symbol
                     if (referencedSymbol && referencedSymbol !== unknownSymbol && getSymbol(func.locals, referencedSymbol.name, SymbolFlags.Value) === referencedSymbol) {
                         if (referencedSymbol.valueDeclaration.kind === SyntaxKind.Parameter) {
@@ -8637,8 +8710,8 @@ module ts {
                 }
                 return;
             }
-            var symbol = getSymbolOfNode(node);
-            var type = getTypeOfVariableOrParameterOrProperty(symbol);
+            let symbol = getSymbolOfNode(node);
+            let type = getTypeOfVariableOrParameterOrProperty(symbol);
             if (node === symbol.valueDeclaration) {
                 // Node is the primary declaration of the symbol, just validate the initializer
                 if (node.initializer) {
@@ -8649,7 +8722,7 @@ module ts {
             else {
                 // Node is a secondary declaration, check that type is identical to primary declaration and check that
                 // initializer is consistent with type associated with the node
-                var declarationType = getWidenedTypeForVariableLikeDeclaration(node);
+                let declarationType = getWidenedTypeForVariableLikeDeclaration(node);
                 if (type !== unknownType && declarationType !== unknownType && !isTypeIdenticalTo(type, declarationType)) {
                     error(node.name, Diagnostics.Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2, declarationNameToString(node.name), typeToString(type), typeToString(declarationType));
                 }
@@ -8729,7 +8802,7 @@ module ts {
         }
 
         function checkWhileStatement(node: WhileStatement) {
-            // Grammar checking 
+            // Grammar checking
             checkGrammarStatementInAmbientContext(node);
 
             checkExpression(node.expression);
@@ -8759,26 +8832,20 @@ module ts {
         }
 
         function checkForOfStatement(node: ForOfStatement): void {
-            if (languageVersion < ScriptTarget.ES6) {
-                grammarErrorOnFirstToken(node, Diagnostics.for_of_statements_are_only_available_when_targeting_ECMAScript_6_or_higher);
-                return;
-            }
-            
             checkGrammarForInOrForOfStatement(node)
 
             // Check the LHS and RHS
             // If the LHS is a declaration, just check it as a variable declaration, which will in turn check the RHS
-            // via getTypeForVariableDeclarationInForOfStatement.
+            // via checkRightHandSideOfForOf.
             // If the LHS is an expression, check the LHS, as a destructuring assignment or as a reference.
             // Then check that the RHS is assignable to it.
             if (node.initializer.kind === SyntaxKind.VariableDeclarationList) {
                 checkForInOrForOfVariableDeclaration(node);
             }
             else {
-                var varExpr = <Expression>node.initializer;
-                var rightType = checkExpression(node.expression);
-                var iteratedType = checkIteratedType(rightType, node.expression);
-                
+                let varExpr = <Expression>node.initializer;
+                let iteratedType = checkRightHandSideOfForOf(node.expression);
+
                 // There may be a destructuring assignment on the left side
                 if (varExpr.kind === SyntaxKind.ArrayLiteralExpression || varExpr.kind === SyntaxKind.ObjectLiteralExpression) {
                     // iteratedType may be undefined. In this case, we still want to check the structure of
@@ -8787,10 +8854,10 @@ module ts {
                     checkDestructuringAssignment(varExpr, iteratedType || unknownType);
                 }
                 else {
-                    var leftType = checkExpression(varExpr);
+                    let leftType = checkExpression(varExpr);
                     checkReferenceExpression(varExpr, /*invalidReferenceMessage*/ Diagnostics.Invalid_left_hand_side_in_for_of_statement,
                         /*constantVariableMessage*/ Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant);
-                
+
                     // iteratedType will be undefined if the rightType was missing properties/signatures
                     // required to get its iteratedType (like [Symbol.iterator] or next). This may be
                     // because we accessed properties from anyType, or it may have led to an error inside
@@ -8805,20 +8872,20 @@ module ts {
         }
 
         function checkForInStatement(node: ForInStatement) {
-            // Grammar checking 
+            // Grammar checking
             checkGrammarForInOrForOfStatement(node);
 
             // TypeScript 1.0 spec  (April 2014): 5.4
             // In a 'for-in' statement of the form
-            // for (var VarDecl in Expr) Statement
+            // for (let VarDecl in Expr) Statement
             //   VarDecl must be a variable declaration without a type annotation that declares a variable of type Any,
-            //   and Expr must be an expression of type Any, an object type, or a type parameter type.                        
+            //   and Expr must be an expression of type Any, an object type, or a type parameter type.
             if (node.initializer.kind === SyntaxKind.VariableDeclarationList) {
-                var variable = (<VariableDeclarationList>node.initializer).declarations[0];
+                let variable = (<VariableDeclarationList>node.initializer).declarations[0];
                 if (variable && isBindingPattern(variable.name)) {
                     error(variable.name, Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
                 }
-                
+
                 checkForInOrForOfVariableDeclaration(node);
             }
             else {
@@ -8826,8 +8893,8 @@ module ts {
                 // for (Var in Expr) Statement
                 //   Var must be an expression classified as a reference of type Any or the String primitive type,
                 //   and Expr must be an expression of type Any, an object type, or a type parameter type.
-                var varExpr = <Expression>node.initializer;
-                var leftType = checkExpression(varExpr);
+                let varExpr = <Expression>node.initializer;
+                let leftType = checkExpression(varExpr);
                 if (varExpr.kind === SyntaxKind.ArrayLiteralExpression || varExpr.kind === SyntaxKind.ObjectLiteralExpression) {
                     error(varExpr, Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
                 }
@@ -8840,7 +8907,7 @@ module ts {
                 }
             }
 
-            var rightType = checkExpression(node.expression);
+            let rightType = checkExpression(node.expression);
             // unknownType is returned i.e. if node.expression is identifier whose name cannot be resolved
             // in this case error about missing name is already reported - do not report extra one
             if (!allConstituentTypesHaveKind(rightType, TypeFlags.Any | TypeFlags.ObjectType | TypeFlags.TypeParameter)) {
@@ -8851,26 +8918,19 @@ module ts {
         }
 
         function checkForInOrForOfVariableDeclaration(iterationStatement: ForInStatement | ForOfStatement): void {
-            var variableDeclarationList = <VariableDeclarationList>iterationStatement.initializer;
+            let variableDeclarationList = <VariableDeclarationList>iterationStatement.initializer;
             // checkGrammarForInOrForOfStatement will check that there is exactly one declaration.
             if (variableDeclarationList.declarations.length >= 1) {
-                var decl = variableDeclarationList.declarations[0];
+                let decl = variableDeclarationList.declarations[0];
                 checkVariableDeclaration(decl);
             }
         }
 
-        function getTypeForVariableDeclarationInForOfStatement(forOfStatement: ForOfStatement): Type {
-            // Temporarily return 'any' below ES6
-            if (languageVersion < ScriptTarget.ES6) {
-                return anyType;
-            }
-
-            // iteratedType will be undefined if the for-of expression type was missing properties/signatures
-            // required to get its iteratedType (like [Symbol.iterator] or next). This may be
-            // because we accessed properties from anyType, or it may have led to an error inside
-            // getIteratedType.
-            var expressionType = getTypeOfExpression(forOfStatement.expression);
-            return checkIteratedType(expressionType, forOfStatement.expression) || anyType;
+        function checkRightHandSideOfForOf(rhsExpression: Expression): Type {
+            let expressionType = getTypeOfExpression(rhsExpression);
+            return languageVersion >= ScriptTarget.ES6
+                ? checkIteratedType(expressionType, rhsExpression)
+                : checkElementTypeOfArrayOrString(expressionType, rhsExpression);
         }
 
         /**
@@ -8878,18 +8938,18 @@ module ts {
          */
         function checkIteratedType(iterable: Type, expressionForError: Expression): Type {
             Debug.assert(languageVersion >= ScriptTarget.ES6);
-            var iteratedType = getIteratedType(iterable, expressionForError);
+            let iteratedType = getIteratedType(iterable, expressionForError);
             // Now even though we have extracted the iteratedType, we will have to validate that the type
             // passed in is actually an Iterable.
             if (expressionForError && iteratedType) {
-                var completeIterableType = globalIterableType !== emptyObjectType
+                let completeIterableType = globalIterableType !== emptyObjectType
                     ? createTypeReference(<GenericType>globalIterableType, [iteratedType])
                     : emptyObjectType;
                 checkTypeAssignableTo(iterable, completeIterableType, expressionForError);
             }
 
             return iteratedType;
-            
+
             function getIteratedType(iterable: Type, expressionForError: Expression) {
                 // We want to treat type as an iterable, and get the type it is an iterable of. The iterable
                 // must have the following structure (annotated with the names of the variables below):
@@ -8916,17 +8976,17 @@ module ts {
                 // caller requested it. Then the caller can decide what to do in the case where there is no iterated
                 // type. This is different from returning anyType, because that would signify that we have matched the
                 // whole pattern and that T (above) is 'any'.
-                
+
                 if (allConstituentTypesHaveKind(iterable, TypeFlags.Any)) {
                     return undefined;
                 }
 
-                var iteratorFunction = getTypeOfPropertyOfType(iterable, getPropertyNameForKnownSymbolName("iterator"));
+                let iteratorFunction = getTypeOfPropertyOfType(iterable, getPropertyNameForKnownSymbolName("iterator"));
                 if (iteratorFunction && allConstituentTypesHaveKind(iteratorFunction, TypeFlags.Any)) {
                     return undefined;
                 }
 
-                var iteratorFunctionSignatures = iteratorFunction ? getSignaturesOfType(iteratorFunction, SignatureKind.Call) : emptyArray;
+                let iteratorFunctionSignatures = iteratorFunction ? getSignaturesOfType(iteratorFunction, SignatureKind.Call) : emptyArray;
                 if (iteratorFunctionSignatures.length === 0) {
                     if (expressionForError) {
                         error(expressionForError, Diagnostics.The_right_hand_side_of_a_for_of_statement_must_have_a_Symbol_iterator_method_that_returns_an_iterator);
@@ -8934,17 +8994,17 @@ module ts {
                     return undefined;
                 }
 
-                var iterator = getUnionType(map(iteratorFunctionSignatures, getReturnTypeOfSignature));
+                let iterator = getUnionType(map(iteratorFunctionSignatures, getReturnTypeOfSignature));
                 if (allConstituentTypesHaveKind(iterator, TypeFlags.Any)) {
                     return undefined;
                 }
 
-                var iteratorNextFunction = getTypeOfPropertyOfType(iterator, "next");
+                let iteratorNextFunction = getTypeOfPropertyOfType(iterator, "next");
                 if (iteratorNextFunction && allConstituentTypesHaveKind(iteratorNextFunction, TypeFlags.Any)) {
                     return undefined;
                 }
 
-                var iteratorNextFunctionSignatures = iteratorNextFunction ? getSignaturesOfType(iteratorNextFunction, SignatureKind.Call) : emptyArray;
+                let iteratorNextFunctionSignatures = iteratorNextFunction ? getSignaturesOfType(iteratorNextFunction, SignatureKind.Call) : emptyArray;
                 if (iteratorNextFunctionSignatures.length === 0) {
                     if (expressionForError) {
                         error(expressionForError, Diagnostics.The_iterator_returned_by_the_right_hand_side_of_a_for_of_statement_must_have_a_next_method);
@@ -8952,23 +9012,89 @@ module ts {
                     return undefined;
                 }
 
-                var iteratorNextResult = getUnionType(map(iteratorNextFunctionSignatures, getReturnTypeOfSignature));
+                let iteratorNextResult = getUnionType(map(iteratorNextFunctionSignatures, getReturnTypeOfSignature));
                 if (allConstituentTypesHaveKind(iteratorNextResult, TypeFlags.Any)) {
                     return undefined;
                 }
 
-                var iteratorNextValue = getTypeOfPropertyOfType(iteratorNextResult, "value");
+                let iteratorNextValue = getTypeOfPropertyOfType(iteratorNextResult, "value");
                 if (!iteratorNextValue) {
                     if (expressionForError) {
                         error(expressionForError, Diagnostics.The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property);
                     }
                     return undefined;
                 }
-                
+
                 return iteratorNextValue;
             }
         }
 
+        /**
+         * This function does the following steps:
+         *   1. Break up arrayOrStringType (possibly a union) into its string constituents and array constituents.
+         *   2. Take the element types of the array constituents.
+         *   3. Return the union of the element types, and string if there was a string constitutent.
+         *
+         * For example:
+         *     string -> string
+         *     number[] -> number
+         *     string[] | number[] -> string | number
+         *     string | number[] -> string | number
+         *     string | string[] | number[] -> string | number
+         *
+         * It also errors if:
+         *   1. Some constituent is neither a string nor an array.
+         *   2. Some constituent is a string and target is less than ES5 (because in ES3 string is not indexable).
+         */
+        function checkElementTypeOfArrayOrString(arrayOrStringType: Type, expressionForError: Expression): Type {
+            Debug.assert(languageVersion < ScriptTarget.ES6);
+            
+            // After we remove all types that are StringLike, we will know if there was a string constituent
+            // based on whether the remaining type is the same as the initial type.
+            let arrayType = removeTypesFromUnionType(arrayOrStringType, TypeFlags.StringLike, /*isTypeOfKind*/ true, /*allowEmptyUnionResult*/ true);
+            let hasStringConstituent = arrayOrStringType !== arrayType;
+
+            let reportedError = false;
+            if (hasStringConstituent) {
+                if (languageVersion < ScriptTarget.ES5) {
+                    error(expressionForError, Diagnostics.Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher);
+                    reportedError = true;
+                }
+
+                // Now that we've removed all the StringLike types, if no constituents remain, then the entire
+                // arrayOrStringType was a string.
+                if (arrayType === emptyObjectType) {
+                    return stringType;
+                }
+            }
+
+            if (!isArrayLikeType(arrayType)) {
+                if (!reportedError) {
+                    // Which error we report depends on whether there was a string constituent. For example,
+                    // if the input type is number | string, we want to say that number is not an array type.
+                    // But if the input was just number, we want to say that number is not an array type
+                    // or a string type.
+                    let diagnostic = hasStringConstituent
+                        ? Diagnostics.Type_0_is_not_an_array_type
+                        : Diagnostics.Type_0_is_not_an_array_type_or_a_string_type;
+                    error(expressionForError, diagnostic, typeToString(arrayType));
+                }
+                return hasStringConstituent ? stringType : unknownType;
+            }
+
+            let arrayElementType = getIndexTypeOfType(arrayType, IndexKind.Number) || unknownType;
+            if (hasStringConstituent) {
+                // This is just an optimization for the case where arrayOrStringType is string | string[]
+                if (arrayElementType.flags & TypeFlags.StringLike) {
+                    return stringType;
+                }
+
+                return getUnionType([arrayElementType, stringType]);
+            }
+
+            return arrayElementType;
+        }
+
         function checkBreakOrContinueStatement(node: BreakOrContinueStatement) {
             // Grammar checking
             checkGrammarStatementInAmbientContext(node) || checkGrammarBreakOrContinueStatement(node);
@@ -8983,17 +9109,17 @@ module ts {
         function checkReturnStatement(node: ReturnStatement) {
             // Grammar checking
             if (!checkGrammarStatementInAmbientContext(node)) {
-                var functionBlock = getContainingFunction(node);
+                let functionBlock = getContainingFunction(node);
                 if (!functionBlock) {
                     grammarErrorOnFirstToken(node, Diagnostics.A_return_statement_can_only_be_used_within_a_function_body);
                 }
             }
 
             if (node.expression) {
-                var func = getContainingFunction(node);
+                let func = getContainingFunction(node);
                 if (func) {
-                    var returnType = getReturnTypeOfSignature(getSignatureFromDeclaration(func));
-                    var exprType = checkExpressionCached(node.expression);
+                    let returnType = getReturnTypeOfSignature(getSignatureFromDeclaration(func));
+                    let exprType = checkExpressionCached(node.expression);
                     if (func.kind === SyntaxKind.SetAccessor) {
                         error(node.expression, Diagnostics.Setters_cannot_return_a_value);
                     }
@@ -9027,30 +9153,30 @@ module ts {
             // Grammar checking
             checkGrammarStatementInAmbientContext(node);
 
-            var firstDefaultClause: CaseOrDefaultClause;
-            var hasDuplicateDefaultClause = false;
+            let firstDefaultClause: CaseOrDefaultClause;
+            let hasDuplicateDefaultClause = false;
 
-            var expressionType = checkExpression(node.expression);
-            forEach(node.clauses, clause => {
+            let expressionType = checkExpression(node.expression);
+            forEach(node.caseBlock.clauses, clause => {
                 // Grammar check for duplicate default clauses, skip if we already report duplicate default clause
                 if (clause.kind === SyntaxKind.DefaultClause && !hasDuplicateDefaultClause) {
                     if (firstDefaultClause === undefined) {
                         firstDefaultClause = clause;
                     }
                     else {
-                        var sourceFile = getSourceFileOfNode(node);
-                        var start = skipTrivia(sourceFile.text, clause.pos);
-                        var end = clause.statements.length > 0 ? clause.statements[0].pos : clause.end;
+                        let sourceFile = getSourceFileOfNode(node);
+                        let start = skipTrivia(sourceFile.text, clause.pos);
+                        let end = clause.statements.length > 0 ? clause.statements[0].pos : clause.end;
                         grammarErrorAtPos(sourceFile, start, end - start, Diagnostics.A_default_clause_cannot_appear_more_than_once_in_a_switch_statement);
                         hasDuplicateDefaultClause = true;
                     }
                 }
 
                 if (produceDiagnostics && clause.kind === SyntaxKind.CaseClause) {
-                    var caseClause = <CaseClause>clause;
+                    let caseClause = <CaseClause>clause;
                     // TypeScript 1.0 spec (April 2014):5.9
                     // In a 'switch' statement, each 'case' expression must be of a type that is assignable to or from the type of the 'switch' expression.
-                    var caseType = checkExpression(caseClause.expression);
+                    let caseType = checkExpression(caseClause.expression);
                     if (!isTypeAssignableTo(expressionType, caseType)) {
                         // check 'expressionType isAssignableTo caseType' failed, try the reversed check and report errors if it fails
                         checkTypeAssignableTo(caseType, expressionType, caseClause.expression, /*headMessage*/ undefined);
@@ -9063,13 +9189,13 @@ module ts {
         function checkLabeledStatement(node: LabeledStatement) {
             // Grammar checking
             if (!checkGrammarStatementInAmbientContext(node)) {
-                var current = node.parent;
+                let current = node.parent;
                 while (current) {
                     if (isFunctionLike(current)) {
                         break;
                     }
                     if (current.kind === SyntaxKind.LabeledStatement && (<LabeledStatement>current).label.text === node.label.text) {
-                        var sourceFile = getSourceFileOfNode(node);
+                        let sourceFile = getSourceFileOfNode(node);
                         grammarErrorOnNode(node.label, Diagnostics.Duplicate_label_0, getTextOfNodeFromSourceText(sourceFile.text, node.label));
                         break;
                     }
@@ -9099,7 +9225,7 @@ module ts {
             checkGrammarStatementInAmbientContext(node);
 
             checkBlock(node.tryBlock);
-            var catchClause = node.catchClause;
+            let catchClause = node.catchClause;
             if (catchClause) {
                 // Grammar checking
                 if (catchClause.variableDeclaration) {
@@ -9113,10 +9239,10 @@ module ts {
                         grammarErrorOnFirstToken(catchClause.variableDeclaration.initializer, Diagnostics.Catch_clause_variable_cannot_have_an_initializer);
                     }
                     else {
-                        var identifierName = (<Identifier>catchClause.variableDeclaration.name).text;
-                        var locals = catchClause.block.locals;
+                        let identifierName = (<Identifier>catchClause.variableDeclaration.name).text;
+                        let locals = catchClause.block.locals;
                         if (locals && hasProperty(locals, identifierName)) {
-                            var localSymbol = locals[identifierName]
+                            let localSymbol = locals[identifierName]
                             if (localSymbol && (localSymbol.flags & SymbolFlags.BlockScopedVariable) !== 0) {
                                 grammarErrorOnNode(localSymbol.valueDeclaration, Diagnostics.Cannot_redeclare_identifier_0_in_catch_clause, identifierName);
                             }
@@ -9137,46 +9263,45 @@ module ts {
         }
 
         function checkIndexConstraints(type: Type) {
-            var declaredNumberIndexer = getIndexDeclarationOfSymbol(type.symbol, IndexKind.Number);
-            var declaredStringIndexer = getIndexDeclarationOfSymbol(type.symbol, IndexKind.String);
+            let declaredNumberIndexer = getIndexDeclarationOfSymbol(type.symbol, IndexKind.Number);
+            let declaredStringIndexer = getIndexDeclarationOfSymbol(type.symbol, IndexKind.String);
 
-            var stringIndexType = getIndexTypeOfType(type, IndexKind.String);
-            var numberIndexType = getIndexTypeOfType(type, IndexKind.Number);
+            let stringIndexType = getIndexTypeOfType(type, IndexKind.String);
+            let numberIndexType = getIndexTypeOfType(type, IndexKind.Number);
 
             if (stringIndexType || numberIndexType) {
                 forEach(getPropertiesOfObjectType(type), prop => {
-                    var propType = getTypeOfSymbol(prop);
+                    let propType = getTypeOfSymbol(prop);
                     checkIndexConstraintForProperty(prop, propType, type, declaredStringIndexer, stringIndexType, IndexKind.String);
                     checkIndexConstraintForProperty(prop, propType, type, declaredNumberIndexer, numberIndexType, IndexKind.Number);
                 });
 
                 if (type.flags & TypeFlags.Class && type.symbol.valueDeclaration.kind === SyntaxKind.ClassDeclaration) {
-                    var classDeclaration = <ClassDeclaration>type.symbol.valueDeclaration;
-                    for (var i = 0; i < classDeclaration.members.length; i++) {
-                        var member = classDeclaration.members[i];
+                    let classDeclaration = <ClassDeclaration>type.symbol.valueDeclaration;
+                    for (let member of classDeclaration.members) {
                         // Only process instance properties with computed names here.
                         // Static properties cannot be in conflict with indexers,
                         // and properties with literal names were already checked.
                         if (!(member.flags & NodeFlags.Static) && hasDynamicName(member)) {
-                            var propType = getTypeOfSymbol(member.symbol);
+                            let propType = getTypeOfSymbol(member.symbol);
                             checkIndexConstraintForProperty(member.symbol, propType, type, declaredStringIndexer, stringIndexType, IndexKind.String);
-                            checkIndexConstraintForProperty(member.symbol, propType, type, declaredNumberIndexer, numberIndexType, IndexKind.Number); 
+                            checkIndexConstraintForProperty(member.symbol, propType, type, declaredNumberIndexer, numberIndexType, IndexKind.Number);
                         }
                     }
                 }
             }
 
-            var errorNode: Node;
+            let errorNode: Node;
             if (stringIndexType && numberIndexType) {
                 errorNode = declaredNumberIndexer || declaredStringIndexer;
                 // condition 'errorNode === undefined' may appear if types does not declare nor string neither number indexer
                 if (!errorNode && (type.flags & TypeFlags.Interface)) {
-                    var someBaseTypeHasBothIndexers = forEach((<InterfaceType>type).baseTypes, base => getIndexTypeOfType(base, IndexKind.String) && getIndexTypeOfType(base, IndexKind.Number));
+                    let someBaseTypeHasBothIndexers = forEach((<InterfaceType>type).baseTypes, base => getIndexTypeOfType(base, IndexKind.String) && getIndexTypeOfType(base, IndexKind.Number));
                     errorNode = someBaseTypeHasBothIndexers ? undefined : type.symbol.declarations[0];
                 }
             }
 
-            if (errorNode && !isTypeAssignableTo(numberIndexType, stringIndexType)) {                
+            if (errorNode && !isTypeAssignableTo(numberIndexType, stringIndexType)) {
                 error(errorNode, Diagnostics.Numeric_index_type_0_is_not_assignable_to_string_index_type_1,
                     typeToString(numberIndexType), typeToString(stringIndexType));
             }
@@ -9200,7 +9325,7 @@ module ts {
 
                 // perform property check if property or indexer is declared in 'type'
                 // this allows to rule out cases when both property and indexer are inherited from the base class
-                var errorNode: Node;
+                let errorNode: Node;
                 if (prop.valueDeclaration.name.kind === SyntaxKind.ComputedPropertyName || prop.parent === containingType.symbol) {
                     errorNode = prop.valueDeclaration;
                 }
@@ -9211,12 +9336,12 @@ module ts {
                     // for interfaces property and indexer might be inherited from different bases
                     // check if any base class already has both property and indexer.
                     // check should be performed only if 'type' is the first type that brings property\indexer together
-                    var someBaseClassHasBothPropertyAndIndexer = forEach((<InterfaceType>containingType).baseTypes, base => getPropertyOfObjectType(base, prop.name) && getIndexTypeOfType(base, indexKind));
+                    let someBaseClassHasBothPropertyAndIndexer = forEach((<InterfaceType>containingType).baseTypes, base => getPropertyOfObjectType(base, prop.name) && getIndexTypeOfType(base, indexKind));
                     errorNode = someBaseClassHasBothPropertyAndIndexer ? undefined : containingType.symbol.declarations[0];
                 }
 
                 if (errorNode && !isTypeAssignableTo(propertyType, indexType)) {
-                    var errorMessage =
+                    let errorMessage =
                         indexKind === IndexKind.String
                             ? Diagnostics.Property_0_of_type_1_is_not_assignable_to_string_index_type_2
                             : Diagnostics.Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2;
@@ -9242,12 +9367,12 @@ module ts {
         // Check each type parameter and check that list has no duplicate type parameter declarations
         function checkTypeParameters(typeParameterDeclarations: TypeParameterDeclaration[]) {
             if (typeParameterDeclarations) {
-                for (var i = 0; i < typeParameterDeclarations.length; i++) {
-                    var node = typeParameterDeclarations[i];
+                for (let i = 0, n = typeParameterDeclarations.length; i < n; i++) {
+                    let node = typeParameterDeclarations[i];
                     checkTypeParameter(node);
 
                     if (produceDiagnostics) {
-                        for (var j = 0; j < i; j++) {
+                        for (let j = 0; j < i; j++) {
                             if (typeParameterDeclarations[j].symbol === node.symbol) {
                                 error(node.name, Diagnostics.Duplicate_identifier_0, declarationNameToString(node.name));
                             }
@@ -9268,19 +9393,19 @@ module ts {
             }
             checkTypeParameters(node.typeParameters);
             checkExportsOnMergedDeclarations(node);
-            var symbol = getSymbolOfNode(node);
-            var type = <InterfaceType>getDeclaredTypeOfSymbol(symbol);
-            var staticType = <ObjectType>getTypeOfSymbol(symbol);
-            var baseTypeNode = getClassBaseTypeNode(node);
+            let symbol = getSymbolOfNode(node);
+            let type = <InterfaceType>getDeclaredTypeOfSymbol(symbol);
+            let staticType = <ObjectType>getTypeOfSymbol(symbol);
+            let baseTypeNode = getClassBaseTypeNode(node);
             if (baseTypeNode) {
                 emitExtends = emitExtends || !isInAmbientContext(node);
                 checkTypeReference(baseTypeNode);
             }
             if (type.baseTypes.length) {
                 if (produceDiagnostics) {
-                    var baseType = type.baseTypes[0];
+                    let baseType = type.baseTypes[0];
                     checkTypeAssignableTo(type, baseType, node.name || node, Diagnostics.Class_0_incorrectly_extends_base_class_1);
-                    var staticBaseType = getTypeOfSymbol(baseType.symbol);
+                    let staticBaseType = getTypeOfSymbol(baseType.symbol);
                     checkTypeAssignableTo(staticType, getTypeWithoutConstructors(staticBaseType), node.name || node,
                         Diagnostics.Class_static_side_0_incorrectly_extends_base_class_static_side_1);
                     if (baseType.symbol !== resolveEntityName(baseTypeNode.typeName, SymbolFlags.Value)) {
@@ -9289,19 +9414,19 @@ module ts {
 
                     checkKindsOfPropertyMemberOverrides(type, baseType);
                 }
-                
+
                 // Check that base type can be evaluated as expression
                 checkExpressionOrQualifiedName(baseTypeNode.typeName);
             }
 
-            var implementedTypeNodes = getClassImplementedTypeNodes(node);
+            let implementedTypeNodes = getClassImplementedTypeNodes(node);
             if (implementedTypeNodes) {
                 forEach(implementedTypeNodes, typeRefNode => {
                     checkTypeReference(typeRefNode);
                     if (produceDiagnostics) {
-                        var t = getTypeFromTypeReferenceNode(typeRefNode);
+                        let t = getTypeFromTypeReferenceNode(typeRefNode);
                         if (t !== unknownType) {
-                            var declaredType = (t.flags & TypeFlags.Reference) ? (<TypeReference>t).target : t;
+                            let declaredType = (t.flags & TypeFlags.Reference) ? (<TypeReference>t).target : t;
                             if (declaredType.flags & (TypeFlags.Class | TypeFlags.Interface)) {
                                 checkTypeAssignableTo(type, t, node.name || node, Diagnostics.Class_0_incorrectly_implements_interface_1);
                             }
@@ -9333,28 +9458,28 @@ module ts {
             // Inheritance means that a derived class implicitly contains all non - overridden members of the base class.
             // Both public and private property members are inherited, but only public property members can be overridden.
             // A property member in a derived class is said to override a property member in a base class
-            // when the derived class property member has the same name and kind(instance or static) 
+            // when the derived class property member has the same name and kind(instance or static)
             // as the base class property member.
             // The type of an overriding property member must be assignable(section 3.8.4)
             // to the type of the overridden property member, or otherwise a compile - time error occurs.
             // Base class instance member functions can be overridden by derived class instance member functions,
             // but not by other kinds of members.
-            // Base class instance member variables and accessors can be overridden by 
+            // Base class instance member variables and accessors can be overridden by
             // derived class instance member variables and accessors, but not by other kinds of members.
 
             // NOTE: assignability is checked in checkClassDeclaration
-            var baseProperties = getPropertiesOfObjectType(baseType);
-            for (var i = 0, len = baseProperties.length; i < len; ++i) {
-                var base = getTargetSymbol(baseProperties[i]);
+            let baseProperties = getPropertiesOfObjectType(baseType);
+            for (let baseProperty of baseProperties) {
+                let base = getTargetSymbol(baseProperty);
 
                 if (base.flags & SymbolFlags.Prototype) {
                     continue;
                 }
 
-                var derived = getTargetSymbol(getPropertyOfObjectType(type, base.name));
+                let derived = getTargetSymbol(getPropertyOfObjectType(type, base.name));
                 if (derived) {
-                    var baseDeclarationFlags = getDeclarationFlagsFromSymbol(base);
-                    var derivedDeclarationFlags = getDeclarationFlagsFromSymbol(derived);
+                    let baseDeclarationFlags = getDeclarationFlagsFromSymbol(base);
+                    let derivedDeclarationFlags = getDeclarationFlagsFromSymbol(derived);
                     if ((baseDeclarationFlags & NodeFlags.Private)  || (derivedDeclarationFlags & NodeFlags.Private)) {
                         // either base or derived property is private - not override, skip it
                         continue;
@@ -9370,7 +9495,7 @@ module ts {
                         continue;
                     }
 
-                    var errorMessage: DiagnosticMessage;
+                    let errorMessage: DiagnosticMessage;
                     if (base.flags & SymbolFlags.Method) {
                         if (derived.flags & SymbolFlags.Accessor) {
                             errorMessage = Diagnostics.Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_accessor;
@@ -9409,9 +9534,9 @@ module ts {
             // TypeScript 1.0 spec (April 2014):
             // When a generic interface has multiple declarations,  all declarations must have identical type parameter
             // lists, i.e. identical type parameter names with identical constraints in identical order.
-            for (var i = 0, len = list1.length; i < len; i++) {
-                var tp1 = list1[i];
-                var tp2 = list2[i];
+            for (let i = 0, len = list1.length; i < len; i++) {
+                let tp1 = list1[i];
+                let tp2 = list2[i];
                 if (tp1.name.text !== tp2.name.text) {
                     return false;
                 }
@@ -9433,28 +9558,26 @@ module ts {
                 return true;
             }
 
-            var seen: Map<{ prop: Symbol; containingType: Type }> = {};
+            let seen: Map<{ prop: Symbol; containingType: Type }> = {};
             forEach(type.declaredProperties, p => { seen[p.name] = { prop: p, containingType: type }; });
-            var ok = true;
+            let ok = true;
 
-            for (var i = 0, len = type.baseTypes.length; i < len; ++i) {
-                var base = type.baseTypes[i];
-                var properties = getPropertiesOfObjectType(base);
-                for (var j = 0, proplen = properties.length; j < proplen; ++j) {
-                    var prop = properties[j];
+            for (let base of type.baseTypes) {
+                let properties = getPropertiesOfObjectType(base);
+                for (let prop of properties) {
                     if (!hasProperty(seen, prop.name)) {
                         seen[prop.name] = { prop: prop, containingType: base };
                     }
                     else {
-                        var existing = seen[prop.name];
-                        var isInheritedProperty = existing.containingType !== type;
+                        let existing = seen[prop.name];
+                        let isInheritedProperty = existing.containingType !== type;
                         if (isInheritedProperty && !isPropertyIdenticalTo(existing.prop, prop)) {
                             ok = false;
 
-                            var typeName1 = typeToString(existing.containingType);
-                            var typeName2 = typeToString(base);
+                            let typeName1 = typeToString(existing.containingType);
+                            let typeName2 = typeToString(base);
 
-                            var errorInfo = chainDiagnosticMessages(undefined, Diagnostics.Named_property_0_of_types_1_and_2_are_not_identical, symbolToString(prop), typeName1, typeName2);
+                            let errorInfo = chainDiagnosticMessages(undefined, Diagnostics.Named_property_0_of_types_1_and_2_are_not_identical, symbolToString(prop), typeName1, typeName2);
                             errorInfo = chainDiagnosticMessages(errorInfo, Diagnostics.Interface_0_cannot_simultaneously_extend_types_1_and_2, typeToString(type), typeName1, typeName2);
                             diagnostics.add(createDiagnosticForNodeFromMessageChain(typeNode, errorInfo));
                         }
@@ -9474,8 +9597,8 @@ module ts {
                 checkTypeNameIsReserved(node.name, Diagnostics.Interface_name_cannot_be_0);
 
                 checkExportsOnMergedDeclarations(node);
-                var symbol = getSymbolOfNode(node);
-                var firstInterfaceDecl = <InterfaceDeclaration>getDeclarationOfKind(symbol, SyntaxKind.InterfaceDeclaration);
+                let symbol = getSymbolOfNode(node);
+                let firstInterfaceDecl = <InterfaceDeclaration>getDeclarationOfKind(symbol, SyntaxKind.InterfaceDeclaration);
                 if (symbol.declarations.length > 1) {
                     if (node !== firstInterfaceDecl && !areTypeParametersIdentical(firstInterfaceDecl.typeParameters, node.typeParameters)) {
                         error(node.name, Diagnostics.All_declarations_of_an_interface_must_have_identical_type_parameters);
@@ -9484,7 +9607,7 @@ module ts {
 
                 // Only check this symbol once
                 if (node === firstInterfaceDecl) {
-                    var type = <InterfaceType>getDeclaredTypeOfSymbol(symbol);
+                    let type = <InterfaceType>getDeclaredTypeOfSymbol(symbol);
                     // run subsequent checks only if first set succeeded
                     if (checkInheritedPropertiesAreIdentical(type, node.name)) {
                         forEach(type.baseTypes, baseType => {
@@ -9505,26 +9628,26 @@ module ts {
         function checkTypeAliasDeclaration(node: TypeAliasDeclaration) {
             // Grammar checking
             checkGrammarModifiers(node);
-            
+
             checkTypeNameIsReserved(node.name, Diagnostics.Type_alias_name_cannot_be_0);
             checkSourceElement(node.type);
         }
 
         function computeEnumMemberValues(node: EnumDeclaration) {
-            var nodeLinks = getNodeLinks(node);
+            let nodeLinks = getNodeLinks(node);
 
             if (!(nodeLinks.flags & NodeCheckFlags.EnumValuesComputed)) {
-                var enumSymbol = getSymbolOfNode(node);
-                var enumType = getDeclaredTypeOfSymbol(enumSymbol);
-                var autoValue = 0;
-                var ambient = isInAmbientContext(node);
-                var enumIsConst = isConst(node);
+                let enumSymbol = getSymbolOfNode(node);
+                let enumType = getDeclaredTypeOfSymbol(enumSymbol);
+                let autoValue = 0;
+                let ambient = isInAmbientContext(node);
+                let enumIsConst = isConst(node);
 
                 forEach(node.members, member => {
                     if (member.name.kind !== SyntaxKind.ComputedPropertyName && isNumericLiteralName((<Identifier>member.name).text)) {
                         error(member.name, Diagnostics.An_enum_member_cannot_have_a_numeric_name);
                     }
-                    var initializer = member.initializer;
+                    let initializer = member.initializer;
                     if (initializer) {
                         autoValue = getConstantValueForEnumMemberInitializer(initializer, enumIsConst);
                         if (autoValue === undefined) {
@@ -9533,10 +9656,10 @@ module ts {
                             }
                             else if (!ambient) {
                                 // Only here do we need to check that the initializer is assignable to the enum type.
-                                // If it is a constant value (not undefined), it is syntactically constrained to be a number. 
+                                // If it is a constant value (not undefined), it is syntactically constrained to be a number.
                                 // Also, we do not need to check this for ambients because there is already
                                 // a syntax error if it is not a constant.
-                            checkTypeAssignableTo(checkExpression(initializer), enumType, initializer, /*headMessage*/ undefined);
+                                checkTypeAssignableTo(checkExpression(initializer), enumType, initializer, /*headMessage*/ undefined);
                             }
                         }
                         else if (enumIsConst) {
@@ -9567,7 +9690,7 @@ module ts {
                 function evalConstant(e: Node): number {
                     switch (e.kind) {
                         case SyntaxKind.PrefixUnaryExpression:
-                            var value = evalConstant((<PrefixUnaryExpression>e).operand);
+                            let value = evalConstant((<PrefixUnaryExpression>e).operand);
                             if (value === undefined) {
                                 return undefined;
                             }
@@ -9582,11 +9705,11 @@ module ts {
                                 return undefined;
                             }
 
-                            var left = evalConstant((<BinaryExpression>e).left);
+                            let left = evalConstant((<BinaryExpression>e).left);
                             if (left === undefined) {
                                 return undefined;
                             }
-                            var right = evalConstant((<BinaryExpression>e).right);
+                            let right = evalConstant((<BinaryExpression>e).right);
                             if (right === undefined) {
                                 return undefined;
                             }
@@ -9615,10 +9738,10 @@ module ts {
                                 return undefined;
                             }
 
-                            var member = initializer.parent;
-                            var currentType = getTypeOfSymbol(getSymbolOfNode(member.parent));
-                            var enumType: Type;
-                            var propertyName: string;
+                            let member = initializer.parent;
+                            let currentType = getTypeOfSymbol(getSymbolOfNode(member.parent));
+                            let enumType: Type;
+                            let propertyName: string;
 
                             if (e.kind === SyntaxKind.Identifier) {
                                 // unqualified names can refer to member that reside in different declaration of the enum so just doing name resolution won't work.
@@ -9632,11 +9755,11 @@ module ts {
                                         (<ElementAccessExpression>e).argumentExpression.kind !== SyntaxKind.StringLiteral) {
                                         return undefined;
                                     }
-                                    var enumType = getTypeOfNode((<ElementAccessExpression>e).expression);
+                                    enumType = getTypeOfNode((<ElementAccessExpression>e).expression);
                                     propertyName = (<LiteralExpression>(<ElementAccessExpression>e).argumentExpression).text;
                                 }
                                 else {
-                                    var enumType = getTypeOfNode((<PropertyAccessExpression>e).expression);
+                                    enumType = getTypeOfNode((<PropertyAccessExpression>e).expression);
                                     propertyName = (<PropertyAccessExpression>e).name.text;
                                 }
                                 if (enumType !== currentType) {
@@ -9647,11 +9770,11 @@ module ts {
                             if (propertyName === undefined) {
                                 return undefined;
                             }
-                            var property = getPropertyOfObjectType(enumType, propertyName);
+                            let property = getPropertyOfObjectType(enumType, propertyName);
                             if (!property || !(property.flags & SymbolFlags.EnumMember)) {
                                 return undefined;
                             }
-                            var propertyDecl = property.valueDeclaration;
+                            let propertyDecl = property.valueDeclaration;
                             // self references are illegal
                             if (member === propertyDecl) {
                                 return undefined;
@@ -9688,11 +9811,11 @@ module ts {
             // for the first member.
             //
             // Only perform this check once per symbol
-            var enumSymbol = getSymbolOfNode(node);
-            var firstDeclaration = getDeclarationOfKind(enumSymbol, node.kind);
+            let enumSymbol = getSymbolOfNode(node);
+            let firstDeclaration = getDeclarationOfKind(enumSymbol, node.kind);
             if (node === firstDeclaration) {
                 if (enumSymbol.declarations.length > 1) {
-                    var enumIsConst = isConst(node);
+                    let enumIsConst = isConst(node);
                     // check that const is placed\omitted on all enum declarations
                     forEach(enumSymbol.declarations, decl => {
                         if (isConstEnumDeclaration(decl) !== enumIsConst) {
@@ -9701,19 +9824,19 @@ module ts {
                     });
                 }
 
-                var seenEnumMissingInitialInitializer = false;
+                let seenEnumMissingInitialInitializer = false;
                 forEach(enumSymbol.declarations, declaration => {
                     // return true if we hit a violation of the rule, false otherwise
                     if (declaration.kind !== SyntaxKind.EnumDeclaration) {
                         return false;
                     }
 
-                    var enumDeclaration = <EnumDeclaration>declaration;
+                    let enumDeclaration = <EnumDeclaration>declaration;
                     if (!enumDeclaration.members.length) {
                         return false;
                     }
 
-                    var firstEnumMember = enumDeclaration.members[0];
+                    let firstEnumMember = enumDeclaration.members[0];
                     if (!firstEnumMember.initializer) {
                         if (seenEnumMissingInitialInitializer) {
                             error(firstEnumMember.name, Diagnostics.In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enum_element);
@@ -9727,9 +9850,8 @@ module ts {
         }
 
         function getFirstNonAmbientClassOrFunctionDeclaration(symbol: Symbol): Declaration {
-            var declarations = symbol.declarations;
-            for (var i = 0; i < declarations.length; i++) {
-                var declaration = declarations[i];
+            let declarations = symbol.declarations;
+            for (let declaration of declarations) {
                 if ((declaration.kind === SyntaxKind.ClassDeclaration || (declaration.kind === SyntaxKind.FunctionDeclaration && nodeIsPresent((<FunctionLikeDeclaration>declaration).body))) && !isInAmbientContext(declaration)) {
                     return declaration;
                 }
@@ -9749,14 +9871,14 @@ module ts {
                 checkCollisionWithCapturedThisVariable(node, node.name);
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
                 checkExportsOnMergedDeclarations(node);
-                var symbol = getSymbolOfNode(node);
+                let symbol = getSymbolOfNode(node);
 
                 // The following checks only apply on a non-ambient instantiated module declaration.
                 if (symbol.flags & SymbolFlags.ValueModule
                     && symbol.declarations.length > 1
                     && !isInAmbientContext(node)
                     && isInstantiatedModule(node, compilerOptions.preserveConstEnums)) {
-                    var classOrFunc = getFirstNonAmbientClassOrFunctionDeclaration(symbol);
+                    let classOrFunc = getFirstNonAmbientClassOrFunctionDeclaration(symbol);
                     if (classOrFunc) {
                         if (getSourceFileOfNode(node) !== getSourceFileOfNode(classOrFunc)) {
                             error(node.name, Diagnostics.A_module_declaration_cannot_be_in_a_different_file_from_a_class_or_function_with_which_it_is_merged);
@@ -9788,12 +9910,12 @@ module ts {
         }
 
         function checkExternalImportOrExportDeclaration(node: ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration): boolean {
-            var moduleName = getExternalModuleName(node);
+            let moduleName = getExternalModuleName(node);
             if (getFullWidth(moduleName) !== 0 && moduleName.kind !== SyntaxKind.StringLiteral) {
                 error(moduleName, Diagnostics.String_literal_expected);
                 return false;
             }
-            var inAmbientExternalModule = node.parent.kind === SyntaxKind.ModuleBlock && (<ModuleDeclaration>node.parent.parent).name.kind === SyntaxKind.StringLiteral;
+            let inAmbientExternalModule = node.parent.kind === SyntaxKind.ModuleBlock && (<ModuleDeclaration>node.parent.parent).name.kind === SyntaxKind.StringLiteral;
             if (node.parent.kind !== SyntaxKind.SourceFile && !inAmbientExternalModule) {
                 error(moduleName, node.kind === SyntaxKind.ExportDeclaration ?
                     Diagnostics.Export_declarations_are_not_permitted_in_an_internal_module :
@@ -9802,7 +9924,7 @@ module ts {
             }
             if (inAmbientExternalModule && isExternalModuleNameRelative((<LiteralExpression>moduleName).text)) {
                 // TypeScript 1.0 spec (April 2013): 12.1.6
-                // An ExternalImportDeclaration in an AmbientExternalModuleDeclaration may reference 
+                // An ExternalImportDeclaration in an AmbientExternalModuleDeclaration may reference
                 // other external modules only through top - level external module names.
                 // Relative external module names are not permitted.
                 error(node, Diagnostics.Import_or_export_declaration_in_an_ambient_external_module_declaration_cannot_reference_external_module_through_relative_external_module_name);
@@ -9812,15 +9934,15 @@ module ts {
         }
 
         function checkAliasSymbol(node: ImportEqualsDeclaration | ImportClause | NamespaceImport | ImportSpecifier | ExportSpecifier) {
-            var symbol = getSymbolOfNode(node);
-            var target = resolveAlias(symbol);
+            let symbol = getSymbolOfNode(node);
+            let target = resolveAlias(symbol);
             if (target !== unknownSymbol) {
-                var excludedMeanings =
+                let excludedMeanings =
                     (symbol.flags & SymbolFlags.Value ? SymbolFlags.Value : 0) |
                     (symbol.flags & SymbolFlags.Type ? SymbolFlags.Type : 0) |
                     (symbol.flags & SymbolFlags.Namespace ? SymbolFlags.Namespace : 0);
                 if (target.flags & excludedMeanings) {
-                    var message = node.kind === SyntaxKind.ExportSpecifier ?
+                    let message = node.kind === SyntaxKind.ExportSpecifier ?
                         Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 :
                         Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0;
                     error(node, message, symbolToString(symbol));
@@ -9839,7 +9961,7 @@ module ts {
                 grammarErrorOnFirstToken(node, Diagnostics.An_import_declaration_cannot_have_modifiers);
             }
             if (checkExternalImportOrExportDeclaration(node)) {
-                var importClause = node.importClause;
+                let importClause = node.importClause;
                 if (importClause) {
                     if (importClause.name) {
                         checkImportBinding(importClause);
@@ -9864,11 +9986,11 @@ module ts {
                     markExportAsReferenced(node);
                 }
                 if (isInternalModuleImportEqualsDeclaration(node)) {
-                    var target = resolveAlias(getSymbolOfNode(node));
+                    let target = resolveAlias(getSymbolOfNode(node));
                     if (target !== unknownSymbol) {
                         if (target.flags & SymbolFlags.Value) {
                             // Target is a value symbol, check that it is not hidden by a local declaration with the same name
-                            var moduleName = getFirstIdentifier(<EntityName>node.moduleReference);
+                            let moduleName = getFirstIdentifier(<EntityName>node.moduleReference);
                             if (!(resolveEntityName(moduleName, SymbolFlags.Value | SymbolFlags.Namespace).flags & SymbolFlags.Namespace)) {
                                 error(moduleName, Diagnostics.Module_0_is_hidden_by_a_local_declaration_with_the_same_name, declarationNameToString(moduleName));
                             }
@@ -9900,7 +10022,7 @@ module ts {
         }
 
         function checkExportAssignment(node: ExportAssignment) {
-            var container = node.parent.kind === SyntaxKind.SourceFile ? <SourceFile>node.parent : <ModuleDeclaration>node.parent.parent;
+            let container = node.parent.kind === SyntaxKind.SourceFile ? <SourceFile>node.parent : <ModuleDeclaration>node.parent.parent;
             if (container.kind === SyntaxKind.ModuleDeclaration && (<ModuleDeclaration>container).name.kind === SyntaxKind.Identifier) {
                 error(node, Diagnostics.An_export_assignment_cannot_be_used_in_an_internal_module);
                 return;
@@ -9929,19 +10051,17 @@ module ts {
         }
 
         function hasExportedMembers(moduleSymbol: Symbol) {
-            var declarations = moduleSymbol.declarations;
-            for (var i = 0; i < declarations.length; i++) {
-                var statements = getModuleStatements(declarations[i]);
-                for (var j = 0; j < statements.length; j++) {
-                    var node = statements[j];
+            let declarations = moduleSymbol.declarations;
+            for (let current of declarations) {
+                let statements = getModuleStatements(current);
+                for (let node of statements) {
                     if (node.kind === SyntaxKind.ExportDeclaration) {
-                        var exportClause = (<ExportDeclaration>node).exportClause;
+                        let exportClause = (<ExportDeclaration>node).exportClause;
                         if (!exportClause) {
                             return true;
                         }
-                        var specifiers = exportClause.elements;
-                        for (var k = 0; k < specifiers.length; k++) {
-                            var specifier = specifiers[k];
+                        let specifiers = exportClause.elements;
+                        for (let specifier of specifiers) {
                             if (!(specifier.propertyName && specifier.name && specifier.name.text === "default")) {
                                 return true;
                             }
@@ -9955,13 +10075,13 @@ module ts {
         }
 
         function checkExternalModuleExports(node: SourceFile | ModuleDeclaration) {
-            var moduleSymbol = getSymbolOfNode(node);
-            var links = getSymbolLinks(moduleSymbol);
+            let moduleSymbol = getSymbolOfNode(node);
+            let links = getSymbolLinks(moduleSymbol);
             if (!links.exportsChecked) {
-                var defaultSymbol = getExportAssignmentSymbol(moduleSymbol);
+                let defaultSymbol = getExportAssignmentSymbol(moduleSymbol);
                 if (defaultSymbol) {
                     if (hasExportedMembers(moduleSymbol)) {
-                        var declaration = getDeclarationOfAliasSymbol(defaultSymbol) || defaultSymbol.valueDeclaration;
+                        let declaration = getDeclarationOfAliasSymbol(defaultSymbol) || defaultSymbol.valueDeclaration;
                         error(declaration, Diagnostics.An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements);
                     }
                 }
@@ -10077,8 +10197,8 @@ module ts {
 
         // Function expression bodies are checked after all statements in the enclosing body. This is to ensure
         // constructs like the following are permitted:
-        //     var foo = function () {
-        //        var s = foo();
+        //     let foo = function () {
+        //        let s = foo();
         //        return "hello";
         //     }
         // Here, performing a full type check of the body of the function expression whilst in the process of
@@ -10147,6 +10267,7 @@ module ts {
                 case SyntaxKind.BreakStatement:
                 case SyntaxKind.ReturnStatement:
                 case SyntaxKind.SwitchStatement:
+                case SyntaxKind.CaseBlock:
                 case SyntaxKind.CaseClause:
                 case SyntaxKind.DefaultClause:
                 case SyntaxKind.LabeledStatement:
@@ -10166,14 +10287,14 @@ module ts {
         }
 
         function checkSourceFile(node: SourceFile) {
-            var start = new Date().getTime();
+            let start = new Date().getTime();
             checkSourceFileWorker(node);
             checkTime += new Date().getTime() - start;
         }
 
         // Fully type check a source file and collect the relevant diagnostics.
         function checkSourceFileWorker(node: SourceFile) {
-            var links = getNodeLinks(node);
+            let links = getNodeLinks(node);
             if (!(links.flags & NodeCheckFlags.TypeChecked)) {
                 // Grammar checking
                 checkGrammarSourceFile(node);
@@ -10238,11 +10359,11 @@ module ts {
         }
 
         function getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[] {
-            var symbols: SymbolTable = {};
-            var memberFlags: NodeFlags = 0;
+            let symbols: SymbolTable = {};
+            let memberFlags: NodeFlags = 0;
             function copySymbol(symbol: Symbol, meaning: SymbolFlags) {
                 if (symbol.flags & meaning) {
-                    var id = symbol.name;
+                    let id = symbol.name;
                     if (!isReservedMemberName(id) && !hasProperty(symbols, id)) {
                         symbols[id] = symbol;
                     }
@@ -10250,7 +10371,7 @@ module ts {
             }
             function copySymbols(source: SymbolTable, meaning: SymbolFlags) {
                 if (meaning) {
-                    for (var id in source) {
+                    for (let id in source) {
                         if (hasProperty(source, id)) {
                             copySymbol(source[id], meaning);
                         }
@@ -10314,7 +10435,7 @@ module ts {
 
         // True if the given identifier is part of a type reference
         function isTypeReferenceIdentifier(entityName: EntityName): boolean {
-            var node: Node = entityName;
+            let node: Node = entityName;
             while (node.parent && node.parent.kind === SyntaxKind.QualifiedName) node = node.parent;
             return node.parent && node.parent.kind === SyntaxKind.TypeReference;
         }
@@ -10349,13 +10470,13 @@ module ts {
                     // At this point, node is either a qualified name or an identifier
                     Debug.assert(node.kind === SyntaxKind.Identifier || node.kind === SyntaxKind.QualifiedName, "'node' was expected to be a qualified name or identifier in 'isTypeNode'.");
 
-                    var parent = node.parent;
+                    let parent = node.parent;
                     if (parent.kind === SyntaxKind.TypeQuery) {
                         return false;
                     }
                     // Do not recursively call isTypeNode on the parent. In the example:
                     //
-                    //     var a: A.B.C;
+                    //     let a: A.B.C;
                     //
                     // Calling isTypeNode would consider the qualified name A.B a type node. Only C or
                     // A.B.C is a type node.
@@ -10452,18 +10573,18 @@ module ts {
                 if (entityName.kind === SyntaxKind.Identifier) {
                     // Include aliases in the meaning, this ensures that we do not follow aliases to where they point and instead
                     // return the alias symbol.
-                    var meaning: SymbolFlags = SymbolFlags.Value | SymbolFlags.Alias;
+                    let meaning: SymbolFlags = SymbolFlags.Value | SymbolFlags.Alias;
                     return resolveEntityName(<Identifier>entityName, meaning);
                 }
                 else if (entityName.kind === SyntaxKind.PropertyAccessExpression) {
-                    var symbol = getNodeLinks(entityName).resolvedSymbol;
+                    let symbol = getNodeLinks(entityName).resolvedSymbol;
                     if (!symbol) {
                         checkPropertyAccessExpression(<PropertyAccessExpression>entityName);
                     }
                     return getNodeLinks(entityName).resolvedSymbol;
                 }
                 else if (entityName.kind === SyntaxKind.QualifiedName) {
-                    var symbol = getNodeLinks(entityName).resolvedSymbol;
+                    let symbol = getNodeLinks(entityName).resolvedSymbol;
                     if (!symbol) {
                         checkQualifiedName(<QualifiedName>entityName);
                     }
@@ -10471,7 +10592,7 @@ module ts {
                 }
             }
             else if (isTypeReferenceIdentifier(<EntityName>entityName)) {
-                var meaning = entityName.parent.kind === SyntaxKind.TypeReference ? SymbolFlags.Type : SymbolFlags.Namespace;
+                let meaning = entityName.parent.kind === SyntaxKind.TypeReference ? SymbolFlags.Type : SymbolFlags.Namespace;
                 // Include aliases in the meaning, this ensures that we do not follow aliases to where they point and instead
                 // return the alias symbol.
                 meaning |= SymbolFlags.Alias;
@@ -10507,12 +10628,12 @@ module ts {
 
                 case SyntaxKind.ThisKeyword:
                 case SyntaxKind.SuperKeyword:
-                    var type = checkExpression(<Expression>node);
+                    let type = checkExpression(<Expression>node);
                     return type.symbol;
 
                 case SyntaxKind.ConstructorKeyword:
                     // constructor keyword for an overload, should take us to the definition if it exist
-                    var constructorDeclaration = node.parent;
+                    let constructorDeclaration = node.parent;
                     if (constructorDeclaration && constructorDeclaration.kind === SyntaxKind.Constructor) {
                         return (<ClassDeclaration>constructorDeclaration.parent).symbol;
                     }
@@ -10520,7 +10641,7 @@ module ts {
 
                 case SyntaxKind.StringLiteral:
                     // External module name in an import declaration
-                    var moduleName: Expression;
+                    let moduleName: Expression;
                     if ((isExternalModuleImportEqualsDeclaration(node.parent.parent) &&
                         getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) ||
                         ((node.parent.kind === SyntaxKind.ImportDeclaration || node.parent.kind === SyntaxKind.ExportDeclaration) &&
@@ -10532,9 +10653,9 @@ module ts {
                 case SyntaxKind.NumericLiteral:
                     // index access
                     if (node.parent.kind == SyntaxKind.ElementAccessExpression && (<ElementAccessExpression>node.parent).argumentExpression === node) {
-                        var objectType = checkExpression((<ElementAccessExpression>node.parent).expression);
+                        let objectType = checkExpression((<ElementAccessExpression>node.parent).expression);
                         if (objectType === unknownType) return undefined;
-                        var apparentType = getApparentType(objectType);
+                        let apparentType = getApparentType(objectType);
                         if (apparentType === unknownType) return undefined;
                         return getPropertyOfType(apparentType, (<LiteralExpression>node).text);
                     }
@@ -10569,29 +10690,29 @@ module ts {
 
             if (isTypeDeclaration(node)) {
                 // In this case, we call getSymbolOfNode instead of getSymbolInfo because it is a declaration
-                var symbol = getSymbolOfNode(node);
+                let symbol = getSymbolOfNode(node);
                 return getDeclaredTypeOfSymbol(symbol);
             }
 
             if (isTypeDeclarationName(node)) {
-                var symbol = getSymbolInfo(node);
+                let symbol = getSymbolInfo(node);
                 return symbol && getDeclaredTypeOfSymbol(symbol);
             }
 
             if (isDeclaration(node)) {
                 // In this case, we call getSymbolOfNode instead of getSymbolInfo because it is a declaration
-                var symbol = getSymbolOfNode(node);
+                let symbol = getSymbolOfNode(node);
                 return getTypeOfSymbol(symbol);
             }
 
             if (isDeclarationName(node)) {
-                var symbol = getSymbolInfo(node);
+                let symbol = getSymbolInfo(node);
                 return symbol && getTypeOfSymbol(symbol);
             }
 
             if (isInRightSideOfImportOrExportAssignment(<Identifier>node)) {
-                var symbol = getSymbolInfo(node);
-                var declaredType = symbol && getDeclaredTypeOfSymbol(symbol);
+                let symbol = getSymbolInfo(node);
+                let declaredType = symbol && getDeclaredTypeOfSymbol(symbol);
                 return declaredType !== unknownType ? declaredType : getTypeOfSymbol(symbol);
             }
 
@@ -10609,7 +10730,7 @@ module ts {
         // if the type has call or construct signatures
         function getAugmentedPropertiesOfType(type: Type): Symbol[] {
             var type = getApparentType(type);
-            var propsByName = createSymbolTable(getPropertiesOfType(type));
+            let propsByName = createSymbolTable(getPropertiesOfType(type));
             if (getSignaturesOfType(type, SignatureKind.Call).length || getSignaturesOfType(type, SignatureKind.Construct).length) {
                 forEach(getPropertiesOfType(globalFunctionType), p => {
                     if (!hasProperty(propsByName, p.name)) {
@@ -10622,15 +10743,15 @@ module ts {
 
         function getRootSymbols(symbol: Symbol): Symbol[] {
             if (symbol.flags & SymbolFlags.UnionProperty) {
-                var symbols: Symbol[] = [];
-                var name = symbol.name;
+                let symbols: Symbol[] = [];
+                let name = symbol.name;
                 forEach(getSymbolLinks(symbol).unionType.types, t => {
                     symbols.push(getPropertyOfType(t, name));
                 });
                 return symbols;
             }
             else if (symbol.flags & SymbolFlags.Transient) {
-                var target = getSymbolLinks(symbol).target;
+                let target = getSymbolLinks(symbol).target;
                 if (target) {
                     return [target];
                 }
@@ -10653,7 +10774,7 @@ module ts {
         }
 
         function isUniqueLocalName(name: string, container: Node): boolean {
-            for (var node = container; isNodeDescendentOf(node, container); node = node.nextContainer) {
+            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)) {
@@ -10665,8 +10786,8 @@ module ts {
         }
 
         function getGeneratedNamesForSourceFile(sourceFile: SourceFile): Map<string> {
-            var links = getNodeLinks(sourceFile);
-            var generatedNames = links.generatedNames;
+            let links = getNodeLinks(sourceFile);
+            let generatedNames = links.generatedNames;
             if (!generatedNames) {
                 generatedNames = links.generatedNames = {};
                 generateNames(sourceFile);
@@ -10707,7 +10828,7 @@ module ts {
             }
 
             function makeUniqueName(baseName: string): string {
-                var name = generateUniqueName(baseName, isExistingName);
+                let name = generateUniqueName(baseName, isExistingName);
                 return generatedNames[name] = name;
             }
 
@@ -10723,15 +10844,15 @@ module ts {
 
             function generateNameForModuleOrEnum(node: ModuleDeclaration | EnumDeclaration) {
                 if (node.name.kind === SyntaxKind.Identifier) {
-                    var name = node.name.text;
+                    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) {
-                var expr = getExternalModuleName(node);
-                var baseName = expr.kind === SyntaxKind.StringLiteral ?
+                let expr = getExternalModuleName(node);
+                let baseName = expr.kind === SyntaxKind.StringLiteral ?
                     escapeIdentifier(makeIdentifierFromModuleName((<LiteralExpression>expr).text)) : "module";
                 assignGeneratedName(node, makeUniqueName(baseName));
             }
@@ -10756,7 +10877,7 @@ module ts {
         }
 
         function getGeneratedNameForNode(node: Node) {
-            var links = getNodeLinks(node);
+            let links = getNodeLinks(node);
             if (!links.generatedName) {
                 getGeneratedNamesForSourceFile(getSourceFile(node));
             }
@@ -10772,10 +10893,10 @@ module ts {
         }
 
         function getAliasNameSubstitution(symbol: Symbol): string {
-            var declaration = getDeclarationOfAliasSymbol(symbol);
+            let declaration = getDeclarationOfAliasSymbol(symbol);
             if (declaration && declaration.kind === SyntaxKind.ImportSpecifier) {
-                var moduleName = getGeneratedNameForNode(<ImportDeclaration>declaration.parent.parent.parent);
-                var propertyName = (<ImportSpecifier>declaration).propertyName || (<ImportSpecifier>declaration).name;
+                let moduleName = getGeneratedNameForNode(<ImportDeclaration>declaration.parent.parent.parent);
+                let propertyName = (<ImportSpecifier>declaration).propertyName || (<ImportSpecifier>declaration).name;
                 return moduleName + "." + unescapeIdentifier(propertyName.text);
             }
         }
@@ -10784,8 +10905,8 @@ module ts {
             if (isExternalModuleSymbol(symbol.parent)) {
                 return "exports." + unescapeIdentifier(symbol.name);
             }
-            var node = location;
-            var containerSymbol = getParentOfSymbol(symbol);
+            let node = location;
+            let containerSymbol = getParentOfSymbol(symbol);
             while (node) {
                 if ((node.kind === SyntaxKind.ModuleDeclaration || node.kind === SyntaxKind.EnumDeclaration) && getSymbolOfNode(node) === containerSymbol) {
                     return getGeneratedNameForNode(<ModuleDeclaration | EnumDeclaration>node) + "." + unescapeIdentifier(symbol.name);
@@ -10795,7 +10916,7 @@ module ts {
         }
 
         function getExpressionNameSubstitution(node: Identifier): string {
-            var symbol = getNodeLinks(node).resolvedSymbol;
+            let symbol = getNodeLinks(node).resolvedSymbol;
             if (symbol) {
                 // Whan an identifier resolves to a parented symbol, it references an exported entity from
                 // another declaration of the same internal module.
@@ -10805,7 +10926,7 @@ module ts {
                 // 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.
-                var exportSymbol = getExportSymbolOfValueSymbolIfExported(symbol);
+                let exportSymbol = getExportSymbolOfValueSymbolIfExported(symbol);
                 if (symbol !== exportSymbol && !(exportSymbol.flags & SymbolFlags.ExportHasLocal)) {
                     return getExportNameSubstitution(exportSymbol, node.parent);
                 }
@@ -10817,7 +10938,7 @@ module ts {
         }
 
         function hasExportDefaultValue(node: SourceFile): boolean {
-            var symbol = getResolvedExportAssignmentSymbol(getSymbolOfNode(node));
+            let symbol = getResolvedExportAssignmentSymbol(getSymbolOfNode(node));
             return symbol && symbol !== unknownSymbol && symbolIsValue(symbol) && !isConstEnumSymbol(symbol);
         }
 
@@ -10830,7 +10951,7 @@ module ts {
         }
 
         function isAliasResolvedToValue(symbol: Symbol): boolean {
-            var target = resolveAlias(symbol);
+            let target = resolveAlias(symbol);
             // const enums and modules that contain only const enums are not considered values from the emit perespective
             return target !== unknownSymbol && target.flags & SymbolFlags.Value && !isConstEnumOrConstEnumOnlyModule(target);
         }
@@ -10841,7 +10962,7 @@ module ts {
 
         function isReferencedAliasDeclaration(node: Node): boolean {
             if (isAliasSymbolDeclaration(node)) {
-                var symbol = getSymbolOfNode(node);
+                let symbol = getSymbolOfNode(node);
                 if (getSymbolLinks(symbol).referenced) {
                     return true;
                 }
@@ -10851,8 +10972,8 @@ module ts {
 
         function isImplementationOfOverload(node: FunctionLikeDeclaration) {
             if (nodeIsPresent(node.body)) {
-                var symbol = getSymbolOfNode(node);
-                var signaturesOfSymbol = getSignaturesOfSymbol(symbol);
+                let symbol = getSymbolOfNode(node);
+                let signaturesOfSymbol = getSignaturesOfSymbol(symbol);
                 // If this function body corresponds to function with multiple signature, it is implementation of overload
                 // e.g.: function foo(a: string): string;
                 //       function foo(a: number): number;
@@ -10884,10 +11005,10 @@ module ts {
                 return getEnumMemberValue(<EnumMember>node);
             }
 
-            var symbol = getNodeLinks(node).resolvedSymbol;
+            let symbol = getNodeLinks(node).resolvedSymbol;
             if (symbol && (symbol.flags & SymbolFlags.EnumMember)) {
-                var declaration = symbol.valueDeclaration;
-                var constantValue: number;
+                let declaration = symbol.valueDeclaration;
+                let constantValue: number;
                 if (declaration.kind === SyntaxKind.EnumMember) {
                     return getEnumMemberValue(<EnumMember>declaration);
                 }
@@ -10898,8 +11019,8 @@ module ts {
 
         function writeTypeOfDeclaration(declaration: AccessorDeclaration | VariableLikeDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter) {
             // Get type of the symbol if this is the valid symbol otherwise get type at location
-            var symbol = getSymbolOfNode(declaration);
-            var type = symbol && !(symbol.flags & (SymbolFlags.TypeLiteral | SymbolFlags.Signature))
+            let symbol = getSymbolOfNode(declaration);
+            let type = symbol && !(symbol.flags & (SymbolFlags.TypeLiteral | SymbolFlags.Signature))
                 ? getTypeOfSymbol(symbol)
                 : unknownType;
 
@@ -10907,11 +11028,12 @@ module ts {
         }
 
         function writeReturnTypeOfSignatureDeclaration(signatureDeclaration: SignatureDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter) {
-            var signature = getSignatureFromDeclaration(signatureDeclaration);
+            let signature = getSignatureFromDeclaration(signatureDeclaration);
             getSymbolDisplayBuilder().buildTypeDisplay(getReturnTypeOfSignature(signature), 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);
         }
@@ -10932,17 +11054,17 @@ module ts {
             }
 
             // for names in variable declarations and binding elements try to short circuit and fetch symbol from the node
-            var declarationSymbol: Symbol =
+            let declarationSymbol: Symbol =
                 (n.parent.kind === SyntaxKind.VariableDeclaration && (<VariableDeclaration>n.parent).name === n) ||
                  n.parent.kind === SyntaxKind.BindingElement
                     ? getSymbolOfNode(n.parent)
                     : undefined;
 
-            var symbol = declarationSymbol ||
+            let symbol = declarationSymbol ||
                 getNodeLinks(n).resolvedSymbol ||
-                resolveName(n, n.text, SymbolFlags.BlockScopedVariable | SymbolFlags.Alias, /*nodeNotFoundMessage*/ undefined, /*nameArg*/ undefined);
-            
-            var isLetOrConst =
+                resolveName(n, n.text, SymbolFlags.Value | SymbolFlags.Alias, /*nodeNotFoundMessage*/ undefined, /*nameArg*/ undefined);
+
+            let isLetOrConst =
                 symbol &&
                 (symbol.flags & SymbolFlags.BlockScopedVariable) &&
                 symbol.valueDeclaration.parent.kind !== SyntaxKind.CatchClause;
@@ -11058,16 +11180,14 @@ module ts {
                 return;
             }
 
-            var lastStatic: Node, lastPrivate: Node, lastProtected: Node, lastDeclare: Node;
-            var flags = 0;
-            for (var i = 0, n = node.modifiers.length; i < n; i++) {
-                var modifier = node.modifiers[i];
-
+            let lastStatic: Node, lastPrivate: Node, lastProtected: Node, lastDeclare: Node;
+            let flags = 0;
+            for (let modifier of node.modifiers) {
                 switch (modifier.kind) {
                     case SyntaxKind.PublicKeyword:
                     case SyntaxKind.ProtectedKeyword:
                     case SyntaxKind.PrivateKeyword:
-                        var text: string;
+                        let text: string;
                         if (modifier.kind === SyntaxKind.PublicKeyword) {
                             text = "public";
                         }
@@ -11165,9 +11285,9 @@ module ts {
 
         function checkGrammarForDisallowedTrailingComma(list: NodeArray<Node>): boolean {
             if (list && list.hasTrailingComma) {
-                var start = list.end - ",".length;
-                var end = list.end;
-                var sourceFile = getSourceFileOfNode(list[0]);
+                let start = list.end - ",".length;
+                let end = list.end;
+                let sourceFile = getSourceFileOfNode(list[0]);
                 return grammarErrorAtPos(sourceFile, start, end - start, Diagnostics.Trailing_comma_not_allowed);
             }
         }
@@ -11178,9 +11298,9 @@ module ts {
             }
 
             if (typeParameters && typeParameters.length === 0) {
-                var start = typeParameters.pos - "<".length;
-                var sourceFile = getSourceFileOfNode(node);
-                var end = skipTrivia(sourceFile.text, typeParameters.end) + ">".length;
+                let start = typeParameters.pos - "<".length;
+                let sourceFile = getSourceFileOfNode(node);
+                let end = skipTrivia(sourceFile.text, typeParameters.end) + ">".length;
                 return grammarErrorAtPos(sourceFile, start, end - start, Diagnostics.Type_parameter_list_cannot_be_empty);
             }
         }
@@ -11190,11 +11310,11 @@ module ts {
                 return true;
             }
 
-            var seenOptionalParameter = false;
-            var parameterCount = parameters.length;
+            let seenOptionalParameter = false;
+            let parameterCount = parameters.length;
 
-            for (var i = 0; i < parameterCount; i++) {
-                var parameter = parameters[i];
+            for (let i = 0; i < parameterCount; i++) {
+                let parameter = parameters[i];
                 if (parameter.dotDotDotToken) {
                     if (i !== (parameterCount - 1)) {
                         return grammarErrorOnNode(parameter.dotDotDotToken, Diagnostics.A_rest_parameter_must_be_last_in_a_parameter_list);
@@ -11229,7 +11349,7 @@ module ts {
         }
 
         function checkGrammarIndexSignatureParameters(node: SignatureDeclaration): boolean {
-            var parameter = node.parameters[0];
+            let parameter = node.parameters[0];
             if (node.parameters.length !== 1) {
                 if (parameter) {
                     return grammarErrorOnNode(parameter.name, Diagnostics.An_index_signature_must_have_exactly_one_parameter);
@@ -11274,9 +11394,9 @@ module ts {
 
         function checkGrammarForAtLeastOneTypeArgument(node: Node, typeArguments: NodeArray<TypeNode>): boolean {
             if (typeArguments && typeArguments.length === 0) {
-                var sourceFile = getSourceFileOfNode(node);
-                var start = typeArguments.pos - "<".length;
-                var end = skipTrivia(sourceFile.text, typeArguments.end) + ">".length;
+                let sourceFile = getSourceFileOfNode(node);
+                let start = typeArguments.pos - "<".length;
+                let end = skipTrivia(sourceFile.text, typeArguments.end) + ">".length;
                 return grammarErrorAtPos(sourceFile, start, end - start, Diagnostics.Type_argument_list_cannot_be_empty);
             }
         }
@@ -11288,9 +11408,8 @@ module ts {
 
         function checkGrammarForOmittedArgument(node: CallExpression, arguments: NodeArray<Expression>): boolean {
             if (arguments) {
-                var sourceFile = getSourceFileOfNode(node);
-                for (var i = 0, n = arguments.length; i < n; i++) {
-                    var arg = arguments[i];
+                let sourceFile = getSourceFileOfNode(node);
+                for (let arg of arguments) {
                     if (arg.kind === SyntaxKind.OmittedExpression) {
                         return grammarErrorAtPos(sourceFile, arg.pos, 0, Diagnostics.Argument_expression_expected);
                     }
@@ -11304,26 +11423,23 @@ module ts {
         }
 
         function checkGrammarHeritageClause(node: HeritageClause): boolean {
-            var types = node.types;
+            let types = node.types;
             if (checkGrammarForDisallowedTrailingComma(types)) {
                 return true;
             }
             if (types && types.length === 0) {
-                var listType = tokenToString(node.token);
-                var sourceFile = getSourceFileOfNode(node);
+                let listType = tokenToString(node.token);
+                let sourceFile = getSourceFileOfNode(node);
                 return grammarErrorAtPos(sourceFile, types.pos, 0, Diagnostics._0_list_cannot_be_empty, listType)
             }
         }
 
         function checkGrammarClassDeclarationHeritageClauses(node: ClassDeclaration) {
-            var seenExtendsClause = false;
-            var seenImplementsClause = false;
+            let seenExtendsClause = false;
+            let seenImplementsClause = false;
 
             if (!checkGrammarModifiers(node) && node.heritageClauses) {
-                for (var i = 0, n = node.heritageClauses.length; i < n; i++) {
-                    Debug.assert(i <= 2);
-                    var heritageClause = node.heritageClauses[i];
-
+                for (let heritageClause of node.heritageClauses) {
                     if (heritageClause.token === SyntaxKind.ExtendsKeyword) {
                         if (seenExtendsClause) {
                             return grammarErrorOnFirstToken(heritageClause, Diagnostics.extends_clause_already_seen)
@@ -11355,13 +11471,10 @@ module ts {
         }
 
         function checkGrammarInterfaceDeclaration(node: InterfaceDeclaration) {
-            var seenExtendsClause = false;
+            let seenExtendsClause = false;
 
             if (node.heritageClauses) {
-                for (var i = 0, n = node.heritageClauses.length; i < n; i++) {
-                    Debug.assert(i <= 1);
-                    var heritageClause = node.heritageClauses[i];
-
+                for (let heritageClause of node.heritageClauses) {
                     if (heritageClause.token === SyntaxKind.ExtendsKeyword) {
                         if (seenExtendsClause) {
                             return grammarErrorOnFirstToken(heritageClause, Diagnostics.extends_clause_already_seen);
@@ -11388,7 +11501,7 @@ module ts {
                 return false;
             }
 
-            var computedPropertyName = <ComputedPropertyName>node;
+            let computedPropertyName = <ComputedPropertyName>node;
             if (computedPropertyName.expression.kind === SyntaxKind.BinaryExpression && (<BinaryExpression>computedPropertyName.expression).operatorToken.kind === SyntaxKind.CommaToken) {
                 return grammarErrorOnNode(computedPropertyName.expression, Diagnostics.A_comma_expression_is_not_allowed_in_a_computed_property_name);
             }
@@ -11412,17 +11525,16 @@ module ts {
         }
 
         function checkGrammarObjectLiteralExpression(node: ObjectLiteralExpression) {
-            var seen: Map<SymbolFlags> = {};
-            var Property = 1;
-            var GetAccessor = 2;
-            var SetAccesor = 4;
-            var GetOrSetAccessor = GetAccessor | SetAccesor;
-            var inStrictMode = (node.parserContextFlags & ParserContextFlags.StrictMode) !== 0;
+            let seen: Map<SymbolFlags> = {};
+            let Property = 1;
+            let GetAccessor = 2;
+            let SetAccesor = 4;
+            let GetOrSetAccessor = GetAccessor | SetAccesor;
+            let inStrictMode = (node.parserContextFlags & ParserContextFlags.StrictMode) !== 0;
 
-            for (var i = 0, n = node.properties.length; i < n; i++) {
-                var prop = node.properties[i];
-                var name = prop.name;
-                if (prop.kind === SyntaxKind.OmittedExpression || 
+            for (let prop of node.properties) {
+                let name = prop.name;
+                if (prop.kind === SyntaxKind.OmittedExpression ||
                     name.kind === SyntaxKind.ComputedPropertyName) {
                     // If the name is not a ComputedPropertyName, the grammar checking will skip it
                     checkGrammarComputedPropertyName(<ComputedPropertyName>name);
@@ -11437,7 +11549,7 @@ module ts {
                 //    c.IsAccessorDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true.
                 //    d.IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true
                 // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields
-                var currentKind: number;
+                let currentKind: number;
                 if (prop.kind === SyntaxKind.PropertyAssignment || prop.kind === SyntaxKind.ShorthandPropertyAssignment) {
                     // Grammar checking for computedPropertName and shorthandPropertyAssignment
                     checkGrammarForInvalidQuestionMark(prop,(<PropertyAssignment>prop).questionToken, Diagnostics.An_object_member_cannot_be_declared_optional);
@@ -11463,7 +11575,7 @@ module ts {
                     seen[(<Identifier>name).text] = currentKind;
                 }
                 else {
-                    var existingKind = seen[(<Identifier>name).text];
+                    let existingKind = seen[(<Identifier>name).text];
                     if (currentKind === Property && existingKind === Property) {
                         if (inStrictMode) {
                             grammarErrorOnNode(name, Diagnostics.An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode);
@@ -11490,23 +11602,23 @@ module ts {
             }
 
             if (forInOrOfStatement.initializer.kind === SyntaxKind.VariableDeclarationList) {
-                var variableList = <VariableDeclarationList>forInOrOfStatement.initializer;
+                let variableList = <VariableDeclarationList>forInOrOfStatement.initializer;
                 if (!checkGrammarVariableDeclarationList(variableList)) {
                     if (variableList.declarations.length > 1) {
-                        var diagnostic = forInOrOfStatement.kind === SyntaxKind.ForInStatement
+                        let diagnostic = forInOrOfStatement.kind === SyntaxKind.ForInStatement
                             ? Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement
                             : Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement;
                         return grammarErrorOnFirstToken(variableList.declarations[1], diagnostic);
                     }
-                    var firstDeclaration = variableList.declarations[0];
+                    let firstDeclaration = variableList.declarations[0];
                     if (firstDeclaration.initializer) {
-                        var diagnostic = forInOrOfStatement.kind === SyntaxKind.ForInStatement
+                        let diagnostic = forInOrOfStatement.kind === SyntaxKind.ForInStatement
                             ? Diagnostics.The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer
                             : Diagnostics.The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer;
                         return grammarErrorOnNode(firstDeclaration.name, diagnostic);
                     }
                     if (firstDeclaration.type) {
-                        var diagnostic = forInOrOfStatement.kind === SyntaxKind.ForInStatement
+                        let diagnostic = forInOrOfStatement.kind === SyntaxKind.ForInStatement
                             ? Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation
                             : Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation;
                         return grammarErrorOnNode(firstDeclaration, diagnostic);
@@ -11518,7 +11630,7 @@ module ts {
         }
 
         function checkGrammarAccessor(accessor: MethodDeclaration): boolean {
-            var kind = accessor.kind;
+            let kind = accessor.kind;
             if (languageVersion < ScriptTarget.ES5) {
                 return grammarErrorOnNode(accessor.name, Diagnostics.Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher);
             }
@@ -11542,7 +11654,7 @@ module ts {
                     return grammarErrorOnNode(accessor.name, Diagnostics.A_set_accessor_must_have_exactly_one_parameter);
                 }
                 else {
-                    var parameter = accessor.parameters[0];
+                    let parameter = accessor.parameters[0];
                     if (parameter.dotDotDotToken) {
                         return grammarErrorOnNode(parameter.dotDotDotToken, Diagnostics.A_set_accessor_cannot_have_rest_parameter);
                     }
@@ -11621,7 +11733,7 @@ module ts {
         }
 
         function checkGrammarBreakOrContinueStatement(node: BreakOrContinueStatement): boolean {
-            var current: Node = node;
+            let current: Node = node;
             while (current) {
                 if (isFunctionLike(current)) {
                     return grammarErrorOnNode(node, Diagnostics.Jump_target_cannot_cross_function_boundary);
@@ -11632,7 +11744,7 @@ module ts {
                         if (node.label && (<LabeledStatement>current).label.text === node.label.text) {
                             // found matching label - verify that label usage is correct
                             // continue can only target labels that are on iteration statements
-                            var isMisplacedContinueLabel = node.kind === SyntaxKind.ContinueStatement
+                            let isMisplacedContinueLabel = node.kind === SyntaxKind.ContinueStatement
                                 && !isIterationStatement((<LabeledStatement>current).statement, /*lookInLabeledStatement*/ true);
 
                             if (isMisplacedContinueLabel) {
@@ -11660,14 +11772,14 @@ module ts {
             }
 
             if (node.label) {
-                var message = node.kind === SyntaxKind.BreakStatement
+                let message = node.kind === SyntaxKind.BreakStatement
                     ? Diagnostics.A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement
                     : Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement;
 
                 return grammarErrorOnNode(node, message)
             }
             else {
-                var message = node.kind === SyntaxKind.BreakStatement
+                let message = node.kind === SyntaxKind.BreakStatement
                     ? Diagnostics.A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement
                     : Diagnostics.A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement;
                 return grammarErrorOnNode(node, message)
@@ -11676,7 +11788,7 @@ module ts {
 
         function checkGrammarBindingElement(node: BindingElement) {
             if (node.dotDotDotToken) {
-                var elements = (<BindingPattern>node.parent).elements;
+                let elements = (<BindingPattern>node.parent).elements;
                 if (node !== elements[elements.length - 1]) {
                     return grammarErrorOnNode(node, Diagnostics.A_rest_element_must_be_last_in_an_array_destructuring_pattern);
                 }
@@ -11685,8 +11797,8 @@ module ts {
                     return grammarErrorAtPos(getSourceFileOfNode(node), node.initializer.pos - 1, 1, Diagnostics.A_rest_element_cannot_have_an_initializer);
                 }
             }
-            // It is a SyntaxError if a VariableDeclaration or VariableDeclarationNoIn occurs within strict code 
-            // and its Identifier is eval or arguments 
+            // It is a SyntaxError if a VariableDeclaration or VariableDeclarationNoIn occurs within strict code
+            // and its Identifier is eval or arguments
             return checkGrammarEvalOrArgumentsInStrictMode(node, <Identifier>node.name);
         }
 
@@ -11698,7 +11810,7 @@ module ts {
                     }
                     if (node.initializer) {
                         // Error on equals token which immediate precedes the initializer
-                        var equalsTokenLength = "=".length;
+                        let equalsTokenLength = "=".length;
                         return grammarErrorAtPos(getSourceFileOfNode(node), node.initializer.pos - equalsTokenLength,
                             equalsTokenLength, Diagnostics.Initializers_are_not_allowed_in_ambient_contexts);
                     }
@@ -11713,15 +11825,15 @@ module ts {
                 }
             }
 
-            var checkLetConstNames =  languageVersion >= ScriptTarget.ES6 && (isLet(node) || isConst(node));
+            let checkLetConstNames =  languageVersion >= ScriptTarget.ES6 && (isLet(node) || isConst(node));
 
             // 1. LexicalDeclaration : LetOrConst BindingList ;
             // It is a Syntax Error if the BoundNames of BindingList contains "let".
             // 2. ForDeclaration: ForDeclaration : LetOrConst ForBinding
             // It is a Syntax Error if the BoundNames of ForDeclaration contains "let".
 
-            // It is a SyntaxError if a VariableDeclaration or VariableDeclarationNoIn occurs within strict code 
-            // and its Identifier is eval or arguments 
+            // It is a SyntaxError if a VariableDeclaration or VariableDeclarationNoIn occurs within strict code
+            // and its Identifier is eval or arguments
             return (checkLetConstNames && checkGrammarNameInLetOrConstDeclarations(node.name)) ||
                 checkGrammarEvalOrArgumentsInStrictMode(node, <Identifier>node.name);
         }
@@ -11733,15 +11845,15 @@ module ts {
                 }
             }
             else {
-                var elements = (<BindingPattern>name).elements;
-                for (var i = 0; i < elements.length; ++i) {
-                    checkGrammarNameInLetOrConstDeclarations(elements[i].name);
+                let elements = (<BindingPattern>name).elements;
+                for (let element of elements) {
+                    checkGrammarNameInLetOrConstDeclarations(element.name);
                 }
             }
         }
 
         function checkGrammarVariableDeclarationList(declarationList: VariableDeclarationList): boolean {
-            var declarations = declarationList.declarations;
+            let declarations = declarationList.declarations;
             if (checkGrammarForDisallowedTrailingComma(declarationList.declarations)) {
                 return true;
             }
@@ -11781,7 +11893,7 @@ module ts {
 
         function isIntegerLiteral(expression: Expression): boolean {
             if (expression.kind === SyntaxKind.PrefixUnaryExpression) {
-                var unaryExpression = <PrefixUnaryExpression>expression;
+                let unaryExpression = <PrefixUnaryExpression>expression;
                 if (unaryExpression.operator === SyntaxKind.PlusToken || unaryExpression.operator === SyntaxKind.MinusToken) {
                     expression = unaryExpression.operand;
                 }
@@ -11799,17 +11911,16 @@ module ts {
         }
 
         function checkGrammarEnumDeclaration(enumDecl: EnumDeclaration): boolean {
-            var enumIsConst = (enumDecl.flags & NodeFlags.Const) !== 0;
+            let enumIsConst = (enumDecl.flags & NodeFlags.Const) !== 0;
 
-            var hasError = false;
+            let hasError = false;
 
             // skip checks below for const enums  - they allow arbitrary initializers as long as they can be evaluated to constant expressions.
             // since all values are known in compile time - it is not necessary to check that constant enum section precedes computed enum members.
             if (!enumIsConst) {
-                var inConstantEnumMemberSection = true;
-                var inAmbientContext = isInAmbientContext(enumDecl);
-                for (var i = 0, n = enumDecl.members.length; i < n; i++) {
-                    var node = enumDecl.members[i];
+                let inConstantEnumMemberSection = true;
+                let inAmbientContext = isInAmbientContext(enumDecl);
+                for (let node of enumDecl.members) {
                     // Do not use hasDynamicName here, because that returns false for well known symbols.
                     // We want to perform checkComputedPropertyName for all computed properties, including
                     // well known symbols.
@@ -11838,9 +11949,9 @@ module ts {
         }
 
         function grammarErrorOnFirstToken(node: Node, message: DiagnosticMessage, arg0?: any, arg1?: any, arg2?: any): boolean {
-            var sourceFile = getSourceFileOfNode(node);
+            let sourceFile = getSourceFileOfNode(node);
             if (!hasParseDiagnostics(sourceFile)) {
-                var span = getSpanOfTokenAtPosition(sourceFile, node.pos);
+                let span = getSpanOfTokenAtPosition(sourceFile, node.pos);
                 diagnostics.add(createFileDiagnostic(sourceFile, span.start, span.length, message, arg0, arg1, arg2));
                 return true;
             }
@@ -11854,7 +11965,7 @@ module ts {
         }
 
         function grammarErrorOnNode(node: Node, message: DiagnosticMessage, arg0?: any, arg1?: any, arg2?: any): boolean {
-            var sourceFile = getSourceFileOfNode(node);
+            let sourceFile = getSourceFileOfNode(node);
             if (!hasParseDiagnostics(sourceFile)) {
                 diagnostics.add(createDiagnosticForNode(node, message, arg0, arg1, arg2));
                 return true;
@@ -11863,9 +11974,9 @@ module ts {
 
         function checkGrammarEvalOrArgumentsInStrictMode(contextNode: Node, name: Node): boolean {
             if (name && name.kind === SyntaxKind.Identifier) {
-                var identifier = <Identifier>name;
+                let identifier = <Identifier>name;
                 if (contextNode && (contextNode.parserContextFlags & ParserContextFlags.StrictMode) && isEvalOrArgumentsIdentifier(identifier)) {
-                    var nameText = declarationNameToString(identifier);
+                    let nameText = declarationNameToString(identifier);
                     return grammarErrorOnNode(identifier, Diagnostics.Invalid_use_of_0_in_strict_mode, nameText);
                 }
             }
@@ -11931,8 +12042,7 @@ module ts {
         }
 
         function checkGrammarTopLevelElementsForRequiredDeclareModifier(file: SourceFile): boolean {
-            for (var i = 0, n = file.statements.length; i < n; i++) {
-                var decl = file.statements[i];
+            for (let decl of file.statements) {
                 if (isDeclaration(decl) || decl.kind === SyntaxKind.VariableStatement) {
                     if (checkGrammarTopLevelElementForRequiredDeclareModifier(decl)) {
                         return true;
@@ -11953,18 +12063,18 @@ module ts {
                 }
 
                 // Find containing block which is either Block, ModuleBlock, SourceFile
-                var links = getNodeLinks(node);
+                let links = getNodeLinks(node);
                 if (!links.hasReportedStatementInAmbientContext && isFunctionLike(node.parent)) {
                     return getNodeLinks(node).hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, Diagnostics.An_implementation_cannot_be_declared_in_ambient_contexts)
                 }
-                
+
                 // We are either parented by another statement, or some sort of block.
                 // If we're in a block, we only want to really report an error once
                 // to prevent noisyness.  So use a bit on the block to indicate if
                 // this has already been reported, and don't report if it has.
                 //
                 if (node.parent.kind === SyntaxKind.Block || node.parent.kind === SyntaxKind.ModuleBlock || node.parent.kind === SyntaxKind.SourceFile) {
-                    var links = getNodeLinks(node.parent);
+                    let links = getNodeLinks(node.parent);
                     // Check if the containing block ever report this error
                     if (!links.hasReportedStatementInAmbientContext) {
                         return links.hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, Diagnostics.Statements_are_not_allowed_in_ambient_contexts);
@@ -11991,9 +12101,9 @@ module ts {
         }
 
         function grammarErrorAfterFirstToken(node: Node, message: DiagnosticMessage, arg0?: any, arg1?: any, arg2?: any): boolean {
-            var sourceFile = getSourceFileOfNode(node);
+            let sourceFile = getSourceFileOfNode(node);
             if (!hasParseDiagnostics(sourceFile)) {
-                var span = getSpanOfTokenAtPosition(sourceFile, node.pos);
+                let span = getSpanOfTokenAtPosition(sourceFile, node.pos);
                 diagnostics.add(createFileDiagnostic(sourceFile, textSpanEnd(span), /*length*/ 0, message, arg0, arg1, arg2));
                 return true;
             }
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index 1fb73c90698..27fc152f534 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -25,8 +25,8 @@ module ts {
 
     export function forEach<T, U>(array: T[], callback: (element: T, index: number) => U): U {
         if (array) {
-            for (var i = 0, len = array.length; i < len; i++) {
-                var result = callback(array[i], i);
+            for (let i = 0, len = array.length; i < len; i++) {
+                let result = callback(array[i], i);
                 if (result) {
                     return result;
                 }
@@ -37,8 +37,8 @@ module ts {
 
     export function contains<T>(array: T[], value: T): boolean {
         if (array) {
-            for (var i = 0, len = array.length; i < len; i++) {
-                if (array[i] === value) {
+            for (let v of array) {
+                if (v === value) {
                     return true;
                 }
             }
@@ -48,7 +48,7 @@ module ts {
 
     export function indexOf<T>(array: T[], value: T): number {
         if (array) {
-            for (var i = 0, len = array.length; i < len; i++) {
+            for (let i = 0, len = array.length; i < len; i++) {
                 if (array[i] === value) {
                     return i;
                 }
@@ -58,10 +58,10 @@ module ts {
     }
 
     export function countWhere<T>(array: T[], predicate: (x: T) => boolean): number {
-        var count = 0;
+        let count = 0;
         if (array) {
-            for (var i = 0, len = array.length; i < len; i++) {
-                if (predicate(array[i])) {
+            for (let v of array) {
+                if (predicate(v)) {
                     count++;
                 }
             }
@@ -69,11 +69,11 @@ module ts {
         return count;
     }
 
-    export function filter<T>(array: T[], f: (x: T) => boolean): T[] {
+    export function filter<T>(array: T[], f: (x: T) => boolean): T[]{
+        let result: T[];
         if (array) {
-            var result: T[] = [];
-            for (var i = 0, len = array.length; i < len; i++) {
-                var item = array[i];
+            result = [];
+            for (let item of array) {
                 if (f(item)) {
                     result.push(item);
                 }
@@ -82,11 +82,12 @@ module ts {
         return result;
     }
 
-    export function map<T, U>(array: T[], f: (x: T) => U): U[] {
+    export function map<T, U>(array: T[], f: (x: T) => U): U[]{
+        let result: U[];
         if (array) {
-            var result: U[] = [];
-            for (var i = 0, len = array.length; i < len; i++) {
-                result.push(f(array[i]));
+            result = [];
+            for (let v of array) {
+                result.push(f(v));
             }
         }
         return result;
@@ -99,28 +100,30 @@ module ts {
         return array1.concat(array2);
     }
 
-    export function deduplicate<T>(array: T[]): T[] {
+    export function deduplicate<T>(array: T[]): T[]{
+        let result: T[];
         if (array) {
-            var result: T[] = [];
-            for (var i = 0, len = array.length; i < len; i++) {
-                var item = array[i];
-                if (!contains(result, item)) result.push(item);
+            result = [];
+            for (let item of array) {
+                if (!contains(result, item)) {
+                    result.push(item);
+                }
             }
         }
         return result;
     }
 
     export function sum(array: any[], prop: string): number {
-        var result = 0;
-        for (var i = 0; i < array.length; i++) {
-            result += array[i][prop];
+        let result = 0;
+        for (let v of array) {
+            result += v[prop];
         }
         return result;
     }
 
     export function addRange<T>(to: T[], from: T[]): void {
-        for (var i = 0, n = from.length; i < n; i++) {
-            to.push(from[i]);
+        for (let v of from) {
+            to.push(v);
         }
     } 
 
@@ -136,12 +139,12 @@ module ts {
     }
 
     export function binarySearch(array: number[], value: number): number {
-        var low = 0;
-        var high = array.length - 1;
+        let low = 0;
+        let high = array.length - 1;
 
         while (low <= high) {
-            var middle = low + ((high - low) >> 1);
-            var midValue = array[middle];
+            let middle = low + ((high - low) >> 1);
+            let midValue = array[middle];
 
             if (midValue === value) {
                 return middle;
@@ -157,7 +160,7 @@ module ts {
         return ~low;
     }
 
-    var hasOwnProperty = Object.prototype.hasOwnProperty;
+    let hasOwnProperty = Object.prototype.hasOwnProperty;
 
     export function hasProperty<T>(map: Map<T>, key: string): boolean {
         return hasOwnProperty.call(map, key);
@@ -168,7 +171,7 @@ module ts {
     }
 
     export function isEmpty<T>(map: Map<T>) {
-        for (var id in map) {
+        for (let id in map) {
             if (hasProperty(map, id)) {
                 return false;
             }
@@ -177,19 +180,19 @@ module ts {
     }
 
     export function clone<T>(object: T): T {
-        var result: any = {};
-        for (var id in object) {
+        let result: any = {};
+        for (let id in object) {
             result[id] = (<any>object)[id];
         }
         return <T>result;
     }
 
     export function extend<T>(first: Map<T>, second: Map<T>): Map<T> {
-        var result: Map<T> = {};
-        for (var id in first) {
+        let result: Map<T> = {};
+        for (let id in first) {
             result[id] = first[id];
         }
-        for (var id in second) {
+        for (let id in second) {
             if (!hasProperty(result, id)) {
                 result[id] = second[id];
             }
@@ -198,16 +201,16 @@ module ts {
     }
 
     export function forEachValue<T, U>(map: Map<T>, callback: (value: T) => U): U {
-        var result: U;
-        for (var id in map) {
+        let result: U;
+        for (let id in map) {
             if (result = callback(map[id])) break;
         }
         return result;
     }
 
     export function forEachKey<T, U>(map: Map<T>, callback: (key: string) => U): U {
-        var result: U;
-        for (var id in map) {
+        let result: U;
+        for (let id in map) {
             if (result = callback(id)) break;
         }
         return result;
@@ -218,9 +221,9 @@ module ts {
     }
 
     export function mapToArray<T>(map: Map<T>): T[] {
-        var result: T[] = [];
+        let result: T[] = [];
 
-        for (var id in map) {
+        for (let id in map) {
             result.push(map[id]);
         }
 
@@ -228,7 +231,7 @@ module ts {
     }
 
     export function copyMap<T>(source: Map<T>, target: Map<T>): void {
-        for (var p in source) {
+        for (let p in source) {
             target[p] = source[p];
         }
     }
@@ -244,7 +247,7 @@ module ts {
      * index in the array will be the one associated with the produced key.
      */
     export function arrayToMap<T>(array: T[], makeKey: (value: T) => string): Map<T> {
-        var result: Map<T> = {};
+        let result: Map<T> = {};
 
         forEach(array, value => {
             result[makeKey(value)] = value;
@@ -259,7 +262,7 @@ module ts {
         return text.replace(/{(\d+)}/g, (match, index?) => args[+index + baseIndex]);
     }
 
-    export var localizedDiagnosticMessages: Map<string> = undefined;
+    export let localizedDiagnosticMessages: Map<string> = undefined;
 
     export function getLocaleSpecificMessage(message: string) {
         return localizedDiagnosticMessages && localizedDiagnosticMessages[message]
@@ -269,10 +272,14 @@ module ts {
 
     export function createFileDiagnostic(file: SourceFile, start: number, length: number, message: DiagnosticMessage, ...args: any[]): Diagnostic;
     export function createFileDiagnostic(file: SourceFile, start: number, length: number, message: DiagnosticMessage): Diagnostic {
+        let end = start + length;
+
         Debug.assert(start >= 0, "start must be non-negative, is " + start);
         Debug.assert(length >= 0, "length must be non-negative, is " + length);
+        Debug.assert(start <= file.text.length, `start must be within the bounds of the file. ${ start } > ${ file.text.length }`);
+        Debug.assert(end <= file.text.length, `end must be the bounds of the file. ${ end } > ${ file.text.length }`);
 
-        var text = getLocaleSpecificMessage(message.key);
+        let text = getLocaleSpecificMessage(message.key);
         
         if (arguments.length > 4) {
             text = formatStringFromArgs(text, arguments, 4);
@@ -291,7 +298,7 @@ module ts {
 
     export function createCompilerDiagnostic(message: DiagnosticMessage, ...args: any[]): Diagnostic;
     export function createCompilerDiagnostic(message: DiagnosticMessage): Diagnostic {
-        var text = getLocaleSpecificMessage(message.key);
+        let text = getLocaleSpecificMessage(message.key);
 
         if (arguments.length > 1) {
             text = formatStringFromArgs(text, arguments, 1);
@@ -310,7 +317,7 @@ module ts {
 
     export function chainDiagnosticMessages(details: DiagnosticMessageChain, message: DiagnosticMessage, ...args: any[]): DiagnosticMessageChain;
     export function chainDiagnosticMessages(details: DiagnosticMessageChain, message: DiagnosticMessage): DiagnosticMessageChain {
-        var text = getLocaleSpecificMessage(message.key);
+        let text = getLocaleSpecificMessage(message.key);
 
         if (arguments.length > 2) {
             text = formatStringFromArgs(text, arguments, 2);
@@ -354,10 +361,10 @@ module ts {
     function compareMessageText(text1: string | DiagnosticMessageChain, text2: string | DiagnosticMessageChain): Comparison {
         while (text1 && text2) {
             // We still have both chains.
-            var string1 = typeof text1 === "string" ? text1 : text1.messageText;
-            var string2 = typeof text2 === "string" ? text2 : text2.messageText;
+            let string1 = typeof text1 === "string" ? text1 : text1.messageText;
+            let string2 = typeof text2 === "string" ? text2 : text2.messageText;
 
-            var res = compareValues(string1, string2);
+            let res = compareValues(string1, string2);
             if (res) {
                 return res;
             }
@@ -384,11 +391,11 @@ module ts {
             return diagnostics;
         }
 
-        var newDiagnostics = [diagnostics[0]];
-        var previousDiagnostic = diagnostics[0];
-        for (var i = 1; i < diagnostics.length; i++) {
-            var currentDiagnostic = diagnostics[i];
-            var isDupe = compareDiagnostics(currentDiagnostic, previousDiagnostic) === Comparison.EqualTo;
+        let newDiagnostics = [diagnostics[0]];
+        let previousDiagnostic = diagnostics[0];
+        for (let i = 1; i < diagnostics.length; i++) {
+            let currentDiagnostic = diagnostics[i];
+            let isDupe = compareDiagnostics(currentDiagnostic, previousDiagnostic) === Comparison.EqualTo;
             if (!isDupe) {
                 newDiagnostics.push(currentDiagnostic);
                 previousDiagnostic = currentDiagnostic;
@@ -406,9 +413,9 @@ module ts {
     export function getRootLength(path: string): number {
         if (path.charCodeAt(0) === CharacterCodes.slash) {
             if (path.charCodeAt(1) !== CharacterCodes.slash) return 1;
-            var p1 = path.indexOf("/", 2);
+            let p1 = path.indexOf("/", 2);
             if (p1 < 0) return 2;
-            var p2 = path.indexOf("/", p1 + 1);
+            let p2 = path.indexOf("/", p1 + 1);
             if (p2 < 0) return p1 + 1;
             return p2 + 1;
         }
@@ -419,12 +426,11 @@ module ts {
         return 0;
     }
 
-    export var directorySeparator = "/";
+    export let directorySeparator = "/";
     function getNormalizedParts(normalizedSlashedPath: string, rootLength: number) {
-        var parts = normalizedSlashedPath.substr(rootLength).split(directorySeparator);
-        var normalized: string[] = [];
-        for (var i = 0; i < parts.length; i++) {
-            var part = parts[i];
+        let parts = normalizedSlashedPath.substr(rootLength).split(directorySeparator);
+        let normalized: string[] = [];
+        for (let part of parts) {
             if (part !== ".") {
                 if (part === ".." && normalized.length > 0 && normalized[normalized.length - 1] !== "..") {
                     normalized.pop();
@@ -443,9 +449,9 @@ module ts {
     }
 
     export function normalizePath(path: string): string {
-        var path = normalizeSlashes(path);
-        var rootLength = getRootLength(path);
-        var normalized = getNormalizedParts(path, rootLength);
+        path = normalizeSlashes(path);
+        let rootLength = getRootLength(path);
+        let normalized = getNormalizedParts(path, rootLength);
         return path.substr(0, rootLength) + normalized.join(directorySeparator);
     }
 
@@ -462,13 +468,13 @@ module ts {
     }
 
     function normalizedPathComponents(path: string, rootLength: number) {
-        var normalizedParts = getNormalizedParts(path, rootLength);
+        let normalizedParts = getNormalizedParts(path, rootLength);
         return [path.substr(0, rootLength)].concat(normalizedParts);
     }
 
     export function getNormalizedPathComponents(path: string, currentDirectory: string) {
-        var path = normalizeSlashes(path);
-        var rootLength = getRootLength(path);
+        path = normalizeSlashes(path);
+        let rootLength = getRootLength(path);
         if (rootLength == 0) {
             // If the path is not rooted it is relative to current directory
             path = combinePaths(normalizeSlashes(currentDirectory), path);
@@ -493,9 +499,9 @@ module ts {
         // In this example the root is:  http://www.website.com/ 
         // normalized path components should be ["http://www.website.com/", "folder1", "folder2"]
 
-        var urlLength = url.length;
+        let urlLength = url.length;
         // Initial root length is http:// part
-        var rootLength = url.indexOf("://") + "://".length;
+        let rootLength = url.indexOf("://") + "://".length;
         while (rootLength < urlLength) {
             // Consume all immediate slashes in the protocol 
             // eg.initial rootlength is just file:// but it needs to consume another "/" in file:///
@@ -514,7 +520,7 @@ module ts {
         }
 
         // Find the index of "/" after website.com so the root can be http://www.website.com/ (from existing http://)
-        var indexOfNextSlash = url.indexOf(directorySeparator, rootLength);
+        let indexOfNextSlash = url.indexOf(directorySeparator, rootLength);
         if (indexOfNextSlash !== -1) {
             // Found the "/" after the website.com so the root is length of http://www.website.com/ 
             // and get components afetr the root normally like any other folder components
@@ -540,8 +546,8 @@ module ts {
     }
 
     export function getRelativePathToDirectoryOrUrl(directoryPathOrUrl: string, relativeOrAbsolutePath: string, currentDirectory: string, getCanonicalFileName: (fileName: string) => string, isAbsolutePathAnUrl: boolean) {
-        var pathComponents = getNormalizedPathOrUrlComponents(relativeOrAbsolutePath, currentDirectory);
-        var directoryComponents = getNormalizedPathOrUrlComponents(directoryPathOrUrl, currentDirectory);
+        let pathComponents = getNormalizedPathOrUrlComponents(relativeOrAbsolutePath, currentDirectory);
+        let directoryComponents = getNormalizedPathOrUrlComponents(directoryPathOrUrl, currentDirectory);
         if (directoryComponents.length > 1 && directoryComponents[directoryComponents.length - 1] === "") {
             // If the directory path given was of type test/cases/ then we really need components of directory to be only till its name
             // that is  ["test", "cases", ""] needs to be actually ["test", "cases"]
@@ -557,8 +563,8 @@ module ts {
 
         // Get the relative path
         if (joinStartIndex) {
-            var relativePath = "";
-            var relativePathComponents = pathComponents.slice(joinStartIndex, pathComponents.length);
+            let relativePath = "";
+            let relativePathComponents = pathComponents.slice(joinStartIndex, pathComponents.length);
             for (; joinStartIndex < directoryComponents.length; joinStartIndex++) {
                 if (directoryComponents[joinStartIndex] !== "") {
                     relativePath = relativePath + ".." + directorySeparator;
@@ -569,7 +575,7 @@ module ts {
         }
 
         // Cant find the relative path, get the absolute path
-        var absolutePath = getNormalizedPathFromPathComponents(pathComponents);
+        let absolutePath = getNormalizedPathFromPathComponents(pathComponents);
         if (isAbsolutePathAnUrl && isRootedDiskPath(absolutePath)) {
             absolutePath = "file:///" + absolutePath;
         }
@@ -578,7 +584,7 @@ module ts {
     }
 
     export function getBaseFileName(path: string) {
-        var i = path.lastIndexOf(directorySeparator);
+        let i = path.lastIndexOf(directorySeparator);
         return i < 0 ? path : path.substring(i + 1);
     }
 
@@ -591,16 +597,15 @@ module ts {
     }
 
     export function fileExtensionIs(path: string, extension: string): boolean {
-        var pathLen = path.length;
-        var extLen = extension.length;
+        let pathLen = path.length;
+        let extLen = extension.length;
         return pathLen > extLen && path.substr(pathLen - extLen, extLen) === extension;
     }
 
-    var supportedExtensions = [".d.ts", ".ts", ".js"];
+    let supportedExtensions = [".d.ts", ".ts", ".js"];
 
     export function removeFileExtension(path: string): string {
-        for (var i = 0; i < supportedExtensions.length; i++) {
-            var ext = supportedExtensions[i];
+        for (let ext of supportedExtensions) {
 
             if (fileExtensionIs(path, ext)) {
                 return path.substr(0, path.length - ext.length);
@@ -610,9 +615,9 @@ module ts {
         return path;
     }
 
-    var backslashOrDoubleQuote = /[\"\\]/g;
-    var escapedCharsRegExp = /[\u0000-\u001f\t\v\f\b\r\n\u2028\u2029\u0085]/g;
-    var escapedCharsMap: Map<string> = {
+    let backslashOrDoubleQuote = /[\"\\]/g;
+    let escapedCharsRegExp = /[\u0000-\u001f\t\v\f\b\r\n\u2028\u2029\u0085]/g;
+    let escapedCharsMap: Map<string> = {
         "\0": "\\0",
         "\t": "\\t",
         "\v": "\\v",
@@ -651,7 +656,7 @@ module ts {
     function Signature(checker: TypeChecker) {
     }
 
-    export var objectAllocator: ObjectAllocator = {
+    export let objectAllocator: ObjectAllocator = {
         getNodeConstructor: kind => {
             function Node() {
             }
@@ -677,7 +682,7 @@ module ts {
     }
 
     export module Debug {
-        var currentAssertionLevel = AssertionLevel.None;
+        let currentAssertionLevel = AssertionLevel.None;
 
         export function shouldAssert(level: AssertionLevel): boolean {
             return currentAssertionLevel >= level;
@@ -685,7 +690,7 @@ module ts {
 
         export function assert(expression: boolean, message?: string, verboseDebugInfo?: () => string): void {
             if (!expression) {
-                var verboseDebugString = "";
+                let verboseDebugString = "";
                 if (verboseDebugInfo) {
                     verboseDebugString = "\r\nVerbose Debug Information: " + verboseDebugInfo();
                 }
diff --git a/src/compiler/diagnosticInformationMap.generated.ts b/src/compiler/diagnosticInformationMap.generated.ts
index 24ed8ce4e99..d40fcd25ce0 100644
--- a/src/compiler/diagnosticInformationMap.generated.ts
+++ b/src/compiler/diagnosticInformationMap.generated.ts
@@ -327,7 +327,6 @@ module ts {
         Property_0_does_not_exist_on_const_enum_1: { code: 2479, category: DiagnosticCategory.Error, key: "Property '{0}' does not exist on 'const' enum '{1}'." },
         let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations: { code: 2480, category: DiagnosticCategory.Error, key: "'let' is not allowed to be used as a name in 'let' or 'const' declarations." },
         Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1: { code: 2481, category: DiagnosticCategory.Error, key: "Cannot initialize outer scoped variable '{0}' in the same scope as block scoped declaration '{1}'." },
-        for_of_statements_are_only_available_when_targeting_ECMAScript_6_or_higher: { code: 2482, category: DiagnosticCategory.Error, key: "'for...of' statements are only available when targeting ECMAScript 6 or higher." },
         The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: { code: 2483, category: DiagnosticCategory.Error, key: "The left-hand side of a 'for...of' statement cannot use a type annotation." },
         Export_declaration_conflicts_with_exported_declaration_of_0: { code: 2484, category: DiagnosticCategory.Error, key: "Export declaration conflicts with exported declaration of '{0}'" },
         The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant: { code: 2485, category: DiagnosticCategory.Error, key: "The left-hand side of a 'for...of' statement cannot be a previously defined constant." },
@@ -338,6 +337,9 @@ module ts {
         The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: { code: 2490, category: DiagnosticCategory.Error, key: "The type returned by the 'next()' method of an iterator must have a 'value' property." },
         The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern: { code: 2491, category: DiagnosticCategory.Error, key: "The left-hand side of a 'for...in' statement cannot be a destructuring pattern." },
         Cannot_redeclare_identifier_0_in_catch_clause: { code: 2492, category: DiagnosticCategory.Error, key: "Cannot redeclare identifier '{0}' in catch clause" },
+        Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2: { code: 2493, category: DiagnosticCategory.Error, key: "Tuple type '{0}' with length '{1}' cannot be assigned to tuple with length '{2}'." },
+        Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher: { code: 2494, category: DiagnosticCategory.Error, key: "Using a string in a 'for...of' statement is only supported in ECMAScript 5 and higher." },
+        Type_0_is_not_an_array_type_or_a_string_type: { code: 2461, category: DiagnosticCategory.Error, key: "Type '{0}' is not an array type or a string type." },
         Import_declaration_0_is_using_private_name_1: { code: 4000, category: DiagnosticCategory.Error, key: "Import declaration '{0}' is using private name '{1}'." },
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: DiagnosticCategory.Error, key: "Type parameter '{0}' of exported class has or is using private name '{1}'." },
         Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4004, category: DiagnosticCategory.Error, key: "Type parameter '{0}' of exported interface has or is using private name '{1}'." },
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 40f7d55f9f0..c4121e92251 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -1299,10 +1299,6 @@
         "category": "Error",
         "code": 2481
     },
-    "'for...of' statements are only available when targeting ECMAScript 6 or higher.": {
-        "category": "Error",
-        "code": 2482
-    },
     "The left-hand side of a 'for...of' statement cannot use a type annotation.": {
         "category": "Error",
         "code": 2483
@@ -1343,6 +1339,18 @@
         "category": "Error",
         "code": 2492
     },
+    "Tuple type '{0}' with length '{1}' cannot be assigned to tuple with length '{2}'.": {
+        "category": "Error",
+        "code": 2493
+    },
+    "Using a string in a 'for...of' statement is only supported in ECMAScript 5 and higher.": {
+        "category": "Error",
+        "code": 2494
+    },
+    "Type '{0}' is not an array type or a string type.": {
+        "category": "Error",
+        "code": 2461
+    },
 
     "Import declaration '{0}' is using private name '{1}'.": {
         "category": "Error",
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index a592c033c22..496d50780c8 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -54,7 +54,7 @@ module ts {
         referencePathsOutput: string;
     }
 
-    var indentStrings: string[] = ["", "    "];
+    let indentStrings: string[] = ["", "    "];
     export function getIndentString(level: number) {
         if (indentStrings[level] === undefined) {
             indentStrings[level] = getIndentString(level - 1) + indentStrings[1];
@@ -81,11 +81,11 @@ module ts {
     }
 
     function createTextWriter(newLine: String): EmitTextWriter {
-        var output = "";
-        var indent = 0;
-        var lineStart = true;
-        var lineCount = 0;
-        var linePos = 0;
+        let output = "";
+        let indent = 0;
+        let lineStart = true;
+        let lineCount = 0;
+        let linePos = 0;
 
         function write(s: string) {
             if (s && s.length) {
@@ -109,7 +109,7 @@ module ts {
         function writeLiteral(s: string) {
             if (s && s.length) {
                 write(s);
-                var lineStartsOfS = computeLineStarts(s);
+                let lineStartsOfS = computeLineStarts(s);
                 if (lineStartsOfS.length > 1) {
                     lineCount = lineCount + lineStartsOfS.length - 1;
                     linePos = output.length - s.length + lineStartsOfS[lineStartsOfS.length - 1];
@@ -160,7 +160,7 @@ module ts {
 
     function emitComments(currentSourceFile: SourceFile, writer: EmitTextWriter, comments: CommentRange[], trailingSeparator: boolean, newLine: string,
                           writeComment: (currentSourceFile: SourceFile, writer: EmitTextWriter, comment: CommentRange, newLine: string) => void) {
-        var emitLeadingSpace = !trailingSeparator;
+        let emitLeadingSpace = !trailingSeparator;
         forEach(comments, comment => {
             if (emitLeadingSpace) {
                 writer.write(" ");
@@ -182,11 +182,11 @@ module ts {
 
     function writeCommentRange(currentSourceFile: SourceFile, writer: EmitTextWriter, comment: CommentRange, newLine: string){
         if (currentSourceFile.text.charCodeAt(comment.pos + 1) === CharacterCodes.asterisk) {
-            var firstCommentLineAndCharacter = getLineAndCharacterOfPosition(currentSourceFile, comment.pos);
-            var lineCount = getLineStarts(currentSourceFile).length;
-            var firstCommentLineIndent: number;
-            for (var pos = comment.pos, currentLine = firstCommentLineAndCharacter.line; pos < comment.end; currentLine++) {
-                var nextLineStart = (currentLine + 1) === lineCount
+            let firstCommentLineAndCharacter = getLineAndCharacterOfPosition(currentSourceFile, comment.pos);
+            let lineCount = getLineStarts(currentSourceFile).length;
+            let firstCommentLineIndent: number;
+            for (let pos = comment.pos, currentLine = firstCommentLineAndCharacter.line; pos < comment.end; currentLine++) {
+                let nextLineStart = (currentLine + 1) === lineCount
                     ? currentSourceFile.text.length + 1
                     : getStartPositionOfLine(currentLine + 1, currentSourceFile);
 
@@ -197,7 +197,7 @@ module ts {
                     }
 
                     // These are number of spaces writer is going to write at current indent
-                    var currentWriterIndentSpacing = writer.getIndent() * getIndentSize();
+                    let currentWriterIndentSpacing = writer.getIndent() * getIndentSize();
 
                     // Number of spaces we want to be writing
                     // eg: Assume writer indent
@@ -213,10 +213,10 @@ module ts {
                     //            More right indented comment */                  --4 = 8 - 4 + 11
                     //     class c { }
                     // }
-                    var spacesToEmit = currentWriterIndentSpacing - firstCommentLineIndent + calculateIndent(pos, nextLineStart);
+                    let spacesToEmit = currentWriterIndentSpacing - firstCommentLineIndent + calculateIndent(pos, nextLineStart);
                     if (spacesToEmit > 0) {
-                        var numberOfSingleSpacesToEmit = spacesToEmit % getIndentSize();
-                        var indentSizeSpaceString = getIndentString((spacesToEmit - numberOfSingleSpacesToEmit) / getIndentSize());
+                        let numberOfSingleSpacesToEmit = spacesToEmit % getIndentSize();
+                        let indentSizeSpaceString = getIndentString((spacesToEmit - numberOfSingleSpacesToEmit) / getIndentSize());
 
                         // Write indent size string ( in eg 1: = "", 2: "" , 3: string with 8 spaces 4: string with 12 spaces
                         writer.rawWrite(indentSizeSpaceString);
@@ -245,8 +245,8 @@ module ts {
         }
 
         function writeTrimmedCurrentLine(pos: number, nextLineStart: number) {
-            var end = Math.min(comment.end, nextLineStart - 1);
-            var currentLineText = currentSourceFile.text.substring(pos, end).replace(/^\s+|\s+$/g, '');
+            let end = Math.min(comment.end, nextLineStart - 1);
+            let currentLineText = currentSourceFile.text.substring(pos, end).replace(/^\s+|\s+$/g, '');
             if (currentLineText) {
                 // trimmed forward and ending spaces text
                 writer.write(currentLineText);
@@ -261,7 +261,7 @@ module ts {
         }
 
         function calculateIndent(pos: number, end: number) {
-            var currentLineIndent = 0;
+            let currentLineIndent = 0;
             for (; pos < end && isWhiteSpace(currentSourceFile.text.charCodeAt(pos)); pos++) {
                 if (currentSourceFile.text.charCodeAt(pos) === CharacterCodes.tab) {
                     // Tabs = TabSize = indent size and go to next tabStop
@@ -286,9 +286,9 @@ module ts {
     }
 
     function getAllAccessorDeclarations(declarations: NodeArray<Declaration>, accessor: AccessorDeclaration) {
-        var firstAccessor: AccessorDeclaration;
-        var getAccessor: AccessorDeclaration;
-        var setAccessor: AccessorDeclaration;
+        let firstAccessor: AccessorDeclaration;
+        let getAccessor: AccessorDeclaration;
+        let setAccessor: AccessorDeclaration;
         if (hasDynamicName(accessor)) {
             firstAccessor = accessor;
             if (accessor.kind === SyntaxKind.GetAccessor) {
@@ -305,8 +305,8 @@ module ts {
             forEach(declarations, (member: Declaration) => {
                 if ((member.kind === SyntaxKind.GetAccessor || member.kind === SyntaxKind.SetAccessor)
                     && (member.flags & NodeFlags.Static) === (accessor.flags & NodeFlags.Static)) {
-                    var memberName = getPropertyNameForPropertyNameNode(member.name);
-                    var accessorName = getPropertyNameForPropertyNameNode(accessor.name);
+                    let memberName = getPropertyNameForPropertyNameNode(member.name);
+                    let accessorName = getPropertyNameForPropertyNameNode(accessor.name);
                     if (memberName === accessorName) {
                         if (!firstAccessor) {
                             firstAccessor = <AccessorDeclaration>member;
@@ -331,18 +331,19 @@ module ts {
     }
 
     function getSourceFilePathInNewDir(sourceFile: SourceFile, host: EmitHost, newDirPath: string) {
-        var sourceFilePath = getNormalizedAbsolutePath(sourceFile.fileName, host.getCurrentDirectory());
+        let sourceFilePath = getNormalizedAbsolutePath(sourceFile.fileName, host.getCurrentDirectory());
         sourceFilePath = sourceFilePath.replace(host.getCommonSourceDirectory(), "");
         return combinePaths(newDirPath, sourceFilePath);
     }
 
     function getOwnEmitOutputFilePath(sourceFile: SourceFile, host: EmitHost, extension: string){
-        var compilerOptions = host.getCompilerOptions();
+        let compilerOptions = host.getCompilerOptions();
+        let emitOutputFilePathWithoutExtension: string;
         if (compilerOptions.outDir) {
-            var emitOutputFilePathWithoutExtension = removeFileExtension(getSourceFilePathInNewDir(sourceFile, host, compilerOptions.outDir));
+            emitOutputFilePathWithoutExtension = removeFileExtension(getSourceFilePathInNewDir(sourceFile, host, compilerOptions.outDir));
         }
         else {
-            var emitOutputFilePathWithoutExtension = removeFileExtension(sourceFile.fileName);
+            emitOutputFilePathWithoutExtension = removeFileExtension(sourceFile.fileName);
         }
 
         return emitOutputFilePathWithoutExtension + extension;
@@ -355,37 +356,37 @@ module ts {
     }
 
     function emitDeclarations(host: EmitHost, resolver: EmitResolver, diagnostics: Diagnostic[], jsFilePath: string, root?: SourceFile): DeclarationEmit {
-        var newLine = host.getNewLine();
-        var compilerOptions = host.getCompilerOptions();
-        var languageVersion = compilerOptions.target || ScriptTarget.ES3;
+        let newLine = host.getNewLine();
+        let compilerOptions = host.getCompilerOptions();
+        let languageVersion = compilerOptions.target || ScriptTarget.ES3;
 
-        var write: (s: string) => void;
-        var writeLine: () => void;
-        var increaseIndent: () => void;
-        var decreaseIndent: () => void;
-        var writeTextOfNode: (sourceFile: SourceFile, node: Node) => void;
+        let write: (s: string) => void;
+        let writeLine: () => void;
+        let increaseIndent: () => void;
+        let decreaseIndent: () => void;
+        let writeTextOfNode: (sourceFile: SourceFile, node: Node) => void;
 
-        var writer = createAndSetNewTextWriterWithSymbolWriter();
+        let writer = createAndSetNewTextWriterWithSymbolWriter();
 
-        var enclosingDeclaration: Node;
-        var currentSourceFile: SourceFile;
-        var reportedDeclarationError = false;
-        var emitJsDocComments = compilerOptions.removeComments ? function (declaration: Node) { } : writeJsDocComments;
-        var emit = compilerOptions.stripInternal ? stripInternal : emitNode;
+        let enclosingDeclaration: Node;
+        let currentSourceFile: SourceFile;
+        let reportedDeclarationError = false;
+        let emitJsDocComments = compilerOptions.removeComments ? function (declaration: Node) { } : writeJsDocComments;
+        let emit = compilerOptions.stripInternal ? stripInternal : emitNode;
 
-        var aliasDeclarationEmitInfo: AliasDeclarationEmitInfo[] = [];
+        let aliasDeclarationEmitInfo: AliasDeclarationEmitInfo[] = [];
 
         // Contains the reference paths that needs to go in the declaration file.
         // Collecting this separately because reference paths need to be first thing in the declaration file
         // and we could be collecting these paths from multiple files into single one with --out option
-        var referencePathsOutput = "";
+        let referencePathsOutput = "";
 
         if (root) {
             // Emitting just a single file, so emit references in this file only
             if (!compilerOptions.noResolve) {
-                var addedGlobalFileReference = false;
+                let addedGlobalFileReference = false;
                 forEach(root.referencedFiles, fileReference => {
-                    var referencedFile = tryResolveScriptReference(host, root, fileReference);
+                    let referencedFile = tryResolveScriptReference(host, root, fileReference);
 
                     // All the references that are not going to be part of same file
                     if (referencedFile && ((referencedFile.flags & NodeFlags.DeclarationFile) || // This is a declare file reference
@@ -404,13 +405,13 @@ module ts {
         }
         else {
             // Emit references corresponding to this file
-            var emittedReferencedFiles: SourceFile[] = [];
+            let emittedReferencedFiles: SourceFile[] = [];
             forEach(host.getSourceFiles(), sourceFile => {
                 if (!isExternalModuleOrDeclarationFile(sourceFile)) {
                     // Check what references need to be added
                     if (!compilerOptions.noResolve) {
                         forEach(sourceFile.referencedFiles, fileReference => {
-                            var referencedFile = tryResolveScriptReference(host, sourceFile, fileReference);
+                            let referencedFile = tryResolveScriptReference(host, sourceFile, fileReference);
 
                             // If the reference file is a declaration file or an external module, emit that reference
                             if (referencedFile && (isExternalModuleOrDeclarationFile(referencedFile) &&
@@ -435,14 +436,14 @@ module ts {
         }
 
         function hasInternalAnnotation(range: CommentRange) {
-            var text = currentSourceFile.text;
-            var comment = text.substring(range.pos, range.end);
+            let text = currentSourceFile.text;
+            let comment = text.substring(range.pos, range.end);
             return comment.indexOf("@internal") >= 0;
         }
 
         function stripInternal(node: Node) {
             if (node) {
-                var leadingCommentRanges = getLeadingCommentRanges(currentSourceFile.text, node.pos);
+                let leadingCommentRanges = getLeadingCommentRanges(currentSourceFile.text, node.pos);
                 if (forEach(leadingCommentRanges, hasInternalAnnotation)) {
                     return;
                 }
@@ -452,7 +453,7 @@ module ts {
         }
 
         function createAndSetNewTextWriterWithSymbolWriter(): EmitTextWriterWithSymbolWriter {
-            var writer = <EmitTextWriterWithSymbolWriter>createTextWriter(newLine);
+            let writer = <EmitTextWriterWithSymbolWriter>createTextWriter(newLine);
             writer.trackSymbol = trackSymbol;
             writer.writeKeyword = writer.write;
             writer.writeOperator = writer.write;
@@ -475,9 +476,9 @@ module ts {
         }
 
         function writeAsychronousImportEqualsDeclarations(importEqualsDeclarations: ImportEqualsDeclaration[]) {
-            var oldWriter = writer;
+            let oldWriter = writer;
             forEach(importEqualsDeclarations, aliasToWrite => {
-                var aliasEmitInfo = forEach(aliasDeclarationEmitInfo, declEmitInfo => declEmitInfo.declaration === aliasToWrite ? declEmitInfo : undefined);
+                let aliasEmitInfo = forEach(aliasDeclarationEmitInfo, declEmitInfo => declEmitInfo.declaration === aliasToWrite ? declEmitInfo : undefined);
                 // If the alias was marked as not visible when we saw its declaration, we would have saved the aliasEmitInfo, but if we haven't yet visited the alias declaration
                 // then we don't need to write it at this point. We will write it when we actually see its declaration
                 // Eg.
@@ -487,7 +488,7 @@ module ts {
                 // we would write alias foo declaration when we visit it since it would now be marked as visible
                 if (aliasEmitInfo) {
                     createAndSetNewTextWriterWithSymbolWriter();
-                    for (var declarationIndent = aliasEmitInfo.indent; declarationIndent; declarationIndent--) {
+                    for (let declarationIndent = aliasEmitInfo.indent; declarationIndent; declarationIndent--) {
                         increaseIndent();
                     }
                     writeImportEqualsDeclaration(aliasToWrite);
@@ -507,7 +508,7 @@ module ts {
             else {
                 // Report error
                 reportedDeclarationError = true;
-                var errorInfo = writer.getSymbolAccessibilityDiagnostic(symbolAccesibilityResult);
+                let errorInfo = writer.getSymbolAccessibilityDiagnostic(symbolAccesibilityResult);
                 if (errorInfo) {
                     if (errorInfo.typeName) {
                         diagnostics.push(createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode,
@@ -555,19 +556,19 @@ module ts {
         }
 
         function emitLines(nodes: Node[]) {
-            for (var i = 0, n = nodes.length; i < n; i++) {
-                emit(nodes[i]);
+            for (let node of nodes) {
+                emit(node);
             }
         }
 
         function emitSeparatedList(nodes: Node[], separator: string, eachNodeEmitFn: (node: Node) => void) {
-            var currentWriterPos = writer.getTextPos();
-            for (var i = 0, n = nodes.length; i < n; i++) {
+            let currentWriterPos = writer.getTextPos();
+            for (let node of nodes) {
                 if (currentWriterPos !== writer.getTextPos()) {
                     write(separator);
                 }
                 currentWriterPos = writer.getTextPos();
-                eachNodeEmitFn(nodes[i]);
+                eachNodeEmitFn(node);
             }
         }
 
@@ -577,7 +578,7 @@ module ts {
 
         function writeJsDocComments(declaration: Node) {
             if (declaration) {
-                var jsDocComments = getJsDocComments(declaration, currentSourceFile);
+                let jsDocComments = getJsDocComments(declaration, currentSourceFile);
                 emitNewLineBeforeLeadingComments(currentSourceFile, writer, declaration, jsDocComments);
                 // jsDoc comments are emitted at /*leading comment1 */space/*leading comment*/space
                 emitComments(currentSourceFile, writer, jsDocComments, /*trailingSeparator*/ true, newLine, writeCommentRange);
@@ -625,7 +626,7 @@ module ts {
             }
 
             function emitEntityName(entityName: EntityName) {
-                var visibilityResult = resolver.isEntityNameVisible(entityName,
+                let visibilityResult = resolver.isEntityNameVisible(entityName,
                     // Aliases can be written asynchronously so use correct enclosing declaration
                     entityName.parent.kind === SyntaxKind.ImportEqualsDeclaration ? entityName.parent : enclosingDeclaration);
 
@@ -637,7 +638,7 @@ module ts {
                         writeTextOfNode(currentSourceFile, entityName);
                     }
                     else {
-                        var qualifiedName = <QualifiedName>entityName;
+                        let qualifiedName = <QualifiedName>entityName;
                         writeEntityName(qualifiedName.left);
                         write(".");
                         writeTextOfNode(currentSourceFile, qualifiedName.right);
@@ -734,7 +735,7 @@ module ts {
         }
 
         function emitImportEqualsDeclaration(node: ImportEqualsDeclaration) {
-            var nodeEmitInfo = {
+            let nodeEmitInfo = {
                 declaration: node,
                 outputPos: writer.getTextPos(),
                 indent: writer.getIndent(),
@@ -787,7 +788,7 @@ module ts {
                     write(".");
                     writeTextOfNode(currentSourceFile, node.name);
                 }
-                var prevEnclosingDeclaration = enclosingDeclaration;
+                let prevEnclosingDeclaration = enclosingDeclaration;
                 enclosingDeclaration = node;
                 write(" {");
                 writeLine();
@@ -842,7 +843,7 @@ module ts {
         function emitEnumMemberDeclaration(node: EnumMember) {
             emitJsDocComments(node);
             writeTextOfNode(currentSourceFile, node.name);
-            var enumMemberValue = resolver.getConstantValue(node);
+            let enumMemberValue = resolver.getConstantValue(node);
             if (enumMemberValue !== undefined) {
                 write(" = ");
                 write(enumMemberValue.toString());
@@ -882,7 +883,7 @@ module ts {
 
                 function getTypeParameterConstraintVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic {
                     // Type parameter constraints are named by user so we should always be able to name it
-                    var diagnosticMessage: DiagnosticMessage;
+                    let diagnosticMessage: DiagnosticMessage;
                     switch (node.parent.kind) {
                         case SyntaxKind.ClassDeclaration:
                             diagnosticMessage = Diagnostics.Type_parameter_0_of_exported_class_has_or_is_using_private_name_1;
@@ -946,7 +947,7 @@ module ts {
                 emitTypeWithNewGetSymbolAccessibilityDiagnostic(node, getHeritageClauseVisibilityError);
 
                 function getHeritageClauseVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic {
-                    var diagnosticMessage: DiagnosticMessage;
+                    let diagnosticMessage: DiagnosticMessage;
                     // Heritage clause is written by user so it can always be named
                     if (node.parent.parent.kind === SyntaxKind.ClassDeclaration) {
                         // Class or Interface implemented/extended is inaccessible
@@ -984,10 +985,10 @@ module ts {
                 emitModuleElementDeclarationFlags(node);
                 write("class ");
                 writeTextOfNode(currentSourceFile, node.name);
-                var prevEnclosingDeclaration = enclosingDeclaration;
+                let prevEnclosingDeclaration = enclosingDeclaration;
                 enclosingDeclaration = node;
                 emitTypeParameters(node.typeParameters);
-                var baseTypeNode = getClassBaseTypeNode(node);
+                let baseTypeNode = getClassBaseTypeNode(node);
                 if (baseTypeNode) {
                     emitHeritageClause([baseTypeNode], /*isImplementsList*/ false);
                 }
@@ -1010,7 +1011,7 @@ module ts {
                 emitModuleElementDeclarationFlags(node);
                 write("interface ");
                 writeTextOfNode(currentSourceFile, node.name);
-                var prevEnclosingDeclaration = enclosingDeclaration;
+                let prevEnclosingDeclaration = enclosingDeclaration;
                 enclosingDeclaration = node;
                 emitTypeParameters(node.typeParameters);
                 emitHeritageClause(getInterfaceBaseTypeNodes(node), /*isImplementsList*/ false);
@@ -1058,7 +1059,7 @@ module ts {
             }
 
             function getVariableDeclarationTypeVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic {
-                var diagnosticMessage: DiagnosticMessage;
+                let diagnosticMessage: DiagnosticMessage;
                 if (node.kind === SyntaxKind.VariableDeclaration) {
                     diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
                     symbolAccesibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ?
@@ -1110,7 +1111,7 @@ module ts {
         }
 
         function emitVariableStatement(node: VariableStatement) {
-            var hasDeclarationWithEmit = forEach(node.declarationList.declarations, varDeclaration => resolver.isDeclarationVisible(varDeclaration));
+            let hasDeclarationWithEmit = forEach(node.declarationList.declarations, varDeclaration => resolver.isDeclarationVisible(varDeclaration));
             if (hasDeclarationWithEmit) {
                 emitJsDocComments(node);
                 emitModuleElementDeclarationFlags(node);
@@ -1134,18 +1135,20 @@ module ts {
                 return;
             }
 
-            var accessors = getAllAccessorDeclarations((<ClassDeclaration>node.parent).members, node);
+            let accessors = getAllAccessorDeclarations((<ClassDeclaration>node.parent).members, node);
+            let accessorWithTypeAnnotation: AccessorDeclaration;
+
             if (node === accessors.firstAccessor) {
                 emitJsDocComments(accessors.getAccessor);
                 emitJsDocComments(accessors.setAccessor);
                 emitClassMemberDeclarationFlags(node);
                 writeTextOfNode(currentSourceFile, node.name);
                 if (!(node.flags & NodeFlags.Private)) {
-                    var accessorWithTypeAnnotation: AccessorDeclaration = node;
-                    var type = getTypeAnnotationFromAccessor(node);
+                    accessorWithTypeAnnotation = node;
+                    let type = getTypeAnnotationFromAccessor(node);
                     if (!type) {
                         // couldn't get type for the first accessor, try the another one
-                        var anotherAccessor = node.kind === SyntaxKind.GetAccessor ? accessors.setAccessor : accessors.getAccessor;
+                        let anotherAccessor = node.kind === SyntaxKind.GetAccessor ? accessors.setAccessor : accessors.getAccessor;
                         type = getTypeAnnotationFromAccessor(anotherAccessor);
                         if (type) {
                             accessorWithTypeAnnotation = anotherAccessor;
@@ -1168,7 +1171,7 @@ module ts {
             }
 
             function getAccessorDeclarationTypeVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic {
-                var diagnosticMessage: DiagnosticMessage;
+                let diagnosticMessage: DiagnosticMessage;
                 if (accessorWithTypeAnnotation.kind === SyntaxKind.SetAccessor) {
                     // Setters have to have type named and cannot infer it so, the type should always be named
                     if (accessorWithTypeAnnotation.parent.flags & NodeFlags.Static) {
@@ -1263,7 +1266,7 @@ module ts {
                 write("(");
             }
 
-            var prevEnclosingDeclaration = enclosingDeclaration;
+            let prevEnclosingDeclaration = enclosingDeclaration;
             enclosingDeclaration = node;
 
             // Parameters
@@ -1277,7 +1280,7 @@ module ts {
             }
 
             // If this is not a constructor and is not private, emit the return type
-            var isFunctionTypeOrConstructorType = node.kind === SyntaxKind.FunctionType || node.kind === SyntaxKind.ConstructorType;
+            let isFunctionTypeOrConstructorType = node.kind === SyntaxKind.FunctionType || node.kind === SyntaxKind.ConstructorType;
             if (isFunctionTypeOrConstructorType || node.parent.kind === SyntaxKind.TypeLiteral) {
                 // Emit type literal signature return type only if specified
                 if (node.type) {
@@ -1297,7 +1300,7 @@ module ts {
             }
 
             function getReturnTypeVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic {
-                var diagnosticMessage: DiagnosticMessage;
+                let diagnosticMessage: DiagnosticMessage;
                 switch (node.kind) {
                     case SyntaxKind.ConstructSignature:
                         // Interfaces cannot have return types that cannot be named
@@ -1390,7 +1393,7 @@ module ts {
             }
 
             function getParameterDeclarationTypeVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic {
-                var diagnosticMessage: DiagnosticMessage;
+                let diagnosticMessage: DiagnosticMessage;
                 switch (node.parent.kind) {
                     case SyntaxKind.Constructor:
                         diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
@@ -1499,7 +1502,7 @@ module ts {
         }
 
         function writeReferencePath(referencedFile: SourceFile) {
-            var declFileName = referencedFile.flags & NodeFlags.DeclarationFile
+            let declFileName = referencedFile.flags & NodeFlags.DeclarationFile
                 ? referencedFile.fileName // Declaration file, use declaration file name
                 : shouldEmitToOwnFile(referencedFile, compilerOptions)
                     ? getOwnEmitOutputFilePath(referencedFile, host, ".d.ts") // Own output file so get the .d.ts file
@@ -1517,8 +1520,8 @@ module ts {
     }
 
     export function getDeclarationDiagnostics(host: EmitHost, resolver: EmitResolver, targetSourceFile: SourceFile): Diagnostic[] {
-        var diagnostics: Diagnostic[] = [];
-        var jsFilePath = getOwnEmitOutputFilePath(targetSourceFile, host, ".js");
+        let diagnostics: Diagnostic[] = [];
+        let jsFilePath = getOwnEmitOutputFilePath(targetSourceFile, host, ".js");
         emitDeclarations(host, resolver, diagnostics, jsFilePath, targetSourceFile);
         return diagnostics;
     }
@@ -1526,16 +1529,16 @@ module ts {
     // @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 {
-        var compilerOptions = host.getCompilerOptions();
-        var languageVersion = compilerOptions.target || ScriptTarget.ES3;
-        var sourceMapDataList: SourceMapData[] = compilerOptions.sourceMap ? [] : undefined;
-        var diagnostics: Diagnostic[] = [];
-        var newLine = host.getNewLine();
+        let compilerOptions = host.getCompilerOptions();
+        let languageVersion = compilerOptions.target || ScriptTarget.ES3;
+        let sourceMapDataList: SourceMapData[] = compilerOptions.sourceMap ? [] : undefined;
+        let diagnostics: Diagnostic[] = [];
+        let newLine = host.getNewLine();
 
         if (targetSourceFile === undefined) {
             forEach(host.getSourceFiles(), sourceFile => {
                 if (shouldEmitToOwnFile(sourceFile, compilerOptions)) {
-                    var jsFilePath = getOwnEmitOutputFilePath(sourceFile, host, ".js");
+                    let jsFilePath = getOwnEmitOutputFilePath(sourceFile, host, ".js");
                     emitFile(jsFilePath, sourceFile);
                 }
             });
@@ -1547,7 +1550,7 @@ module ts {
         else {
             // targetSourceFile is specified (e.g calling emitter from language service or calling getSemanticDiagnostic from language service)
             if (shouldEmitToOwnFile(targetSourceFile, compilerOptions)) {
-                var jsFilePath = getOwnEmitOutputFilePath(targetSourceFile, host, ".js");
+                let jsFilePath = getOwnEmitOutputFilePath(targetSourceFile, host, ".js");
                 emitFile(jsFilePath, targetSourceFile);
             }
             else if (!isDeclarationFile(targetSourceFile) && compilerOptions.out) {
@@ -1565,57 +1568,57 @@ module ts {
         };
 
         function emitJavaScript(jsFilePath: string, root?: SourceFile) {
-            var writer = createTextWriter(newLine);
-            var write = writer.write;
-            var writeTextOfNode = writer.writeTextOfNode;
-            var writeLine = writer.writeLine;
-            var increaseIndent = writer.increaseIndent;
-            var decreaseIndent = writer.decreaseIndent;
-            var preserveNewLines = compilerOptions.preserveNewLines || false;
+            let writer = createTextWriter(newLine);
+            let write = writer.write;
+            let writeTextOfNode = writer.writeTextOfNode;
+            let writeLine = writer.writeLine;
+            let increaseIndent = writer.increaseIndent;
+            let decreaseIndent = writer.decreaseIndent;
+            let preserveNewLines = compilerOptions.preserveNewLines || false;
 
-            var currentSourceFile: SourceFile;
+            let currentSourceFile: SourceFile;
 
-            var lastFrame: ScopeFrame;
-            var currentScopeNames: Map<string>;
+            let lastFrame: ScopeFrame;
+            let currentScopeNames: Map<string>;
 
-            var generatedBlockScopeNames: string[];
+            let generatedBlockScopeNames: string[];
 
-            var extendsEmitted = false;
-            var tempCount = 0;
-            var tempVariables: Identifier[];
-            var tempParameters: Identifier[];
-            var externalImports: ExternalImportInfo[];
-            var exportSpecifiers: Map<ExportSpecifier[]>;
-            var exportDefault: FunctionDeclaration | ClassDeclaration | ExportAssignment | ExportSpecifier;
+            let extendsEmitted = false;
+            let tempCount = 0;
+            let tempVariables: Identifier[];
+            let tempParameters: Identifier[];
+            let externalImports: ExternalImportInfo[];
+            let exportSpecifiers: Map<ExportSpecifier[]>;
+            let exportDefault: FunctionDeclaration | ClassDeclaration | ExportAssignment | ExportSpecifier;
 
             /** write emitted output to disk*/
-            var writeEmittedFiles = writeJavaScriptFile;
+            let writeEmittedFiles = writeJavaScriptFile;
 
             /** Emit leading comments of the node */
-            var emitLeadingComments = compilerOptions.removeComments ? (node: Node) => { } : emitLeadingDeclarationComments;
+            let emitLeadingComments = compilerOptions.removeComments ? (node: Node) => { } : emitLeadingDeclarationComments;
 
             /** Emit Trailing comments of the node */
-            var emitTrailingComments = compilerOptions.removeComments ? (node: Node) => { } : emitTrailingDeclarationComments;
+            let emitTrailingComments = compilerOptions.removeComments ? (node: Node) => { } : emitTrailingDeclarationComments;
 
-            var emitLeadingCommentsOfPosition = compilerOptions.removeComments ? (pos: number) => { } : emitLeadingCommentsOfLocalPosition;
+            let emitLeadingCommentsOfPosition = compilerOptions.removeComments ? (pos: number) => { } : emitLeadingCommentsOfLocalPosition;
 
-            var detachedCommentsInfo: { nodePos: number; detachedCommentEndPos: number }[];
+            let detachedCommentsInfo: { nodePos: number; detachedCommentEndPos: number }[];
 
             /** Emit detached comments of the node */
-            var emitDetachedComments = compilerOptions.removeComments ? (node: TextRange) => { } : emitDetachedCommentsAtPosition;
+            let emitDetachedComments = compilerOptions.removeComments ? (node: TextRange) => { } : emitDetachedCommentsAtPosition;
 
-            var writeComment = writeCommentRange;
+            let writeComment = writeCommentRange;
 
             /** Emit a node */
-            var emitNodeWithoutSourceMap = compilerOptions.removeComments ? emitNodeWithoutSourceMapWithoutComments : emitNodeWithoutSourceMapWithComments;
-            var emit = emitNodeWithoutSourceMap;
-            var emitWithoutComments = emitNodeWithoutSourceMapWithoutComments;
+            let emitNodeWithoutSourceMap = compilerOptions.removeComments ? emitNodeWithoutSourceMapWithoutComments : emitNodeWithoutSourceMapWithComments;
+            let emit = emitNodeWithoutSourceMap;
+            let emitWithoutComments = emitNodeWithoutSourceMapWithoutComments;
 
             /** Called just before starting emit of a node */
-            var emitStart = function (node: Node) { };
+            let emitStart = function (node: Node) { };
 
             /** Called once the emit of the node is done */
-            var emitEnd = function (node: Node) { };
+            let emitEnd = function (node: Node) { };
 
             /** Emit the text for the given token that comes after startPos
               * This by default writes the text provided with the given tokenKind
@@ -1623,30 +1626,31 @@ module ts {
               * @param tokenKind the kind of the token to search and emit
               * @param startPos the position in the source to start searching for the token
               * @param emitFn if given will be invoked to emit the text instead of actual token emit */
-            var emitToken = emitTokenText;
+            let emitToken = emitTokenText;
 
             /** Called to before starting the lexical scopes as in function/class in the emitted code because of node
               * @param scopeDeclaration node that starts the lexical scope
               * @param scopeName Optional name of this scope instead of deducing one from the declaration node */
-            var scopeEmitStart = function (scopeDeclaration: Node, scopeName?: string) { }
+            let scopeEmitStart = function (scopeDeclaration: Node, scopeName?: string) { }
 
             /** Called after coming out of the scope */
-            var scopeEmitEnd = function () { }
+            let scopeEmitEnd = function () { }
 
             /** Sourcemap data that will get encoded */
-            var sourceMapData: SourceMapData;
+            let sourceMapData: SourceMapData;
 
             if (compilerOptions.sourceMap) {
                 initializeEmitterWithSourceMaps();
             }
 
             if (root) {
-                emit(root);
+                // Do not call emit directly. It does not set the currentSourceFile.
+                emitSourceFile(root);
             }
             else {
                 forEach(host.getSourceFiles(), sourceFile => {
                     if (!isExternalModuleOrDeclarationFile(sourceFile)) {
-                        emit(sourceFile);
+                        emitSourceFile(sourceFile);
                     }
                 });
             }
@@ -1655,10 +1659,15 @@ module ts {
             writeEmittedFiles(writer.getText(), /*writeByteOrderMark*/ compilerOptions.emitBOM);
             return;
 
+            function emitSourceFile(sourceFile: SourceFile): void {
+                currentSourceFile = sourceFile;
+                emit(sourceFile);
+            }
+
             // enters the new lexical environment
             // return value should be passed to matching call to exitNameScope.
             function enterNameScope(): boolean {
-                var names = currentScopeNames;
+                let names = currentScopeNames;
                 currentScopeNames = undefined;
                 if (names) {
                     lastFrame = { names, previous: lastFrame };
@@ -1678,7 +1687,7 @@ module ts {
             }
 
             function generateUniqueNameForLocation(location: Node, baseName: string): string {
-                var name: string
+                let name: string
                 // first try to check if base name can be used as is
                 if (!isExistingName(location, baseName)) {
                     name = baseName;
@@ -1686,7 +1695,11 @@ module ts {
                 else {
                     name = generateUniqueName(baseName, n => isExistingName(location, n));
                 }
-
+                
+                return recordNameInCurrentScope(name);
+            }
+            
+            function recordNameInCurrentScope(name: string): string {
                 if (!currentScopeNames) {
                     currentScopeNames = {};
                 }
@@ -1706,7 +1719,7 @@ module ts {
                 }
 
                 // check generated names in outer scopes
-                // var x;
+                // let x;
                 // function foo() {
                 //    let x; // 1
                 //    function bar() {
@@ -1718,7 +1731,7 @@ module ts {
                 //}
                 // 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)
-                var frame = lastFrame;
+                let frame = lastFrame;
                 while (frame) {
                     if (hasProperty(frame.names, name)) {
                         return true;
@@ -1729,28 +1742,28 @@ module ts {
             }
 
             function initializeEmitterWithSourceMaps() {
-                var sourceMapDir: string; // The directory in which sourcemap will be
+                let sourceMapDir: string; // The directory in which sourcemap will be
 
                 // Current source map file and its index in the sources list
-                var sourceMapSourceIndex = -1;
+                let sourceMapSourceIndex = -1;
 
                 // Names and its index map
-                var sourceMapNameIndexMap: Map<number> = {};
-                var sourceMapNameIndices: number[] = [];
+                let sourceMapNameIndexMap: Map<number> = {};
+                let sourceMapNameIndices: number[] = [];
                 function getSourceMapNameIndex() {
                     return sourceMapNameIndices.length ? sourceMapNameIndices[sourceMapNameIndices.length - 1] : -1;
                 }
 
                 // Last recorded and encoded spans
-                var lastRecordedSourceMapSpan: SourceMapSpan;
-                var lastEncodedSourceMapSpan: SourceMapSpan = {
+                let lastRecordedSourceMapSpan: SourceMapSpan;
+                let lastEncodedSourceMapSpan: SourceMapSpan = {
                     emittedLine: 1,
                     emittedColumn: 1,
                     sourceLine: 1,
                     sourceColumn: 1,
                     sourceIndex: 0
                 };
-                var lastEncodedNameIndex = 0;
+                let lastEncodedNameIndex = 0;
 
                 // Encoding for sourcemap span
                 function encodeLastRecordedSourceMapSpan() {
@@ -1758,7 +1771,7 @@ module ts {
                         return;
                     }
 
-                    var prevEncodedEmittedColumn = lastEncodedSourceMapSpan.emittedColumn;
+                    let prevEncodedEmittedColumn = lastEncodedSourceMapSpan.emittedColumn;
                     // Line/Comma delimiters
                     if (lastEncodedSourceMapSpan.emittedLine == lastRecordedSourceMapSpan.emittedLine) {
                         // Emit comma to separate the entry
@@ -1768,7 +1781,7 @@ module ts {
                     }
                     else {
                         // Emit line delimiters
-                        for (var encodedLine = lastEncodedSourceMapSpan.emittedLine; encodedLine < lastRecordedSourceMapSpan.emittedLine; encodedLine++) {
+                        for (let encodedLine = lastEncodedSourceMapSpan.emittedLine; encodedLine < lastRecordedSourceMapSpan.emittedLine; encodedLine++) {
                             sourceMapData.sourceMapMappings += ";";
                         }
                         prevEncodedEmittedColumn = 1;
@@ -1816,9 +1829,9 @@ module ts {
                         }
 
                         // Encode 5 bits at a time starting from least significant bits
-                        var encodedStr = "";
+                        let encodedStr = "";
                         do {
-                            var currentDigit = inValue & 31; // 11111
+                            let currentDigit = inValue & 31; // 11111
                             inValue = inValue >> 5;
                             if (inValue > 0) {
                                 // There are still more digits to decode, set the msb (6th bit)
@@ -1832,14 +1845,14 @@ module ts {
                 }
 
                 function recordSourceMapSpan(pos: number) {
-                    var sourceLinePos = getLineAndCharacterOfPosition(currentSourceFile, pos);
+                    let sourceLinePos = getLineAndCharacterOfPosition(currentSourceFile, pos);
 
                     // Convert the location to be one-based.
                     sourceLinePos.line++;
                     sourceLinePos.character++;
 
-                    var emittedLine = writer.getLine();
-                    var emittedColumn = writer.getColumn();
+                    let emittedLine = writer.getLine();
+                    let emittedColumn = writer.getColumn();
 
                     // If this location wasn't recorded or the location in source is going backwards, record the span
                     if (!lastRecordedSourceMapSpan ||
@@ -1879,9 +1892,9 @@ module ts {
                 }
 
                 function writeTextWithSpanRecord(tokenKind: SyntaxKind, startPos: number, emitFn?: () => void) {
-                    var tokenStartPos = ts.skipTrivia(currentSourceFile.text, startPos);
+                    let tokenStartPos = ts.skipTrivia(currentSourceFile.text, startPos);
                     recordSourceMapSpan(tokenStartPos);
-                    var tokenEndPos = emitTokenText(tokenKind, tokenStartPos, emitFn);
+                    let tokenEndPos = emitTokenText(tokenKind, tokenStartPos, emitFn);
                     recordSourceMapSpan(tokenEndPos);
                     return tokenEndPos;
                 }
@@ -1890,7 +1903,7 @@ module ts {
                     // Add the file to tsFilePaths
                     // If sourceroot option: Use the relative path corresponding to the common directory path
                     // otherwise source locations relative to map file location
-                    var sourcesDirectoryPath = compilerOptions.sourceRoot ? host.getCommonSourceDirectory() : sourceMapDir;
+                    let sourcesDirectoryPath = compilerOptions.sourceRoot ? host.getCommonSourceDirectory() : sourceMapDir;
 
                     sourceMapData.sourceMapSources.push(getRelativePathToDirectoryOrUrl(sourcesDirectoryPath,
                         node.fileName,
@@ -1909,14 +1922,14 @@ module ts {
                     }
 
                     function recordScopeNameStart(scopeName: string) {
-                        var scopeNameIndex = -1;
+                        let scopeNameIndex = -1;
                         if (scopeName) {
-                            var parentIndex = getSourceMapNameIndex();
+                            let parentIndex = getSourceMapNameIndex();
                             if (parentIndex !== -1) {
                                 // Child scopes are always shown with a dot (even if they have no name),
                                 // unless it is a computed property. Then it is shown with brackets,
                                 // but the brackets are included in the name.
-                                var name = (<Declaration>node).name;
+                                let name = (<Declaration>node).name;
                                 if (!name || name.kind !== SyntaxKind.ComputedPropertyName) {
                                     scopeName = "." + scopeName;
                                 }
@@ -1948,7 +1961,7 @@ module ts {
                         node.kind === SyntaxKind.EnumDeclaration) {
                         // Declaration and has associated name use it
                         if ((<Declaration>node).name) {
-                            var name = (<Declaration>node).name;
+                            let name = (<Declaration>node).name;
                             // For computed property names, the text will include the brackets
                             scopeName = name.kind === SyntaxKind.ComputedPropertyName
                                 ? getTextOfNode(name)
@@ -1987,8 +2000,8 @@ module ts {
                     return "{\"version\":" + version + ",\"file\":\"" + escapeString(file) + "\",\"sourceRoot\":\"" + escapeString(sourceRoot) + "\",\"sources\":[" + serializeStringArray(sources) + "],\"names\":[" + serializeStringArray(names) + "],\"mappings\":\"" + escapeString(mappings) + "\"}";
 
                     function serializeStringArray(list: string[]): string {
-                        var output = "";
-                        for (var i = 0, n = list.length; i < n; i++) {
+                        let output = "";
+                        for (let i = 0, n = list.length; i < n; i++) {
                             if (i) {
                                 output += ",";
                             }
@@ -2015,7 +2028,7 @@ module ts {
                 }
 
                 // Initialize source map data
-                var sourceMapJsFile = getBaseFileName(normalizeSlashes(jsFilePath));
+                let sourceMapJsFile = getBaseFileName(normalizeSlashes(jsFilePath));
                 sourceMapData = {
                     sourceMapFilePath: jsFilePath + ".map",
                     jsSourceMappingURL: sourceMapJsFile + ".map",
@@ -2063,6 +2076,9 @@ module ts {
 
                 function emitNodeWithSourceMap(node: Node) {
                     if (node) {
+                        if (nodeIsSynthesized(node)) {
+                            return emitNodeWithoutSourceMap(node);
+                        }
                         if (node.kind != SyntaxKind.SourceFile) {
                             recordEmitNodeStartSpan(node);
                             emitNodeWithoutSourceMap(node);
@@ -2101,16 +2117,22 @@ module ts {
             // 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, forLoopVariable?: boolean): Identifier {
-                var name = forLoopVariable ? "_i" : undefined;
+                let name = forLoopVariable ? "_i" : undefined;
                 while (true) {
                     if (name && !isExistingName(location, name)) {
                         break;
                     }
                     // _a .. _h, _j ... _z, _0, _1, ...
+                    // Note that _i is skipped
                     name = "_" + (tempCount < 25 ? String.fromCharCode(tempCount + (tempCount < 8 ? 0 : 1) + CharacterCodes.a) : tempCount - 25);
                     tempCount++;
                 }
-                var result = <Identifier>createSynthesizedNode(SyntaxKind.Identifier);
+                
+                // This is necessary so that a name generated via renameNonTopLevelLetAndConst will see the name
+                // we just generated.
+                recordNameInCurrentScope(name);
+                
+                let result = <Identifier>createSynthesizedNode(SyntaxKind.Identifier);
                 result.text = name;
                 return result;
             }
@@ -2123,7 +2145,7 @@ module ts {
             }
 
             function createAndRecordTempVariable(location: Node): Identifier {
-                var temp = createTempVariable(location, /*forLoopVariable*/ false);
+                let temp = createTempVariable(location, /*forLoopVariable*/ false);
                 recordTempDeclaration(temp);
 
                 return temp;
@@ -2144,7 +2166,7 @@ module ts {
             }
 
             function emitTokenText(tokenKind: SyntaxKind, startPos: number, emitFn?: () => void) {
-                var tokenString = tokenToString(tokenKind);
+                let tokenString = tokenToString(tokenKind);
                 if (emitFn) {
                     emitFn();
                 }
@@ -2191,7 +2213,7 @@ module ts {
                     writeLine();
                 }
 
-                for (var i = 0, n = nodes.length; i < n; i++) {
+                for (let i = 0, n = nodes.length; i < n; i++) {
                     if (i) {
                         if (preserveNewLines && nodeEndIsOnSameLineAsNodeStart(nodes[i - 1], nodes[i])) {
                             write(", ");
@@ -2222,7 +2244,7 @@ module ts {
             }
 
             function emitList(nodes: Node[], start: number, count: number, multiLine: boolean, trailingComma: boolean) {
-                for (var i = 0; i < count; i++) {
+                for (let i = 0; i < count; i++) {
                     if (multiLine) {
                         if (i) {
                             write(",");
@@ -2255,7 +2277,7 @@ module ts {
             }
 
             function emitLinesStartingAt(nodes: Node[], startIndex: number): void {
-                for (var i = startIndex; i < nodes.length; i++) {
+                for (let i = startIndex; i < nodes.length; i++) {
                     writeLine();
                     emit(nodes[i]);
                 }
@@ -2276,7 +2298,7 @@ module ts {
             }
 
             function emitLiteral(node: LiteralExpression) {
-                var text = getLiteralText(node);
+                let text = getLiteralText(node);
                 
                 if (compilerOptions.sourceMap && (node.kind === SyntaxKind.StringLiteral || isTemplateLiteralKind(node.kind))) {
                     writer.writeLiteral(text);
@@ -2331,13 +2353,13 @@ module ts {
                 // Find original source text, since we need to emit the raw strings of the tagged template.
                 // The raw strings contain the (escaped) strings of what the user wrote.
                 // Examples: `\n` is converted to "\\n", a template string with a newline to "\n".
-                var text = getSourceTextOfNodeFromSourceFile(currentSourceFile, node);
+                let text = getSourceTextOfNodeFromSourceFile(currentSourceFile, node);
                 
                 // text contains the original source, it will also contain quotes ("`"), dolar signs and braces ("${" and "}"),
                 // thus we need to remove those characters.
                 // First template piece starts with "`", others with "}"
                 // Last template piece ends with "`", others with "${"
-                var isLast = node.kind === SyntaxKind.NoSubstitutionTemplateLiteral || node.kind === SyntaxKind.TemplateTail;
+                let isLast = node.kind === SyntaxKind.NoSubstitutionTemplateLiteral || node.kind === SyntaxKind.TemplateTail;
                 text = text.substring(1, text.length - (isLast ? 1 : 2));
                 
                 // Newline normalization:
@@ -2365,7 +2387,7 @@ module ts {
             }
             
             function emitDownlevelTaggedTemplate(node: TaggedTemplateExpression) {
-                var tempVariable = createAndRecordTempVariable(node);
+                let tempVariable = createAndRecordTempVariable(node);
                 write("(");
                 emit(tempVariable);
                 write(" = ");
@@ -2385,7 +2407,7 @@ module ts {
                 if (node.template.kind === SyntaxKind.TemplateExpression) {
                     forEach((<TemplateExpression>node.template).templateSpans, templateSpan => {
                         write(", ");
-                        var needsParens = templateSpan.expression.kind === SyntaxKind.BinaryExpression
+                        let needsParens = templateSpan.expression.kind === SyntaxKind.BinaryExpression
                             && (<BinaryExpression>templateSpan.expression).operatorToken.kind === SyntaxKind.CommaToken;
                         emitParenthesizedIf(templateSpan.expression, needsParens);
                     });
@@ -2401,21 +2423,21 @@ module ts {
                     return;
                 }
 
-                var emitOuterParens = isExpression(node.parent)
+                let emitOuterParens = isExpression(node.parent)
                     && templateNeedsParens(node, <Expression>node.parent);
 
                 if (emitOuterParens) {
                     write("(");
                 }
 
-                var headEmitted = false;
+                let headEmitted = false;
                 if (shouldEmitTemplateHead()) {
                     emitLiteral(node.head);
                     headEmitted = true;
                 }
 
-                for (var i = 0; i < node.templateSpans.length; i++) {
-                    var templateSpan = node.templateSpans[i];
+                for (let i = 0, n = node.templateSpans.length; i < n; i++) {
+                    let templateSpan = node.templateSpans[i];
 
                     // Check if the expression has operands and binds its operands less closely than binary '+'.
                     // If it does, we need to wrap the expression in parentheses. Otherwise, something like
@@ -2426,7 +2448,7 @@ module ts {
                     //    ("abc" + 1) << (2 + "")
                     // rather than
                     //    "abc" + (1 << 2) + ""
-                    var needsParens = templateSpan.expression.kind !== SyntaxKind.ParenthesizedExpression
+                    let needsParens = templateSpan.expression.kind !== SyntaxKind.ParenthesizedExpression
                         && comparePrecedenceToBinaryPlus(templateSpan.expression) !== Comparison.GreaterThan;
 
                     if (i > 0 || headEmitted) {
@@ -2554,7 +2576,7 @@ module ts {
             }
 
             function isNotExpressionIdentifier(node: Identifier) {
-                var parent = node.parent;
+                let parent = node.parent;
                 switch (parent.kind) {
                     case SyntaxKind.Parameter:
                     case SyntaxKind.VariableDeclaration:
@@ -2586,7 +2608,7 @@ module ts {
             }
 
             function emitExpressionIdentifier(node: Identifier) {
-                var substitution = resolver.getExpressionNameSubstitution(node);
+                let substitution = resolver.getExpressionNameSubstitution(node);
                 if (substitution) {
                     write(substitution);
                 }
@@ -2601,9 +2623,9 @@ module ts {
             }
 
             function emitIdentifier(node: Identifier) {
-                var variableId = getBlockScopedVariableId(node);
+                let variableId = getBlockScopedVariableId(node);
                 if (variableId !== undefined && generatedBlockScopeNames) {
-                    var text = generatedBlockScopeNames[variableId];
+                    let text = generatedBlockScopeNames[variableId];
                     if (text) {
                         write(text);
                         return;
@@ -2630,7 +2652,7 @@ module ts {
             }
 
             function emitSuper(node: Node) {
-                var flags = resolver.getNodeCheckFlags(node);
+                let flags = resolver.getNodeCheckFlags(node);
                 if (flags & NodeCheckFlags.SuperInstance) {
                     write("_super.prototype");
                 }
@@ -2644,14 +2666,14 @@ module ts {
 
             function emitObjectBindingPattern(node: BindingPattern) {
                 write("{ ");
-                var elements = node.elements;
+                let elements = node.elements;
                 emitList(elements, 0, elements.length, /*multiLine*/ false, /*trailingComma*/ elements.hasTrailingComma);
                 write(" }");
             }
 
             function emitArrayBindingPattern(node: BindingPattern) {
                 write("[");
-                var elements = node.elements;
+                let elements = node.elements;
                 emitList(elements, 0, elements.length, /*multiLine*/ false, /*trailingComma*/ elements.hasTrailingComma);
                 write("]");
             }
@@ -2694,9 +2716,9 @@ module ts {
             }
 
             function emitListWithSpread(elements: Expression[], multiLine: boolean, trailingComma: boolean) {
-                var pos = 0;
-                var group = 0;
-                var length = elements.length;
+                let pos = 0;
+                let group = 0;
+                let length = elements.length;
                 while (pos < length) {
                     // Emit using the pattern <group0>.concat(<group1>, <group2>, ...)
                     if (group === 1) {
@@ -2705,14 +2727,14 @@ module ts {
                     else if (group > 1) {
                         write(", ");
                     }
-                    var e = elements[pos];
+                    let e = elements[pos];
                     if (e.kind === SyntaxKind.SpreadElementExpression) {
                         e = (<SpreadElementExpression>e).expression;
                         emitParenthesizedIf(e, /*parenthesized*/ group === 0 && needsParenthesisForPropertyAccessOrInvocation(e));
                         pos++;
                     }
                     else {
-                        var i = pos;
+                        let i = pos;
                         while (i < length && elements[i].kind !== SyntaxKind.SpreadElementExpression) {
                             i++;
                         }
@@ -2739,7 +2761,7 @@ module ts {
             }
 
             function emitArrayLiteral(node: ArrayLiteralExpression) {
-                var elements = node.elements;
+                let elements = node.elements;
                 if (elements.length === 0) {
                     write("[]");
                 }
@@ -2755,31 +2777,31 @@ module ts {
             }
 
             function emitDownlevelObjectLiteralWithComputedProperties(node: ObjectLiteralExpression, firstComputedPropertyIndex: number): void {
-                var parenthesizedObjectLiteral = createDownlevelObjectLiteralWithComputedProperties(node, firstComputedPropertyIndex);
+                let parenthesizedObjectLiteral = createDownlevelObjectLiteralWithComputedProperties(node, firstComputedPropertyIndex);
                 return emit(parenthesizedObjectLiteral);
             }
 
             function createDownlevelObjectLiteralWithComputedProperties(originalObjectLiteral: ObjectLiteralExpression, firstComputedPropertyIndex: number): ParenthesizedExpression {
                 // For computed properties, we need to create a unique handle to the object
                 // literal so we can modify it without risking internal assignments tainting the object.
-                var tempVar = createAndRecordTempVariable(originalObjectLiteral);
+                let tempVar = createAndRecordTempVariable(originalObjectLiteral);
 
                 // Hold onto the initial non-computed properties in a new object literal,
                 // then create the rest through property accesses on the temp variable.
-                var initialObjectLiteral = <ObjectLiteralExpression>createSynthesizedNode(SyntaxKind.ObjectLiteralExpression);
+                let initialObjectLiteral = <ObjectLiteralExpression>createSynthesizedNode(SyntaxKind.ObjectLiteralExpression);
                 initialObjectLiteral.properties = <NodeArray<ObjectLiteralElement>>originalObjectLiteral.properties.slice(0, firstComputedPropertyIndex);
                 initialObjectLiteral.flags |= NodeFlags.MultiLine;
 
                 // The comma expressions that will patch the object literal.
                 // This will end up being something like '_a = { ... }, _a.x = 10, _a.y = 20, _a'.
-                var propertyPatches = createBinaryExpression(tempVar, SyntaxKind.EqualsToken, initialObjectLiteral);
+                let propertyPatches = createBinaryExpression(tempVar, SyntaxKind.EqualsToken, initialObjectLiteral);
 
                 ts.forEach(originalObjectLiteral.properties, property => {
-                    var patchedProperty = tryCreatePatchingPropertyAssignment(originalObjectLiteral, tempVar, property);
+                    let patchedProperty = tryCreatePatchingPropertyAssignment(originalObjectLiteral, tempVar, property);
                     if (patchedProperty) {
                         // TODO(drosen): Preserve comments
-                        //var leadingComments = getLeadingCommentRanges(currentSourceFile.text, property.pos);
-                        //var trailingComments = getTrailingCommentRanges(currentSourceFile.text, property.end);
+                        //let leadingComments = getLeadingCommentRanges(currentSourceFile.text, property.pos);
+                        //let trailingComments = getTrailingCommentRanges(currentSourceFile.text, property.end);
                         //addCommentsToSynthesizedNode(patchedProperty, leadingComments, trailingComments);
 
                         propertyPatches = createBinaryExpression(propertyPatches, SyntaxKind.CommaToken, patchedProperty);
@@ -2789,11 +2811,11 @@ module ts {
                 // Finally, return the temp variable.
                 propertyPatches = createBinaryExpression(propertyPatches, SyntaxKind.CommaToken, createIdentifier(tempVar.text, /*startsOnNewLine:*/ true));
 
-                var result = createParenthesizedExpression(propertyPatches);
+                let result = createParenthesizedExpression(propertyPatches);
                 
                 // TODO(drosen): Preserve comments
-                // var leadingComments = getLeadingCommentRanges(currentSourceFile.text, originalObjectLiteral.pos);
-                // var trailingComments = getTrailingCommentRanges(currentSourceFile.text, originalObjectLiteral.end);
+                // let leadingComments = getLeadingCommentRanges(currentSourceFile.text, originalObjectLiteral.pos);
+                // let trailingComments = getTrailingCommentRanges(currentSourceFile.text, originalObjectLiteral.end);
                 //addCommentsToSynthesizedNode(result, leadingComments, trailingComments);
 
                 return result;
@@ -2807,8 +2829,8 @@ module ts {
             // Returns 'undefined' if a property has already been accounted for
             // (e.g. a 'get' accessor which has already been emitted along with its 'set' accessor).
             function tryCreatePatchingPropertyAssignment(objectLiteral: ObjectLiteralExpression, tempVar: Identifier, property: ObjectLiteralElement): Expression {
-                var leftHandSide = createMemberAccessForPropertyName(tempVar, property.name);
-                var maybeRightHandSide = tryGetRightHandSideOfPatchingPropertyAssignment(objectLiteral, property);
+                let leftHandSide = createMemberAccessForPropertyName(tempVar, property.name);
+                let maybeRightHandSide = tryGetRightHandSideOfPatchingPropertyAssignment(objectLiteral, property);
 
                 return maybeRightHandSide && createBinaryExpression(leftHandSide, SyntaxKind.EqualsToken, maybeRightHandSide, /*startsOnNewLine:*/ true);
             }
@@ -2822,7 +2844,7 @@ module ts {
                         // TODO: (andersh) Technically it isn't correct to make an identifier here since getExpressionNamePrefix returns
                         // a string containing a dotted name. In general I'm not a fan of mini tree rewriters as this one, elsewhere we
                         // manage by just emitting strings (which is a lot more performant).
-                        //var prefix = createIdentifier(resolver.getExpressionNamePrefix((<ShorthandPropertyAssignment>property).name));
+                        //let prefix = createIdentifier(resolver.getExpressionNamePrefix((<ShorthandPropertyAssignment>property).name));
                         //return createPropertyAccessExpression(prefix, (<ShorthandPropertyAssignment>property).name);
                         return createIdentifier(resolver.getExpressionNameSubstitution((<ShorthandPropertyAssignment>property).name));
 
@@ -2838,29 +2860,29 @@ module ts {
                             return undefined;
                         }
 
-                        var propertyDescriptor = <ObjectLiteralExpression>createSynthesizedNode(SyntaxKind.ObjectLiteralExpression);
+                        let propertyDescriptor = <ObjectLiteralExpression>createSynthesizedNode(SyntaxKind.ObjectLiteralExpression);
 
-                        var descriptorProperties = <NodeArray<ObjectLiteralElement>>[];
+                        let descriptorProperties = <NodeArray<ObjectLiteralElement>>[];
                         if (getAccessor) {
-                            var getProperty = createPropertyAssignment(createIdentifier("get"), createFunctionExpression(getAccessor.parameters, getAccessor.body));
+                            let getProperty = createPropertyAssignment(createIdentifier("get"), createFunctionExpression(getAccessor.parameters, getAccessor.body));
                             descriptorProperties.push(getProperty);
                         }
                         if (setAccessor) {
-                            var setProperty = createPropertyAssignment(createIdentifier("set"), createFunctionExpression(setAccessor.parameters, setAccessor.body));
+                            let setProperty = createPropertyAssignment(createIdentifier("set"), createFunctionExpression(setAccessor.parameters, setAccessor.body));
                             descriptorProperties.push(setProperty);
                         }
 
-                        var trueExpr = <PrimaryExpression>createSynthesizedNode(SyntaxKind.TrueKeyword);
+                        let trueExpr = <PrimaryExpression>createSynthesizedNode(SyntaxKind.TrueKeyword);
 
-                        var enumerableTrue = createPropertyAssignment(createIdentifier("enumerable"), trueExpr);
+                        let enumerableTrue = createPropertyAssignment(createIdentifier("enumerable"), trueExpr);
                         descriptorProperties.push(enumerableTrue);
 
-                        var configurableTrue = createPropertyAssignment(createIdentifier("configurable"), trueExpr);
+                        let configurableTrue = createPropertyAssignment(createIdentifier("configurable"), trueExpr);
                         descriptorProperties.push(configurableTrue);
 
                         propertyDescriptor.properties = descriptorProperties;
 
-                        var objectDotDefineProperty = createPropertyAccessExpression(createIdentifier("Object"), createIdentifier("defineProperty"));
+                        let objectDotDefineProperty = createPropertyAccessExpression(createIdentifier("Object"), createIdentifier("defineProperty"));
                         return createCallExpression(objectDotDefineProperty, createNodeArray(propertyDescriptor));
 
                     default:
@@ -2869,14 +2891,14 @@ module ts {
             }
 
             function createParenthesizedExpression(expression: Expression) {
-                var result = <ParenthesizedExpression>createSynthesizedNode(SyntaxKind.ParenthesizedExpression);
+                let result = <ParenthesizedExpression>createSynthesizedNode(SyntaxKind.ParenthesizedExpression);
                 result.expression = expression;
 
                 return result;
             }
 
             function createNodeArray<T extends Node>(...elements: T[]): NodeArray<T> {
-                var result = <NodeArray<T>>elements;
+                let result = <NodeArray<T>>elements;
                 result.pos = -1;
                 result.end = -1;
 
@@ -2884,13 +2906,19 @@ module ts {
             }
 
             function createBinaryExpression(left: Expression, operator: SyntaxKind, right: Expression, startsOnNewLine?: boolean): BinaryExpression {
-                var result = <BinaryExpression>createSynthesizedNode(SyntaxKind.BinaryExpression, startsOnNewLine);
+                let result = <BinaryExpression>createSynthesizedNode(SyntaxKind.BinaryExpression, startsOnNewLine);
                 result.operatorToken = createSynthesizedNode(operator);
                 result.left = left;
                 result.right = right;
 
                 return result;
             }
+            
+            function createExpressionStatement(expression: Expression): ExpressionStatement {
+                let result = <ExpressionStatement>createSynthesizedNode(SyntaxKind.ExpressionStatement);
+                result.expression = expression;
+                return result;
+            }
 
             function createMemberAccessForPropertyName(expression: LeftHandSideExpression, memberName: DeclarationName): PropertyAccessExpression | ElementAccessExpression {
                 if (memberName.kind === SyntaxKind.Identifier) {
@@ -2908,7 +2936,7 @@ module ts {
             }
 
             function createPropertyAssignment(name: LiteralExpression | Identifier, initializer: Expression) {
-                var result = <PropertyAssignment>createSynthesizedNode(SyntaxKind.PropertyAssignment);
+                let result = <PropertyAssignment>createSynthesizedNode(SyntaxKind.PropertyAssignment);
                 result.name = name;
                 result.initializer = initializer;
 
@@ -2916,7 +2944,7 @@ module ts {
             }
 
             function createFunctionExpression(parameters: NodeArray<ParameterDeclaration>, body: Block): FunctionExpression {
-                var result = <FunctionExpression>createSynthesizedNode(SyntaxKind.FunctionExpression);
+                let result = <FunctionExpression>createSynthesizedNode(SyntaxKind.FunctionExpression);
                 result.parameters = parameters;
                 result.body = body;
 
@@ -2924,7 +2952,7 @@ module ts {
             }
 
             function createPropertyAccessExpression(expression: LeftHandSideExpression, name: Identifier): PropertyAccessExpression {
-                var result = <PropertyAccessExpression>createSynthesizedNode(SyntaxKind.PropertyAccessExpression);
+                let result = <PropertyAccessExpression>createSynthesizedNode(SyntaxKind.PropertyAccessExpression);
                 result.expression = expression;
                 result.dotToken = createSynthesizedNode(SyntaxKind.DotToken);
                 result.name = name;
@@ -2933,7 +2961,7 @@ module ts {
             }
 
             function createElementAccessExpression(expression: LeftHandSideExpression, argumentExpression: Expression): ElementAccessExpression {
-                var result = <ElementAccessExpression>createSynthesizedNode(SyntaxKind.ElementAccessExpression);
+                let result = <ElementAccessExpression>createSynthesizedNode(SyntaxKind.ElementAccessExpression);
                 result.expression = expression;
                 result.argumentExpression = argumentExpression;
 
@@ -2941,14 +2969,14 @@ module ts {
             }
             
             function createIdentifier(name: string, startsOnNewLine?: boolean) {
-                var result = <Identifier>createSynthesizedNode(SyntaxKind.Identifier, startsOnNewLine);
+                let result = <Identifier>createSynthesizedNode(SyntaxKind.Identifier, startsOnNewLine);
                 result.text = name;
 
                 return result;
             }
 
             function createCallExpression(invokedExpression: MemberExpression, arguments: NodeArray<Expression>) {
-                var result = <CallExpression>createSynthesizedNode(SyntaxKind.CallExpression);
+                let result = <CallExpression>createSynthesizedNode(SyntaxKind.CallExpression);
                 result.expression = invokedExpression;
                 result.arguments = arguments;
 
@@ -2956,22 +2984,22 @@ module ts {
             }
 
             function emitObjectLiteral(node: ObjectLiteralExpression): void {
-                var properties = node.properties;
+                let properties = node.properties;
 
                 if (languageVersion < ScriptTarget.ES6) {
-                    var numProperties = properties.length;
+                    let numProperties = properties.length;
 
                     // Find the first computed property.
                     // Everything until that point can be emitted as part of the initial object literal.
-                    var numInitialNonComputedProperties = numProperties;
-                    for (var i = 0, n = properties.length; i < n; i++) {
+                    let numInitialNonComputedProperties = numProperties;
+                    for (let i = 0, n = properties.length; i < n; i++) {
                         if (properties[i].name.kind === SyntaxKind.ComputedPropertyName) {
                             numInitialNonComputedProperties = i;
                             break;
                         }
                     }
                     
-                    var hasComputedProperty = numInitialNonComputedProperties !== properties.length;
+                    let hasComputedProperty = numInitialNonComputedProperties !== properties.length;
                     if (hasComputedProperty) {
                         emitDownlevelObjectLiteralWithComputedProperties(node, numInitialNonComputedProperties);
                         return;
@@ -2982,7 +3010,6 @@ module ts {
                 // or we're compiling with an ES6+ target.
                 write("{");
 
-                var properties = node.properties;
                 if (properties.length) {
                     emitLinePreservingList(node, properties, /*allowTrailingComma:*/ languageVersion >= ScriptTarget.ES5, /*spacesBetweenBraces:*/ true)
                 }
@@ -3014,10 +3041,10 @@ module ts {
                 emit(node.name);
                 // If short-hand property has a prefix, then regardless of the target version, we will emit it as normal property assignment. For example:
                 //  module m {
-                //      export var y;
+                //      export let y;
                 //  }
                 //  module m {
-                //      export var obj = { y };
+                //      export let obj = { y };
                 //  }
                 //  The short-hand property in obj need to emit as such ... = { y : m.y } regardless of the TargetScript version
                 if (languageVersion < ScriptTarget.ES6 || resolver.getExpressionNameSubstitution(node.name)) {
@@ -3030,11 +3057,11 @@ module ts {
             }
 
             function tryEmitConstantValue(node: PropertyAccessExpression | ElementAccessExpression): boolean {
-                var constantValue = resolver.getConstantValue(node);
+                let constantValue = resolver.getConstantValue(node);
                 if (constantValue !== undefined) {
                     write(constantValue.toString());
                     if (!compilerOptions.removeComments) {
-                        var propertyName: string = node.kind === SyntaxKind.PropertyAccessExpression ? declarationNameToString((<PropertyAccessExpression>node).name) : getTextOfNode((<ElementAccessExpression>node).argumentExpression);
+                        let propertyName: string = node.kind === SyntaxKind.PropertyAccessExpression ? declarationNameToString((<PropertyAccessExpression>node).name) : getTextOfNode((<ElementAccessExpression>node).argumentExpression);
                         write(" /* " + propertyName + " */");
                     }
                     return true;
@@ -3046,10 +3073,10 @@ module ts {
             // If the code is not indented, an optional valueToWriteWhenNotIndenting will be 
             // emitted instead.
             function indentIfOnDifferentLines(parent: Node, node1: Node, node2: Node, valueToWriteWhenNotIndenting?: string): boolean {
-                var realNodesAreOnDifferentLines = preserveNewLines && !nodeIsSynthesized(parent) && !nodeEndIsOnSameLineAsNodeStart(node1, node2);
+                let realNodesAreOnDifferentLines = preserveNewLines && !nodeIsSynthesized(parent) && !nodeEndIsOnSameLineAsNodeStart(node1, node2);
 
                 // Always use a newline for synthesized code if the synthesizer desires it.
-                var synthesizedNodeIsOnDifferentLine = synthesizedNodeStartsOnNewLine(node2);
+                let synthesizedNodeIsOnDifferentLine = synthesizedNodeStartsOnNewLine(node2);
 
                 if (realNodesAreOnDifferentLines || synthesizedNodeIsOnDifferentLine) {
                     increaseIndent();
@@ -3070,9 +3097,9 @@ module ts {
                 }
 
                 emit(node.expression);
-                var indentedBeforeDot = indentIfOnDifferentLines(node, node.expression, node.dotToken);
+                let indentedBeforeDot = indentIfOnDifferentLines(node, node.expression, node.dotToken);
                 write(".");
-                var indentedAfterDot = indentIfOnDifferentLines(node, node.dotToken, node.name);
+                let indentedAfterDot = indentIfOnDifferentLines(node, node.dotToken, node.name);
                 emit(node.name);
                 decreaseIndentIf(indentedBeforeDot, indentedAfterDot);
             }
@@ -3109,7 +3136,7 @@ module ts {
                     emit(node);
                     return node;
                 }
-                var temp = createAndRecordTempVariable(node);
+                let temp = createAndRecordTempVariable(node);
 
                 write("(");
                 emit(temp);
@@ -3120,8 +3147,8 @@ module ts {
             }
 
             function emitCallWithSpread(node: CallExpression) {
-                var target: Expression;
-                var expr = skipParentheses(node.expression);
+                let target: Expression;
+                let expr = skipParentheses(node.expression);
                 if (expr.kind === SyntaxKind.PropertyAccessExpression) {
                     // Target will be emitted as "this" argument
                     target = emitCallTarget((<PropertyAccessExpression>expr).expression);
@@ -3167,7 +3194,7 @@ module ts {
                     emitCallWithSpread(node);
                     return;
                 }
-                var superCall = false;
+                let superCall = false;
                 if (node.expression.kind === SyntaxKind.SuperKeyword) {
                     write("_super");
                     superCall = true;
@@ -3216,7 +3243,7 @@ module ts {
             function emitParenExpression(node: ParenthesizedExpression) {
                 if (!node.parent || node.parent.kind !== SyntaxKind.ArrowFunction) {
                     if (node.expression.kind === SyntaxKind.TypeAssertionExpression) {
-                        var operand = (<TypeAssertion>node.expression).expression;
+                        let operand = (<TypeAssertion>node.expression).expression;
 
                         // Make sure we consider all nested cast expressions, e.g.:
                         // (<any><number><any>-A).x;
@@ -3284,7 +3311,7 @@ module ts {
                 // expression a prefix increment whose operand is a plus expression - (++(+x))
                 // The same is true of minus of course.
                 if (node.operand.kind === SyntaxKind.PrefixUnaryExpression) {
-                    var operand = <PrefixUnaryExpression>node.operand;
+                    let operand = <PrefixUnaryExpression>node.operand;
                     if (node.operator === SyntaxKind.PlusToken && (operand.operator === SyntaxKind.PlusToken || operand.operator === SyntaxKind.PlusPlusToken)) {
                         write(" ");
                     }
@@ -3303,13 +3330,13 @@ module ts {
             function emitBinaryExpression(node: BinaryExpression) {
                 if (languageVersion < ScriptTarget.ES6 && node.operatorToken.kind === SyntaxKind.EqualsToken &&
                     (node.left.kind === SyntaxKind.ObjectLiteralExpression || node.left.kind === SyntaxKind.ArrayLiteralExpression)) {
-                    emitDestructuring(node);
+                    emitDestructuring(node, node.parent.kind === SyntaxKind.ExpressionStatement);
                 }
                 else {
                     emit(node.left);
-                    var indentedBeforeOperator = indentIfOnDifferentLines(node, node.left, node.operatorToken, node.operatorToken.kind !== SyntaxKind.CommaToken ? " " : undefined);
+                    let indentedBeforeOperator = indentIfOnDifferentLines(node, node.left, node.operatorToken, node.operatorToken.kind !== SyntaxKind.CommaToken ? " " : undefined);
                     write(tokenToString(node.operatorToken.kind));
-                    var indentedAfterOperator = indentIfOnDifferentLines(node, node.operatorToken, node.right, " ");
+                    let indentedAfterOperator = indentIfOnDifferentLines(node, node.operatorToken, node.right, " ");
                     emit(node.right);
                     decreaseIndentIf(indentedBeforeOperator, indentedAfterOperator);
                 }
@@ -3321,14 +3348,14 @@ module ts {
 
             function emitConditionalExpression(node: ConditionalExpression) {
                 emit(node.condition);
-                var indentedBeforeQuestion = indentIfOnDifferentLines(node, node.condition, node.questionToken, " ");
+                let indentedBeforeQuestion = indentIfOnDifferentLines(node, node.condition, node.questionToken, " ");
                 write("?");
-                var indentedAfterQuestion = indentIfOnDifferentLines(node, node.questionToken, node.whenTrue, " ");
+                let indentedAfterQuestion = indentIfOnDifferentLines(node, node.questionToken, node.whenTrue, " ");
                 emit(node.whenTrue);
                 decreaseIndentIf(indentedBeforeQuestion, indentedAfterQuestion);
-                var indentedBeforeColon = indentIfOnDifferentLines(node, node.whenTrue, node.colonToken, " ");
+                let indentedBeforeColon = indentIfOnDifferentLines(node, node.whenTrue, node.colonToken, " ");
                 write(":");
-                var indentedAfterColon = indentIfOnDifferentLines(node, node.colonToken, node.whenFalse, " ");
+                let indentedAfterColon = indentIfOnDifferentLines(node, node.colonToken, node.whenFalse, " ");
                 emit(node.whenFalse);
                 decreaseIndentIf(indentedBeforeColon, indentedAfterColon);
             }
@@ -3348,7 +3375,7 @@ module ts {
 
             function isSingleLineEmptyBlock(node: Node) {
                 if (node && node.kind === SyntaxKind.Block) {
-                    var block = <Block>node;
+                    let block = <Block>node;
                     return block.statements.length === 0 && nodeEndIsOnSameLineAsNodeStart(block, block);
                 }
             }
@@ -3397,7 +3424,7 @@ module ts {
             }
 
             function emitIfStatement(node: IfStatement) {
-                var endPos = emitToken(SyntaxKind.IfKeyword, node.pos);
+                let endPos = emitToken(SyntaxKind.IfKeyword, node.pos);
                 write(" ");
                 endPos = emitToken(SyntaxKind.OpenParenToken, endPos);
                 emit(node.expression);
@@ -3438,7 +3465,7 @@ module ts {
             }
 
             function emitStartOfVariableDeclarationList(decl: Node, startPos?: number): void {
-                var tokenKind = SyntaxKind.VarKeyword;
+                let tokenKind = SyntaxKind.VarKeyword;
                 if (decl && languageVersion >= ScriptTarget.ES6) {
                     if (isLet(decl)) {
                         tokenKind = SyntaxKind.LetKeyword;
@@ -3464,12 +3491,12 @@ module ts {
             }
 
             function emitForStatement(node: ForStatement) {
-                var endPos = emitToken(SyntaxKind.ForKeyword, node.pos);
+                let endPos = emitToken(SyntaxKind.ForKeyword, node.pos);
                 write(" ");
                 endPos = emitToken(SyntaxKind.OpenParenToken, endPos);
                 if (node.initializer && node.initializer.kind === SyntaxKind.VariableDeclarationList) {
-                    var variableDeclarationList = <VariableDeclarationList>node.initializer;
-                    var declarations = variableDeclarationList.declarations;
+                    let variableDeclarationList = <VariableDeclarationList>node.initializer;
+                    let declarations = variableDeclarationList.declarations;
                     emitStartOfVariableDeclarationList(declarations[0], endPos);
                     write(" ");
                     emitCommaList(declarations);
@@ -3486,13 +3513,17 @@ module ts {
             }
 
             function emitForInOrForOfStatement(node: ForInStatement | ForOfStatement) {
-                var endPos = emitToken(SyntaxKind.ForKeyword, node.pos);
+                if (languageVersion < ScriptTarget.ES6 && node.kind === SyntaxKind.ForOfStatement) {
+                    return emitDownLevelForOfStatement(node);
+                }
+                
+                let endPos = emitToken(SyntaxKind.ForKeyword, node.pos);
                 write(" ");
                 endPos = emitToken(SyntaxKind.OpenParenToken, endPos);
                 if (node.initializer.kind === SyntaxKind.VariableDeclarationList) {
-                    var variableDeclarationList = <VariableDeclarationList>node.initializer;
+                    let variableDeclarationList = <VariableDeclarationList>node.initializer;
                     if (variableDeclarationList.declarations.length >= 1) {
-                        var decl = variableDeclarationList.declarations[0];
+                        let decl = variableDeclarationList.declarations[0];
                         emitStartOfVariableDeclarationList(decl, endPos);
                         write(" ");
                         emit(decl);
@@ -3512,6 +3543,146 @@ module ts {
                 emitToken(SyntaxKind.CloseParenToken, node.expression.end);
                 emitEmbeddedStatement(node.statement);
             }
+            
+            function emitDownLevelForOfStatement(node: ForOfStatement) {
+                // The following ES6 code:
+                //
+                //    for (let v of expr) { }
+                //
+                // should be emitted as
+                //
+                //    for (let _i = 0, _a = expr; _i < _a.length; _i++) {
+                //        let v = _a[_i];
+                //    }
+                //
+                // where _a and _i are temps emitted to capture the RHS and the counter,
+                // respectively.
+                // When the left hand side is an expression instead of a let declaration,
+                // the "let v" is not emitted.
+                // When the left hand side is a let/const, the v is renamed if there is
+                // another v in scope.
+                // Note that all assignments to the LHS are emitted in the body, including
+                // all destructuring.
+                // Note also that because an extra statement is needed to assign to the LHS,
+                // for-of bodies are always emitted as blocks.
+                
+                let endPos = emitToken(SyntaxKind.ForKeyword, node.pos);
+                write(" ");
+                endPos = emitToken(SyntaxKind.OpenParenToken, endPos);
+                
+                // Do not emit the LHS let declaration yet, because it might contain destructuring.
+                
+                // Do not call recordTempDeclaration because we are declaring the temps
+                // right here. Recording means they will be declared later.
+                // In the case where the user wrote an identifier as the RHS, like this:
+                //
+                //     for (let v of arr) { }
+                //
+                // 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, /*forLoopVariable*/ true);
+                let rhsReference = rhsIsIdentifier ? <Identifier>node.expression : createTempVariable(node, /*forLoopVariable*/ false);
+
+                // This is the let keyword for the counter and rhsReference. The let keyword for
+                // the LHS will be emitted inside the body.
+                emitStart(node.expression);
+                write("var ");
+                
+                // _i = 0
+                emitNodeWithoutSourceMap(counter);
+                write(" = 0");
+                emitEnd(node.expression);
+                
+                if (!rhsIsIdentifier) {
+                    // , _a = expr
+                    write(", ");
+                    emitStart(node.expression);
+                    emitNodeWithoutSourceMap(rhsReference);
+                    write(" = ");
+                    emitNodeWithoutSourceMap(node.expression);
+                    emitEnd(node.expression);
+                }
+                write("; ");
+                
+                // _i < _a.length;
+                emitStart(node.initializer);
+                emitNodeWithoutSourceMap(counter);
+                write(" < ");
+                emitNodeWithoutSourceMap(rhsReference);
+                write(".length");
+                emitEnd(node.initializer);
+                write("; ");
+                
+                // _i++)
+                emitStart(node.initializer);
+                emitNodeWithoutSourceMap(counter);
+                write("++");
+                emitEnd(node.initializer);
+                emitToken(SyntaxKind.CloseParenToken, node.expression.end);
+                
+                // Body
+                write(" {");
+                writeLine();
+                increaseIndent();
+                
+                // Initialize LHS
+                // let v = _a[_i];
+                let rhsIterationValue = createElementAccessExpression(rhsReference, counter);
+                emitStart(node.initializer);
+                if (node.initializer.kind === SyntaxKind.VariableDeclarationList) {
+                    write("var ");
+                    let variableDeclarationList = <VariableDeclarationList>node.initializer;
+                    if (variableDeclarationList.declarations.length > 0) {
+                        let declaration = variableDeclarationList.declarations[0];
+                        if (isBindingPattern(declaration.name)) {
+                            // This works whether the declaration is a var, let, or const.
+                            // It will use rhsIterationValue _a[_i] as the initializer.
+                            emitDestructuring(declaration, /*isAssignmentExpressionStatement*/ false, rhsIterationValue);
+                        }
+                        else {
+                            // The following call does not include the initializer, so we have
+                            // to emit it separately.
+                            emitNodeWithoutSourceMap(declaration);
+                            write(" = ");
+                            emitNodeWithoutSourceMap(rhsIterationValue);
+                        }
+                    }
+                    else {
+                        // It's an empty declaration list. This can only happen in an error case, if the user wrote
+                        //     for (let of []) {}
+                        emitNodeWithoutSourceMap(createTempVariable(node, /*forLoopVariable*/ false));
+                        write(" = ");
+                        emitNodeWithoutSourceMap(rhsIterationValue);
+                    }
+                }
+                else {
+                    // Initializer is an expression. Emit the expression in the body, so that it's
+                    // evaluated on every iteration.
+                    let assignmentExpression = createBinaryExpression(<Expression>node.initializer, SyntaxKind.EqualsToken, rhsIterationValue, /*startsOnNewLine*/ false);
+                    if (node.initializer.kind === SyntaxKind.ArrayLiteralExpression || node.initializer.kind === SyntaxKind.ObjectLiteralExpression) {
+                        // This is a destructuring pattern, so call emitDestructuring instead of emit. Calling emit will not work, because it will cause
+                        // the BinaryExpression to be passed in instead of the expression statement, which will cause emitDestructuring to crash.
+                        emitDestructuring(assignmentExpression, /*isAssignmentExpressionStatement*/ true, /*value*/ undefined, /*locationForCheckingExistingName*/ node);
+                    }
+                    else {
+                        emitNodeWithoutSourceMap(assignmentExpression);
+                    }
+                }
+                emitEnd(node.initializer);
+                write(";");
+                
+                if (node.statement.kind === SyntaxKind.Block) {
+                    emitLines((<Block>node.statement).statements);
+                }
+                else {
+                    writeLine();
+                    emit(node.statement);
+                }
+                
+                writeLine();
+                decreaseIndent();
+                write("}");
+            }
 
             function emitBreakOrContinueStatement(node: BreakOrContinueStatement) {
                 emitToken(node.kind === SyntaxKind.BreakStatement ? SyntaxKind.BreakKeyword : SyntaxKind.ContinueKeyword, node.pos);
@@ -3533,13 +3704,17 @@ module ts {
             }
 
             function emitSwitchStatement(node: SwitchStatement) {
-                var endPos = emitToken(SyntaxKind.SwitchKeyword, node.pos);
+                let endPos = emitToken(SyntaxKind.SwitchKeyword, node.pos);
                 write(" ");
                 emitToken(SyntaxKind.OpenParenToken, endPos);
                 emit(node.expression);
                 endPos = emitToken(SyntaxKind.CloseParenToken, node.expression.end);
                 write(" ");
-                emitToken(SyntaxKind.OpenBraceToken, endPos);
+                emitCaseBlock(node.caseBlock, endPos)
+            }
+
+            function emitCaseBlock(node: CaseBlock, startPos: number): void {
+                emitToken(SyntaxKind.OpenBraceToken, startPos);
                 increaseIndent();
                 emitLines(node.clauses);
                 decreaseIndent();
@@ -3602,7 +3777,7 @@ module ts {
 
             function emitCatchClause(node: CatchClause) {
                 writeLine();
-                var endPos = emitToken(SyntaxKind.CatchKeyword, node.pos);
+                let endPos = emitToken(SyntaxKind.CatchKeyword, node.pos);
                 write(" ");
                 emitToken(SyntaxKind.OpenParenToken, endPos);
                 emit(node.variableDeclaration);
@@ -3630,7 +3805,7 @@ module ts {
             }
 
             function emitContainingModuleName(node: Node) {
-                var container = getContainingModule(node);
+                let container = getContainingModule(node);
                 write(container ? resolver.getGeneratedNameForNode(container) : "exports");
             }
 
@@ -3645,9 +3820,9 @@ module ts {
             }
             
             function createVoidZero(): Expression {
-                var zero = <LiteralExpression>createSynthesizedNode(SyntaxKind.NumericLiteral);
+                let zero = <LiteralExpression>createSynthesizedNode(SyntaxKind.NumericLiteral);
                 zero.text = "0";
-                var result = <VoidExpression>createSynthesizedNode(SyntaxKind.VoidExpression);
+                let result = <VoidExpression>createSynthesizedNode(SyntaxKind.VoidExpression);
                 result.expression = zero;
                 return result;
             }
@@ -3668,15 +3843,25 @@ module ts {
                 }
             }
 
-            function emitDestructuring(root: BinaryExpression | VariableDeclaration | ParameterDeclaration, value?: Expression) {
-                var emitCount = 0;
+            /**
+             * If the root has a chance of being a synthesized node, callers should also pass a value for
+             * lowestNonSynthesizedAncestor. This should be an ancestor of root, it should not be synthesized,
+             * and there should not be a lower ancestor that introduces a scope. This node will be used as the
+             * location for ensuring that temporary names are unique.
+             */
+            function emitDestructuring(root: BinaryExpression | VariableDeclaration | ParameterDeclaration,
+                isAssignmentExpressionStatement: boolean,
+                value?: Expression,
+                lowestNonSynthesizedAncestor?: Node) {
+                let emitCount = 0;
                 // An exported declaration is actually emitted as an assignment (to a property on the module object), so
                 // temporary variables in an exported declaration need to have real declarations elsewhere
-                var isDeclaration = (root.kind === SyntaxKind.VariableDeclaration && !(getCombinedNodeFlags(root) & NodeFlags.Export)) || root.kind === SyntaxKind.Parameter;
+                let isDeclaration = (root.kind === SyntaxKind.VariableDeclaration && !(getCombinedNodeFlags(root) & NodeFlags.Export)) || root.kind === SyntaxKind.Parameter;
                 if (root.kind === SyntaxKind.BinaryExpression) {
                     emitAssignmentExpression(<BinaryExpression>root);
                 }
                 else {
+                    Debug.assert(!isAssignmentExpressionStatement);
                     emitBindingElement(<BindingElement>root, value);
                 }
 
@@ -3698,7 +3883,10 @@ module ts {
 
                 function ensureIdentifier(expr: Expression): Expression {
                     if (expr.kind !== SyntaxKind.Identifier) {
-                        var identifier = createTempVariable(root);
+                        // In case the root is a synthesized node, we need to pass lowestNonSynthesizedAncestor
+                        // as the location for determining uniqueness of the variable we are about to
+                        // generate.
+                        let identifier = createTempVariable(lowestNonSynthesizedAncestor || root);
                         if (!isDeclaration) {
                             recordTempDeclaration(identifier);
                         }
@@ -3713,7 +3901,7 @@ module ts {
                     // we need to generate a temporary variable
                     value = ensureIdentifier(value);
                     // Return the expression 'value === void 0 ? defaultValue : value'
-                    var equals = <BinaryExpression>createSynthesizedNode(SyntaxKind.BinaryExpression);
+                    let equals = <BinaryExpression>createSynthesizedNode(SyntaxKind.BinaryExpression);
                     equals.left = value;
                     equals.operatorToken = createSynthesizedNode(SyntaxKind.EqualsEqualsEqualsToken);
                     equals.right = createVoidZero();
@@ -3721,7 +3909,7 @@ module ts {
                 }
 
                 function createConditionalExpression(condition: Expression, whenTrue: Expression, whenFalse: Expression) {
-                    var cond = <ConditionalExpression>createSynthesizedNode(SyntaxKind.ConditionalExpression);
+                    let cond = <ConditionalExpression>createSynthesizedNode(SyntaxKind.ConditionalExpression);
                     cond.condition = condition;
                     cond.questionToken = createSynthesizedNode(SyntaxKind.QuestionToken);
                     cond.whenTrue = whenTrue;
@@ -3731,7 +3919,7 @@ module ts {
                 }
 
                 function createNumericLiteral(value: number) {
-                    var node = <LiteralExpression>createSynthesizedNode(SyntaxKind.NumericLiteral);
+                    let node = <LiteralExpression>createSynthesizedNode(SyntaxKind.NumericLiteral);
                     node.text = "" + value;
                     return node;
                 }
@@ -3740,7 +3928,7 @@ module ts {
                     if (expr.kind === SyntaxKind.Identifier || expr.kind === SyntaxKind.PropertyAccessExpression || expr.kind === SyntaxKind.ElementAccessExpression) {
                         return <LeftHandSideExpression>expr;
                     }
-                    var node = <ParenthesizedExpression>createSynthesizedNode(SyntaxKind.ParenthesizedExpression);
+                    let node = <ParenthesizedExpression>createSynthesizedNode(SyntaxKind.ParenthesizedExpression);
                     node.expression = expr;
                     return node;
                 }
@@ -3753,38 +3941,37 @@ module ts {
                 }
 
                 function createElementAccess(object: Expression, index: Expression): Expression {
-                    var node = <ElementAccessExpression>createSynthesizedNode(SyntaxKind.ElementAccessExpression);
+                    let node = <ElementAccessExpression>createSynthesizedNode(SyntaxKind.ElementAccessExpression);
                     node.expression = parenthesizeForAccess(object);
                     node.argumentExpression = index;
                     return node;
                 }
 
                 function emitObjectLiteralAssignment(target: ObjectLiteralExpression, value: Expression) {
-                    var properties = target.properties;
+                    let properties = target.properties;
                     if (properties.length !== 1) {
                         // For anything but a single element destructuring we need to generate a temporary
                         // to ensure value is evaluated exactly once.
                         value = ensureIdentifier(value);
                     }
-                    for (var i = 0; i < properties.length; i++) {
-                        var p = properties[i];
+                    for (let p of properties) {
                         if (p.kind === SyntaxKind.PropertyAssignment || p.kind === SyntaxKind.ShorthandPropertyAssignment) {
                             // TODO(andersh): Computed property support
-                            var propName = <Identifier>((<PropertyAssignment>p).name);
+                            let propName = <Identifier>((<PropertyAssignment>p).name);
                             emitDestructuringAssignment((<PropertyAssignment>p).initializer || propName, createPropertyAccess(value, propName));
                         }
                     }
                 }
 
                 function emitArrayLiteralAssignment(target: ArrayLiteralExpression, value: Expression) {
-                    var elements = target.elements;
+                    let elements = target.elements;
                     if (elements.length !== 1) {
                         // For anything but a single element destructuring we need to generate a temporary
                         // to ensure value is evaluated exactly once.
                         value = ensureIdentifier(value);
                     }
-                    for (var i = 0; i < elements.length; i++) {
-                        var e = elements[i];
+                    for (let i = 0; i < elements.length; i++) {
+                        let e = elements[i];
                         if (e.kind !== SyntaxKind.OmittedExpression) {
                             if (e.kind !== SyntaxKind.SpreadElementExpression) {
                                 emitDestructuringAssignment(e, createElementAccess(value, createNumericLiteral(i)));
@@ -3817,9 +4004,9 @@ module ts {
                 }
 
                 function emitAssignmentExpression(root: BinaryExpression) {
-                    var target = root.left;
-                    var value = root.right;
-                    if (root.parent.kind === SyntaxKind.ExpressionStatement) {
+                    let target = root.left;
+                    let value = root.right;
+                    if (isAssignmentExpressionStatement) {
                         emitDestructuringAssignment(target, value);
                     }
                     else {
@@ -3846,18 +4033,18 @@ module ts {
                         value = createVoidZero();
                     }
                     if (isBindingPattern(target.name)) {
-                        var pattern = <BindingPattern>target.name;
-                        var elements = pattern.elements;
+                        let pattern = <BindingPattern>target.name;
+                        let elements = pattern.elements;
                         if (elements.length !== 1) {
                             // For anything but a single element destructuring we need to generate a temporary
                             // to ensure value is evaluated exactly once.
                             value = ensureIdentifier(value);
                         }
-                        for (var i = 0; i < elements.length; i++) {
-                            var element = elements[i];
+                        for (let i = 0; i < elements.length; i++) {
+                            let element = elements[i];
                             if (pattern.kind === SyntaxKind.ObjectBindingPattern) {
                                 // Rewrite element to a declaration with an initializer that fetches property
-                                var propName = element.propertyName || <Identifier>element.name;
+                                let propName = element.propertyName || <Identifier>element.name;
                                 emitBindingElement(element, createPropertyAccess(value, propName));
                             }
                             else if (element.kind !== SyntaxKind.OmittedExpression) {
@@ -3884,7 +4071,7 @@ module ts {
             function emitVariableDeclaration(node: VariableDeclaration) {
                 if (isBindingPattern(node.name)) {
                     if (languageVersion < ScriptTarget.ES6) {
-                        emitDestructuring(node);
+                        emitDestructuring(node, /*isAssignmentExpressionStatement*/ false);
                     }
                     else {
                         emit(node.name);
@@ -3892,10 +4079,10 @@ module ts {
                     }
                 }
                 else {
-                    var isLet = renameNonTopLevelLetAndConst(<Identifier>node.name);
+                    renameNonTopLevelLetAndConst(<Identifier>node.name);
                     emitModuleMemberName(node);
 
-                    var initializer = node.initializer;
+                    let initializer = node.initializer;
                     if (!initializer && languageVersion < ScriptTarget.ES6) {
 
                         // downlevel emit for non-initialized let bindings defined in loops
@@ -3904,7 +4091,7 @@ module ts {
                         // for (...) { var <some-uniqie-name> = void 0; }
                         // this is necessary to preserve ES6 semantic in scenarios like
                         // for (...) { let x; console.log(x); x = 1 } // assignment on one iteration should not affect other iterations
-                        var isUninitializedLet =
+                        let isUninitializedLet =
                             (resolver.getNodeCheckFlags(node) & NodeCheckFlags.BlockScopedBindingInLoop) &&
                             (getCombinedFlagsForIdentifier(<Identifier>node.name) & NodeFlags.Let);
 
@@ -3921,7 +4108,7 @@ module ts {
             }
 
             function emitExportVariableAssignments(node: VariableDeclaration | BindingElement) {
-                var name = (<VariableLikeDeclaration>node).name;
+                let name = (<VariableLikeDeclaration>node).name;
                 if (name.kind === SyntaxKind.Identifier) {
                     emitExportMemberAssignments(<Identifier>name);
                 }
@@ -3930,34 +4117,6 @@ module ts {
                 }
             }
             
-            function getEnclosingBlockScopeContainer(node: Node): Node {
-                var current = node;
-                while (current) {
-                    if (isFunctionLike(current)) {
-                        return current;
-                    }
-                    switch (current.kind) {
-                        case SyntaxKind.SourceFile:
-                        case SyntaxKind.SwitchKeyword:
-                        case SyntaxKind.CatchClause:
-                        case SyntaxKind.ModuleDeclaration:
-                        case SyntaxKind.ForStatement:
-                        case SyntaxKind.ForInStatement:
-                        case SyntaxKind.ForOfStatement:
-                            return current;
-                        case SyntaxKind.Block:
-                            // function block is not considered block-scope container
-                            // see comment in binder.ts: bind(...), case for SyntaxKind.Block
-                            if (!isFunctionLike(current.parent)) {
-                                return current;
-                            }
-                    }
-
-                    current = current.parent;
-                }
-            }
-            
-
             function getCombinedFlagsForIdentifier(node: Identifier): NodeFlags {
                 if (!node.parent || (node.parent.kind !== SyntaxKind.VariableDeclaration && node.parent.kind !== SyntaxKind.BindingElement)) {
                     return 0;
@@ -3980,26 +4139,26 @@ module ts {
                     return;
                 }
 
-                var combinedFlags = getCombinedFlagsForIdentifier(<Identifier>node);
+                let combinedFlags = getCombinedFlagsForIdentifier(<Identifier>node);
                 if (((combinedFlags & NodeFlags.BlockScoped) === 0) || combinedFlags & NodeFlags.Export) {
                     // do not rename exported or non-block scoped variables
                     return;
                 }
 
                 // here it is known that node is a block scoped variable
-                var list = getAncestor(node, SyntaxKind.VariableDeclarationList);
+                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;
                 }
 
-                var blockScopeContainer = getEnclosingBlockScopeContainer(node);
-                var parent = blockScopeContainer.kind === SyntaxKind.SourceFile
+                let blockScopeContainer = getEnclosingBlockScopeContainer(node);
+                let parent = blockScopeContainer.kind === SyntaxKind.SourceFile
                     ? blockScopeContainer
                     : blockScopeContainer.parent;
 
-                var generatedName = generateUniqueNameForLocation(parent, (<Identifier>node).text);
-                var variableId = resolver.getBlockScopedVariableId(<Identifier>node);
+                let generatedName = generateUniqueNameForLocation(parent, (<Identifier>node).text);
+                let variableId = resolver.getBlockScopedVariableId(<Identifier>node);
                 if (!generatedBlockScopeNames) {
                     generatedBlockScopeNames = [];
                 }
@@ -4020,7 +4179,7 @@ module ts {
             function emitParameter(node: ParameterDeclaration) {
                 if (languageVersion < ScriptTarget.ES6) {
                     if (isBindingPattern(node.name)) {
-                        var name = createTempVariable(node);
+                        let name = createTempVariable(node);
                         if (!tempParameters) {
                             tempParameters = [];
                         }
@@ -4042,12 +4201,12 @@ module ts {
 
             function emitDefaultValueAssignments(node: FunctionLikeDeclaration) {
                 if (languageVersion < ScriptTarget.ES6) {
-                    var tempIndex = 0;
+                    let tempIndex = 0;
                     forEach(node.parameters, p => {
                         if (isBindingPattern(p.name)) {
                             writeLine();
                             write("var ");
-                            emitDestructuring(p, tempParameters[tempIndex]);
+                            emitDestructuring(p, /*isAssignmentExpressionStatement*/ false, tempParameters[tempIndex]);
                             write(";");
                             tempIndex++;
                         }
@@ -4072,9 +4231,9 @@ module ts {
 
             function emitRestParameter(node: FunctionLikeDeclaration) {
                 if (languageVersion < ScriptTarget.ES6 && hasRestParameters(node)) {
-                    var restIndex = node.parameters.length - 1;
-                    var restParam = node.parameters[restIndex];
-                    var tempName = createTempVariable(node, /*forLoopVariable*/ true).text;
+                    let restIndex = node.parameters.length - 1;
+                    let restParam = node.parameters[restIndex];
+                    let tempName = createTempVariable(node, /*forLoopVariable*/ true).text;
                     writeLine();
                     emitLeadingComments(restParam);
                     emitStart(restParam);
@@ -4169,8 +4328,8 @@ module ts {
                 increaseIndent();
                 write("(");
                 if (node) {
-                    var parameters = node.parameters;
-                    var omitCount = languageVersion < ScriptTarget.ES6 && hasRestParameters(node) ? 1 : 0;
+                    let parameters = node.parameters;
+                    let omitCount = languageVersion < ScriptTarget.ES6 && hasRestParameters(node) ? 1 : 0;
                     emitList(parameters, 0, parameters.length - omitCount, /*multiLine*/ false, /*trailingComma*/ false);
                 }
                 write(")");
@@ -4187,14 +4346,14 @@ module ts {
             }
 
             function emitSignatureAndBody(node: FunctionLikeDeclaration) {
-                var saveTempCount = tempCount;
-                var saveTempVariables = tempVariables;
-                var saveTempParameters = tempParameters;
+                let saveTempCount = tempCount;
+                let saveTempVariables = tempVariables;
+                let saveTempParameters = tempParameters;
                 tempCount = 0;
                 tempVariables = undefined;
                 tempParameters = undefined;
 
-                var popFrame = enterNameScope()
+                let popFrame = enterNameScope()
 
                 // When targeting ES6, emit arrow function natively in ES6
                 if (shouldEmitAsArrowFunction(node)) {
@@ -4254,7 +4413,7 @@ module ts {
                 write(" ");
 
                 // Unwrap all type assertions.
-                var current = body;
+                let current = body;
                 while (current.kind === SyntaxKind.TypeAssertionExpression) {
                     current = (<TypeAssertion>current).expression;
                 }
@@ -4267,10 +4426,10 @@ module ts {
                 scopeEmitStart(node);
 
                 increaseIndent();
-                var outPos = writer.getTextPos();
+                let outPos = writer.getTextPos();
                 emitDetachedComments(node.body);
                 emitFunctionBodyPreamble(node);
-                var preambleEmitted = writer.getTextPos() !== outPos;
+                let preambleEmitted = writer.getTextPos() !== outPos;
                 decreaseIndent();
 
                 // If we didn't have to emit any preamble code, then attempt to keep the arrow
@@ -4316,23 +4475,23 @@ module ts {
                 write(" {");
                 scopeEmitStart(node);
 
-                var initialTextPos = writer.getTextPos();
+                let initialTextPos = writer.getTextPos();
 
                 increaseIndent();
                 emitDetachedComments(body.statements);
 
                 // Emit all the directive prologues (like "use strict").  These have to come before
                 // any other preamble code we write (like parameter initializers).
-                var startIndex = emitDirectivePrologues(body.statements, /*startWithNewLine*/ true);
+                let startIndex = emitDirectivePrologues(body.statements, /*startWithNewLine*/ true);
                 emitFunctionBodyPreamble(node);
                 decreaseIndent();
 
-                var preambleEmitted = writer.getTextPos() !== initialTextPos;
+                let preambleEmitted = writer.getTextPos() !== initialTextPos;
 
                 if (preserveNewLines && !preambleEmitted && nodeEndIsOnSameLineAsNodeStart(body, body)) {
-                    for (var i = 0, n = body.statements.length; i < n; i++) {
+                    for (let statement of body.statements) {
                         write(" ");
-                        emit(body.statements[i]);
+                        emit(statement);
                     }
                     emitTempDeclarations(/*newLine*/ false);
                     write(" ");
@@ -4354,11 +4513,11 @@ module ts {
 
             function findInitialSuperCall(ctor: ConstructorDeclaration): ExpressionStatement {
                 if (ctor.body) {
-                    var statement = (<Block>ctor.body).statements[0];
+                    let statement = (<Block>ctor.body).statements[0];
                     if (statement && statement.kind === SyntaxKind.ExpressionStatement) {
-                        var expr = (<ExpressionStatement>statement).expression;
+                        let expr = (<ExpressionStatement>statement).expression;
                         if (expr && expr.kind === SyntaxKind.CallExpression) {
-                            var func = (<CallExpression>expr).expression;
+                            let func = (<CallExpression>expr).expression;
                             if (func && func.kind === SyntaxKind.SuperKeyword) {
                                 return <ExpressionStatement>statement;
                             }
@@ -4385,7 +4544,7 @@ module ts {
             }
 
             function emitMemberAccessForPropertyName(memberName: DeclarationName) {
-                // TODO: (jfreeman,drosen): comment on why this is emitNode instead of emit here.
+                // TODO: (jfreeman,drosen): comment on why this is emitNodeWithoutSourceMap instead of emit here.
                 if (memberName.kind === SyntaxKind.StringLiteral || memberName.kind === SyntaxKind.NumericLiteral) {
                     write("[");
                     emitNodeWithoutSourceMap(memberName);
@@ -4451,7 +4610,7 @@ module ts {
                         emitTrailingComments(member);
                     }
                     else if (member.kind === SyntaxKind.GetAccessor || member.kind === SyntaxKind.SetAccessor) {
-                        var accessors = getAllAccessorDeclarations(node.members, <AccessorDeclaration>member);
+                        let accessors = getAllAccessorDeclarations(node.members, <AccessorDeclaration>member);
                         if (member === accessors.firstAccessor) {
                             writeLine();
                             emitStart(member);
@@ -4506,7 +4665,7 @@ module ts {
                 write("var ");
                 emitDeclarationName(node);
                 write(" = (function (");
-                var baseTypeNode = getClassBaseTypeNode(node);
+                let baseTypeNode = getClassBaseTypeNode(node);
                 if (baseTypeNode) {
                     write("_super");
                 }
@@ -4556,14 +4715,14 @@ module ts {
                 }
 
                 function emitConstructorOfClass() {
-                    var saveTempCount = tempCount;
-                    var saveTempVariables = tempVariables;
-                    var saveTempParameters = tempParameters;
+                    let saveTempCount = tempCount;
+                    let saveTempVariables = tempVariables;
+                    let saveTempParameters = tempParameters;
                     tempCount = 0;
                     tempVariables = undefined;
                     tempParameters = undefined;
 
-                    var popFrame = enterNameScope();
+                    let popFrame = enterNameScope();
 
                     // Emit the constructor overload pinned comments
                     forEach(node.members, member => {
@@ -4572,7 +4731,7 @@ module ts {
                         }
                     });
 
-                    var ctor = getFirstConstructorWithBody(node);
+                    let ctor = getFirstConstructorWithBody(node);
                     if (ctor) {
                         emitLeadingComments(ctor);
                     }
@@ -4587,11 +4746,12 @@ module ts {
                         emitDetachedComments((<Block>ctor.body).statements);
                     }
                     emitCaptureThisForNodeIfNecessary(node);
+                    let superCall: ExpressionStatement;
                     if (ctor) {
                         emitDefaultValueAssignments(ctor);
                         emitRestParameter(ctor);
                         if (baseTypeNode) {
-                            var superCall = findInitialSuperCall(ctor);
+                            superCall = findInitialSuperCall(ctor);
                             if (superCall) {
                                 writeLine();
                                 emit(superCall);
@@ -4609,7 +4769,7 @@ module ts {
                     }
                     emitMemberAssignments(node, /*nonstatic*/0);
                     if (ctor) {
-                        var statements: Node[] = (<Block>ctor.body).statements;
+                        let statements: Node[] = (<Block>ctor.body).statements;
                         if (superCall) statements = statements.slice(1);
                         emitLines(statements);
                     }
@@ -4639,7 +4799,7 @@ module ts {
             }
 
             function shouldEmitEnumDeclaration(node: EnumDeclaration) {
-                var isConstEnum = isConst(node);
+                let isConstEnum = isConst(node);
                 return !isConstEnum || compilerOptions.preserveConstEnums;
             }
 
@@ -4692,7 +4852,7 @@ module ts {
             }
 
             function emitEnumMember(node: EnumMember) {
-                var enumParent = <EnumDeclaration>node.parent;
+                let enumParent = <EnumDeclaration>node.parent;
                 emitStart(node);
                 write(resolver.getGeneratedNameForNode(enumParent));
                 write("[");
@@ -4709,7 +4869,7 @@ module ts {
 
             function writeEnumMemberDeclarationValue(member: EnumMember) {
                 if (!member.initializer || isConst(member.parent)) {
-                    var value = resolver.getConstantValue(member);
+                    let value = resolver.getConstantValue(member);
                     if (value !== undefined) {
                         write(value.toString());
                         return;
@@ -4726,7 +4886,7 @@ module ts {
 
             function getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration: ModuleDeclaration): ModuleDeclaration {
                 if (moduleDeclaration.body.kind === SyntaxKind.ModuleDeclaration) {
-                    var recursiveInnerModule = getInnerMostModuleDeclarationFromDottedModule(<ModuleDeclaration>moduleDeclaration.body);
+                    let recursiveInnerModule = getInnerMostModuleDeclarationFromDottedModule(<ModuleDeclaration>moduleDeclaration.body);
                     return recursiveInnerModule || <ModuleDeclaration>moduleDeclaration.body;
                 }
             }
@@ -4737,7 +4897,7 @@ module ts {
 
             function emitModuleDeclaration(node: ModuleDeclaration) {
                 // Emit only if this module is non-ambient.
-                var shouldEmit = shouldEmitModuleDeclaration(node);
+                let shouldEmit = shouldEmitModuleDeclaration(node);
 
                 if (!shouldEmit) {
                     return emitPinnedOrTripleSlashComments(node);
@@ -4756,11 +4916,11 @@ module ts {
                 emitEnd(node.name);
                 write(") ");
                 if (node.body.kind === SyntaxKind.ModuleBlock) {
-                    var saveTempCount = tempCount;
-                    var saveTempVariables = tempVariables;
+                    let saveTempCount = tempCount;
+                    let saveTempVariables = tempVariables;
                     tempCount = 0;
                     tempVariables = undefined;
-                    var popFrame = enterNameScope();
+                    let popFrame = enterNameScope();
 
                     emit(node.body);
 
@@ -4777,7 +4937,7 @@ module ts {
                     emit(node.body);
                     decreaseIndent();
                     writeLine();
-                    var moduleBlock = <ModuleBlock>getInnerMostModuleDeclarationFromDottedModule(node).body;
+                    let moduleBlock = <ModuleBlock>getInnerMostModuleDeclarationFromDottedModule(node).body;
                     emitToken(SyntaxKind.CloseBraceToken, moduleBlock.statements.end);
                     scopeEmitEnd();
                 }
@@ -4811,14 +4971,14 @@ module ts {
             }
 
             function emitImportDeclaration(node: ImportDeclaration | ImportEqualsDeclaration) {
-                var info = getExternalImportInfo(node);
+                let info = getExternalImportInfo(node);
                 if (info) {
-                    var declarationNode = info.declarationNode;
-                    var namedImports = info.namedImports;
+                    let declarationNode = info.declarationNode;
+                    let namedImports = info.namedImports;
                     if (compilerOptions.module !== ModuleKind.AMD) {
                         emitLeadingComments(node);
                         emitStart(node);
-                        var moduleName = getExternalModuleName(node);
+                        let moduleName = getExternalModuleName(node);
                         if (declarationNode) {
                             if (!(declarationNode.flags & NodeFlags.Export)) write("var ");
                             emitModuleMemberName(declarationNode);
@@ -4875,7 +5035,7 @@ module ts {
             function emitExportDeclaration(node: ExportDeclaration) {
                 if (node.moduleSpecifier) {
                     emitStart(node);
-                    var generatedName = resolver.getGeneratedNameForNode(node);
+                    let generatedName = resolver.getGeneratedNameForNode(node);
                     if (compilerOptions.module !== ModuleKind.AMD) {
                         write("var ");
                         write(generatedName);
@@ -4900,7 +5060,7 @@ module ts {
                     }
                     else {
                         // export *
-                        var tempName = createTempVariable(node).text;
+                        let tempName = createTempVariable(node).text;
                         writeLine();
                         write("for (var " + tempName + " in " + generatedName + ") if (!");
                         emitContainingModuleName(node);
@@ -4922,7 +5082,7 @@ module ts {
                     }
                 }
                 else if (node.kind === SyntaxKind.ImportDeclaration) {
-                    var importClause = (<ImportDeclaration>node).importClause;
+                    let importClause = (<ImportDeclaration>node).importClause;
                     if (importClause) {
                         if (importClause.name) {
                             return {
@@ -4965,7 +5125,7 @@ module ts {
                             if (specifier.name.text === "default") {
                                 exportDefault = exportDefault || specifier;
                             }
-                            var name = (specifier.propertyName || specifier.name).text;
+                            let name = (specifier.propertyName || specifier.name).text;
                             (exportSpecifiers[name] || (exportSpecifiers[name] = [])).push(specifier);
                         });
                     }
@@ -4978,7 +5138,7 @@ module ts {
                         }
                     }
                     else {
-                        var info = createExternalImportInfo(node);
+                        let info = createExternalImportInfo(node);
                         if (info) {
                             if ((!info.declarationNode && !info.namedImports) || resolver.isReferencedAliasDeclaration(node)) {
                                 externalImports.push(info);
@@ -4990,8 +5150,7 @@ module ts {
 
             function getExternalImportInfo(node: ImportDeclaration | ImportEqualsDeclaration): ExternalImportInfo {
                 if (externalImports) {
-                    for (var i = 0; i < externalImports.length; i++) {
-                        var info = externalImports[i];
+                    for (let info of externalImports) {
                         if (info.rootNode === node) {
                             return info;
                         }
@@ -5022,7 +5181,7 @@ module ts {
                 write("[\"require\", \"exports\"");
                 forEach(externalImports, info => {
                     write(", ");
-                    var moduleName = getExternalModuleName(info.rootNode);
+                    let moduleName = getExternalModuleName(info.rootNode);
                     if (moduleName.kind === SyntaxKind.StringLiteral) {
                         emitLiteral(<LiteralExpression>moduleName);
                     }
@@ -5031,7 +5190,7 @@ module ts {
                     }
                 });
                 forEach(node.amdDependencies, amdDependency => {
-                    var text = "\"" + amdDependency.path + "\"";
+                    let text = "\"" + amdDependency.path + "\"";
                     write(", ");
                     write(text);
                 });
@@ -5089,7 +5248,7 @@ module ts {
             }
 
             function emitDirectivePrologues(statements: Node[], startWithNewLine: boolean): number {
-                for (var i = 0; i < statements.length; ++i) {
+                for (let i = 0; i < statements.length; ++i) {
                     if (isPrologueDirective(statements[i])) {
                         if (startWithNewLine || i > 0) {
                             writeLine();
@@ -5104,14 +5263,13 @@ module ts {
                 return statements.length;
             }
 
-            function emitSourceFile(node: SourceFile) {
-                currentSourceFile = node;
+            function emitSourceFileNode(node: SourceFile) {
                 // Start new file on new line
                 writeLine();
                 emitDetachedComments(node);
 
                 // emit prologue directives prior to __extends
-                var startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ false);
+                let startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ false);
                 if (!extendsEmitted && resolver.getNodeCheckFlags(node) & NodeCheckFlags.EmitExtends) {
                     writeLine();
                     write("var __extends = this.__extends || function (d, b) {");
@@ -5159,7 +5317,7 @@ module ts {
                     return emitPinnedOrTripleSlashComments(node);
                 }
 
-                var emitComments = shouldEmitLeadingAndTrailingComments(node);
+                let emitComments = shouldEmitLeadingAndTrailingComments(node);
                 if (emitComments) {
                     emitLeadingComments(node);
                 }
@@ -5360,7 +5518,7 @@ module ts {
                     case SyntaxKind.ExportDeclaration:
                         return emitExportDeclaration(<ExportDeclaration>node);
                     case SyntaxKind.SourceFile:
-                        return emitSourceFile(<SourceFile>node);
+                        return emitSourceFileNode(<SourceFile>node);
                 }
             }
 
@@ -5370,7 +5528,7 @@ module ts {
 
             function getLeadingCommentsWithoutDetachedComments() {
                 // get the leading comments from detachedPos
-                var leadingComments = getLeadingCommentRanges(currentSourceFile.text, detachedCommentsInfo[detachedCommentsInfo.length - 1].detachedCommentEndPos);
+                let leadingComments = getLeadingCommentRanges(currentSourceFile.text, detachedCommentsInfo[detachedCommentsInfo.length - 1].detachedCommentEndPos);
                 if (detachedCommentsInfo.length - 1) {
                     detachedCommentsInfo.pop();
                 }
@@ -5385,7 +5543,7 @@ module ts {
                 // Emit the leading comments only if the parent's pos doesn't match because parent should take care of emitting these comments
                 if (node.parent) {
                     if (node.parent.kind === SyntaxKind.SourceFile || node.pos !== node.parent.pos) {
-                        var leadingComments: CommentRange[];
+                        let leadingComments: CommentRange[];
                         if (hasDetachedComments(node.pos)) {
                             // get comments without detached comments
                             leadingComments = getLeadingCommentsWithoutDetachedComments();
@@ -5400,7 +5558,7 @@ module ts {
             }
 
             function emitLeadingDeclarationComments(node: Node) {
-                var leadingComments = getLeadingCommentsToEmit(node);
+                let leadingComments = getLeadingCommentsToEmit(node);
                 emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments);
                 // Leading comments are emitted at /*leading comment1 */space/*leading comment*/space
                 emitComments(currentSourceFile, writer, leadingComments, /*trailingSeparator*/ true, newLine, writeComment);
@@ -5410,7 +5568,7 @@ module ts {
                 // Emit the trailing comments only if the parent's end doesn't match
                 if (node.parent) {
                     if (node.parent.kind === SyntaxKind.SourceFile || node.end !== node.parent.end) {
-                        var trailingComments = getTrailingCommentRanges(currentSourceFile.text, node.end);
+                        let trailingComments = getTrailingCommentRanges(currentSourceFile.text, node.end);
                         // trailing comments are emitted at space/*trailing comment1 */space/*trailing comment*/
                         emitComments(currentSourceFile, writer, trailingComments, /*trailingSeparator*/ false, newLine, writeComment);
                     }
@@ -5418,7 +5576,7 @@ module ts {
             }
 
             function emitLeadingCommentsOfLocalPosition(pos: number) {
-                var leadingComments: CommentRange[];
+                let leadingComments: CommentRange[];
                 if (hasDetachedComments(pos)) {
                     // get comments without detached comments
                     leadingComments = getLeadingCommentsWithoutDetachedComments();
@@ -5433,15 +5591,15 @@ module ts {
             }
 
             function emitDetachedCommentsAtPosition(node: TextRange) {
-                var leadingComments = getLeadingCommentRanges(currentSourceFile.text, node.pos);
+                let leadingComments = getLeadingCommentRanges(currentSourceFile.text, node.pos);
                 if (leadingComments) {
-                    var detachedComments: CommentRange[] = [];
-                    var lastComment: CommentRange;
+                    let detachedComments: CommentRange[] = [];
+                    let lastComment: CommentRange;
 
                     forEach(leadingComments, comment => {
                         if (lastComment) {
-                            var lastCommentLine = getLineOfLocalPosition(currentSourceFile, lastComment.end);
-                            var commentLine = getLineOfLocalPosition(currentSourceFile, comment.pos);
+                            let lastCommentLine = getLineOfLocalPosition(currentSourceFile, lastComment.end);
+                            let commentLine = getLineOfLocalPosition(currentSourceFile, comment.pos);
 
                             if (commentLine >= lastCommentLine + 2) {
                                 // There was a blank line between the last comment and this comment.  This
@@ -5459,13 +5617,13 @@ module ts {
                         // All comments look like they could have been part of the copyright header.  Make
                         // sure there is at least one blank line between it and the node.  If not, it's not
                         // a copyright header.
-                        var lastCommentLine = getLineOfLocalPosition(currentSourceFile, detachedComments[detachedComments.length - 1].end);
-                        var nodeLine = getLineOfLocalPosition(currentSourceFile, skipTrivia(currentSourceFile.text, node.pos));
+                        let lastCommentLine = getLineOfLocalPosition(currentSourceFile, detachedComments[detachedComments.length - 1].end);
+                        let nodeLine = getLineOfLocalPosition(currentSourceFile, skipTrivia(currentSourceFile.text, node.pos));
                         if (nodeLine >= lastCommentLine + 2) {
                             // Valid detachedComments
                             emitNewLineBeforeLeadingComments(currentSourceFile, writer, node, leadingComments);
                             emitComments(currentSourceFile, writer, detachedComments, /*trailingSeparator*/ true, newLine, writeComment);
-                            var currentDetachedCommentInfo = { nodePos: node.pos, detachedCommentEndPos: detachedComments[detachedComments.length - 1].end };
+                            let currentDetachedCommentInfo = { nodePos: node.pos, detachedCommentEndPos: detachedComments[detachedComments.length - 1].end };
                             if (detachedCommentsInfo) {
                                 detachedCommentsInfo.push(currentDetachedCommentInfo);
                             }
@@ -5479,7 +5637,7 @@ module ts {
 
             /** Emits /// or pinned which is comment starting with /*! comments */
             function emitPinnedOrTripleSlashComments(node: Node) {
-                var pinnedComments = ts.filter(getLeadingCommentsToEmit(node), isPinnedOrTripleSlashComment);
+                let pinnedComments = ts.filter(getLeadingCommentsToEmit(node), isPinnedOrTripleSlashComment);
 
                 function isPinnedOrTripleSlashComment(comment: CommentRange) {
                     if (currentSourceFile.text.charCodeAt(comment.pos + 1) === CharacterCodes.asterisk) {
@@ -5502,13 +5660,13 @@ module ts {
         }
 
         function writeDeclarationFile(jsFilePath: string, sourceFile: SourceFile) {
-            var emitDeclarationResult = emitDeclarations(host, resolver, diagnostics, jsFilePath, sourceFile);
+            let emitDeclarationResult = emitDeclarations(host, resolver, diagnostics, jsFilePath, sourceFile);
             // TODO(shkamat): Should we not write any declaration file if any of them can produce error,
             // or should we just not write this file like we are doing now
             if (!emitDeclarationResult.reportedDeclarationError) {
-                var declarationOutput = emitDeclarationResult.referencePathsOutput;
+                let declarationOutput = emitDeclarationResult.referencePathsOutput;
                 // apply additions
-                var appliedSyncOutputPos = 0;
+                let appliedSyncOutputPos = 0;
                 forEach(emitDeclarationResult.aliasDeclarationEmitInfo, aliasEmitInfo => {
                     if (aliasEmitInfo.asynchronousOutput) {
                         declarationOutput += emitDeclarationResult.synchronousDeclarationOutput.substring(appliedSyncOutputPos, aliasEmitInfo.outputPos);
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 0d6f002a3da..7f89ff6153b 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -2,8 +2,8 @@
 /// <reference path="utilities.ts"/>
 
 module ts {
-    var nodeConstructors = new Array<new () => Node>(SyntaxKind.Count);
-    /* @internal */ export var parseTime = 0;
+    let nodeConstructors = new Array<new () => Node>(SyntaxKind.Count);
+    /* @internal */ export let parseTime = 0;
 
     export function getNodeConstructor(kind: SyntaxKind): new () => Node {
         return nodeConstructors[kind] || (nodeConstructors[kind] = objectAllocator.getNodeConstructor(kind));
@@ -27,8 +27,8 @@ module ts {
 
     function visitEachNode<T>(cbNode: (node: Node) => T, nodes: Node[]) {
         if (nodes) {
-            for (var i = 0, len = nodes.length; i < len; i++) {
-                var result = cbNode(nodes[i]);
+            for (let node of nodes) {
+                let result = cbNode(node);
                 if (result) {
                     return result;
                 }
@@ -47,8 +47,8 @@ module ts {
         // The visitXXX functions could be written as local functions that close over the cbNode and cbNodeArray
         // callback parameters, but that causes a closure allocation for each invocation with noticeable effects
         // on performance.
-        var visitNodes: (cb: (node: Node | Node[]) => T, nodes: Node[]) => T = cbNodeArray ? visitNodeArray : visitEachNode;
-        var cbNodes = cbNodeArray || cbNode;
+        let visitNodes: (cb: (node: Node | Node[]) => T, nodes: Node[]) => T = cbNodeArray ? visitNodeArray : visitEachNode;
+        let cbNodes = cbNodeArray || cbNode;
         switch (node.kind) {
             case SyntaxKind.QualifiedName:
                 return visitNode(cbNode, (<QualifiedName>node).left) ||
@@ -209,7 +209,9 @@ module ts {
                     visitNode(cbNode, (<WithStatement>node).statement);
             case SyntaxKind.SwitchStatement:
                 return visitNode(cbNode, (<SwitchStatement>node).expression) ||
-                    visitNodes(cbNodes, (<SwitchStatement>node).clauses);
+                    visitNode(cbNode, (<SwitchStatement>node).caseBlock);
+            case SyntaxKind.CaseBlock:
+                return visitNodes(cbNodes, (<CaseBlock>node).clauses);
             case SyntaxKind.CaseClause:
                 return visitNode(cbNode, (<CaseClause>node).expression) ||
                     visitNodes(cbNodes, (<CaseClause>node).statements);
@@ -371,7 +373,7 @@ module ts {
         // overhead.  This functions allows us to set all the parents, without all the expense of
         // binding.
 
-        var parent: Node = sourceFile;
+        let parent: Node = sourceFile;
         forEachChild(sourceFile, visitNode);
         return;
 
@@ -382,7 +384,7 @@ module ts {
             if (n.parent !== parent) {
                 n.parent = parent;
 
-                var saveParent = parent;
+                let saveParent = parent;
                 parent = n;
                 forEachChild(n, visitNode);
                 parent = saveParent;
@@ -434,8 +436,8 @@ module ts {
             array.pos += delta;
             array.end += delta;
 
-            for (var i = 0, n = array.length; i < n; i++) {
-                visitNode(array[i]);
+            for (let node of array) {
+                visitNode(node);
             }
         }
     }
@@ -517,7 +519,7 @@ module ts {
 
     function checkNodePositions(node: Node, aggressiveChecks: boolean) {
         if (aggressiveChecks) {
-            var pos = node.pos;
+            let pos = node.pos;
             forEachChild(node, child => {
                 Debug.assert(child.pos >= pos);
                 pos = child.end;
@@ -551,7 +553,7 @@ module ts {
             // Check if the element intersects the change range.  If it does, then it is not
             // reusable.  Also, we'll need to recurse to see what constituent portions we may
             // be able to use.
-            var fullEnd = child.end;
+            let fullEnd = child.end;
             if (fullEnd >= changeStart) {
                 child.intersectsChange = true;
                 child._children = undefined;
@@ -580,15 +582,15 @@ module ts {
             // Check if the element intersects the change range.  If it does, then it is not
             // reusable.  Also, we'll need to recurse to see what constituent portions we may
             // be able to use.
-            var fullEnd = array.end;
+            let fullEnd = array.end;
             if (fullEnd >= changeStart) {
                 array.intersectsChange = true;
                 array._children = undefined;
 
                 // Adjust the pos or end (or both) of the intersecting array accordingly.
                 adjustIntersectingElement(array, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta);
-                for (var i = 0, n = array.length; i < n; i++) {
-                    visitNode(array[i]);
+                for (let node of array) {
+                    visitNode(node);
                 }
                 return;
             }
@@ -609,35 +611,35 @@ module ts {
         // (as it does not intersect the actual original change range).  Because an edit may
         // change the token touching it, we actually need to look back *at least* one token so
         // that the prior token sees that change.  
-        var maxLookahead = 1;
+        let maxLookahead = 1;
 
-        var start = changeRange.span.start;
+        let start = changeRange.span.start;
 
         // the first iteration aligns us with the change start. subsequent iteration move us to
         // the left by maxLookahead tokens.  We only need to do this as long as we're not at the
         // start of the tree.
-        for (var i = 0; start > 0 && i <= maxLookahead; i++) {
-            var nearestNode = findNearestNodeStartingBeforeOrAtPosition(sourceFile, start);
+        for (let i = 0; start > 0 && i <= maxLookahead; i++) {
+            let nearestNode = findNearestNodeStartingBeforeOrAtPosition(sourceFile, start);
             Debug.assert(nearestNode.pos <= start);
-            var position = nearestNode.pos;
+            let position = nearestNode.pos;
 
             start = Math.max(0, position - 1);
         }
 
-        var finalSpan = createTextSpanFromBounds(start, textSpanEnd(changeRange.span));
-        var finalLength = changeRange.newLength + (changeRange.span.start - start);
+        let finalSpan = createTextSpanFromBounds(start, textSpanEnd(changeRange.span));
+        let finalLength = changeRange.newLength + (changeRange.span.start - start);
 
         return createTextChangeRange(finalSpan, finalLength);
     }
 
     function findNearestNodeStartingBeforeOrAtPosition(sourceFile: SourceFile, position: number): Node {
-        var bestResult: Node = sourceFile;
-        var lastNodeEntirelyBeforePosition: Node;
+        let bestResult: Node = sourceFile;
+        let lastNodeEntirelyBeforePosition: Node;
 
         forEachChild(sourceFile, visit);
 
         if (lastNodeEntirelyBeforePosition) {
-            var lastChildOfLastEntireNodeBeforePosition = getLastChild(lastNodeEntirelyBeforePosition);
+            let lastChildOfLastEntireNodeBeforePosition = getLastChild(lastNodeEntirelyBeforePosition);
             if (lastChildOfLastEntireNodeBeforePosition.pos > bestResult.pos) {
                 bestResult = lastChildOfLastEntireNodeBeforePosition;
             }
@@ -647,7 +649,7 @@ module ts {
 
         function getLastChild(node: Node): Node {
             while (true) {
-                var lastChild = getLastChildWorker(node);
+                let lastChild = getLastChildWorker(node);
                 if (lastChild) {
                     node = lastChild;
                 }
@@ -658,7 +660,7 @@ module ts {
         }
 
         function getLastChildWorker(node: Node): Node {
-            var last: Node = undefined;
+            let last: Node = undefined;
             forEachChild(node, child => {
                 if (nodeIsPresent(child)) {
                     last = child;
@@ -726,17 +728,17 @@ module ts {
     }
 
     function checkChangeRange(sourceFile: SourceFile, newText: string, textChangeRange: TextChangeRange, aggressiveChecks: boolean) {
-        var oldText = sourceFile.text;
+        let oldText = sourceFile.text;
         if (textChangeRange) {
             Debug.assert((oldText.length - textChangeRange.span.length + textChangeRange.newLength) === newText.length);
 
             if (aggressiveChecks || Debug.shouldAssert(AssertionLevel.VeryAggressive)) {
-                var oldTextPrefix = oldText.substr(0, textChangeRange.span.start);
-                var newTextPrefix = newText.substr(0, textChangeRange.span.start);
+                let oldTextPrefix = oldText.substr(0, textChangeRange.span.start);
+                let newTextPrefix = newText.substr(0, textChangeRange.span.start);
                 Debug.assert(oldTextPrefix === newTextPrefix);
 
-                var oldTextSuffix = oldText.substring(textSpanEnd(textChangeRange.span), oldText.length);
-                var newTextSuffix = newText.substring(textSpanEnd(textChangeRangeNewSpan(textChangeRange)), newText.length);
+                let oldTextSuffix = oldText.substring(textSpanEnd(textChangeRange.span), oldText.length);
+                let newTextSuffix = newText.substring(textSpanEnd(textChangeRangeNewSpan(textChangeRange)), newText.length);
                 Debug.assert(oldTextSuffix === newTextSuffix);
             }
         }
@@ -772,16 +774,16 @@ module ts {
         // This is because we do incremental parsing in-place.  i.e. we take nodes from the old
         // tree and give them new positions and parents.  From that point on, trusting the old
         // tree at all is not possible as far too much of it may violate invariants.
-        var incrementalSourceFile = <IncrementalNode><Node>sourceFile;
+        let incrementalSourceFile = <IncrementalNode><Node>sourceFile;
         Debug.assert(!incrementalSourceFile.hasBeenIncrementallyParsed);
         incrementalSourceFile.hasBeenIncrementallyParsed = true;
 
-        var oldText = sourceFile.text;
-        var syntaxCursor = createSyntaxCursor(sourceFile);
+        let oldText = sourceFile.text;
+        let syntaxCursor = createSyntaxCursor(sourceFile);
 
         // Make the actual change larger so that we know to reparse anything whose lookahead 
         // might have intersected the change.
-        var changeRange = extendToAffectedRange(sourceFile, textChangeRange);
+        let changeRange = extendToAffectedRange(sourceFile, textChangeRange);
         checkChangeRange(sourceFile, newText, changeRange, aggressiveChecks);
 
         // Ensure that extending the affected range only moved the start of the change range 
@@ -793,7 +795,7 @@ module ts {
         // The is the amount the nodes after the edit range need to be adjusted.  It can be 
         // positive (if the edit added characters), negative (if the edit deleted characters)
         // or zero (if this was a pure overwrite with nothing added/removed).
-        var delta = textChangeRangeNewSpan(changeRange).length - changeRange.span.length;
+        let delta = textChangeRangeNewSpan(changeRange).length - changeRange.span.length;
 
         // If we added or removed characters during the edit, then we need to go and adjust all
         // the nodes after the edit.  Those nodes may move forward (if we inserted chars) or they 
@@ -827,7 +829,7 @@ module ts {
         // inconsistent tree.  Setting the parents on the new tree should be very fast.  We 
         // will immediately bail out of walking any subtrees when we can see that their parents
         // are already correct.
-        var result = parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, syntaxCursor, /* setParentNode */ true)  
+        let result = parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, syntaxCursor, /* setParentNode */ true)  
 
         return result;
     }
@@ -840,7 +842,7 @@ module ts {
     /// Should be called only on prologue directives (isPrologueDirective(node) should be true)
     function isUseStrictPrologueDirective(sourceFile: SourceFile, node: Node): boolean {
         Debug.assert(isPrologueDirective(node));
-        var nodeText = getSourceTextOfNodeFromSourceFile(sourceFile,(<ExpressionStatement>node).expression);
+        let nodeText = getSourceTextOfNodeFromSourceFile(sourceFile,(<ExpressionStatement>node).expression);
 
         // Note: the node text must be exactly "use strict" or 'use strict'.  It is not ok for the
         // string to contain unicode escapes (as per ES5).
@@ -874,12 +876,12 @@ module ts {
     }
 
     function createSyntaxCursor(sourceFile: SourceFile): SyntaxCursor {
-        var currentArray: NodeArray<Node> = sourceFile.statements;
-        var currentArrayIndex = 0;
+        let currentArray: NodeArray<Node> = sourceFile.statements;
+        let currentArrayIndex = 0;
 
         Debug.assert(currentArrayIndex < currentArray.length);
-        var current = currentArray[currentArrayIndex];
-        var lastQueriedPosition = InvalidPosition.Value;
+        let current = currentArray[currentArrayIndex];
+        let lastQueriedPosition = InvalidPosition.Value;
 
         return {
             currentNode(position: number) {
@@ -946,8 +948,8 @@ module ts {
                 if (position >= array.pos && position < array.end) {
                     // position was in this array.  Search through this array to see if we find a
                     // viable element.
-                    for (var i = 0, n = array.length; i < n; i++) {
-                        var child = array[i];
+                    for (let i = 0, n = array.length; i < n; i++) {
+                        let child = array[i];
                         if (child) {
                             if (child.pos === position) {
                                 // Found the right node.  We're done.
@@ -975,21 +977,21 @@ module ts {
     }
 
     export function createSourceFile(fileName: string, sourceText: string, languageVersion: ScriptTarget, setParentNodes = false): SourceFile {
-        var start = new Date().getTime();
-        var result = parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes);
+        let start = new Date().getTime();
+        let result = parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes);
 
         parseTime += new Date().getTime() - start;
         return result;
     }
 
     function parseSourceFile(fileName: string, sourceText: string, languageVersion: ScriptTarget, syntaxCursor: SyntaxCursor, setParentNodes = false): SourceFile {
-        var parsingContext: ParsingContext = 0;
-        var identifiers: Map<string> = {};
-        var identifierCount = 0;
-        var nodeCount = 0;
-        var token: SyntaxKind;
+        let parsingContext: ParsingContext = 0;
+        let identifiers: Map<string> = {};
+        let identifierCount = 0;
+        let nodeCount = 0;
+        let token: SyntaxKind;
 
-        var sourceFile = <SourceFile>createNode(SyntaxKind.SourceFile, /*pos*/ 0);
+        let sourceFile = <SourceFile>createNode(SyntaxKind.SourceFile, /*pos*/ 0);
 
         sourceFile.pos = 0;
         sourceFile.end = sourceText.length;
@@ -1047,7 +1049,7 @@ module ts {
         // Note: it should not be necessary to save/restore these flags during speculative/lookahead
         // parsing.  These context flags are naturally stored and restored through normal recursive
         // descent parsing and unwinding.
-        var contextFlags: ParserContextFlags = 0;
+        let contextFlags: ParserContextFlags = 0;
 
         // Whether or not we've had a parse error since creating the last AST node.  If we have 
         // encountered an error, it will be stored on the next AST node we create.  Parse errors
@@ -1076,10 +1078,10 @@ module ts {
         //
         // Note: any errors at the end of the file that do not precede a regular node, should get
         // attached to the EOF token.
-        var parseErrorBeforeNextFinishedNode: boolean = false;
+        let parseErrorBeforeNextFinishedNode: boolean = false;
 
         // Create and prime the scanner before parsing the source elements.
-        var scanner = createScanner(languageVersion, /*skipTrivia*/ true, sourceText, scanError);
+        let scanner = createScanner(languageVersion, /*skipTrivia*/ true, sourceText, scanError);
         token = nextToken();
 
         processReferenceComments(sourceFile);
@@ -1129,7 +1131,7 @@ module ts {
         function allowInAnd<T>(func: () => T): T {
             if (contextFlags & ParserContextFlags.DisallowIn) {
                 setDisallowInContext(false);
-                var result = func();
+                let result = func();
                 setDisallowInContext(true);
                 return result;
             }
@@ -1145,7 +1147,7 @@ module ts {
             }
 
             setDisallowInContext(true);
-            var result = func();
+            let result = func();
             setDisallowInContext(false);
             return result;
         }
@@ -1157,7 +1159,7 @@ module ts {
             }
 
             setYieldContext(true);
-            var result = func();
+            let result = func();
             setYieldContext(false);
             return result;
         }
@@ -1165,7 +1167,7 @@ module ts {
         function doOutsideOfYieldContext<T>(func: () => T): T {
             if (contextFlags & ParserContextFlags.Yield) {
                 setYieldContext(false);
-                var result = func();
+                let result = func();
                 setYieldContext(true);
                 return result;
             }
@@ -1191,15 +1193,15 @@ module ts {
         }
 
         function parseErrorAtCurrentToken(message: DiagnosticMessage, arg0?: any): void {
-            var start = scanner.getTokenPos();
-            var length = scanner.getTextPos() - start;
+            let start = scanner.getTokenPos();
+            let length = scanner.getTextPos() - start;
 
             parseErrorAtPosition(start, length, message, arg0);
         }
 
         function parseErrorAtPosition(start: number, length: number, message: DiagnosticMessage, arg0?: any): void {
             // Don't report another error if it would just be at the same position as the last error.
-            var lastError = lastOrUndefined(sourceFile.parseDiagnostics);
+            let lastError = lastOrUndefined(sourceFile.parseDiagnostics);
             if (!lastError || start !== lastError.start) {
                 sourceFile.parseDiagnostics.push(createFileDiagnostic(sourceFile, start, length, message, arg0));
             }
@@ -1210,7 +1212,7 @@ module ts {
         }
 
         function scanError(message: DiagnosticMessage, length?: number) {
-            var pos = scanner.getTextPos();
+            let pos = scanner.getTextPos();
             parseErrorAtPosition(pos, length || 0, message);
         }
 
@@ -1245,20 +1247,20 @@ module ts {
         function speculationHelper<T>(callback: () => T, isLookAhead: boolean): T {
             // Keep track of the state we'll need to rollback to if lookahead fails (or if the 
             // caller asked us to always reset our state).
-            var saveToken = token;
-            var saveParseDiagnosticsLength = sourceFile.parseDiagnostics.length;
-            var saveParseErrorBeforeNextFinishedNode = parseErrorBeforeNextFinishedNode;
+            let saveToken = token;
+            let saveParseDiagnosticsLength = sourceFile.parseDiagnostics.length;
+            let saveParseErrorBeforeNextFinishedNode = parseErrorBeforeNextFinishedNode;
 
             // Note: it is not actually necessary to save/restore the context flags here.  That's
             // because the saving/restorating of these flags happens naturally through the recursive
             // descent nature of our parser.  However, we still store this here just so we can 
             // assert that that invariant holds.
-            var saveContextFlags = contextFlags;
+            let saveContextFlags = contextFlags;
 
             // If we're only looking ahead, then tell the scanner to only lookahead as well.
             // Otherwise, if we're actually speculatively parsing, then tell the scanner to do the 
             // same. 
-            var result = isLookAhead
+            let result = isLookAhead
                 ? scanner.lookAhead(callback)
                 : scanner.tryScan(callback);
 
@@ -1341,7 +1343,7 @@ module ts {
         }
 
         function parseTokenNode<T extends Node>(): T {
-            var node = <T>createNode(token);
+            let node = <T>createNode(token);
             nextToken();
             return finishNode(node);
         }
@@ -1372,7 +1374,7 @@ module ts {
 
         function createNode(kind: SyntaxKind, pos?: number): Node {
             nodeCount++;
-            var node = new (nodeConstructors[kind] || (nodeConstructors[kind] = objectAllocator.getNodeConstructor(kind)))();
+            let node = new (nodeConstructors[kind] || (nodeConstructors[kind] = objectAllocator.getNodeConstructor(kind)))();
             if (!(pos >= 0)) {
                 pos = scanner.getStartPos();
             }
@@ -1408,7 +1410,7 @@ module ts {
                 parseErrorAtCurrentToken(diagnosticMessage, arg0);
             }
 
-            var result = createNode(kind, scanner.getStartPos());
+            let result = createNode(kind, scanner.getStartPos());
             (<Identifier>result).text = "";
             return finishNode(result);
         }
@@ -1424,7 +1426,7 @@ module ts {
         function createIdentifier(isIdentifier: boolean, diagnosticMessage?: DiagnosticMessage): Identifier {
             identifierCount++;
             if (isIdentifier) {
-                var node = <Identifier>createNode(SyntaxKind.Identifier);
+                let node = <Identifier>createNode(SyntaxKind.Identifier);
                 node.text = internIdentifier(scanner.getTokenValue());
                 nextToken();
                 return finishNode(node);
@@ -1466,13 +1468,13 @@ module ts {
             // ComputedPropertyName[Yield] :
             //     [ AssignmentExpression[In, ?Yield] ]
             //
-            var node = <ComputedPropertyName>createNode(SyntaxKind.ComputedPropertyName);
+            let node = <ComputedPropertyName>createNode(SyntaxKind.ComputedPropertyName);
             parseExpected(SyntaxKind.OpenBracketToken);
 
             // We parse any expression (including a comma expression). But the grammar
             // says that only an assignment expression is allowed, so the grammar checker
             // will error if it sees a comma expression.
-            var yieldContext = inYieldContext();
+            let yieldContext = inYieldContext();
             if (inGeneratorParameterContext()) {
                 setYieldContext(false);
             }
@@ -1532,7 +1534,7 @@ module ts {
 
         // True if positioned at the start of a list element
         function isListElement(parsingContext: ParsingContext, inErrorRecovery: boolean): boolean {
-            var node = currentNode(parsingContext);
+            let node = currentNode(parsingContext);
             if (node) {
                 return true;
             }
@@ -1672,7 +1674,7 @@ module ts {
 
         // True if positioned at element or terminator of the current list or any enclosing list
         function isInSomeParsingContext(): boolean {
-            for (var kind = 0; kind < ParsingContext.Count; kind++) {
+            for (let kind = 0; kind < ParsingContext.Count; kind++) {
                 if (parsingContext & (1 << kind)) {
                     if (isListElement(kind, /* inErrorRecovery */ true) || isListTerminator(kind)) {
                         return true;
@@ -1685,15 +1687,15 @@ module ts {
 
         // Parses a list of elements
         function parseList<T extends Node>(kind: ParsingContext, checkForStrictMode: boolean, parseElement: () => T): NodeArray<T> {
-            var saveParsingContext = parsingContext;
+            let saveParsingContext = parsingContext;
             parsingContext |= 1 << kind;
-            var result = <NodeArray<T>>[];
+            let result = <NodeArray<T>>[];
             result.pos = getNodePos();
-            var savedStrictModeContext = inStrictModeContext();
+            let savedStrictModeContext = inStrictModeContext();
 
             while (!isListTerminator(kind)) {
                 if (isListElement(kind, /* inErrorRecovery */ false)) {
-                    var element = parseListElement(kind, parseElement);
+                    let element = parseListElement(kind, parseElement);
                     result.push(element);
 
                     // test elements only if we are not already in strict mode
@@ -1724,7 +1726,7 @@ module ts {
         }
 
         function parseListElement<T extends Node>(parsingContext: ParsingContext, parseElement: () => T): T {
-            var node = currentNode(parsingContext);
+            let node = currentNode(parsingContext);
             if (node) {
                 return <T>consumeNode(node);
             }
@@ -1749,7 +1751,7 @@ module ts {
                 return undefined;
             }
 
-            var node = syntaxCursor.currentNode(scanner.getStartPos());
+            let node = syntaxCursor.currentNode(scanner.getStartPos());
 
             // Can't reuse a missing node.
             if (nodeIsMissing(node)) {
@@ -1778,7 +1780,7 @@ module ts {
             // differently depending on what mode it is in.
             //
             // This also applies to all our other context flags as well.
-            var nodeContextFlags = node.parserContextFlags & ParserContextFlags.ParserGeneratedFlags;
+            let nodeContextFlags = node.parserContextFlags & ParserContextFlags.ParserGeneratedFlags;
             if (nodeContextFlags !== contextFlags) {
                 return undefined;
             }
@@ -1976,19 +1978,19 @@ module ts {
 
             // Very subtle incremental parsing bug.  Consider the following code:
             //
-            //      var v = new List < A, B
+            //      let v = new List < A, B
             //
             // This is actually legal code.  It's a list of variable declarators "v = new List<A" 
             // on one side and "B" on the other. If you then change that to:
             //
-            //      var v = new List < A, B >()
+            //      let v = new List < A, B >()
             // 
             // then we have a problem.  "v = new List<A" doesn't intersect the change range, so we
             // start reparsing at "B" and we completely fail to handle this properly.
             //
             // In order to prevent this, we do not allow a variable declarator to be reused if it
             // has an initializer.
-            var variableDeclarator = <VariableDeclaration>node;
+            let variableDeclarator = <VariableDeclaration>node;
             return variableDeclarator.initializer === undefined;
         }
 
@@ -1998,7 +2000,7 @@ module ts {
             }
 
             // See the comment in isReusableVariableDeclaration for why we do this.
-            var parameter = <ParameterDeclaration>node;
+            let parameter = <ParameterDeclaration>node;
             return parameter.initializer === undefined;
         }
 
@@ -2015,12 +2017,12 @@ module ts {
 
         // Parses a comma-delimited list of elements
         function parseDelimitedList<T extends Node>(kind: ParsingContext, parseElement: () => T, considerSemicolonAsDelimeter?: boolean): NodeArray<T> {
-            var saveParsingContext = parsingContext;
+            let saveParsingContext = parsingContext;
             parsingContext |= 1 << kind;
-            var result = <NodeArray<T>>[];
+            let result = <NodeArray<T>>[];
             result.pos = getNodePos();
 
-            var commaStart = -1; // Meaning the previous token was not a comma
+            let commaStart = -1; // Meaning the previous token was not a comma
             while (true) {
                 if (isListElement(kind, /* inErrorRecovery */ false)) {
                     result.push(parseListElement(kind, parseElement));
@@ -2074,8 +2076,8 @@ module ts {
         }
 
         function createMissingList<T>(): NodeArray<T> {
-            var pos = getNodePos();
-            var result = <NodeArray<T>>[];
+            let pos = getNodePos();
+            let result = <NodeArray<T>>[];
             result.pos = pos;
             result.end = pos;
             return result;
@@ -2083,7 +2085,7 @@ module ts {
 
         function parseBracketedList<T extends Node>(kind: ParsingContext, parseElement: () => T, open: SyntaxKind, close: SyntaxKind): NodeArray<T> {
             if (parseExpected(open)) {
-                var result = parseDelimitedList(kind, parseElement);
+                let result = parseDelimitedList(kind, parseElement);
                 parseExpected(close);
                 return result;
             }
@@ -2093,9 +2095,9 @@ module ts {
 
         // The allowReservedWords parameter controls whether reserved words are permitted after the first dot
         function parseEntityName(allowReservedWords: boolean, diagnosticMessage?: DiagnosticMessage): EntityName {
-            var entity: EntityName = parseIdentifier(diagnosticMessage);
+            let entity: EntityName = parseIdentifier(diagnosticMessage);
             while (parseOptional(SyntaxKind.DotToken)) {
-                var node = <QualifiedName>createNode(SyntaxKind.QualifiedName, entity.pos);
+                let node = <QualifiedName>createNode(SyntaxKind.QualifiedName, entity.pos);
                 node.left = entity;
                 node.right = parseRightSideOfDot(allowReservedWords);
                 entity = finishNode(node);
@@ -2124,7 +2126,7 @@ module ts {
             // In the first case though, ASI will not take effect because there is not a
             // line terminator after the keyword.
             if (scanner.hasPrecedingLineBreak() && scanner.isReservedWord()) {
-                var matchesPattern = lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine);
+                let matchesPattern = lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine);
 
                 if (matchesPattern) {
                     // Report that we need an identifier.  However, report it right after the dot, 
@@ -2138,12 +2140,12 @@ module ts {
         }
 
         function parseTemplateExpression(): TemplateExpression {
-            var template = <TemplateExpression>createNode(SyntaxKind.TemplateExpression);
+            let template = <TemplateExpression>createNode(SyntaxKind.TemplateExpression);
 
             template.head = parseLiteralNode();
             Debug.assert(template.head.kind === SyntaxKind.TemplateHead, "Template head has wrong token kind");
 
-            var templateSpans = <NodeArray<TemplateSpan>>[];
+            let templateSpans = <NodeArray<TemplateSpan>>[];
             templateSpans.pos = getNodePos();
 
             do {
@@ -2158,10 +2160,10 @@ module ts {
         }
 
         function parseTemplateSpan(): TemplateSpan {
-            var span = <TemplateSpan>createNode(SyntaxKind.TemplateSpan);
+            let span = <TemplateSpan>createNode(SyntaxKind.TemplateSpan);
             span.expression = allowInAnd(parseExpression);
 
-            var literal: LiteralExpression;
+            let literal: LiteralExpression;
 
             if (token === SyntaxKind.CloseBraceToken) {
                 reScanTemplateToken()
@@ -2176,8 +2178,8 @@ module ts {
         }
 
         function parseLiteralNode(internName?: boolean): LiteralExpression {
-            var node = <LiteralExpression>createNode(token);
-            var text = scanner.getTokenValue();
+            let node = <LiteralExpression>createNode(token);
+            let text = scanner.getTokenValue();
             node.text = internName ? internIdentifier(text) : text;
 
             if (scanner.hasExtendedUnicodeEscape()) {
@@ -2188,7 +2190,7 @@ module ts {
                 node.isUnterminated = true;
             }
 
-            var tokenPos = scanner.getTokenPos();
+            let tokenPos = scanner.getTokenPos();
             nextToken();
             finishNode(node);
             
@@ -2211,7 +2213,7 @@ module ts {
         // TYPES
 
         function parseTypeReference(): TypeReferenceNode {
-            var node = <TypeReferenceNode>createNode(SyntaxKind.TypeReference);
+            let node = <TypeReferenceNode>createNode(SyntaxKind.TypeReference);
             node.typeName = parseEntityName(/*allowReservedWords*/ false, Diagnostics.Type_expected);
             if (!scanner.hasPrecedingLineBreak() && token === SyntaxKind.LessThanToken) {
                 node.typeArguments = parseBracketedList(ParsingContext.TypeArguments, parseType, SyntaxKind.LessThanToken, SyntaxKind.GreaterThanToken);
@@ -2220,14 +2222,14 @@ module ts {
         }
 
         function parseTypeQuery(): TypeQueryNode {
-            var node = <TypeQueryNode>createNode(SyntaxKind.TypeQuery);
+            let node = <TypeQueryNode>createNode(SyntaxKind.TypeQuery);
             parseExpected(SyntaxKind.TypeOfKeyword);
             node.exprName = parseEntityName(/*allowReservedWords*/ true);
             return finishNode(node);
         }
 
         function parseTypeParameter(): TypeParameterDeclaration {
-            var node = <TypeParameterDeclaration>createNode(SyntaxKind.TypeParameter);
+            let node = <TypeParameterDeclaration>createNode(SyntaxKind.TypeParameter);
             node.name = parseIdentifier();
             if (parseOptional(SyntaxKind.ExtendsKeyword)) {
                 // It's not uncommon for people to write improper constraints to a generic.  If the 
@@ -2280,7 +2282,7 @@ module ts {
         }
 
         function parseParameter(): ParameterDeclaration {
-            var node = <ParameterDeclaration>createNode(SyntaxKind.Parameter);
+            let node = <ParameterDeclaration>createNode(SyntaxKind.Parameter);
             setModifiers(node, parseModifiers());
             node.dotDotDotToken = parseOptionalToken(SyntaxKind.DotDotDotToken);
 
@@ -2326,7 +2328,7 @@ module ts {
                 yieldAndGeneratorParameterContext: boolean,
                 requireCompleteParameterList: boolean,
                 signature: SignatureDeclaration): void {
-            var returnTokenRequired = returnToken === SyntaxKind.EqualsGreaterThanToken;
+            let returnTokenRequired = returnToken === SyntaxKind.EqualsGreaterThanToken;
             signature.typeParameters = parseTypeParameters();
             signature.parameters = parseParameterList(yieldAndGeneratorParameterContext, requireCompleteParameterList);
 
@@ -2359,13 +2361,13 @@ module ts {
             //      [+GeneratorParameter]BindingIdentifier[Yield]Initializer[In]opt
             //      [~GeneratorParameter]BindingIdentifier[?Yield]Initializer[In, ?Yield]opt
             if (parseExpected(SyntaxKind.OpenParenToken)) {
-                var savedYieldContext = inYieldContext();
-                var savedGeneratorParameterContext = inGeneratorParameterContext();
+                let savedYieldContext = inYieldContext();
+                let savedGeneratorParameterContext = inGeneratorParameterContext();
 
                 setYieldContext(yieldAndGeneratorParameterContext);
                 setGeneratorParameterContext(yieldAndGeneratorParameterContext);
 
-                var result = parseDelimitedList(ParsingContext.Parameters, parseParameter);
+                let result = parseDelimitedList(ParsingContext.Parameters, parseParameter);
 
                 setYieldContext(savedYieldContext);
                 setGeneratorParameterContext(savedGeneratorParameterContext);
@@ -2397,7 +2399,7 @@ module ts {
         }
 
         function parseSignatureMember(kind: SyntaxKind): SignatureDeclaration {
-            var node = <SignatureDeclaration>createNode(kind);
+            let node = <SignatureDeclaration>createNode(kind);
             if (kind === SyntaxKind.ConstructSignature) {
                 parseExpected(SyntaxKind.NewKeyword);
             }
@@ -2470,8 +2472,8 @@ module ts {
         }
 
         function parseIndexSignatureDeclaration(modifiers: ModifiersArray): IndexSignatureDeclaration {
-            var fullStart = modifiers ? modifiers.pos : scanner.getStartPos();
-            var node = <IndexSignatureDeclaration>createNode(SyntaxKind.IndexSignature, fullStart);
+            let fullStart = modifiers ? modifiers.pos : scanner.getStartPos();
+            let node = <IndexSignatureDeclaration>createNode(SyntaxKind.IndexSignature, fullStart);
             setModifiers(node, modifiers);
             node.parameters = parseBracketedList(ParsingContext.Parameters, parseParameter, SyntaxKind.OpenBracketToken, SyntaxKind.CloseBracketToken);
             node.type = parseTypeAnnotation();
@@ -2480,12 +2482,12 @@ module ts {
         }
 
         function parsePropertyOrMethodSignature(): Declaration {
-            var fullStart = scanner.getStartPos();
-            var name = parsePropertyName();
-            var questionToken = parseOptionalToken(SyntaxKind.QuestionToken);
+            let fullStart = scanner.getStartPos();
+            let name = parsePropertyName();
+            let questionToken = parseOptionalToken(SyntaxKind.QuestionToken);
 
             if (token === SyntaxKind.OpenParenToken || token === SyntaxKind.LessThanToken) {
-                var method = <MethodDeclaration>createNode(SyntaxKind.MethodSignature, fullStart);
+                let method = <MethodDeclaration>createNode(SyntaxKind.MethodSignature, fullStart);
                 method.name = name;
                 method.questionToken = questionToken;
 
@@ -2496,7 +2498,7 @@ module ts {
                 return finishNode(method);
             }
             else {
-                var property = <PropertyDeclaration>createNode(SyntaxKind.PropertySignature, fullStart);
+                let property = <PropertyDeclaration>createNode(SyntaxKind.PropertySignature, fullStart);
                 property.name = name;
                 property.questionToken = questionToken;
                 property.type = parseTypeAnnotation();
@@ -2513,7 +2515,7 @@ module ts {
                     return true;
                 default:
                     if (isModifier(token)) {
-                        var result = lookAhead(isStartOfIndexSignatureDeclaration);
+                        let result = lookAhead(isStartOfIndexSignatureDeclaration);
                         if (result) {
                             return result;
                         }
@@ -2566,7 +2568,7 @@ module ts {
                     // if it has the same text regardless of whether it is inside a class or an
                     // object type.
                     if (isModifier(token)) {
-                        var result = tryParse(parseIndexSignatureWithModifiers);
+                        let result = tryParse(parseIndexSignatureWithModifiers);
                         if (result) {
                             return result;
                         }
@@ -2579,7 +2581,7 @@ module ts {
         }
 
         function parseIndexSignatureWithModifiers() {
-            var modifiers = parseModifiers();
+            let modifiers = parseModifiers();
             return isIndexSignature()
                 ? parseIndexSignatureDeclaration(modifiers)
                 : undefined;
@@ -2591,13 +2593,13 @@ module ts {
         }
 
         function parseTypeLiteral(): TypeLiteralNode {
-            var node = <TypeLiteralNode>createNode(SyntaxKind.TypeLiteral);
+            let node = <TypeLiteralNode>createNode(SyntaxKind.TypeLiteral);
             node.members = parseObjectTypeMembers();
             return finishNode(node);
         }
 
         function parseObjectTypeMembers(): NodeArray<Declaration> {
-            var members: NodeArray<Declaration>;
+            let members: NodeArray<Declaration>;
             if (parseExpected(SyntaxKind.OpenBraceToken)) {
                 members = parseList(ParsingContext.TypeMembers, /*checkForStrictMode*/ false, parseTypeMember);
                 parseExpected(SyntaxKind.CloseBraceToken);
@@ -2610,13 +2612,13 @@ module ts {
         }
 
         function parseTupleType(): TupleTypeNode {
-            var node = <TupleTypeNode>createNode(SyntaxKind.TupleType);
+            let node = <TupleTypeNode>createNode(SyntaxKind.TupleType);
             node.elementTypes = parseBracketedList(ParsingContext.TupleElementTypes, parseType, SyntaxKind.OpenBracketToken, SyntaxKind.CloseBracketToken);
             return finishNode(node);
         }
 
         function parseParenthesizedType(): ParenthesizedTypeNode {
-            var node = <ParenthesizedTypeNode>createNode(SyntaxKind.ParenthesizedType);
+            let node = <ParenthesizedTypeNode>createNode(SyntaxKind.ParenthesizedType);
             parseExpected(SyntaxKind.OpenParenToken);
             node.type = parseType();
             parseExpected(SyntaxKind.CloseParenToken);
@@ -2624,7 +2626,7 @@ module ts {
         }
 
         function parseFunctionOrConstructorType(kind: SyntaxKind): FunctionOrConstructorTypeNode {
-            var node = <FunctionOrConstructorTypeNode>createNode(kind);
+            let node = <FunctionOrConstructorTypeNode>createNode(kind);
             if (kind === SyntaxKind.ConstructorType) {
                 parseExpected(SyntaxKind.NewKeyword);
             }
@@ -2633,7 +2635,7 @@ module ts {
         }
 
         function parseKeywordAndNoDot(): TypeNode {
-            var node = parseTokenNode<TypeNode>();
+            let node = parseTokenNode<TypeNode>();
             return token === SyntaxKind.DotToken ? undefined : node;
         }
 
@@ -2645,7 +2647,7 @@ module ts {
                 case SyntaxKind.BooleanKeyword:
                 case SyntaxKind.SymbolKeyword:
                     // If these are followed by a dot, then parse these out as a dotted type reference instead.
-                    var node = tryParse(parseKeywordAndNoDot);
+                    let node = tryParse(parseKeywordAndNoDot);
                     return node || parseTypeReference();
                 case SyntaxKind.VoidKeyword:
                     return parseTokenNode<TypeNode>();
@@ -2691,10 +2693,10 @@ module ts {
         }
 
         function parseArrayTypeOrHigher(): TypeNode {
-            var type = parseNonArrayType();
+            let type = parseNonArrayType();
             while (!scanner.hasPrecedingLineBreak() && parseOptional(SyntaxKind.OpenBracketToken)) {
                 parseExpected(SyntaxKind.CloseBracketToken);
-                var node = <ArrayTypeNode>createNode(SyntaxKind.ArrayType, type.pos);
+                let node = <ArrayTypeNode>createNode(SyntaxKind.ArrayType, type.pos);
                 node.elementType = type;
                 type = finishNode(node);
             }
@@ -2702,15 +2704,15 @@ module ts {
         }
 
         function parseUnionTypeOrHigher(): TypeNode {
-            var type = parseArrayTypeOrHigher();
+            let type = parseArrayTypeOrHigher();
             if (token === SyntaxKind.BarToken) {
-                var types = <NodeArray<TypeNode>>[type];
+                let types = <NodeArray<TypeNode>>[type];
                 types.pos = type.pos;
                 while (parseOptional(SyntaxKind.BarToken)) {
                     types.push(parseArrayTypeOrHigher());
                 }
                 types.end = getNodeEnd();
-                var node = <UnionTypeNode>createNode(SyntaxKind.UnionType, type.pos);
+                let node = <UnionTypeNode>createNode(SyntaxKind.UnionType, type.pos);
                 node.types = types;
                 type = finishNode(node);
             }
@@ -2758,13 +2760,13 @@ module ts {
         function parseType(): TypeNode {
             // The rules about 'yield' only apply to actual code/expression contexts.  They don't
             // apply to 'type' contexts.  So we disable these parameters here before moving on.
-            var savedYieldContext = inYieldContext();
-            var savedGeneratorParameterContext = inGeneratorParameterContext();
+            let savedYieldContext = inYieldContext();
+            let savedGeneratorParameterContext = inGeneratorParameterContext();
 
             setYieldContext(false);
             setGeneratorParameterContext(false);
 
-            var result = parseTypeWorker();
+            let result = parseTypeWorker();
 
             setYieldContext(savedYieldContext);
             setGeneratorParameterContext(savedGeneratorParameterContext);
@@ -2845,8 +2847,8 @@ module ts {
             //      AssignmentExpression[in] 
             //      Expression[in] , AssignmentExpression[in]
 
-            var expr = parseAssignmentExpressionOrHigher();
-            var operatorToken: Node;
+            let expr = parseAssignmentExpressionOrHigher();
+            let operatorToken: Node;
             while ((operatorToken = parseOptionalToken(SyntaxKind.CommaToken))) {
                 expr = makeBinaryExpression(expr, operatorToken, parseAssignmentExpressionOrHigher());
             }
@@ -2897,7 +2899,7 @@ module ts {
             // parameter list. If we do, we must *not* recurse for productions 1, 2 or 3. An ArrowFunction is
             // not a  LeftHandSideExpression, nor does it start a ConditionalExpression.  So we are done 
             // with AssignmentExpression if we see one.
-            var arrowExpression = tryParseParenthesizedArrowFunctionExpression();
+            let arrowExpression = tryParseParenthesizedArrowFunctionExpression();
             if (arrowExpression) {
                 return arrowExpression;
             }
@@ -2911,7 +2913,7 @@ module ts {
             // Otherwise, we try to parse out the conditional expression bit.  We want to allow any 
             // binary expression here, so we pass in the 'lowest' precedence here so that it matches
             // and consumes anything.
-            var expr = parseBinaryExpressionOrHigher(/*precedence:*/ 0);
+            let expr = parseBinaryExpressionOrHigher(/*precedence:*/ 0);
 
             // To avoid a look-ahead, we did not handle the case of an arrow function with a single un-parenthesized
             // parameter ('x => ...') above. We handle it here by checking if the parsed expression was a single
@@ -2973,8 +2975,14 @@ module ts {
             return !scanner.hasPrecedingLineBreak() && isIdentifier()
         }
 
+        function nextTokenIsIdentifierOrStartOfDestructuringOnTheSameLine() {
+            nextToken();
+            return !scanner.hasPrecedingLineBreak() &&
+                (isIdentifier() || token === SyntaxKind.OpenBraceToken || token === SyntaxKind.OpenBracketToken);
+        }
+
         function parseYieldExpression(): YieldExpression {
-            var node = <YieldExpression>createNode(SyntaxKind.YieldExpression);
+            let node = <YieldExpression>createNode(SyntaxKind.YieldExpression);
 
             // YieldExpression[In] :
             //      yield
@@ -2998,9 +3006,9 @@ module ts {
         function parseSimpleArrowFunctionExpression(identifier: Identifier): Expression {
             Debug.assert(token === SyntaxKind.EqualsGreaterThanToken, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
 
-            var node = <FunctionExpression>createNode(SyntaxKind.ArrowFunction, identifier.pos);
+            let node = <FunctionExpression>createNode(SyntaxKind.ArrowFunction, identifier.pos);
 
-            var parameter = <ParameterDeclaration>createNode(SyntaxKind.Parameter, identifier.pos);
+            let parameter = <ParameterDeclaration>createNode(SyntaxKind.Parameter, identifier.pos);
             parameter.name = identifier;
             finishNode(parameter);
 
@@ -3015,7 +3023,7 @@ module ts {
         }
 
         function tryParseParenthesizedArrowFunctionExpression(): Expression {
-            var triState = isParenthesizedArrowFunctionExpression();
+            let triState = isParenthesizedArrowFunctionExpression();
 
             if (triState === Tristate.False) {
                 // It's definitely not a parenthesized arrow function expression.
@@ -3026,7 +3034,7 @@ module ts {
             // following => or { token. Otherwise, we *might* have an arrow function.  Try to parse
             // it out, but don't allow any ambiguity, and return 'undefined' if this could be an
             // expression instead.
-            var arrowFunction = triState === Tristate.True
+            let arrowFunction = triState === Tristate.True
                 ? parseParenthesizedArrowFunctionExpressionHead(/*allowAmbiguity:*/ true)
                 : tryParse(parsePossibleParenthesizedArrowFunctionExpressionHead);
 
@@ -3068,8 +3076,8 @@ module ts {
         }
 
         function isParenthesizedArrowFunctionExpressionWorker() {
-            var first = token;
-            var second = nextToken();
+            let first = token;
+            let second = nextToken();
 
             if (first === SyntaxKind.OpenParenToken) {
                 if (second === SyntaxKind.CloseParenToken) {
@@ -3077,7 +3085,7 @@ module ts {
                     // This is an arrow function with no parameters.
                     // The last one is not actually an arrow function,
                     // but this is probably what the user intended.
-                    var third = nextToken();
+                    let third = nextToken();
                     switch (third) {
                         case SyntaxKind.EqualsGreaterThanToken:
                         case SyntaxKind.ColonToken:
@@ -3132,7 +3140,7 @@ module ts {
         }
 
         function parseParenthesizedArrowFunctionExpressionHead(allowAmbiguity: boolean): FunctionExpression {
-            var node = <FunctionExpression>createNode(SyntaxKind.ArrowFunction);
+            let node = <FunctionExpression>createNode(SyntaxKind.ArrowFunction);
             // Arrow functions are never generators.
             //
             // If we're speculatively parsing a signature for a parenthesized arrow function, then
@@ -3175,7 +3183,7 @@ module ts {
                 // user meant to supply a block. For example, if the user wrote:
                 //
                 //  a =>
-                //      var v = 0;
+                //      let v = 0;
                 //  }
                 //
                 // they may be missing an open brace.  Check to see if that's the case so we can
@@ -3191,14 +3199,14 @@ module ts {
 
         function parseConditionalExpressionRest(leftOperand: Expression): Expression {
             // Note: we are passed in an expression which was produced from parseBinaryExpressionOrHigher.
-            var questionToken = parseOptionalToken(SyntaxKind.QuestionToken);
+            let questionToken = parseOptionalToken(SyntaxKind.QuestionToken);
             if (!questionToken) {
                 return leftOperand;
             }
 
             // Note: we explicitly 'allowIn' in the whenTrue part of the condition expression, and 
             // we do not that for the 'whenFalse' part.  
-            var node = <ConditionalExpression>createNode(SyntaxKind.ConditionalExpression, leftOperand.pos);
+            let node = <ConditionalExpression>createNode(SyntaxKind.ConditionalExpression, leftOperand.pos);
             node.condition = leftOperand;
             node.questionToken = questionToken;
             node.whenTrue = allowInAnd(parseAssignmentExpressionOrHigher);
@@ -3209,7 +3217,7 @@ module ts {
         }
 
         function parseBinaryExpressionOrHigher(precedence: number): Expression {
-            var leftOperand = parseUnaryExpressionOrHigher();
+            let leftOperand = parseUnaryExpressionOrHigher();
             return parseBinaryExpressionRest(precedence, leftOperand);
         }
 
@@ -3223,7 +3231,7 @@ module ts {
                 // reScanGreaterToken so that we merge token sequences like > and = into >=
 
                 reScanGreaterToken();
-                var newPrecedence = getBinaryOperatorPrecedence();
+                let newPrecedence = getBinaryOperatorPrecedence();
 
                 // Check the precedence to see if we should "take" this operator
                 if (newPrecedence <= precedence) {
@@ -3291,7 +3299,7 @@ module ts {
         }
 
         function makeBinaryExpression(left: Expression, operatorToken: Node, right: Expression): BinaryExpression {
-            var node = <BinaryExpression>createNode(SyntaxKind.BinaryExpression, left.pos);
+            let node = <BinaryExpression>createNode(SyntaxKind.BinaryExpression, left.pos);
             node.left = left;
             node.operatorToken = operatorToken;
             node.right = right;
@@ -3299,7 +3307,7 @@ module ts {
         }
 
         function parsePrefixUnaryExpression() {
-            var node = <PrefixUnaryExpression>createNode(SyntaxKind.PrefixUnaryExpression);
+            let node = <PrefixUnaryExpression>createNode(SyntaxKind.PrefixUnaryExpression);
             node.operator = token;
             nextToken();
             node.operand = parseUnaryExpressionOrHigher();
@@ -3307,21 +3315,21 @@ module ts {
         }
 
         function parseDeleteExpression() {
-            var node = <DeleteExpression>createNode(SyntaxKind.DeleteExpression);
+            let node = <DeleteExpression>createNode(SyntaxKind.DeleteExpression);
             nextToken();
             node.expression = parseUnaryExpressionOrHigher();
             return finishNode(node);
         }
 
         function parseTypeOfExpression() {
-            var node = <TypeOfExpression>createNode(SyntaxKind.TypeOfExpression);
+            let node = <TypeOfExpression>createNode(SyntaxKind.TypeOfExpression);
             nextToken();
             node.expression = parseUnaryExpressionOrHigher();
             return finishNode(node);
         }
 
         function parseVoidExpression() {
-            var node = <VoidExpression>createNode(SyntaxKind.VoidExpression);
+            let node = <VoidExpression>createNode(SyntaxKind.VoidExpression);
             nextToken();
             node.expression = parseUnaryExpressionOrHigher();
             return finishNode(node);
@@ -3350,11 +3358,11 @@ module ts {
         }
 
         function parsePostfixExpressionOrHigher(): PostfixExpression {
-            var expression = parseLeftHandSideExpressionOrHigher();
+            let expression = parseLeftHandSideExpressionOrHigher();
 
             Debug.assert(isLeftHandSideExpression(expression));
             if ((token === SyntaxKind.PlusPlusToken || token === SyntaxKind.MinusMinusToken) && !scanner.hasPrecedingLineBreak()) {
-                var node = <PostfixUnaryExpression>createNode(SyntaxKind.PostfixUnaryExpression, expression.pos);
+                let node = <PostfixUnaryExpression>createNode(SyntaxKind.PostfixUnaryExpression, expression.pos);
                 node.operand = expression;
                 node.operator = token;
                 nextToken();
@@ -3395,7 +3403,7 @@ module ts {
             // the last two CallExpression productions.  Or we have a MemberExpression which either
             // completes the LeftHandSideExpression, or starts the beginning of the first four
             // CallExpression productions.
-            var expression = token === SyntaxKind.SuperKeyword
+            let expression = token === SyntaxKind.SuperKeyword
                 ? parseSuperExpression()
                 : parseMemberExpressionOrHigher();
 
@@ -3452,19 +3460,19 @@ module ts {
             //
             // Because CallExpression and MemberExpression are left recursive, we need to bottom out
             // of the recursion immediately.  So we parse out a primary expression to start with.
-            var expression = parsePrimaryExpression();
+            let expression = parsePrimaryExpression();
             return parseMemberExpressionRest(expression);
         }
 
         function parseSuperExpression(): MemberExpression {
-            var expression = parseTokenNode<PrimaryExpression>();
+            let expression = parseTokenNode<PrimaryExpression>();
             if (token === SyntaxKind.OpenParenToken || token === SyntaxKind.DotToken) {
                 return expression;
             }
 
             // If we have seen "super" it must be followed by '(' or '.'.
             // If it wasn't then just try to parse out a '.' and report an error.
-            var node = <PropertyAccessExpression>createNode(SyntaxKind.PropertyAccessExpression, expression.pos);
+            let node = <PropertyAccessExpression>createNode(SyntaxKind.PropertyAccessExpression, expression.pos);
             node.expression = expression;
             node.dotToken = parseExpectedToken(SyntaxKind.DotToken, /*reportAtCurrentPosition:*/ false, Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access);
             node.name = parseRightSideOfDot(/*allowIdentifierNames:*/ true);
@@ -3472,7 +3480,7 @@ module ts {
         }
 
         function parseTypeAssertion(): TypeAssertion {
-            var node = <TypeAssertion>createNode(SyntaxKind.TypeAssertionExpression);
+            let node = <TypeAssertion>createNode(SyntaxKind.TypeAssertionExpression);
             parseExpected(SyntaxKind.LessThanToken);
             node.type = parseType();
             parseExpected(SyntaxKind.GreaterThanToken);
@@ -3482,9 +3490,9 @@ module ts {
 
         function parseMemberExpressionRest(expression: LeftHandSideExpression): MemberExpression {
             while (true) {
-                var dotToken = parseOptionalToken(SyntaxKind.DotToken);
+                let dotToken = parseOptionalToken(SyntaxKind.DotToken);
                 if (dotToken) {
-                    var propertyAccess = <PropertyAccessExpression>createNode(SyntaxKind.PropertyAccessExpression, expression.pos);
+                    let propertyAccess = <PropertyAccessExpression>createNode(SyntaxKind.PropertyAccessExpression, expression.pos);
                     propertyAccess.expression = expression;
                     propertyAccess.dotToken = dotToken;
                     propertyAccess.name = parseRightSideOfDot(/*allowIdentifierNames:*/ true);
@@ -3493,7 +3501,7 @@ module ts {
                 }
 
                 if (parseOptional(SyntaxKind.OpenBracketToken)) {
-                    var indexedAccess = <ElementAccessExpression>createNode(SyntaxKind.ElementAccessExpression, expression.pos);
+                    let indexedAccess = <ElementAccessExpression>createNode(SyntaxKind.ElementAccessExpression, expression.pos);
                     indexedAccess.expression = expression;
 
                     // It's not uncommon for a user to write: "new Type[]".
@@ -3501,7 +3509,7 @@ module ts {
                     if (token !== SyntaxKind.CloseBracketToken) {
                         indexedAccess.argumentExpression = allowInAnd(parseExpression);
                         if (indexedAccess.argumentExpression.kind === SyntaxKind.StringLiteral || indexedAccess.argumentExpression.kind === SyntaxKind.NumericLiteral) {
-                            var literal = <LiteralExpression>indexedAccess.argumentExpression;
+                            let literal = <LiteralExpression>indexedAccess.argumentExpression;
                             literal.text = internIdentifier(literal.text);
                         }
                     }
@@ -3512,7 +3520,7 @@ module ts {
                 }
 
                 if (token === SyntaxKind.NoSubstitutionTemplateLiteral || token === SyntaxKind.TemplateHead) {
-                    var tagExpression = <TaggedTemplateExpression>createNode(SyntaxKind.TaggedTemplateExpression, expression.pos);
+                    let tagExpression = <TaggedTemplateExpression>createNode(SyntaxKind.TaggedTemplateExpression, expression.pos);
                     tagExpression.tag = expression;
                     tagExpression.template = token === SyntaxKind.NoSubstitutionTemplateLiteral
                         ? parseLiteralNode()
@@ -3534,12 +3542,12 @@ module ts {
                     // keep checking for postfix expressions.  Otherwise, it's just a '<' that's 
                     // part of an arithmetic expression.  Break out so we consume it higher in the
                     // stack.
-                    var typeArguments = tryParse(parseTypeArgumentsInExpression);
+                    let typeArguments = tryParse(parseTypeArgumentsInExpression);
                     if (!typeArguments) {
                         return expression;
                     }
 
-                    var callExpr = <CallExpression>createNode(SyntaxKind.CallExpression, expression.pos);
+                    let callExpr = <CallExpression>createNode(SyntaxKind.CallExpression, expression.pos);
                     callExpr.expression = expression;
                     callExpr.typeArguments = typeArguments;
                     callExpr.arguments = parseArgumentList();
@@ -3547,7 +3555,7 @@ module ts {
                     continue;
                 }
                 else if (token === SyntaxKind.OpenParenToken) {
-                    var callExpr = <CallExpression>createNode(SyntaxKind.CallExpression, expression.pos);
+                    let callExpr = <CallExpression>createNode(SyntaxKind.CallExpression, expression.pos);
                     callExpr.expression = expression;
                     callExpr.arguments = parseArgumentList();
                     expression = finishNode(callExpr);
@@ -3560,7 +3568,7 @@ module ts {
 
         function parseArgumentList() {
             parseExpected(SyntaxKind.OpenParenToken);
-            var result = parseDelimitedList(ParsingContext.ArgumentExpressions, parseArgumentExpression);
+            let result = parseDelimitedList(ParsingContext.ArgumentExpressions, parseArgumentExpression);
             parseExpected(SyntaxKind.CloseParenToken);
             return result;
         }
@@ -3570,7 +3578,7 @@ module ts {
                 return undefined;
             }
 
-            var typeArguments = parseDelimitedList(ParsingContext.TypeArguments, parseType);
+            let typeArguments = parseDelimitedList(ParsingContext.TypeArguments, parseType);
             if (!parseExpected(SyntaxKind.GreaterThanToken)) {
                 // If it doesn't have the closing >  then it's definitely not an type argument list.
                 return undefined;
@@ -3654,7 +3662,7 @@ module ts {
         }
 
         function parseParenthesizedExpression(): ParenthesizedExpression {
-            var node = <ParenthesizedExpression>createNode(SyntaxKind.ParenthesizedExpression);
+            let node = <ParenthesizedExpression>createNode(SyntaxKind.ParenthesizedExpression);
             parseExpected(SyntaxKind.OpenParenToken);
             node.expression = allowInAnd(parseExpression);
             parseExpected(SyntaxKind.CloseParenToken);
@@ -3662,7 +3670,7 @@ module ts {
         }
 
         function parseSpreadElement(): Expression {
-            var node = <SpreadElementExpression>createNode(SyntaxKind.SpreadElementExpression);
+            let node = <SpreadElementExpression>createNode(SyntaxKind.SpreadElementExpression);
             parseExpected(SyntaxKind.DotDotDotToken);
             node.expression = parseAssignmentExpressionOrHigher();
             return finishNode(node);
@@ -3679,7 +3687,7 @@ module ts {
         }
 
         function parseArrayLiteralExpression(): ArrayLiteralExpression {
-            var node = <ArrayLiteralExpression>createNode(SyntaxKind.ArrayLiteralExpression);
+            let node = <ArrayLiteralExpression>createNode(SyntaxKind.ArrayLiteralExpression);
             parseExpected(SyntaxKind.OpenBracketToken);
             if (scanner.hasPrecedingLineBreak()) node.flags |= NodeFlags.MultiLine;
             node.elements = parseDelimitedList(ParsingContext.ArrayLiteralMembers, parseArgumentOrArrayLiteralElement);
@@ -3699,34 +3707,34 @@ module ts {
         }
 
         function parseObjectLiteralElement(): ObjectLiteralElement {
-            var fullStart = scanner.getStartPos();
-            var modifiers = parseModifiers();
+            let fullStart = scanner.getStartPos();
+            let modifiers = parseModifiers();
 
-            var accessor = tryParseAccessorDeclaration(fullStart, modifiers);
+            let accessor = tryParseAccessorDeclaration(fullStart, modifiers);
             if (accessor) {
                 return accessor;
             }
 
-            var asteriskToken = parseOptionalToken(SyntaxKind.AsteriskToken);
-            var tokenIsIdentifier = isIdentifier();
-            var nameToken = token;
-            var propertyName = parsePropertyName();
+            let asteriskToken = parseOptionalToken(SyntaxKind.AsteriskToken);
+            let tokenIsIdentifier = isIdentifier();
+            let nameToken = token;
+            let propertyName = parsePropertyName();
 
             // Disallowing of optional property assignments happens in the grammar checker.
-            var questionToken = parseOptionalToken(SyntaxKind.QuestionToken);
+            let questionToken = parseOptionalToken(SyntaxKind.QuestionToken);
             if (asteriskToken || token === SyntaxKind.OpenParenToken || token === SyntaxKind.LessThanToken) {
                 return parseMethodDeclaration(fullStart, modifiers, asteriskToken, propertyName, questionToken);
             }
 
             // Parse to check if it is short-hand property assignment or normal property assignment
             if ((token === SyntaxKind.CommaToken || token === SyntaxKind.CloseBraceToken) && tokenIsIdentifier) {
-                var shorthandDeclaration = <ShorthandPropertyAssignment>createNode(SyntaxKind.ShorthandPropertyAssignment, fullStart);
+                let shorthandDeclaration = <ShorthandPropertyAssignment>createNode(SyntaxKind.ShorthandPropertyAssignment, fullStart);
                 shorthandDeclaration.name = <Identifier>propertyName;
                 shorthandDeclaration.questionToken = questionToken;
                 return finishNode(shorthandDeclaration);
             }
             else {
-                var propertyAssignment = <PropertyAssignment>createNode(SyntaxKind.PropertyAssignment, fullStart);
+                let propertyAssignment = <PropertyAssignment>createNode(SyntaxKind.PropertyAssignment, fullStart);
                 propertyAssignment.name = propertyName;
                 propertyAssignment.questionToken = questionToken;
                 parseExpected(SyntaxKind.ColonToken);
@@ -3736,7 +3744,7 @@ module ts {
         }
 
         function parseObjectLiteralExpression(): ObjectLiteralExpression {
-            var node = <ObjectLiteralExpression>createNode(SyntaxKind.ObjectLiteralExpression);
+            let node = <ObjectLiteralExpression>createNode(SyntaxKind.ObjectLiteralExpression);
             parseExpected(SyntaxKind.OpenBraceToken);
             if (scanner.hasPrecedingLineBreak()) {
                 node.flags |= NodeFlags.MultiLine;
@@ -3752,7 +3760,7 @@ module ts {
             //      function * BindingIdentifier[Yield]opt (FormalParameters[Yield, GeneratorParameter]) { GeneratorBody[Yield] }
             // FunctionExpression:
             //      function BindingIdentifieropt(FormalParameters) { FunctionBody }
-            var node = <FunctionExpression>createNode(SyntaxKind.FunctionExpression);
+            let node = <FunctionExpression>createNode(SyntaxKind.FunctionExpression);
             parseExpected(SyntaxKind.FunctionKeyword);
             node.asteriskToken = parseOptionalToken(SyntaxKind.AsteriskToken);
             node.name = node.asteriskToken ? doInYieldContext(parseOptionalIdentifier) : parseOptionalIdentifier();
@@ -3766,7 +3774,7 @@ module ts {
         }
 
         function parseNewExpression(): NewExpression {
-            var node = <NewExpression>createNode(SyntaxKind.NewExpression);
+            let node = <NewExpression>createNode(SyntaxKind.NewExpression);
             parseExpected(SyntaxKind.NewKeyword);
             node.expression = parseMemberExpressionOrHigher();
             node.typeArguments = tryParse(parseTypeArgumentsInExpression);
@@ -3779,7 +3787,7 @@ module ts {
 
         // STATEMENTS
         function parseBlock(ignoreMissingOpenBrace: boolean, checkForStrictMode: boolean, diagnosticMessage?: DiagnosticMessage): Block {
-            var node = <Block>createNode(SyntaxKind.Block);
+            let node = <Block>createNode(SyntaxKind.Block);
             if (parseExpected(SyntaxKind.OpenBraceToken, diagnosticMessage) || ignoreMissingOpenBrace) {
                 node.statements = parseList(ParsingContext.BlockStatements, checkForStrictMode, parseStatement);
                 parseExpected(SyntaxKind.CloseBraceToken);
@@ -3791,10 +3799,10 @@ module ts {
         }
 
         function parseFunctionBlock(allowYield: boolean, ignoreMissingOpenBrace: boolean, diagnosticMessage?: DiagnosticMessage): Block {
-            var savedYieldContext = inYieldContext();
+            let savedYieldContext = inYieldContext();
             setYieldContext(allowYield);
 
-            var block = parseBlock(ignoreMissingOpenBrace, /*checkForStrictMode*/ true, diagnosticMessage);
+            let block = parseBlock(ignoreMissingOpenBrace, /*checkForStrictMode*/ true, diagnosticMessage);
 
             setYieldContext(savedYieldContext);
 
@@ -3802,13 +3810,13 @@ module ts {
         }
 
         function parseEmptyStatement(): Statement {
-            var node = <Statement>createNode(SyntaxKind.EmptyStatement);
+            let node = <Statement>createNode(SyntaxKind.EmptyStatement);
             parseExpected(SyntaxKind.SemicolonToken);
             return finishNode(node);
         }
 
         function parseIfStatement(): IfStatement {
-            var node = <IfStatement>createNode(SyntaxKind.IfStatement);
+            let node = <IfStatement>createNode(SyntaxKind.IfStatement);
             parseExpected(SyntaxKind.IfKeyword);
             parseExpected(SyntaxKind.OpenParenToken);
             node.expression = allowInAnd(parseExpression);
@@ -3819,7 +3827,7 @@ module ts {
         }
 
         function parseDoStatement(): DoStatement {
-            var node = <DoStatement>createNode(SyntaxKind.DoStatement);
+            let node = <DoStatement>createNode(SyntaxKind.DoStatement);
             parseExpected(SyntaxKind.DoKeyword);
             node.statement = parseStatement();
             parseExpected(SyntaxKind.WhileKeyword);
@@ -3836,7 +3844,7 @@ module ts {
         }
 
         function parseWhileStatement(): WhileStatement {
-            var node = <WhileStatement>createNode(SyntaxKind.WhileStatement);
+            let node = <WhileStatement>createNode(SyntaxKind.WhileStatement);
             parseExpected(SyntaxKind.WhileKeyword);
             parseExpected(SyntaxKind.OpenParenToken);
             node.expression = allowInAnd(parseExpression);
@@ -3846,11 +3854,11 @@ module ts {
         }
 
         function parseForOrForInOrForOfStatement(): Statement {
-            var pos = getNodePos();
+            let pos = getNodePos();
             parseExpected(SyntaxKind.ForKeyword);
             parseExpected(SyntaxKind.OpenParenToken);
 
-            var initializer: VariableDeclarationList | Expression = undefined;
+            let initializer: VariableDeclarationList | Expression = undefined;
             if (token !== SyntaxKind.SemicolonToken) {
                 if (token === SyntaxKind.VarKeyword || token === SyntaxKind.LetKeyword || token === SyntaxKind.ConstKeyword) {
                     initializer = parseVariableDeclarationList(/*inForStatementInitializer:*/ true);
@@ -3859,22 +3867,22 @@ module ts {
                     initializer = disallowInAnd(parseExpression);
                 }
             }
-            var forOrForInOrForOfStatement: IterationStatement;
+            let forOrForInOrForOfStatement: IterationStatement;
             if (parseOptional(SyntaxKind.InKeyword)) {
-                var forInStatement = <ForInStatement>createNode(SyntaxKind.ForInStatement, pos);
+                let forInStatement = <ForInStatement>createNode(SyntaxKind.ForInStatement, pos);
                 forInStatement.initializer = initializer;
                 forInStatement.expression = allowInAnd(parseExpression);
                 parseExpected(SyntaxKind.CloseParenToken);
                 forOrForInOrForOfStatement = forInStatement;
             }
             else if (parseOptional(SyntaxKind.OfKeyword)) {
-                var forOfStatement = <ForOfStatement>createNode(SyntaxKind.ForOfStatement, pos);
+                let forOfStatement = <ForOfStatement>createNode(SyntaxKind.ForOfStatement, pos);
                 forOfStatement.initializer = initializer;
                 forOfStatement.expression = allowInAnd(parseAssignmentExpressionOrHigher);
                 parseExpected(SyntaxKind.CloseParenToken);
                 forOrForInOrForOfStatement = forOfStatement;
             } else {
-                var forStatement = <ForStatement>createNode(SyntaxKind.ForStatement, pos);
+                let forStatement = <ForStatement>createNode(SyntaxKind.ForStatement, pos);
                 forStatement.initializer = initializer;
                 parseExpected(SyntaxKind.SemicolonToken);
                 if (token !== SyntaxKind.SemicolonToken && token !== SyntaxKind.CloseParenToken) {
@@ -3894,7 +3902,7 @@ module ts {
         }
 
         function parseBreakOrContinueStatement(kind: SyntaxKind): BreakOrContinueStatement {
-            var node = <BreakOrContinueStatement>createNode(kind);
+            let node = <BreakOrContinueStatement>createNode(kind);
 
             parseExpected(kind === SyntaxKind.BreakStatement ? SyntaxKind.BreakKeyword : SyntaxKind.ContinueKeyword);
             if (!canParseSemicolon()) {
@@ -3906,7 +3914,7 @@ module ts {
         }
 
         function parseReturnStatement(): ReturnStatement {
-            var node = <ReturnStatement>createNode(SyntaxKind.ReturnStatement);
+            let node = <ReturnStatement>createNode(SyntaxKind.ReturnStatement);
 
             parseExpected(SyntaxKind.ReturnKeyword);
             if (!canParseSemicolon()) {
@@ -3918,7 +3926,7 @@ module ts {
         }
 
         function parseWithStatement(): WithStatement {
-            var node = <WithStatement>createNode(SyntaxKind.WithStatement);
+            let node = <WithStatement>createNode(SyntaxKind.WithStatement);
             parseExpected(SyntaxKind.WithKeyword);
             parseExpected(SyntaxKind.OpenParenToken);
             node.expression = allowInAnd(parseExpression);
@@ -3928,7 +3936,7 @@ module ts {
         }
 
         function parseCaseClause(): CaseClause {
-            var node = <CaseClause>createNode(SyntaxKind.CaseClause);
+            let node = <CaseClause>createNode(SyntaxKind.CaseClause);
             parseExpected(SyntaxKind.CaseKeyword);
             node.expression = allowInAnd(parseExpression);
             parseExpected(SyntaxKind.ColonToken);
@@ -3937,7 +3945,7 @@ module ts {
         }
 
         function parseDefaultClause(): DefaultClause {
-            var node = <DefaultClause>createNode(SyntaxKind.DefaultClause);
+            let node = <DefaultClause>createNode(SyntaxKind.DefaultClause);
             parseExpected(SyntaxKind.DefaultKeyword);
             parseExpected(SyntaxKind.ColonToken);
             node.statements = parseList(ParsingContext.SwitchClauseStatements, /*checkForStrictMode*/ false, parseStatement);
@@ -3949,14 +3957,16 @@ module ts {
         }
 
         function parseSwitchStatement(): SwitchStatement {
-            var node = <SwitchStatement>createNode(SyntaxKind.SwitchStatement);
+            let node = <SwitchStatement>createNode(SyntaxKind.SwitchStatement);
             parseExpected(SyntaxKind.SwitchKeyword);
             parseExpected(SyntaxKind.OpenParenToken);
             node.expression = allowInAnd(parseExpression);
             parseExpected(SyntaxKind.CloseParenToken);
+            let caseBlock = <CaseBlock>createNode(SyntaxKind.CaseBlock, scanner.getStartPos());
             parseExpected(SyntaxKind.OpenBraceToken);
-            node.clauses = parseList(ParsingContext.SwitchClauses, /*checkForStrictMode*/ false, parseCaseOrDefaultClause);
+            caseBlock.clauses = parseList(ParsingContext.SwitchClauses, /*checkForStrictMode*/ false, parseCaseOrDefaultClause);
             parseExpected(SyntaxKind.CloseBraceToken);
+            node.caseBlock = finishNode(caseBlock);
             return finishNode(node);
         }
 
@@ -3969,7 +3979,7 @@ module ts {
             // directly as that might consume an expression on the following line.  
             // We just return 'undefined' in that case.  The actual error will be reported in the
             // grammar walker.
-            var node = <ThrowStatement>createNode(SyntaxKind.ThrowStatement);
+            let node = <ThrowStatement>createNode(SyntaxKind.ThrowStatement);
             parseExpected(SyntaxKind.ThrowKeyword);
             node.expression = scanner.hasPrecedingLineBreak() ? undefined : allowInAnd(parseExpression);
             parseSemicolon();
@@ -3978,7 +3988,7 @@ module ts {
 
         // TODO: Review for error recovery
         function parseTryStatement(): TryStatement {
-            var node = <TryStatement>createNode(SyntaxKind.TryStatement);
+            let node = <TryStatement>createNode(SyntaxKind.TryStatement);
 
             parseExpected(SyntaxKind.TryKeyword);
             node.tryBlock = parseBlock(/*ignoreMissingOpenBrace:*/ false, /*checkForStrictMode*/ false);
@@ -3995,7 +4005,7 @@ module ts {
         }
 
         function parseCatchClause(): CatchClause {
-            var result = <CatchClause>createNode(SyntaxKind.CatchClause);
+            let result = <CatchClause>createNode(SyntaxKind.CatchClause);
             parseExpected(SyntaxKind.CatchKeyword);
             if (parseExpected(SyntaxKind.OpenParenToken)) {
                 result.variableDeclaration = parseVariableDeclaration();
@@ -4007,7 +4017,7 @@ module ts {
         }
 
         function parseDebuggerStatement(): Statement {
-            var node = <Statement>createNode(SyntaxKind.DebuggerStatement);
+            let node = <Statement>createNode(SyntaxKind.DebuggerStatement);
             parseExpected(SyntaxKind.DebuggerKeyword);
             parseSemicolon();
             return finishNode(node);
@@ -4017,17 +4027,17 @@ module ts {
             // Avoiding having to do the lookahead for a labeled statement by just trying to parse
             // out an expression, seeing if it is identifier and then seeing if it is followed by
             // a colon.
-            var fullStart = scanner.getStartPos();
-            var expression = allowInAnd(parseExpression);
+            let fullStart = scanner.getStartPos();
+            let expression = allowInAnd(parseExpression);
 
             if (expression.kind === SyntaxKind.Identifier && parseOptional(SyntaxKind.ColonToken)) {
-                var labeledStatement = <LabeledStatement>createNode(SyntaxKind.LabeledStatement, fullStart);
+                let labeledStatement = <LabeledStatement>createNode(SyntaxKind.LabeledStatement, fullStart);
                 labeledStatement.label = <Identifier>expression;
                 labeledStatement.statement = parseStatement();
                 return finishNode(labeledStatement);
             }
             else {
-                var expressionStatement = <ExpressionStatement>createNode(SyntaxKind.ExpressionStatement, fullStart);
+                let expressionStatement = <ExpressionStatement>createNode(SyntaxKind.ExpressionStatement, fullStart);
                 expressionStatement.expression = expression;
                 parseSemicolon();
                 return finishNode(expressionStatement);
@@ -4041,7 +4051,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)) {
-                var result = lookAhead(parseVariableStatementOrFunctionDeclarationWithModifiers);
+                let result = lookAhead(parseVariableStatementOrFunctionDeclarationWithModifiers);
                 if (result) {
                     return true;
                 }
@@ -4081,7 +4091,7 @@ module ts {
                     // const keyword can precede enum keyword when defining constant enums
                     // 'const enum' do not start statement.
                     // In ES 6 'enum' is a future reserved keyword, so it should not be used as identifier
-                    var isConstEnum = lookAhead(nextTokenIsEnumKeyword);
+                    let isConstEnum = lookAhead(nextTokenIsEnumKeyword);
                     return !isConstEnum;
                 case SyntaxKind.InterfaceKeyword:
                 case SyntaxKind.ClassKeyword:
@@ -4171,7 +4181,7 @@ module ts {
                     // same FunctionDeclaraiton or VariableStatement if it has the same text
                     // regardless of whether it is inside a block or not.
                     if (isModifier(token)) {
-                        var result = tryParse(parseVariableStatementOrFunctionDeclarationWithModifiers);
+                        let result = tryParse(parseVariableStatementOrFunctionDeclarationWithModifiers);
                         if (result) {
                             return result;
                         }
@@ -4182,11 +4192,11 @@ module ts {
         }
 
         function parseVariableStatementOrFunctionDeclarationWithModifiers(): FunctionDeclaration | VariableStatement {
-            var start = scanner.getStartPos();
-            var modifiers = parseModifiers();
+            let start = scanner.getStartPos();
+            let modifiers = parseModifiers();
             switch (token) {
                 case SyntaxKind.ConstKeyword:
-                    var nextTokenIsEnum = lookAhead(nextTokenIsEnumKeyword)
+                    let nextTokenIsEnum = lookAhead(nextTokenIsEnumKeyword)
                     if (nextTokenIsEnum) {
                         return undefined;
                     }
@@ -4222,7 +4232,7 @@ module ts {
             if (token === SyntaxKind.CommaToken) {
                 return <BindingElement>createNode(SyntaxKind.OmittedExpression);
             }
-            var node = <BindingElement>createNode(SyntaxKind.BindingElement);
+            let node = <BindingElement>createNode(SyntaxKind.BindingElement);
             node.dotDotDotToken = parseOptionalToken(SyntaxKind.DotDotDotToken);
             node.name = parseIdentifierOrPattern();
             node.initializer = parseInitializer(/*inParameter*/ false);
@@ -4230,9 +4240,9 @@ module ts {
         }
 
         function parseObjectBindingElement(): BindingElement {
-            var node = <BindingElement>createNode(SyntaxKind.BindingElement);
+            let node = <BindingElement>createNode(SyntaxKind.BindingElement);
             // TODO(andersh): Handle computed properties
-            var id = parsePropertyName();
+            let id = parsePropertyName();
             if (id.kind === SyntaxKind.Identifier && token !== SyntaxKind.ColonToken) {
                 node.name = <Identifier>id;
             }
@@ -4246,7 +4256,7 @@ module ts {
         }
 
         function parseObjectBindingPattern(): BindingPattern {
-            var node = <BindingPattern>createNode(SyntaxKind.ObjectBindingPattern);
+            let node = <BindingPattern>createNode(SyntaxKind.ObjectBindingPattern);
             parseExpected(SyntaxKind.OpenBraceToken);
             node.elements = parseDelimitedList(ParsingContext.ObjectBindingElements, parseObjectBindingElement);
             parseExpected(SyntaxKind.CloseBraceToken);
@@ -4254,7 +4264,7 @@ module ts {
         }
 
         function parseArrayBindingPattern(): BindingPattern {
-            var node = <BindingPattern>createNode(SyntaxKind.ArrayBindingPattern);
+            let node = <BindingPattern>createNode(SyntaxKind.ArrayBindingPattern);
             parseExpected(SyntaxKind.OpenBracketToken);
             node.elements = parseDelimitedList(ParsingContext.ArrayBindingElements, parseArrayBindingElement);
             parseExpected(SyntaxKind.CloseBracketToken);
@@ -4276,7 +4286,7 @@ module ts {
         }
 
         function parseVariableDeclaration(): VariableDeclaration {
-            var node = <VariableDeclaration>createNode(SyntaxKind.VariableDeclaration);
+            let node = <VariableDeclaration>createNode(SyntaxKind.VariableDeclaration);
             node.name = parseIdentifierOrPattern();
             node.type = parseTypeAnnotation();
             if (!isInOrOfKeyword(token)) {
@@ -4286,7 +4296,7 @@ module ts {
         }
 
         function parseVariableDeclarationList(inForStatementInitializer: boolean): VariableDeclarationList {
-            var node = <VariableDeclarationList>createNode(SyntaxKind.VariableDeclarationList);
+            let node = <VariableDeclarationList>createNode(SyntaxKind.VariableDeclarationList);
 
             switch (token) {
                 case SyntaxKind.VarKeyword:
@@ -4305,7 +4315,7 @@ module ts {
 
             // The user may have written the following:
             //
-            //    for (var of X) { }
+            //    for (let of X) { }
             //
             // In this case, we want to parse an empty declaration list, and then parse 'of'
             // as a keyword. The reason this is not automatic is that 'of' is a valid identifier.
@@ -4316,7 +4326,7 @@ module ts {
                 node.declarations = createMissingList<VariableDeclaration>();
             }
             else {
-                var savedDisallowIn = inDisallowInContext();
+                let savedDisallowIn = inDisallowInContext();
                 setDisallowInContext(inForStatementInitializer);
 
                 node.declarations = parseDelimitedList(ParsingContext.VariableDeclarations, parseVariableDeclaration);
@@ -4332,7 +4342,7 @@ module ts {
         }
 
         function parseVariableStatement(fullStart: number, modifiers: ModifiersArray): VariableStatement {
-            var node = <VariableStatement>createNode(SyntaxKind.VariableStatement, fullStart);
+            let node = <VariableStatement>createNode(SyntaxKind.VariableStatement, fullStart);
             setModifiers(node, modifiers);
             node.declarationList = parseVariableDeclarationList(/*inForStatementInitializer:*/ false);
             parseSemicolon();
@@ -4340,7 +4350,7 @@ module ts {
         }
 
         function parseFunctionDeclaration(fullStart: number, modifiers: ModifiersArray): FunctionDeclaration {
-            var node = <FunctionDeclaration>createNode(SyntaxKind.FunctionDeclaration, fullStart);
+            let node = <FunctionDeclaration>createNode(SyntaxKind.FunctionDeclaration, fullStart);
             setModifiers(node, modifiers);
             parseExpected(SyntaxKind.FunctionKeyword);
             node.asteriskToken = parseOptionalToken(SyntaxKind.AsteriskToken);
@@ -4351,7 +4361,7 @@ module ts {
         }
 
         function parseConstructorDeclaration(pos: number, modifiers: ModifiersArray): ConstructorDeclaration {
-            var node = <ConstructorDeclaration>createNode(SyntaxKind.Constructor, pos);
+            let node = <ConstructorDeclaration>createNode(SyntaxKind.Constructor, pos);
             setModifiers(node, modifiers);
             parseExpected(SyntaxKind.ConstructorKeyword);
             fillSignature(SyntaxKind.ColonToken, /*yieldAndGeneratorParameterContext:*/ false, /*requireCompleteParameterList:*/ false, node);
@@ -4360,7 +4370,7 @@ module ts {
         }
 
         function parseMethodDeclaration(fullStart: number, modifiers: ModifiersArray, asteriskToken: Node, name: DeclarationName, questionToken: Node, diagnosticMessage?: DiagnosticMessage): MethodDeclaration {
-            var method = <MethodDeclaration>createNode(SyntaxKind.MethodDeclaration, fullStart);
+            let method = <MethodDeclaration>createNode(SyntaxKind.MethodDeclaration, fullStart);
             setModifiers(method, modifiers);
             method.asteriskToken = asteriskToken;
             method.name = name;
@@ -4371,17 +4381,17 @@ module ts {
         }
 
         function parsePropertyOrMethodDeclaration(fullStart: number, modifiers: ModifiersArray): ClassElement {
-            var asteriskToken = parseOptionalToken(SyntaxKind.AsteriskToken);
-            var name = parsePropertyName();
+            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.
-            var questionToken = parseOptionalToken(SyntaxKind.QuestionToken);
+            let questionToken = parseOptionalToken(SyntaxKind.QuestionToken);
             if (asteriskToken || token === SyntaxKind.OpenParenToken || token === SyntaxKind.LessThanToken) {
                 return parseMethodDeclaration(fullStart, modifiers, asteriskToken, name, questionToken, Diagnostics.or_expected);
             }
             else {
-                var property = <PropertyDeclaration>createNode(SyntaxKind.PropertyDeclaration, fullStart);
+                let property = <PropertyDeclaration>createNode(SyntaxKind.PropertyDeclaration, fullStart);
                 setModifiers(property, modifiers);
                 property.name = name;
                 property.questionToken = questionToken;
@@ -4397,7 +4407,7 @@ module ts {
         }
 
         function parseAccessorDeclaration(kind: SyntaxKind, fullStart: number, modifiers: ModifiersArray): AccessorDeclaration {
-            var node = <AccessorDeclaration>createNode(kind, fullStart);
+            let node = <AccessorDeclaration>createNode(kind, fullStart);
             setModifiers(node, modifiers);
             node.name = parsePropertyName();
             fillSignature(SyntaxKind.ColonToken, /*yieldAndGeneratorParameterContext:*/ false, /*requireCompleteParameterList:*/ false, node);
@@ -4406,7 +4416,7 @@ module ts {
         }
 
         function isClassMemberStart(): boolean {
-            var idToken: SyntaxKind;
+            let idToken: SyntaxKind;
 
             // Eat up all modifiers, but hold on to the last one in case it is actually an identifier.
             while (isModifier(token)) {
@@ -4460,11 +4470,11 @@ module ts {
         }
 
         function parseModifiers(): ModifiersArray {
-            var flags = 0;
-            var modifiers: ModifiersArray;
+            let flags = 0;
+            let modifiers: ModifiersArray;
             while (true) {
-                var modifierStart = scanner.getStartPos();
-                var modifierKind = token;
+                let modifierStart = scanner.getStartPos();
+                let modifierKind = token;
 
                 if (!parseAnyContextualModifier()) {
                     break;
@@ -4485,10 +4495,10 @@ module ts {
         }
 
         function parseClassElement(): ClassElement {
-            var fullStart = getNodePos();
-            var modifiers = parseModifiers();
+            let fullStart = getNodePos();
+            let modifiers = parseModifiers();
 
-            var accessor = tryParseAccessorDeclaration(fullStart, modifiers);
+            let accessor = tryParseAccessorDeclaration(fullStart, modifiers);
             if (accessor) {
                 return accessor;
             }
@@ -4517,7 +4527,7 @@ module ts {
         }
 
         function parseClassDeclaration(fullStart: number, modifiers: ModifiersArray): ClassDeclaration {
-            var node = <ClassDeclaration>createNode(SyntaxKind.ClassDeclaration, fullStart);
+            let node = <ClassDeclaration>createNode(SyntaxKind.ClassDeclaration, fullStart);
             setModifiers(node, modifiers);
             parseExpected(SyntaxKind.ClassKeyword);
             node.name = node.flags & NodeFlags.Default ? parseOptionalIdentifier() : parseIdentifier();
@@ -4560,7 +4570,7 @@ module ts {
 
         function parseHeritageClause() {
             if (token === SyntaxKind.ExtendsKeyword || token === SyntaxKind.ImplementsKeyword) {
-                var node = <HeritageClause>createNode(SyntaxKind.HeritageClause);
+                let node = <HeritageClause>createNode(SyntaxKind.HeritageClause);
                 node.token = token;
                 nextToken();
                 node.types = parseDelimitedList(ParsingContext.TypeReferences, parseTypeReference);
@@ -4579,7 +4589,7 @@ module ts {
         }
 
         function parseInterfaceDeclaration(fullStart: number, modifiers: ModifiersArray): InterfaceDeclaration {
-            var node = <InterfaceDeclaration>createNode(SyntaxKind.InterfaceDeclaration, fullStart);
+            let node = <InterfaceDeclaration>createNode(SyntaxKind.InterfaceDeclaration, fullStart);
             setModifiers(node, modifiers);
             parseExpected(SyntaxKind.InterfaceKeyword);
             node.name = parseIdentifier();
@@ -4590,7 +4600,7 @@ module ts {
         }
 
         function parseTypeAliasDeclaration(fullStart: number, modifiers: ModifiersArray): TypeAliasDeclaration {
-            var node = <TypeAliasDeclaration>createNode(SyntaxKind.TypeAliasDeclaration, fullStart);
+            let node = <TypeAliasDeclaration>createNode(SyntaxKind.TypeAliasDeclaration, fullStart);
             setModifiers(node, modifiers);
             parseExpected(SyntaxKind.TypeKeyword);
             node.name = parseIdentifier();
@@ -4605,14 +4615,14 @@ module ts {
         // ConstantEnumMemberSection, which starts at the beginning of an enum declaration
         // or any time an integer literal initializer is encountered.
         function parseEnumMember(): EnumMember {
-            var node = <EnumMember>createNode(SyntaxKind.EnumMember, scanner.getStartPos());
+            let node = <EnumMember>createNode(SyntaxKind.EnumMember, scanner.getStartPos());
             node.name = parsePropertyName();
             node.initializer = allowInAnd(parseNonParameterInitializer);
             return finishNode(node);
         }
 
         function parseEnumDeclaration(fullStart: number, modifiers: ModifiersArray): EnumDeclaration {
-            var node = <EnumDeclaration>createNode(SyntaxKind.EnumDeclaration, fullStart);
+            let node = <EnumDeclaration>createNode(SyntaxKind.EnumDeclaration, fullStart);
             setModifiers(node, modifiers);
             parseExpected(SyntaxKind.EnumKeyword);
             node.name = parseIdentifier();
@@ -4627,7 +4637,7 @@ module ts {
         }
 
         function parseModuleBlock(): ModuleBlock {
-            var node = <ModuleBlock>createNode(SyntaxKind.ModuleBlock, scanner.getStartPos());
+            let node = <ModuleBlock>createNode(SyntaxKind.ModuleBlock, scanner.getStartPos());
             if (parseExpected(SyntaxKind.OpenBraceToken)) {
                 node.statements = parseList(ParsingContext.ModuleElements, /*checkForStrictMode*/false, parseModuleElement);
                 parseExpected(SyntaxKind.CloseBraceToken);
@@ -4639,7 +4649,7 @@ module ts {
         }
 
         function parseInternalModuleTail(fullStart: number, modifiers: ModifiersArray, flags: NodeFlags): ModuleDeclaration {
-            var node = <ModuleDeclaration>createNode(SyntaxKind.ModuleDeclaration, fullStart);
+            let node = <ModuleDeclaration>createNode(SyntaxKind.ModuleDeclaration, fullStart);
             setModifiers(node, modifiers);
             node.flags |= flags;
             node.name = parseIdentifier();
@@ -4650,7 +4660,7 @@ module ts {
         }
 
         function parseAmbientExternalModuleDeclaration(fullStart: number, modifiers: ModifiersArray): ModuleDeclaration {
-            var node = <ModuleDeclaration>createNode(SyntaxKind.ModuleDeclaration, fullStart);
+            let node = <ModuleDeclaration>createNode(SyntaxKind.ModuleDeclaration, fullStart);
             setModifiers(node, modifiers);
             node.name = parseLiteralNode(/*internName:*/ true);
             node.body = parseModuleBlock();
@@ -4681,16 +4691,16 @@ module ts {
 
         function parseImportDeclarationOrImportEqualsDeclaration(fullStart: number, modifiers: ModifiersArray): ImportEqualsDeclaration | ImportDeclaration {
             parseExpected(SyntaxKind.ImportKeyword);
-            var afterImportPos = scanner.getStartPos();
+            let afterImportPos = scanner.getStartPos();
 
-            var identifier: Identifier;
+            let identifier: Identifier;
             if (isIdentifier()) {
                 identifier = parseIdentifier();
                 if (token !== SyntaxKind.CommaToken && token !== SyntaxKind.FromKeyword) {
                     // ImportEquals declaration of type:
                     // import x = require("mod"); or
                     // import x = M.x;
-                    var importEqualsDeclaration = <ImportEqualsDeclaration>createNode(SyntaxKind.ImportEqualsDeclaration, fullStart);
+                    let importEqualsDeclaration = <ImportEqualsDeclaration>createNode(SyntaxKind.ImportEqualsDeclaration, fullStart);
                     setModifiers(importEqualsDeclaration, modifiers);
                     importEqualsDeclaration.name = identifier;
                     parseExpected(SyntaxKind.EqualsToken);
@@ -4701,7 +4711,7 @@ module ts {
             }
 
             // Import statement
-            var importDeclaration = <ImportDeclaration>createNode(SyntaxKind.ImportDeclaration, fullStart);
+            let importDeclaration = <ImportDeclaration>createNode(SyntaxKind.ImportDeclaration, fullStart);
             setModifiers(importDeclaration, modifiers);
 
             // ImportDeclaration:
@@ -4727,7 +4737,7 @@ module ts {
             //  ImportedDefaultBinding, NameSpaceImport
             //  ImportedDefaultBinding, NamedImports
 
-            var importClause = <ImportClause>createNode(SyntaxKind.ImportClause, fullStart);
+            let importClause = <ImportClause>createNode(SyntaxKind.ImportClause, fullStart);
             if (identifier) {
                 // ImportedDefaultBinding:
                 //  ImportedBinding
@@ -4751,7 +4761,7 @@ module ts {
         }
 
         function parseExternalModuleReference() {
-            var node = <ExternalModuleReference>createNode(SyntaxKind.ExternalModuleReference);
+            let node = <ExternalModuleReference>createNode(SyntaxKind.ExternalModuleReference);
             parseExpected(SyntaxKind.RequireKeyword);
             parseExpected(SyntaxKind.OpenParenToken);
             node.expression = parseModuleSpecifier();
@@ -4763,7 +4773,7 @@ module ts {
             // We allow arbitrary expressions here, even though the grammar only allows string 
             // literals.  We check to ensure that it is only a string literal later in the grammar
             // walker.
-            var result = parseExpression();
+            let result = parseExpression();
             // Ensure the string being required is in our 'identifier' table.  This will ensure 
             // that features like 'find refs' will look inside this file when search for its name.
             if (result.kind === SyntaxKind.StringLiteral) {
@@ -4775,7 +4785,7 @@ module ts {
         function parseNamespaceImport(): NamespaceImport {
             // NameSpaceImport:
             //  * as ImportedBinding
-            var namespaceImport = <NamespaceImport>createNode(SyntaxKind.NamespaceImport);
+            let namespaceImport = <NamespaceImport>createNode(SyntaxKind.NamespaceImport);
             parseExpected(SyntaxKind.AsteriskToken);
             parseExpected(SyntaxKind.AsKeyword);
             namespaceImport.name = parseIdentifier();
@@ -4783,7 +4793,7 @@ module ts {
         }
 
         function parseNamedImportsOrExports(kind: SyntaxKind): NamedImportsOrExports {
-            var node = <NamedImports>createNode(kind);
+            let node = <NamedImports>createNode(kind);
 
             // NamedImports:
             //  { }
@@ -4808,13 +4818,13 @@ module ts {
         }
 
         function parseImportOrExportSpecifier(kind: SyntaxKind): ImportOrExportSpecifier {
-            var node = <ImportSpecifier>createNode(kind);
+            let node = <ImportSpecifier>createNode(kind);
             // ImportSpecifier:
             //  ImportedBinding
             //  IdentifierName as ImportedBinding
-            var isFirstIdentifierNameNotAnIdentifier = isKeyword(token) && !isIdentifier();
-            var start = scanner.getTokenPos();
-            var identifierName = parseIdentifierName();
+            let isFirstIdentifierNameNotAnIdentifier = isKeyword(token) && !isIdentifier();
+            let start = scanner.getTokenPos();
+            let identifierName = parseIdentifierName();
             if (token === SyntaxKind.AsKeyword) {
                 node.propertyName = identifierName;
                 parseExpected(SyntaxKind.AsKeyword);
@@ -4837,7 +4847,7 @@ module ts {
         }
 
         function parseExportDeclaration(fullStart: number, modifiers: ModifiersArray): ExportDeclaration {
-            var node = <ExportDeclaration>createNode(SyntaxKind.ExportDeclaration, fullStart);
+            let node = <ExportDeclaration>createNode(SyntaxKind.ExportDeclaration, fullStart);
             setModifiers(node, modifiers);
             if (parseOptional(SyntaxKind.AsteriskToken)) {
                 parseExpected(SyntaxKind.FromKeyword);
@@ -4854,7 +4864,7 @@ module ts {
         }
 
         function parseExportAssignment(fullStart: number, modifiers: ModifiersArray): ExportAssignment {
-            var node = <ExportAssignment>createNode(SyntaxKind.ExportAssignment, fullStart);
+            let node = <ExportAssignment>createNode(SyntaxKind.ExportAssignment, fullStart);
             setModifiers(node, modifiers);
             if (parseOptional(SyntaxKind.EqualsToken)) {
                 node.isExportEquals = true;
@@ -4869,9 +4879,9 @@ module ts {
         }
 
         function isLetDeclaration() {
-            // It is let declaration if in strict mode or next token is identifier on same line.
+            // It is let declaration if in strict mode or next token is identifier\open bracket\open curly on same line.
             // otherwise it needs to be treated like identifier
-            return inStrictModeContext() || lookAhead(nextTokenIsIdentifierOnSameLine);
+            return inStrictModeContext() || lookAhead(nextTokenIsIdentifierOrStartOfDestructuringOnTheSameLine);
         }
 
         function isDeclarationStart(): boolean {
@@ -4943,8 +4953,8 @@ module ts {
         }
 
         function parseDeclaration(): ModuleElement {
-            var fullStart = getNodePos();
-            var modifiers = parseModifiers();
+            let fullStart = getNodePos();
+            let modifiers = parseModifiers();
             if (token === SyntaxKind.ExportKeyword) {
                 nextToken();
                 if (token === SyntaxKind.DefaultKeyword || token === SyntaxKind.EqualsToken) {
@@ -4998,16 +5008,16 @@ module ts {
         }
 
         function processReferenceComments(sourceFile: SourceFile): void {
-            var triviaScanner = createScanner(sourceFile.languageVersion, /*skipTrivia*/false, sourceText);
-            var referencedFiles: FileReference[] = [];
-            var amdDependencies: {path: string; name: string}[] = [];
-            var amdModuleName: string;
+            let triviaScanner = createScanner(sourceFile.languageVersion, /*skipTrivia*/false, sourceText);
+            let referencedFiles: FileReference[] = [];
+            let amdDependencies: {path: string; name: string}[] = [];
+            let amdModuleName: string;
 
             // Keep scanning all the leading trivia in the file until we get to something that 
             // isn't trivia.  Any single line comment will be analyzed to see if it is a 
             // reference comment.
             while (true) {
-                var kind = triviaScanner.scan();
+                let kind = triviaScanner.scan();
                 if (kind === SyntaxKind.WhitespaceTrivia || kind === SyntaxKind.NewLineTrivia || kind === SyntaxKind.MultiLineCommentTrivia) {
                     continue;
                 }
@@ -5015,14 +5025,14 @@ module ts {
                     break;
                 }
 
-                var range = { pos: triviaScanner.getTokenPos(), end: triviaScanner.getTextPos() };
+                let range = { pos: triviaScanner.getTokenPos(), end: triviaScanner.getTextPos() };
 
-                var comment = sourceText.substring(range.pos, range.end);
-                var referencePathMatchResult = getFileReferenceFromReferencePath(comment, range);
+                let comment = sourceText.substring(range.pos, range.end);
+                let referencePathMatchResult = getFileReferenceFromReferencePath(comment, range);
                 if (referencePathMatchResult) {
-                    var fileReference = referencePathMatchResult.fileReference;
+                    let fileReference = referencePathMatchResult.fileReference;
                     sourceFile.hasNoDefaultLib = referencePathMatchResult.isNoDefaultLib;
-                    var diagnosticMessage = referencePathMatchResult.diagnosticMessage;
+                    let diagnosticMessage = referencePathMatchResult.diagnosticMessage;
                     if (fileReference) {
                         referencedFiles.push(fileReference);
                     }
@@ -5031,8 +5041,8 @@ module ts {
                     }
                 }
                 else {
-                    var amdModuleNameRegEx = /^\/\/\/\s*<amd-module\s+name\s*=\s*('|")(.+?)\1/gim;
-                    var amdModuleNameMatchResult = amdModuleNameRegEx.exec(comment);
+                    let amdModuleNameRegEx = /^\/\/\/\s*<amd-module\s+name\s*=\s*('|")(.+?)\1/gim;
+                    let amdModuleNameMatchResult = amdModuleNameRegEx.exec(comment);
                     if (amdModuleNameMatchResult) {
                         if (amdModuleName) {
                             sourceFile.parseDiagnostics.push(createFileDiagnostic(sourceFile, range.pos, range.end - range.pos, Diagnostics.An_AMD_module_cannot_have_multiple_name_assignments));
@@ -5040,15 +5050,15 @@ module ts {
                         amdModuleName = amdModuleNameMatchResult[2];
                     }
 
-                    var amdDependencyRegEx = /^\/\/\/\s*<amd-dependency\s/gim;
-                    var pathRegex = /\spath\s*=\s*('|")(.+?)\1/gim;
-                    var nameRegex = /\sname\s*=\s*('|")(.+?)\1/gim;
-                    var amdDependencyMatchResult = amdDependencyRegEx.exec(comment);
+                    let amdDependencyRegEx = /^\/\/\/\s*<amd-dependency\s/gim;
+                    let pathRegex = /\spath\s*=\s*('|")(.+?)\1/gim;
+                    let nameRegex = /\sname\s*=\s*('|")(.+?)\1/gim;
+                    let amdDependencyMatchResult = amdDependencyRegEx.exec(comment);
                     if (amdDependencyMatchResult) {
-                        var pathMatchResult = pathRegex.exec(comment);
-                        var nameMatchResult = nameRegex.exec(comment);
+                        let pathMatchResult = pathRegex.exec(comment);
+                        let nameMatchResult = nameRegex.exec(comment);
                         if (pathMatchResult) {
-                            var amdDependency = {path: pathMatchResult[2], name: nameMatchResult ? nameMatchResult[2] : undefined };
+                            let amdDependency = {path: pathMatchResult[2], name: nameMatchResult ? nameMatchResult[2] : undefined };
                             amdDependencies.push(amdDependency);
                         }
                     }
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
index 9bb66f10f41..835a5b838d0 100644
--- a/src/compiler/scanner.ts
+++ b/src/compiler/scanner.ts
@@ -37,7 +37,7 @@ module ts {
         tryScan<T>(callback: () => T): T;
     }
 
-    var textToToken: Map<SyntaxKind> = {
+    let textToToken: Map<SyntaxKind> = {
         "any": SyntaxKind.AnyKeyword,
         "as": SyntaxKind.AsKeyword,
         "boolean": SyntaxKind.BooleanKeyword,
@@ -170,8 +170,8 @@ module ts {
         Codepoint ranges for ES3 Identifiers are extracted from the Unicode 3.0.0 specification at:
         http://www.unicode.org/Public/3.0-Update/UnicodeData-3.0.0.txt
     */
-    var unicodeES3IdentifierStart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 543, 546, 563, 592, 685, 688, 696, 699, 705, 720, 721, 736, 740, 750, 750, 890, 890, 902, 902, 904, 906, 908, 908, 910, 929, 931, 974, 976, 983, 986, 1011, 1024, 1153, 1164, 1220, 1223, 1224, 1227, 1228, 1232, 1269, 1272, 1273, 1329, 1366, 1369, 1369, 1377, 1415, 1488, 1514, 1520, 1522, 1569, 1594, 1600, 1610, 1649, 1747, 1749, 1749, 1765, 1766, 1786, 1788, 1808, 1808, 1810, 1836, 1920, 1957, 2309, 2361, 2365, 2365, 2384, 2384, 2392, 2401, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2524, 2525, 2527, 2529, 2544, 2545, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2649, 2652, 2654, 2654, 2674, 2676, 2693, 2699, 2701, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2749, 2749, 2768, 2768, 2784, 2784, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2870, 2873, 2877, 2877, 2908, 2909, 2911, 2913, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 2997, 2999, 3001, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3168, 3169, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3294, 3294, 3296, 3297, 3333, 3340, 3342, 3344, 3346, 3368, 3370, 3385, 3424, 3425, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3585, 3632, 3634, 3635, 3648, 3654, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3760, 3762, 3763, 3773, 3773, 3776, 3780, 3782, 3782, 3804, 3805, 3840, 3840, 3904, 3911, 3913, 3946, 3976, 3979, 4096, 4129, 4131, 4135, 4137, 4138, 4176, 4181, 4256, 4293, 4304, 4342, 4352, 4441, 4447, 4514, 4520, 4601, 4608, 4614, 4616, 4678, 4680, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4742, 4744, 4744, 4746, 4749, 4752, 4782, 4784, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4814, 4816, 4822, 4824, 4846, 4848, 4878, 4880, 4880, 4882, 4885, 4888, 4894, 4896, 4934, 4936, 4954, 5024, 5108, 5121, 5740, 5743, 5750, 5761, 5786, 5792, 5866, 6016, 6067, 6176, 6263, 6272, 6312, 7680, 7835, 7840, 7929, 7936, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8319, 8319, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8497, 8499, 8505, 8544, 8579, 12293, 12295, 12321, 12329, 12337, 12341, 12344, 12346, 12353, 12436, 12445, 12446, 12449, 12538, 12540, 12542, 12549, 12588, 12593, 12686, 12704, 12727, 13312, 19893, 19968, 40869, 40960, 42124, 44032, 55203, 63744, 64045, 64256, 64262, 64275, 64279, 64285, 64285, 64287, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65136, 65138, 65140, 65140, 65142, 65276, 65313, 65338, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500, ];
-    var unicodeES3IdentifierPart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 543, 546, 563, 592, 685, 688, 696, 699, 705, 720, 721, 736, 740, 750, 750, 768, 846, 864, 866, 890, 890, 902, 902, 904, 906, 908, 908, 910, 929, 931, 974, 976, 983, 986, 1011, 1024, 1153, 1155, 1158, 1164, 1220, 1223, 1224, 1227, 1228, 1232, 1269, 1272, 1273, 1329, 1366, 1369, 1369, 1377, 1415, 1425, 1441, 1443, 1465, 1467, 1469, 1471, 1471, 1473, 1474, 1476, 1476, 1488, 1514, 1520, 1522, 1569, 1594, 1600, 1621, 1632, 1641, 1648, 1747, 1749, 1756, 1759, 1768, 1770, 1773, 1776, 1788, 1808, 1836, 1840, 1866, 1920, 1968, 2305, 2307, 2309, 2361, 2364, 2381, 2384, 2388, 2392, 2403, 2406, 2415, 2433, 2435, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2492, 2492, 2494, 2500, 2503, 2504, 2507, 2509, 2519, 2519, 2524, 2525, 2527, 2531, 2534, 2545, 2562, 2562, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2620, 2620, 2622, 2626, 2631, 2632, 2635, 2637, 2649, 2652, 2654, 2654, 2662, 2676, 2689, 2691, 2693, 2699, 2701, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2748, 2757, 2759, 2761, 2763, 2765, 2768, 2768, 2784, 2784, 2790, 2799, 2817, 2819, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2870, 2873, 2876, 2883, 2887, 2888, 2891, 2893, 2902, 2903, 2908, 2909, 2911, 2913, 2918, 2927, 2946, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 2997, 2999, 3001, 3006, 3010, 3014, 3016, 3018, 3021, 3031, 3031, 3047, 3055, 3073, 3075, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3134, 3140, 3142, 3144, 3146, 3149, 3157, 3158, 3168, 3169, 3174, 3183, 3202, 3203, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3262, 3268, 3270, 3272, 3274, 3277, 3285, 3286, 3294, 3294, 3296, 3297, 3302, 3311, 3330, 3331, 3333, 3340, 3342, 3344, 3346, 3368, 3370, 3385, 3390, 3395, 3398, 3400, 3402, 3405, 3415, 3415, 3424, 3425, 3430, 3439, 3458, 3459, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3530, 3530, 3535, 3540, 3542, 3542, 3544, 3551, 3570, 3571, 3585, 3642, 3648, 3662, 3664, 3673, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3769, 3771, 3773, 3776, 3780, 3782, 3782, 3784, 3789, 3792, 3801, 3804, 3805, 3840, 3840, 3864, 3865, 3872, 3881, 3893, 3893, 3895, 3895, 3897, 3897, 3902, 3911, 3913, 3946, 3953, 3972, 3974, 3979, 3984, 3991, 3993, 4028, 4038, 4038, 4096, 4129, 4131, 4135, 4137, 4138, 4140, 4146, 4150, 4153, 4160, 4169, 4176, 4185, 4256, 4293, 4304, 4342, 4352, 4441, 4447, 4514, 4520, 4601, 4608, 4614, 4616, 4678, 4680, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4742, 4744, 4744, 4746, 4749, 4752, 4782, 4784, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4814, 4816, 4822, 4824, 4846, 4848, 4878, 4880, 4880, 4882, 4885, 4888, 4894, 4896, 4934, 4936, 4954, 4969, 4977, 5024, 5108, 5121, 5740, 5743, 5750, 5761, 5786, 5792, 5866, 6016, 6099, 6112, 6121, 6160, 6169, 6176, 6263, 6272, 6313, 7680, 7835, 7840, 7929, 7936, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8255, 8256, 8319, 8319, 8400, 8412, 8417, 8417, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8497, 8499, 8505, 8544, 8579, 12293, 12295, 12321, 12335, 12337, 12341, 12344, 12346, 12353, 12436, 12441, 12442, 12445, 12446, 12449, 12542, 12549, 12588, 12593, 12686, 12704, 12727, 13312, 19893, 19968, 40869, 40960, 42124, 44032, 55203, 63744, 64045, 64256, 64262, 64275, 64279, 64285, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65056, 65059, 65075, 65076, 65101, 65103, 65136, 65138, 65140, 65140, 65142, 65276, 65296, 65305, 65313, 65338, 65343, 65343, 65345, 65370, 65381, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500, ];
+    let unicodeES3IdentifierStart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 543, 546, 563, 592, 685, 688, 696, 699, 705, 720, 721, 736, 740, 750, 750, 890, 890, 902, 902, 904, 906, 908, 908, 910, 929, 931, 974, 976, 983, 986, 1011, 1024, 1153, 1164, 1220, 1223, 1224, 1227, 1228, 1232, 1269, 1272, 1273, 1329, 1366, 1369, 1369, 1377, 1415, 1488, 1514, 1520, 1522, 1569, 1594, 1600, 1610, 1649, 1747, 1749, 1749, 1765, 1766, 1786, 1788, 1808, 1808, 1810, 1836, 1920, 1957, 2309, 2361, 2365, 2365, 2384, 2384, 2392, 2401, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2524, 2525, 2527, 2529, 2544, 2545, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2649, 2652, 2654, 2654, 2674, 2676, 2693, 2699, 2701, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2749, 2749, 2768, 2768, 2784, 2784, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2870, 2873, 2877, 2877, 2908, 2909, 2911, 2913, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 2997, 2999, 3001, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3168, 3169, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3294, 3294, 3296, 3297, 3333, 3340, 3342, 3344, 3346, 3368, 3370, 3385, 3424, 3425, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3585, 3632, 3634, 3635, 3648, 3654, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3760, 3762, 3763, 3773, 3773, 3776, 3780, 3782, 3782, 3804, 3805, 3840, 3840, 3904, 3911, 3913, 3946, 3976, 3979, 4096, 4129, 4131, 4135, 4137, 4138, 4176, 4181, 4256, 4293, 4304, 4342, 4352, 4441, 4447, 4514, 4520, 4601, 4608, 4614, 4616, 4678, 4680, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4742, 4744, 4744, 4746, 4749, 4752, 4782, 4784, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4814, 4816, 4822, 4824, 4846, 4848, 4878, 4880, 4880, 4882, 4885, 4888, 4894, 4896, 4934, 4936, 4954, 5024, 5108, 5121, 5740, 5743, 5750, 5761, 5786, 5792, 5866, 6016, 6067, 6176, 6263, 6272, 6312, 7680, 7835, 7840, 7929, 7936, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8319, 8319, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8497, 8499, 8505, 8544, 8579, 12293, 12295, 12321, 12329, 12337, 12341, 12344, 12346, 12353, 12436, 12445, 12446, 12449, 12538, 12540, 12542, 12549, 12588, 12593, 12686, 12704, 12727, 13312, 19893, 19968, 40869, 40960, 42124, 44032, 55203, 63744, 64045, 64256, 64262, 64275, 64279, 64285, 64285, 64287, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65136, 65138, 65140, 65140, 65142, 65276, 65313, 65338, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500, ];
+    let unicodeES3IdentifierPart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 543, 546, 563, 592, 685, 688, 696, 699, 705, 720, 721, 736, 740, 750, 750, 768, 846, 864, 866, 890, 890, 902, 902, 904, 906, 908, 908, 910, 929, 931, 974, 976, 983, 986, 1011, 1024, 1153, 1155, 1158, 1164, 1220, 1223, 1224, 1227, 1228, 1232, 1269, 1272, 1273, 1329, 1366, 1369, 1369, 1377, 1415, 1425, 1441, 1443, 1465, 1467, 1469, 1471, 1471, 1473, 1474, 1476, 1476, 1488, 1514, 1520, 1522, 1569, 1594, 1600, 1621, 1632, 1641, 1648, 1747, 1749, 1756, 1759, 1768, 1770, 1773, 1776, 1788, 1808, 1836, 1840, 1866, 1920, 1968, 2305, 2307, 2309, 2361, 2364, 2381, 2384, 2388, 2392, 2403, 2406, 2415, 2433, 2435, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2492, 2492, 2494, 2500, 2503, 2504, 2507, 2509, 2519, 2519, 2524, 2525, 2527, 2531, 2534, 2545, 2562, 2562, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2620, 2620, 2622, 2626, 2631, 2632, 2635, 2637, 2649, 2652, 2654, 2654, 2662, 2676, 2689, 2691, 2693, 2699, 2701, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2748, 2757, 2759, 2761, 2763, 2765, 2768, 2768, 2784, 2784, 2790, 2799, 2817, 2819, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2870, 2873, 2876, 2883, 2887, 2888, 2891, 2893, 2902, 2903, 2908, 2909, 2911, 2913, 2918, 2927, 2946, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 2997, 2999, 3001, 3006, 3010, 3014, 3016, 3018, 3021, 3031, 3031, 3047, 3055, 3073, 3075, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3134, 3140, 3142, 3144, 3146, 3149, 3157, 3158, 3168, 3169, 3174, 3183, 3202, 3203, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3262, 3268, 3270, 3272, 3274, 3277, 3285, 3286, 3294, 3294, 3296, 3297, 3302, 3311, 3330, 3331, 3333, 3340, 3342, 3344, 3346, 3368, 3370, 3385, 3390, 3395, 3398, 3400, 3402, 3405, 3415, 3415, 3424, 3425, 3430, 3439, 3458, 3459, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3530, 3530, 3535, 3540, 3542, 3542, 3544, 3551, 3570, 3571, 3585, 3642, 3648, 3662, 3664, 3673, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3769, 3771, 3773, 3776, 3780, 3782, 3782, 3784, 3789, 3792, 3801, 3804, 3805, 3840, 3840, 3864, 3865, 3872, 3881, 3893, 3893, 3895, 3895, 3897, 3897, 3902, 3911, 3913, 3946, 3953, 3972, 3974, 3979, 3984, 3991, 3993, 4028, 4038, 4038, 4096, 4129, 4131, 4135, 4137, 4138, 4140, 4146, 4150, 4153, 4160, 4169, 4176, 4185, 4256, 4293, 4304, 4342, 4352, 4441, 4447, 4514, 4520, 4601, 4608, 4614, 4616, 4678, 4680, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4742, 4744, 4744, 4746, 4749, 4752, 4782, 4784, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4814, 4816, 4822, 4824, 4846, 4848, 4878, 4880, 4880, 4882, 4885, 4888, 4894, 4896, 4934, 4936, 4954, 4969, 4977, 5024, 5108, 5121, 5740, 5743, 5750, 5761, 5786, 5792, 5866, 6016, 6099, 6112, 6121, 6160, 6169, 6176, 6263, 6272, 6313, 7680, 7835, 7840, 7929, 7936, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8255, 8256, 8319, 8319, 8400, 8412, 8417, 8417, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8497, 8499, 8505, 8544, 8579, 12293, 12295, 12321, 12335, 12337, 12341, 12344, 12346, 12353, 12436, 12441, 12442, 12445, 12446, 12449, 12542, 12549, 12588, 12593, 12686, 12704, 12727, 13312, 19893, 19968, 40869, 40960, 42124, 44032, 55203, 63744, 64045, 64256, 64262, 64275, 64279, 64285, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65056, 65059, 65075, 65076, 65101, 65103, 65136, 65138, 65140, 65140, 65142, 65276, 65296, 65305, 65313, 65338, 65343, 65343, 65345, 65370, 65381, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500, ];
 
     /*
         As per ECMAScript Language Specification 5th Edition, Section 7.6: ISyntaxToken Names and Identifiers
@@ -195,8 +195,8 @@ module ts {
         Codepoint ranges for ES5 Identifiers are extracted from the Unicode 6.2 specification at:
         http://www.unicode.org/Public/6.2.0/ucd/UnicodeData.txt
     */
-    var unicodeES5IdentifierStart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 705, 710, 721, 736, 740, 748, 748, 750, 750, 880, 884, 886, 887, 890, 893, 902, 902, 904, 906, 908, 908, 910, 929, 931, 1013, 1015, 1153, 1162, 1319, 1329, 1366, 1369, 1369, 1377, 1415, 1488, 1514, 1520, 1522, 1568, 1610, 1646, 1647, 1649, 1747, 1749, 1749, 1765, 1766, 1774, 1775, 1786, 1788, 1791, 1791, 1808, 1808, 1810, 1839, 1869, 1957, 1969, 1969, 1994, 2026, 2036, 2037, 2042, 2042, 2048, 2069, 2074, 2074, 2084, 2084, 2088, 2088, 2112, 2136, 2208, 2208, 2210, 2220, 2308, 2361, 2365, 2365, 2384, 2384, 2392, 2401, 2417, 2423, 2425, 2431, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2493, 2493, 2510, 2510, 2524, 2525, 2527, 2529, 2544, 2545, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2649, 2652, 2654, 2654, 2674, 2676, 2693, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2749, 2749, 2768, 2768, 2784, 2785, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2869, 2873, 2877, 2877, 2908, 2909, 2911, 2913, 2929, 2929, 2947, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 3001, 3024, 3024, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3133, 3133, 3160, 3161, 3168, 3169, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3261, 3261, 3294, 3294, 3296, 3297, 3313, 3314, 3333, 3340, 3342, 3344, 3346, 3386, 3389, 3389, 3406, 3406, 3424, 3425, 3450, 3455, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3585, 3632, 3634, 3635, 3648, 3654, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3760, 3762, 3763, 3773, 3773, 3776, 3780, 3782, 3782, 3804, 3807, 3840, 3840, 3904, 3911, 3913, 3948, 3976, 3980, 4096, 4138, 4159, 4159, 4176, 4181, 4186, 4189, 4193, 4193, 4197, 4198, 4206, 4208, 4213, 4225, 4238, 4238, 4256, 4293, 4295, 4295, 4301, 4301, 4304, 4346, 4348, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4744, 4746, 4749, 4752, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4822, 4824, 4880, 4882, 4885, 4888, 4954, 4992, 5007, 5024, 5108, 5121, 5740, 5743, 5759, 5761, 5786, 5792, 5866, 5870, 5872, 5888, 5900, 5902, 5905, 5920, 5937, 5952, 5969, 5984, 5996, 5998, 6000, 6016, 6067, 6103, 6103, 6108, 6108, 6176, 6263, 6272, 6312, 6314, 6314, 6320, 6389, 6400, 6428, 6480, 6509, 6512, 6516, 6528, 6571, 6593, 6599, 6656, 6678, 6688, 6740, 6823, 6823, 6917, 6963, 6981, 6987, 7043, 7072, 7086, 7087, 7098, 7141, 7168, 7203, 7245, 7247, 7258, 7293, 7401, 7404, 7406, 7409, 7413, 7414, 7424, 7615, 7680, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8305, 8305, 8319, 8319, 8336, 8348, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8505, 8508, 8511, 8517, 8521, 8526, 8526, 8544, 8584, 11264, 11310, 11312, 11358, 11360, 11492, 11499, 11502, 11506, 11507, 11520, 11557, 11559, 11559, 11565, 11565, 11568, 11623, 11631, 11631, 11648, 11670, 11680, 11686, 11688, 11694, 11696, 11702, 11704, 11710, 11712, 11718, 11720, 11726, 11728, 11734, 11736, 11742, 11823, 11823, 12293, 12295, 12321, 12329, 12337, 12341, 12344, 12348, 12353, 12438, 12445, 12447, 12449, 12538, 12540, 12543, 12549, 12589, 12593, 12686, 12704, 12730, 12784, 12799, 13312, 19893, 19968, 40908, 40960, 42124, 42192, 42237, 42240, 42508, 42512, 42527, 42538, 42539, 42560, 42606, 42623, 42647, 42656, 42735, 42775, 42783, 42786, 42888, 42891, 42894, 42896, 42899, 42912, 42922, 43000, 43009, 43011, 43013, 43015, 43018, 43020, 43042, 43072, 43123, 43138, 43187, 43250, 43255, 43259, 43259, 43274, 43301, 43312, 43334, 43360, 43388, 43396, 43442, 43471, 43471, 43520, 43560, 43584, 43586, 43588, 43595, 43616, 43638, 43642, 43642, 43648, 43695, 43697, 43697, 43701, 43702, 43705, 43709, 43712, 43712, 43714, 43714, 43739, 43741, 43744, 43754, 43762, 43764, 43777, 43782, 43785, 43790, 43793, 43798, 43808, 43814, 43816, 43822, 43968, 44002, 44032, 55203, 55216, 55238, 55243, 55291, 63744, 64109, 64112, 64217, 64256, 64262, 64275, 64279, 64285, 64285, 64287, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65136, 65140, 65142, 65276, 65313, 65338, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500, ];
-    var unicodeES5IdentifierPart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 705, 710, 721, 736, 740, 748, 748, 750, 750, 768, 884, 886, 887, 890, 893, 902, 902, 904, 906, 908, 908, 910, 929, 931, 1013, 1015, 1153, 1155, 1159, 1162, 1319, 1329, 1366, 1369, 1369, 1377, 1415, 1425, 1469, 1471, 1471, 1473, 1474, 1476, 1477, 1479, 1479, 1488, 1514, 1520, 1522, 1552, 1562, 1568, 1641, 1646, 1747, 1749, 1756, 1759, 1768, 1770, 1788, 1791, 1791, 1808, 1866, 1869, 1969, 1984, 2037, 2042, 2042, 2048, 2093, 2112, 2139, 2208, 2208, 2210, 2220, 2276, 2302, 2304, 2403, 2406, 2415, 2417, 2423, 2425, 2431, 2433, 2435, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2492, 2500, 2503, 2504, 2507, 2510, 2519, 2519, 2524, 2525, 2527, 2531, 2534, 2545, 2561, 2563, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2620, 2620, 2622, 2626, 2631, 2632, 2635, 2637, 2641, 2641, 2649, 2652, 2654, 2654, 2662, 2677, 2689, 2691, 2693, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2748, 2757, 2759, 2761, 2763, 2765, 2768, 2768, 2784, 2787, 2790, 2799, 2817, 2819, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2869, 2873, 2876, 2884, 2887, 2888, 2891, 2893, 2902, 2903, 2908, 2909, 2911, 2915, 2918, 2927, 2929, 2929, 2946, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 3001, 3006, 3010, 3014, 3016, 3018, 3021, 3024, 3024, 3031, 3031, 3046, 3055, 3073, 3075, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3133, 3140, 3142, 3144, 3146, 3149, 3157, 3158, 3160, 3161, 3168, 3171, 3174, 3183, 3202, 3203, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3260, 3268, 3270, 3272, 3274, 3277, 3285, 3286, 3294, 3294, 3296, 3299, 3302, 3311, 3313, 3314, 3330, 3331, 3333, 3340, 3342, 3344, 3346, 3386, 3389, 3396, 3398, 3400, 3402, 3406, 3415, 3415, 3424, 3427, 3430, 3439, 3450, 3455, 3458, 3459, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3530, 3530, 3535, 3540, 3542, 3542, 3544, 3551, 3570, 3571, 3585, 3642, 3648, 3662, 3664, 3673, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3769, 3771, 3773, 3776, 3780, 3782, 3782, 3784, 3789, 3792, 3801, 3804, 3807, 3840, 3840, 3864, 3865, 3872, 3881, 3893, 3893, 3895, 3895, 3897, 3897, 3902, 3911, 3913, 3948, 3953, 3972, 3974, 3991, 3993, 4028, 4038, 4038, 4096, 4169, 4176, 4253, 4256, 4293, 4295, 4295, 4301, 4301, 4304, 4346, 4348, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4744, 4746, 4749, 4752, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4822, 4824, 4880, 4882, 4885, 4888, 4954, 4957, 4959, 4992, 5007, 5024, 5108, 5121, 5740, 5743, 5759, 5761, 5786, 5792, 5866, 5870, 5872, 5888, 5900, 5902, 5908, 5920, 5940, 5952, 5971, 5984, 5996, 5998, 6000, 6002, 6003, 6016, 6099, 6103, 6103, 6108, 6109, 6112, 6121, 6155, 6157, 6160, 6169, 6176, 6263, 6272, 6314, 6320, 6389, 6400, 6428, 6432, 6443, 6448, 6459, 6470, 6509, 6512, 6516, 6528, 6571, 6576, 6601, 6608, 6617, 6656, 6683, 6688, 6750, 6752, 6780, 6783, 6793, 6800, 6809, 6823, 6823, 6912, 6987, 6992, 7001, 7019, 7027, 7040, 7155, 7168, 7223, 7232, 7241, 7245, 7293, 7376, 7378, 7380, 7414, 7424, 7654, 7676, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8204, 8205, 8255, 8256, 8276, 8276, 8305, 8305, 8319, 8319, 8336, 8348, 8400, 8412, 8417, 8417, 8421, 8432, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8505, 8508, 8511, 8517, 8521, 8526, 8526, 8544, 8584, 11264, 11310, 11312, 11358, 11360, 11492, 11499, 11507, 11520, 11557, 11559, 11559, 11565, 11565, 11568, 11623, 11631, 11631, 11647, 11670, 11680, 11686, 11688, 11694, 11696, 11702, 11704, 11710, 11712, 11718, 11720, 11726, 11728, 11734, 11736, 11742, 11744, 11775, 11823, 11823, 12293, 12295, 12321, 12335, 12337, 12341, 12344, 12348, 12353, 12438, 12441, 12442, 12445, 12447, 12449, 12538, 12540, 12543, 12549, 12589, 12593, 12686, 12704, 12730, 12784, 12799, 13312, 19893, 19968, 40908, 40960, 42124, 42192, 42237, 42240, 42508, 42512, 42539, 42560, 42607, 42612, 42621, 42623, 42647, 42655, 42737, 42775, 42783, 42786, 42888, 42891, 42894, 42896, 42899, 42912, 42922, 43000, 43047, 43072, 43123, 43136, 43204, 43216, 43225, 43232, 43255, 43259, 43259, 43264, 43309, 43312, 43347, 43360, 43388, 43392, 43456, 43471, 43481, 43520, 43574, 43584, 43597, 43600, 43609, 43616, 43638, 43642, 43643, 43648, 43714, 43739, 43741, 43744, 43759, 43762, 43766, 43777, 43782, 43785, 43790, 43793, 43798, 43808, 43814, 43816, 43822, 43968, 44010, 44012, 44013, 44016, 44025, 44032, 55203, 55216, 55238, 55243, 55291, 63744, 64109, 64112, 64217, 64256, 64262, 64275, 64279, 64285, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65024, 65039, 65056, 65062, 65075, 65076, 65101, 65103, 65136, 65140, 65142, 65276, 65296, 65305, 65313, 65338, 65343, 65343, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500, ];
+    let unicodeES5IdentifierStart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 705, 710, 721, 736, 740, 748, 748, 750, 750, 880, 884, 886, 887, 890, 893, 902, 902, 904, 906, 908, 908, 910, 929, 931, 1013, 1015, 1153, 1162, 1319, 1329, 1366, 1369, 1369, 1377, 1415, 1488, 1514, 1520, 1522, 1568, 1610, 1646, 1647, 1649, 1747, 1749, 1749, 1765, 1766, 1774, 1775, 1786, 1788, 1791, 1791, 1808, 1808, 1810, 1839, 1869, 1957, 1969, 1969, 1994, 2026, 2036, 2037, 2042, 2042, 2048, 2069, 2074, 2074, 2084, 2084, 2088, 2088, 2112, 2136, 2208, 2208, 2210, 2220, 2308, 2361, 2365, 2365, 2384, 2384, 2392, 2401, 2417, 2423, 2425, 2431, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2493, 2493, 2510, 2510, 2524, 2525, 2527, 2529, 2544, 2545, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2649, 2652, 2654, 2654, 2674, 2676, 2693, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2749, 2749, 2768, 2768, 2784, 2785, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2869, 2873, 2877, 2877, 2908, 2909, 2911, 2913, 2929, 2929, 2947, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 3001, 3024, 3024, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3133, 3133, 3160, 3161, 3168, 3169, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3261, 3261, 3294, 3294, 3296, 3297, 3313, 3314, 3333, 3340, 3342, 3344, 3346, 3386, 3389, 3389, 3406, 3406, 3424, 3425, 3450, 3455, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3585, 3632, 3634, 3635, 3648, 3654, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3760, 3762, 3763, 3773, 3773, 3776, 3780, 3782, 3782, 3804, 3807, 3840, 3840, 3904, 3911, 3913, 3948, 3976, 3980, 4096, 4138, 4159, 4159, 4176, 4181, 4186, 4189, 4193, 4193, 4197, 4198, 4206, 4208, 4213, 4225, 4238, 4238, 4256, 4293, 4295, 4295, 4301, 4301, 4304, 4346, 4348, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4744, 4746, 4749, 4752, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4822, 4824, 4880, 4882, 4885, 4888, 4954, 4992, 5007, 5024, 5108, 5121, 5740, 5743, 5759, 5761, 5786, 5792, 5866, 5870, 5872, 5888, 5900, 5902, 5905, 5920, 5937, 5952, 5969, 5984, 5996, 5998, 6000, 6016, 6067, 6103, 6103, 6108, 6108, 6176, 6263, 6272, 6312, 6314, 6314, 6320, 6389, 6400, 6428, 6480, 6509, 6512, 6516, 6528, 6571, 6593, 6599, 6656, 6678, 6688, 6740, 6823, 6823, 6917, 6963, 6981, 6987, 7043, 7072, 7086, 7087, 7098, 7141, 7168, 7203, 7245, 7247, 7258, 7293, 7401, 7404, 7406, 7409, 7413, 7414, 7424, 7615, 7680, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8305, 8305, 8319, 8319, 8336, 8348, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8505, 8508, 8511, 8517, 8521, 8526, 8526, 8544, 8584, 11264, 11310, 11312, 11358, 11360, 11492, 11499, 11502, 11506, 11507, 11520, 11557, 11559, 11559, 11565, 11565, 11568, 11623, 11631, 11631, 11648, 11670, 11680, 11686, 11688, 11694, 11696, 11702, 11704, 11710, 11712, 11718, 11720, 11726, 11728, 11734, 11736, 11742, 11823, 11823, 12293, 12295, 12321, 12329, 12337, 12341, 12344, 12348, 12353, 12438, 12445, 12447, 12449, 12538, 12540, 12543, 12549, 12589, 12593, 12686, 12704, 12730, 12784, 12799, 13312, 19893, 19968, 40908, 40960, 42124, 42192, 42237, 42240, 42508, 42512, 42527, 42538, 42539, 42560, 42606, 42623, 42647, 42656, 42735, 42775, 42783, 42786, 42888, 42891, 42894, 42896, 42899, 42912, 42922, 43000, 43009, 43011, 43013, 43015, 43018, 43020, 43042, 43072, 43123, 43138, 43187, 43250, 43255, 43259, 43259, 43274, 43301, 43312, 43334, 43360, 43388, 43396, 43442, 43471, 43471, 43520, 43560, 43584, 43586, 43588, 43595, 43616, 43638, 43642, 43642, 43648, 43695, 43697, 43697, 43701, 43702, 43705, 43709, 43712, 43712, 43714, 43714, 43739, 43741, 43744, 43754, 43762, 43764, 43777, 43782, 43785, 43790, 43793, 43798, 43808, 43814, 43816, 43822, 43968, 44002, 44032, 55203, 55216, 55238, 55243, 55291, 63744, 64109, 64112, 64217, 64256, 64262, 64275, 64279, 64285, 64285, 64287, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65136, 65140, 65142, 65276, 65313, 65338, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500, ];
+    let unicodeES5IdentifierPart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 705, 710, 721, 736, 740, 748, 748, 750, 750, 768, 884, 886, 887, 890, 893, 902, 902, 904, 906, 908, 908, 910, 929, 931, 1013, 1015, 1153, 1155, 1159, 1162, 1319, 1329, 1366, 1369, 1369, 1377, 1415, 1425, 1469, 1471, 1471, 1473, 1474, 1476, 1477, 1479, 1479, 1488, 1514, 1520, 1522, 1552, 1562, 1568, 1641, 1646, 1747, 1749, 1756, 1759, 1768, 1770, 1788, 1791, 1791, 1808, 1866, 1869, 1969, 1984, 2037, 2042, 2042, 2048, 2093, 2112, 2139, 2208, 2208, 2210, 2220, 2276, 2302, 2304, 2403, 2406, 2415, 2417, 2423, 2425, 2431, 2433, 2435, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2492, 2500, 2503, 2504, 2507, 2510, 2519, 2519, 2524, 2525, 2527, 2531, 2534, 2545, 2561, 2563, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2620, 2620, 2622, 2626, 2631, 2632, 2635, 2637, 2641, 2641, 2649, 2652, 2654, 2654, 2662, 2677, 2689, 2691, 2693, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2748, 2757, 2759, 2761, 2763, 2765, 2768, 2768, 2784, 2787, 2790, 2799, 2817, 2819, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2869, 2873, 2876, 2884, 2887, 2888, 2891, 2893, 2902, 2903, 2908, 2909, 2911, 2915, 2918, 2927, 2929, 2929, 2946, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 3001, 3006, 3010, 3014, 3016, 3018, 3021, 3024, 3024, 3031, 3031, 3046, 3055, 3073, 3075, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3133, 3140, 3142, 3144, 3146, 3149, 3157, 3158, 3160, 3161, 3168, 3171, 3174, 3183, 3202, 3203, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3260, 3268, 3270, 3272, 3274, 3277, 3285, 3286, 3294, 3294, 3296, 3299, 3302, 3311, 3313, 3314, 3330, 3331, 3333, 3340, 3342, 3344, 3346, 3386, 3389, 3396, 3398, 3400, 3402, 3406, 3415, 3415, 3424, 3427, 3430, 3439, 3450, 3455, 3458, 3459, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3530, 3530, 3535, 3540, 3542, 3542, 3544, 3551, 3570, 3571, 3585, 3642, 3648, 3662, 3664, 3673, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3769, 3771, 3773, 3776, 3780, 3782, 3782, 3784, 3789, 3792, 3801, 3804, 3807, 3840, 3840, 3864, 3865, 3872, 3881, 3893, 3893, 3895, 3895, 3897, 3897, 3902, 3911, 3913, 3948, 3953, 3972, 3974, 3991, 3993, 4028, 4038, 4038, 4096, 4169, 4176, 4253, 4256, 4293, 4295, 4295, 4301, 4301, 4304, 4346, 4348, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4744, 4746, 4749, 4752, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4822, 4824, 4880, 4882, 4885, 4888, 4954, 4957, 4959, 4992, 5007, 5024, 5108, 5121, 5740, 5743, 5759, 5761, 5786, 5792, 5866, 5870, 5872, 5888, 5900, 5902, 5908, 5920, 5940, 5952, 5971, 5984, 5996, 5998, 6000, 6002, 6003, 6016, 6099, 6103, 6103, 6108, 6109, 6112, 6121, 6155, 6157, 6160, 6169, 6176, 6263, 6272, 6314, 6320, 6389, 6400, 6428, 6432, 6443, 6448, 6459, 6470, 6509, 6512, 6516, 6528, 6571, 6576, 6601, 6608, 6617, 6656, 6683, 6688, 6750, 6752, 6780, 6783, 6793, 6800, 6809, 6823, 6823, 6912, 6987, 6992, 7001, 7019, 7027, 7040, 7155, 7168, 7223, 7232, 7241, 7245, 7293, 7376, 7378, 7380, 7414, 7424, 7654, 7676, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8204, 8205, 8255, 8256, 8276, 8276, 8305, 8305, 8319, 8319, 8336, 8348, 8400, 8412, 8417, 8417, 8421, 8432, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8505, 8508, 8511, 8517, 8521, 8526, 8526, 8544, 8584, 11264, 11310, 11312, 11358, 11360, 11492, 11499, 11507, 11520, 11557, 11559, 11559, 11565, 11565, 11568, 11623, 11631, 11631, 11647, 11670, 11680, 11686, 11688, 11694, 11696, 11702, 11704, 11710, 11712, 11718, 11720, 11726, 11728, 11734, 11736, 11742, 11744, 11775, 11823, 11823, 12293, 12295, 12321, 12335, 12337, 12341, 12344, 12348, 12353, 12438, 12441, 12442, 12445, 12447, 12449, 12538, 12540, 12543, 12549, 12589, 12593, 12686, 12704, 12730, 12784, 12799, 13312, 19893, 19968, 40908, 40960, 42124, 42192, 42237, 42240, 42508, 42512, 42539, 42560, 42607, 42612, 42621, 42623, 42647, 42655, 42737, 42775, 42783, 42786, 42888, 42891, 42894, 42896, 42899, 42912, 42922, 43000, 43047, 43072, 43123, 43136, 43204, 43216, 43225, 43232, 43255, 43259, 43259, 43264, 43309, 43312, 43347, 43360, 43388, 43392, 43456, 43471, 43481, 43520, 43574, 43584, 43597, 43600, 43609, 43616, 43638, 43642, 43643, 43648, 43714, 43739, 43741, 43744, 43759, 43762, 43766, 43777, 43782, 43785, 43790, 43793, 43798, 43808, 43814, 43816, 43822, 43968, 44010, 44012, 44013, 44016, 44025, 44032, 55203, 55216, 55238, 55243, 55291, 63744, 64109, 64112, 64217, 64256, 64262, 64275, 64279, 64285, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65024, 65039, 65056, 65062, 65075, 65076, 65101, 65103, 65136, 65140, 65142, 65276, 65296, 65305, 65313, 65338, 65343, 65343, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500, ];
 
     function lookupInUnicodeMap(code: number, map: number[]): boolean {
         // Bail out quickly if it couldn't possibly be in the map.
@@ -205,9 +205,9 @@ module ts {
         }
 
         // Perform binary search in one of the Unicode range maps
-        var lo: number = 0;
-        var hi: number = map.length;
-        var mid: number;
+        let lo: number = 0;
+        let hi: number = map.length;
+        let mid: number;
 
         while (lo + 1 < hi) {
             mid = lo + (hi - lo) / 2;
@@ -241,8 +241,8 @@ module ts {
     }
 
     function makeReverseMap(source: Map<number>): string[] {
-        var result: string[] = [];
-        for (var name in source) {
+        let result: string[] = [];
+        for (let name in source) {
             if (source.hasOwnProperty(name)) {
                 result[source[name]] = name;
             }
@@ -250,18 +250,18 @@ module ts {
         return result;
     }
 
-    var tokenStrings = makeReverseMap(textToToken);
+    let tokenStrings = makeReverseMap(textToToken);
 
     export function tokenToString(t: SyntaxKind): string {
         return tokenStrings[t];
     }
 
     export function computeLineStarts(text: string): number[] {
-        var result: number[] = new Array();
-        var pos = 0;
-        var lineStart = 0;
+        let result: number[] = new Array();
+        let pos = 0;
+        let lineStart = 0;
         while (pos < text.length) {
-            var ch = text.charCodeAt(pos++);
+           let ch = text.charCodeAt(pos++);
            switch (ch) {
                 case CharacterCodes.carriageReturn:
                     if (text.charCodeAt(pos) === CharacterCodes.lineFeed) {
@@ -297,7 +297,7 @@ module ts {
     }
 
     export function computeLineAndCharacterOfPosition(lineStarts: number[], position: number) {
-        var lineNumber = binarySearch(lineStarts, position);
+        let lineNumber = binarySearch(lineStarts, position);
         if (lineNumber < 0) {
             // If the actual position was not found, 
             // the binary search returns the negative value of the next line start
@@ -315,7 +315,7 @@ module ts {
         return computeLineAndCharacterOfPosition(getLineStarts(sourceFile), position);
     }
 
-    var hasOwnProperty = Object.prototype.hasOwnProperty;
+    let hasOwnProperty = Object.prototype.hasOwnProperty;
 
     export function isWhiteSpace(ch: number): boolean {
         return ch === CharacterCodes.space || ch === CharacterCodes.tab || ch === CharacterCodes.verticalTab || ch === CharacterCodes.formFeed ||
@@ -337,7 +337,7 @@ module ts {
 
     export function skipTrivia(text: string, pos: number, stopAfterLineBreak?: boolean): number {
         while (true) {
-            var ch = text.charCodeAt(pos);
+            let ch = text.charCodeAt(pos);
             switch (ch) {
                 case CharacterCodes.carriageReturn:
                     if (text.charCodeAt(pos + 1) === CharacterCodes.lineFeed) {
@@ -401,17 +401,17 @@ module ts {
 
     // All conflict markers consist of the same character repeated seven times.  If it is 
     // a <<<<<<< or >>>>>>> marker then it is also followd by a space.
-    var mergeConflictMarkerLength = "<<<<<<<".length;
+    let mergeConflictMarkerLength = "<<<<<<<".length;
 
     function isConflictMarkerTrivia(text: string, pos: number) {
         Debug.assert(pos >= 0);
 
         // Conflict markers must be at the start of a line.
         if (pos === 0 || isLineBreak(text.charCodeAt(pos - 1))) {
-            var ch = text.charCodeAt(pos);
+            let ch = text.charCodeAt(pos);
 
             if ((pos + mergeConflictMarkerLength) < text.length) {
-                for (var i = 0, n = mergeConflictMarkerLength; i < n; i++) {
+                for (let i = 0, n = mergeConflictMarkerLength; i < n; i++) {
                     if (text.charCodeAt(pos + i) !== ch) {
                         return false;
                     }
@@ -430,8 +430,8 @@ module ts {
             error(Diagnostics.Merge_conflict_marker_encountered, mergeConflictMarkerLength);
         }
 
-        var ch = text.charCodeAt(pos);
-        var len = text.length;
+        let ch = text.charCodeAt(pos);
+        let len = text.length;
 
         if (ch === CharacterCodes.lessThan || ch === CharacterCodes.greaterThan) {
             while (pos < len && !isLineBreak(text.charCodeAt(pos))) {
@@ -443,7 +443,7 @@ module ts {
             // Consume everything from the start of the mid-conlict marker to the start of the next
             // end-conflict marker.
             while (pos < len) {
-                var ch = text.charCodeAt(pos);
+                let ch = text.charCodeAt(pos);
                 if (ch === CharacterCodes.greaterThan && isConflictMarkerTrivia(text, pos)) {
                     break;
                 }
@@ -461,10 +461,10 @@ module ts {
     // comment. Single-line comment ranges include the beginning '//' characters but not the ending line break. Multi-line comment
     // ranges include the beginning '/* and ending '*/' characters. The return value is undefined if no comments were found.
     function getCommentRanges(text: string, pos: number, trailing: boolean): CommentRange[] {
-        var result: CommentRange[];
-        var collecting = trailing || pos === 0;
+        let result: CommentRange[];
+        let collecting = trailing || pos === 0;
         while (true) {
-            var ch = text.charCodeAt(pos);
+            let ch = text.charCodeAt(pos);
             switch (ch) {
                 case CharacterCodes.carriageReturn:
                     if (text.charCodeAt(pos + 1) === CharacterCodes.lineFeed) pos++;
@@ -485,10 +485,10 @@ module ts {
                     pos++;
                     continue;
                 case CharacterCodes.slash:
-                    var nextChar = text.charCodeAt(pos + 1);
-                    var hasTrailingNewLine = false;
+                    let nextChar = text.charCodeAt(pos + 1);
+                    let hasTrailingNewLine = false;
                     if (nextChar === CharacterCodes.slash || nextChar === CharacterCodes.asterisk) {
-                        var startPos = pos;
+                        let startPos = pos;
                         pos += 2;
                         if (nextChar === CharacterCodes.slash) {
                             while (pos < text.length) {
@@ -550,15 +550,15 @@ module ts {
     }
 
     export function createScanner(languageVersion: ScriptTarget, skipTrivia: boolean, text?: string, onError?: ErrorCallback): Scanner {
-        var pos: number;       // Current position (end position of text of current token)
-        var len: number;       // Length of text
-        var startPos: number;  // Start position of whitespace before current token
-        var tokenPos: number;  // Start position of text of current token
-        var token: SyntaxKind;
-        var tokenValue: string;
-        var precedingLineBreak: boolean;
-        var hasExtendedUnicodeEscape: boolean;
-        var tokenIsUnterminated: boolean;
+        let pos: number;       // Current position (end position of text of current token)
+        let len: number;       // Length of text
+        let startPos: number;  // Start position of whitespace before current token
+        let tokenPos: number;  // Start position of text of current token
+        let token: SyntaxKind;
+        let tokenValue: string;
+        let precedingLineBreak: boolean;
+        let hasExtendedUnicodeEscape: boolean;
+        let tokenIsUnterminated: boolean;
 
         function error(message: DiagnosticMessage, length?: number): void {
             if (onError) {
@@ -579,13 +579,13 @@ module ts {
         }
 
         function scanNumber(): number {
-            var start = pos;
+            let start = pos;
             while (isDigit(text.charCodeAt(pos))) pos++;
             if (text.charCodeAt(pos) === CharacterCodes.dot) {
                 pos++;
                 while (isDigit(text.charCodeAt(pos))) pos++;
             }
-            var end = pos;
+            let end = pos;
             if (text.charCodeAt(pos) === CharacterCodes.E || text.charCodeAt(pos) === CharacterCodes.e) {
                 pos++;
                 if (text.charCodeAt(pos) === CharacterCodes.plus || text.charCodeAt(pos) === CharacterCodes.minus) pos++;
@@ -602,7 +602,7 @@ module ts {
         }
 
         function scanOctalDigits(): number {
-            var start = pos;
+            let start = pos;
             while (isOctalDigit(text.charCodeAt(pos))) {
                 pos++;
             }
@@ -626,10 +626,10 @@ module ts {
         }
 
         function scanHexDigits(minCount: number, scanAsManyAsPossible: boolean): number {
-            var digits = 0;
-            var value = 0;
+            let digits = 0;
+            let value = 0;
             while (digits < minCount || scanAsManyAsPossible) {
-                var ch = text.charCodeAt(pos);
+                let ch = text.charCodeAt(pos);
                 if (ch >= CharacterCodes._0 && ch <= CharacterCodes._9) {
                     value = value * 16 + ch - CharacterCodes._0;
                 }
@@ -652,9 +652,9 @@ module ts {
         }
 
         function scanString(): string {
-            var quote = text.charCodeAt(pos++);
-            var result = "";
-            var start = pos;
+            let quote = text.charCodeAt(pos++);
+            let result = "";
+            let start = pos;
             while (true) {
                 if (pos >= len) {
                     result += text.substring(start, pos);
@@ -662,7 +662,7 @@ module ts {
                     error(Diagnostics.Unterminated_string_literal);
                     break;
                 }
-                var ch = text.charCodeAt(pos);
+                let ch = text.charCodeAt(pos);
                 if (ch === quote) {
                     result += text.substring(start, pos);
                     pos++;
@@ -690,12 +690,12 @@ module ts {
          * a literal component of a TemplateExpression.
          */
         function scanTemplateAndSetTokenValue(): SyntaxKind {
-            var startedWithBacktick = text.charCodeAt(pos) === CharacterCodes.backtick;
+            let startedWithBacktick = text.charCodeAt(pos) === CharacterCodes.backtick;
 
             pos++;
-            var start = pos;
-            var contents = ""
-            var resultingToken: SyntaxKind;
+            let start = pos;
+            let contents = ""
+            let resultingToken: SyntaxKind;
 
             while (true) {
                 if (pos >= len) {
@@ -706,7 +706,7 @@ module ts {
                     break;
                 }
 
-                var currChar = text.charCodeAt(pos);
+                let currChar = text.charCodeAt(pos);
 
                 // '`'
                 if (currChar === CharacterCodes.backtick) {
@@ -762,7 +762,7 @@ module ts {
                 error(Diagnostics.Unexpected_end_of_text);
                 return "";
             }
-            var ch = text.charCodeAt(pos++);
+            let ch = text.charCodeAt(pos++);
             switch (ch) {
                 case CharacterCodes._0:
                     return "\0";
@@ -814,7 +814,7 @@ module ts {
         }
         
         function scanHexadecimalEscape(numDigits: number): string {
-            var escapedValue = scanExactNumberOfHexDigits(numDigits);
+            let escapedValue = scanExactNumberOfHexDigits(numDigits);
             
             if (escapedValue >= 0) {
                 return String.fromCharCode(escapedValue);
@@ -826,8 +826,8 @@ module ts {
         }
         
         function scanExtendedUnicodeEscape(): string {
-            var escapedValue = scanMinimumNumberOfHexDigits(1);
-            var isInvalidExtendedEscape = false;
+            let escapedValue = scanMinimumNumberOfHexDigits(1);
+            let isInvalidExtendedEscape = false;
 
             // Validate the value of the digit
             if (escapedValue < 0) {
@@ -867,8 +867,8 @@ module ts {
                 return String.fromCharCode(codePoint);
             }
             
-            var codeUnit1 = Math.floor((codePoint - 65536) / 1024) + 0xD800;
-            var codeUnit2 = ((codePoint - 65536) % 1024) + 0xDC00;
+            let codeUnit1 = Math.floor((codePoint - 65536) / 1024) + 0xD800;
+            let codeUnit2 = ((codePoint - 65536) % 1024) + 0xDC00;
             
             return String.fromCharCode(codeUnit1, codeUnit2);
         }
@@ -877,9 +877,9 @@ module ts {
         // and return code point value if valid Unicode escape is found. Otherwise return -1.
         function peekUnicodeEscape(): number {
             if (pos + 5 < len && text.charCodeAt(pos + 1) === CharacterCodes.u) {
-                var start = pos;
+                let start = pos;
                 pos += 2;
-                var value = scanExactNumberOfHexDigits(4);
+                let value = scanExactNumberOfHexDigits(4);
                 pos = start;
                 return value;
             }
@@ -887,10 +887,10 @@ module ts {
         }
 
         function scanIdentifierParts(): string {
-            var result = "";
-            var start = pos;
+            let result = "";
+            let start = pos;
             while (pos < len) {
-                var ch = text.charCodeAt(pos);
+                let ch = text.charCodeAt(pos);
                 if (isIdentifierPart(ch)) {
                     pos++;
                 }
@@ -915,9 +915,9 @@ module ts {
 
         function getIdentifierToken(): SyntaxKind {
             // Reserved words are between 2 and 11 characters long and start with a lowercase letter
-            var len = tokenValue.length;
+            let len = tokenValue.length;
             if (len >= 2 && len <= 11) {
-                var ch = tokenValue.charCodeAt(0);
+                let ch = tokenValue.charCodeAt(0);
                 if (ch >= CharacterCodes.a && ch <= CharacterCodes.z && hasOwnProperty.call(textToToken, tokenValue)) {
                     return token = textToToken[tokenValue];
                 }
@@ -928,13 +928,13 @@ module ts {
         function scanBinaryOrOctalDigits(base: number): number {
             Debug.assert(base !== 2 || base !== 8, "Expected either base 2 or base 8");
 
-            var value = 0;
+            let value = 0;
             // For counting number of digits; Valid binaryIntegerLiteral must have at least one binary digit following B or b.
             // Similarly valid octalIntegerLiteral must have at least one octal digit following o or O.
-            var numberOfDigits = 0;  
+            let numberOfDigits = 0;  
             while (true) {
-                var ch = text.charCodeAt(pos);
-                var valueOfCh = ch - CharacterCodes._0;
+                let ch = text.charCodeAt(pos);
+                let valueOfCh = ch - CharacterCodes._0;
                 if (!isDigit(ch) || valueOfCh >= base) {
                     break;
                 }
@@ -1079,9 +1079,9 @@ module ts {
                         if (text.charCodeAt(pos + 1) === CharacterCodes.asterisk) {
                             pos += 2;
 
-                            var commentClosed = false;
+                            let commentClosed = false;
                             while (pos < len) {
-                                var ch = text.charCodeAt(pos);
+                                let ch = text.charCodeAt(pos);
 
                                 if (ch === CharacterCodes.asterisk && text.charCodeAt(pos + 1) === CharacterCodes.slash) {
                                     pos += 2;
@@ -1117,7 +1117,7 @@ module ts {
                     case CharacterCodes._0:
                         if (pos + 2 < len && (text.charCodeAt(pos + 1) === CharacterCodes.X || text.charCodeAt(pos + 1) === CharacterCodes.x)) {
                             pos += 2;
-                            var value = scanMinimumNumberOfHexDigits(1);
+                            let value = scanMinimumNumberOfHexDigits(1);
                             if (value < 0) {
                                 error(Diagnostics.Hexadecimal_digit_expected);
                                 value = 0;
@@ -1127,7 +1127,7 @@ module ts {
                         }
                         else if (pos + 2 < len && (text.charCodeAt(pos + 1) === CharacterCodes.B || text.charCodeAt(pos + 1) === CharacterCodes.b)) {
                             pos += 2;
-                            var value = scanBinaryOrOctalDigits(/* base */ 2);
+                            let value = scanBinaryOrOctalDigits(/* base */ 2);
                             if (value < 0) {
                                 error(Diagnostics.Binary_digit_expected);
                                 value = 0;
@@ -1137,7 +1137,7 @@ module ts {
                         }
                         else if (pos + 2 < len && (text.charCodeAt(pos + 1) === CharacterCodes.O || text.charCodeAt(pos + 1) === CharacterCodes.o)) {
                             pos += 2;
-                            var value = scanBinaryOrOctalDigits(/* base */ 8);
+                            let value = scanBinaryOrOctalDigits(/* base */ 8);
                             if (value < 0) {
                                 error(Diagnostics.Octal_digit_expected);
                                 value = 0;
@@ -1304,9 +1304,9 @@ module ts {
 
         function reScanSlashToken(): SyntaxKind {
             if (token === SyntaxKind.SlashToken || token === SyntaxKind.SlashEqualsToken) {
-                var p = tokenPos + 1;
-                var inEscape = false;
-                var inCharacterClass = false;
+                let p = tokenPos + 1;
+                let inEscape = false;
+                let inCharacterClass = false;
                 while (true) {
                     // If we reach the end of a file, or hit a newline, then this is an unterminated
                     // regex.  Report error and return what we have so far.
@@ -1316,7 +1316,7 @@ module ts {
                         break;
                     }
 
-                    var ch = text.charCodeAt(p);
+                    let ch = text.charCodeAt(p);
                     if (isLineBreak(ch)) {
                         tokenIsUnterminated = true;
                         error(Diagnostics.Unterminated_regular_expression_literal)
@@ -1366,13 +1366,13 @@ module ts {
         }
 
         function speculationHelper<T>(callback: () => T, isLookahead: boolean): T {
-            var savePos = pos;
-            var saveStartPos = startPos;
-            var saveTokenPos = tokenPos;
-            var saveToken = token;
-            var saveTokenValue = tokenValue;
-            var savePrecedingLineBreak = precedingLineBreak;
-            var result = callback();
+            let savePos = pos;
+            let saveStartPos = startPos;
+            let saveTokenPos = tokenPos;
+            let saveToken = token;
+            let saveTokenValue = tokenValue;
+            let savePrecedingLineBreak = precedingLineBreak;
+            let result = callback();
 
             // If our callback returned something 'falsy' or we're just looking ahead,
             // then unconditionally restore us to where we were.
diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index 5f10a747d42..f89c474ce7f 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -124,15 +124,14 @@ module ts {
                 function visitDirectory(path: string) {
                     var folder = fso.GetFolder(path || ".");
                     var files = getNames(folder.files);
-                    for (var i = 0; i < files.length; i++) {
-                        var name = files[i];
+                    for (let name of files) {
                         if (!extension || fileExtensionIs(name, extension)) {
                             result.push(combinePaths(path, name));
                         }
                     }
                     var subfolders = getNames(folder.subfolders);
-                    for (var i = 0; i < subfolders.length; i++) {
-                        visitDirectory(combinePaths(path, subfolders[i]));
+                    for (let current of subfolders) {
+                        visitDirectory(combinePaths(path, current));
                     }
                 }
             }
@@ -230,8 +229,8 @@ module ts {
                 function visitDirectory(path: string) {
                     var files = _fs.readdirSync(path || ".").sort();
                     var directories: string[] = [];
-                    for (var i = 0; i < files.length; i++) {
-                        var name = combinePaths(path, files[i]);
+                    for (let current of files) {
+                        var name = combinePaths(path, current);
                         var stat = _fs.lstatSync(name);
                         if (stat.isFile()) {
                             if (!extension || fileExtensionIs(name, extension)) {
@@ -242,8 +241,8 @@ module ts {
                             directories.push(name);
                         }
                     }
-                    for (var i = 0; i < directories.length; i++) {
-                        visitDirectory(directories[i]);
+                    for (let current of directories) {
+                        visitDirectory(current);
                     }
                 }
             }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index abace7e224e..7301e087ae1 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -233,6 +233,7 @@ module ts {
         EnumDeclaration,
         ModuleDeclaration,
         ModuleBlock,
+        CaseBlock,
         ImportEqualsDeclaration,
         ImportDeclaration,
         ImportClause,
@@ -790,6 +791,10 @@ module ts {
 
     export interface SwitchStatement extends Statement {
         expression: Expression;
+        caseBlock: CaseBlock;
+    }
+
+    export interface CaseBlock extends Node {
         clauses: NodeArray<CaseOrDefaultClause>;
     }
 
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 28e9b114ec3..ea362eb2220 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -15,8 +15,7 @@ module ts {
 
     export function getDeclarationOfKind(symbol: Symbol, kind: SyntaxKind): Declaration {
         var declarations = symbol.declarations;
-        for (var i = 0; i < declarations.length; i++) {
-            var declaration = declarations[i];
+        for (let declaration of declarations) {
             if (declaration.kind === kind) {
                 return declaration;
             }
@@ -203,6 +202,33 @@ module ts {
             isCatchClauseVariableDeclaration(declaration);
     }
 
+    export function getEnclosingBlockScopeContainer(node: Node): Node {
+        var current = node;
+        while (current) {
+            if (isFunctionLike(current)) {
+                return current;
+            }
+            switch (current.kind) {
+                case SyntaxKind.SourceFile:
+                case SyntaxKind.CaseBlock:
+                case SyntaxKind.CatchClause:
+                case SyntaxKind.ModuleDeclaration:
+                case SyntaxKind.ForStatement:
+                case SyntaxKind.ForInStatement:
+                case SyntaxKind.ForOfStatement:
+                    return current;
+                case SyntaxKind.Block:
+                    // function block is not considered block-scope container
+                    // see comment in binder.ts: bind(...), case for SyntaxKind.Block
+                    if (!isFunctionLike(current.parent)) {
+                        return current;
+                    }
+            }
+
+            current = current.parent;
+        }
+    }
+
     export function isCatchClauseVariableDeclaration(declaration: Declaration) {
         return declaration &&
             declaration.kind === SyntaxKind.VariableDeclaration &&
@@ -376,6 +402,7 @@ module ts {
             switch (node.kind) {
                 case SyntaxKind.ReturnStatement:
                     return visitor(<ReturnStatement>node);
+                case SyntaxKind.CaseBlock:
                 case SyntaxKind.Block:
                 case SyntaxKind.IfStatement:
                 case SyntaxKind.DoStatement:
@@ -824,9 +851,9 @@ module ts {
 
     export function getHeritageClause(clauses: NodeArray<HeritageClause>, kind: SyntaxKind) {
         if (clauses) {
-            for (var i = 0, n = clauses.length; i < n; i++) {
-                if (clauses[i].token === kind) {
-                    return clauses[i];
+            for (let clause of clauses) {
+                if (clause.token === kind) {
+                    return clause;
                 }
             }
         }
@@ -1207,6 +1234,7 @@ module ts {
         }
     }
 
+    // @internal
     export function createDiagnosticCollection(): DiagnosticCollection {
         var nonFileDiagnostics: Diagnostic[] = [];
         var fileDiagnostics: Map<Diagnostic[]> = {};
@@ -1336,4 +1364,4 @@ module ts {
             s.replace(nonAsciiCharacters, c => get16BitUnicodeEscapeSequence(c.charCodeAt(0))) :
             s;
     }
-}
\ No newline at end of file
+}
diff --git a/src/lib/core.d.ts b/src/lib/core.d.ts
index bbaddeeacc1..040eb69ae96 100644
--- a/src/lib/core.d.ts
+++ b/src/lib/core.d.ts
@@ -164,19 +164,19 @@ interface ObjectConstructor {
       * Prevents the modification of attributes of existing properties, and prevents the addition of new properties.
       * @param o Object on which to lock the attributes. 
       */
-    seal(o: any): any;
+    seal<T>(o: T): T;
 
     /**
       * Prevents the modification of existing property attributes and values, and prevents the addition of new properties.
       * @param o Object on which to lock the attributes.
       */
-    freeze(o: any): any;
+    freeze<T>(o: T): T;
 
     /**
       * Prevents the addition of new properties to an object.
       * @param o Object to make non-extensible. 
       */
-    preventExtensions(o: any): any;
+    preventExtensions<T>(o: T): T;
 
     /**
       * Returns true if existing property attributes cannot be modified in an object and new properties cannot be added to the object.
diff --git a/src/services/breakpoints.ts b/src/services/breakpoints.ts
index d59718322c9..c56ea72cd66 100644
--- a/src/services/breakpoints.ts
+++ b/src/services/breakpoints.ts
@@ -13,13 +13,13 @@ module ts.BreakpointResolver {
             return undefined;
         }
 
-        var tokenAtLocation = getTokenAtPosition(sourceFile, position);
-        var lineOfPosition = sourceFile.getLineAndCharacterOfPosition(position).line;
+        let tokenAtLocation = getTokenAtPosition(sourceFile, position);
+        let lineOfPosition = sourceFile.getLineAndCharacterOfPosition(position).line;
         if (sourceFile.getLineAndCharacterOfPosition(tokenAtLocation.getStart()).line > lineOfPosition) {
             // Get previous token if the token is returned starts on new line
-            // eg: var x =10; |--- cursor is here
-            //     var y = 10; 
-            // token at position will return var keyword on second line as the token but we would like to use 
+            // eg: let x =10; |--- cursor is here
+            //     let y = 10; 
+            // token at position will return let keyword on second line as the token but we would like to use 
             // token on same line if trailing trivia (comments or white spaces on same line) part of the last token on that line
             tokenAtLocation = findPrecedingToken(tokenAtLocation.pos, sourceFile);
 
@@ -275,9 +275,9 @@ module ts.BreakpointResolver {
                     return spanInNode(variableDeclaration.parent.parent);
                 }
 
-                var isParentVariableStatement = variableDeclaration.parent.parent.kind === SyntaxKind.VariableStatement;
-                var isDeclarationOfForStatement = variableDeclaration.parent.parent.kind === SyntaxKind.ForStatement && contains((<VariableDeclarationList>(<ForStatement>variableDeclaration.parent.parent).initializer).declarations, variableDeclaration);
-                var declarations = isParentVariableStatement
+                let isParentVariableStatement = variableDeclaration.parent.parent.kind === SyntaxKind.VariableStatement;
+                let isDeclarationOfForStatement = variableDeclaration.parent.parent.kind === SyntaxKind.ForStatement && contains((<VariableDeclarationList>(<ForStatement>variableDeclaration.parent.parent).initializer).declarations, variableDeclaration);
+                let declarations = isParentVariableStatement
                     ? (<VariableStatement>variableDeclaration.parent.parent).declarationList.declarations
                     : isDeclarationOfForStatement
                         ? (<VariableDeclarationList>(<ForStatement>variableDeclaration.parent.parent).initializer).declarations
@@ -287,12 +287,12 @@ module ts.BreakpointResolver {
                 if (variableDeclaration.initializer || (variableDeclaration.flags & NodeFlags.Export)) {
                     if (declarations && declarations[0] === variableDeclaration) {
                         if (isParentVariableStatement) {
-                            // First declaration - include var keyword
+                            // First declaration - include let keyword
                             return textSpan(variableDeclaration.parent, variableDeclaration);
                         }
                         else {
                             Debug.assert(isDeclarationOfForStatement);
-                            // Include var keyword from for statement declarations in the span
+                            // Include let keyword from for statement declarations in the span
                             return textSpan(findPrecedingToken(variableDeclaration.pos, sourceFile, variableDeclaration.parent), variableDeclaration);
                         }
                     }
@@ -303,7 +303,7 @@ module ts.BreakpointResolver {
                 }
                 else if (declarations && declarations[0] !== variableDeclaration) {
                     // If we cant set breakpoint on this declaration, set it on previous one
-                    var indexOfCurrentDeclaration = indexOf(declarations, variableDeclaration);
+                    let indexOfCurrentDeclaration = indexOf(declarations, variableDeclaration);
                     return spanInVariableDeclaration(declarations[indexOfCurrentDeclaration - 1]);
                 }
             }
@@ -319,8 +319,8 @@ module ts.BreakpointResolver {
                     return textSpan(parameter);
                 }
                 else {
-                    var functionDeclaration = <FunctionLikeDeclaration>parameter.parent;
-                    var indexOfParameter = indexOf(functionDeclaration.parameters, parameter);
+                    let functionDeclaration = <FunctionLikeDeclaration>parameter.parent;
+                    let indexOfParameter = indexOf(functionDeclaration.parameters, parameter);
                     if (indexOfParameter) {
                         // Not a first parameter, go to previous parameter
                         return spanInParameterDeclaration(functionDeclaration.parameters[indexOfParameter - 1]);
@@ -353,7 +353,7 @@ module ts.BreakpointResolver {
             }
 
             function spanInFunctionBlock(block: Block): TextSpan {
-                var nodeForSpanInBlock = block.statements.length ? block.statements[0] : block.getLastToken();
+                let nodeForSpanInBlock = block.statements.length ? block.statements[0] : block.getLastToken();
                 if (canFunctionHaveSpanInWholeDeclaration(<FunctionLikeDeclaration>block.parent)) {
                     return spanInNodeIfStartsOnSameLine(block.parent, nodeForSpanInBlock);
                 }
@@ -387,7 +387,7 @@ module ts.BreakpointResolver {
             function spanInForStatement(forStatement: ForStatement): TextSpan {
                 if (forStatement.initializer) {
                     if (forStatement.initializer.kind === SyntaxKind.VariableDeclarationList) {
-                        var variableDeclarationList = <VariableDeclarationList>forStatement.initializer;
+                        let variableDeclarationList = <VariableDeclarationList>forStatement.initializer;
                         if (variableDeclarationList.declarations.length > 0) {
                             return spanInNode(variableDeclarationList.declarations[0]);
                         }
@@ -409,15 +409,15 @@ module ts.BreakpointResolver {
             function spanInOpenBraceToken(node: Node): TextSpan {
                 switch (node.parent.kind) {
                     case SyntaxKind.EnumDeclaration:
-                        var enumDeclaration = <EnumDeclaration>node.parent;
+                        let enumDeclaration = <EnumDeclaration>node.parent;
                         return spanInNodeIfStartsOnSameLine(findPrecedingToken(node.pos, sourceFile, node.parent), enumDeclaration.members.length ? enumDeclaration.members[0] : enumDeclaration.getLastToken(sourceFile));
 
                     case SyntaxKind.ClassDeclaration:
-                        var classDeclaration = <ClassDeclaration>node.parent;
+                        let classDeclaration = <ClassDeclaration>node.parent;
                         return spanInNodeIfStartsOnSameLine(findPrecedingToken(node.pos, sourceFile, node.parent), classDeclaration.members.length ? classDeclaration.members[0] : classDeclaration.getLastToken(sourceFile));
 
-                    case SyntaxKind.SwitchStatement:
-                        return spanInNodeIfStartsOnSameLine(node.parent, (<SwitchStatement>node.parent).clauses[0]);
+                    case SyntaxKind.CaseBlock:
+                        return spanInNodeIfStartsOnSameLine(node.parent.parent, (<CaseBlock>node.parent).clauses[0]);
                 }
 
                 // Default to parent node
@@ -447,10 +447,10 @@ module ts.BreakpointResolver {
                     case SyntaxKind.CatchClause:
                         return spanInNode((<Block>node.parent).statements[(<Block>node.parent).statements.length - 1]);;
 
-                    case SyntaxKind.SwitchStatement:
+                    case SyntaxKind.CaseBlock:
                         // breakpoint in last statement of the last clause
-                        var switchStatement = <SwitchStatement>node.parent;
-                        var lastClause = switchStatement.clauses[switchStatement.clauses.length - 1];
+                        let caseBlock = <CaseBlock>node.parent;
+                        let lastClause = caseBlock.clauses[caseBlock.clauses.length - 1];
                         if (lastClause) {
                             return spanInNode(lastClause.statements[lastClause.statements.length - 1]);
                         }
diff --git a/src/services/formatting/formatting.ts b/src/services/formatting/formatting.ts
index dd12b452b57..b20d8fea22d 100644
--- a/src/services/formatting/formatting.ts
+++ b/src/services/formatting/formatting.ts
@@ -609,8 +609,8 @@ module ts.formatting {
                 }
 
                 var inheritedIndentation = Constants.Unknown;
-                for (var i = 0, len = nodes.length; i < len; ++i) {
-                    inheritedIndentation = processChildNode(nodes[i], inheritedIndentation, node, listDynamicIndentation, startLine, /*isListElement*/ true)
+                for (let child of nodes) {
+                    inheritedIndentation = processChildNode(child, inheritedIndentation, node, listDynamicIndentation, startLine, /*isListElement*/ true)
                 }
 
                 if (listEndToken !== SyntaxKind.Unknown) {
@@ -668,8 +668,7 @@ module ts.formatting {
                 if (indentToken) {
                     var indentNextTokenOrTrivia = true;
                     if (currentTokenInfo.leadingTrivia) {
-                        for (var i = 0, len = currentTokenInfo.leadingTrivia.length; i < len; ++i) {
-                            var triviaItem = currentTokenInfo.leadingTrivia[i];
+                        for (let triviaItem of currentTokenInfo.leadingTrivia) {
                             if (!rangeContainsRange(originalRange, triviaItem)) {
                                 continue;
                             }
@@ -709,8 +708,7 @@ module ts.formatting {
         }
 
         function processTrivia(trivia: TextRangeWithKind[], parent: Node, contextNode: Node, dynamicIndentation: DynamicIndentation): void {
-            for (var i = 0, len = trivia.length; i < len; ++i) {
-                var triviaItem = trivia[i];
+            for (let triviaItem of trivia) {
                 if (isComment(triviaItem.kind) && rangeContainsRange(originalRange, triviaItem)) {
                     var triviaItemStart = sourceFile.getLineAndCharacterOfPosition(triviaItem.pos);
                     processRange(triviaItem, triviaItemStart, parent, contextNode, dynamicIndentation);
diff --git a/src/services/formatting/ruleOperationContext.ts b/src/services/formatting/ruleOperationContext.ts
index d037f8e70d7..dc4e5d4f105 100644
--- a/src/services/formatting/ruleOperationContext.ts
+++ b/src/services/formatting/ruleOperationContext.ts
@@ -36,8 +36,8 @@ module ts.formatting {
                 return true;
             }
 
-            for (var i = 0, len = this.customContextChecks.length; i < len; i++) {
-                if (!this.customContextChecks[i](context)) {
+            for (let check of this.customContextChecks) {
+                if (!check(context)) {
                     return false;
                 }
             }
diff --git a/src/services/formatting/rules.ts b/src/services/formatting/rules.ts
index ecfc5012915..7eb5232af18 100644
--- a/src/services/formatting/rules.ts
+++ b/src/services/formatting/rules.ts
@@ -541,7 +541,7 @@ module ts.formatting {
 
             switch (node.kind) {
                 case SyntaxKind.Block:
-                case SyntaxKind.SwitchStatement:
+                case SyntaxKind.CaseBlock:
                 case SyntaxKind.ObjectLiteralExpression:
                 case SyntaxKind.ModuleBlock:
                     return true;
diff --git a/src/services/formatting/rulesMap.ts b/src/services/formatting/rulesMap.ts
index d25320f16a8..634ec61de9c 100644
--- a/src/services/formatting/rulesMap.ts
+++ b/src/services/formatting/rulesMap.ts
@@ -76,10 +76,10 @@ module ts.formatting {
             var bucketIndex = this.GetRuleBucketIndex(context.currentTokenSpan.kind, context.nextTokenSpan.kind);
             var bucket = this.map[bucketIndex];
             if (bucket != null) {
-                for (var i = 0, len = bucket.Rules().length; i < len; i++) {
-                    var rule = bucket.Rules()[i];
-                    if (rule.Operation.Context.InContext(context))
+                for (let rule of bucket.Rules()) {
+                    if (rule.Operation.Context.InContext(context)) {
                         return rule;
+                    }
                 }
             }
             return null;
diff --git a/src/services/formatting/smartIndenter.ts b/src/services/formatting/smartIndenter.ts
index 6974f160e10..f1d0935c132 100644
--- a/src/services/formatting/smartIndenter.ts
+++ b/src/services/formatting/smartIndenter.ts
@@ -357,7 +357,7 @@ module ts.formatting {
                 case SyntaxKind.ModuleBlock:
                 case SyntaxKind.ObjectLiteralExpression:
                 case SyntaxKind.TypeLiteral:
-                case SyntaxKind.SwitchStatement:
+                case SyntaxKind.CaseBlock:
                 case SyntaxKind.DefaultClause:
                 case SyntaxKind.CaseClause:
                 case SyntaxKind.ParenthesizedExpression:
@@ -431,7 +431,7 @@ module ts.formatting {
                 case SyntaxKind.ObjectLiteralExpression:
                 case SyntaxKind.Block:
                 case SyntaxKind.ModuleBlock:
-                case SyntaxKind.SwitchStatement:
+                case SyntaxKind.CaseBlock:
                     return nodeEndsWith(n, SyntaxKind.CloseBraceToken, sourceFile);
                 case SyntaxKind.CatchClause:
                     return isCompletedNode((<CatchClause>n).block, sourceFile);
@@ -461,6 +461,12 @@ module ts.formatting {
                 case SyntaxKind.DefaultClause:
                     // there is no such thing as terminator token for CaseClause\DefaultClause so for simplicitly always consider them non-completed
                     return false;
+                case SyntaxKind.ForStatement:
+                    return isCompletedNode((<ForStatement>n).statement, sourceFile);
+                case SyntaxKind.ForInStatement:
+                    return isCompletedNode((<ForInStatement>n).statement, sourceFile);
+                case SyntaxKind.ForOfStatement:
+                    return isCompletedNode((<ForOfStatement>n).statement, sourceFile);
                 case SyntaxKind.WhileStatement:
                     return isCompletedNode((<WhileStatement>n).statement, sourceFile);
                 case SyntaxKind.DoStatement:
diff --git a/src/services/navigateTo.ts b/src/services/navigateTo.ts
index b3f72d83cb3..9871a447c05 100644
--- a/src/services/navigateTo.ts
+++ b/src/services/navigateTo.ts
@@ -2,22 +2,21 @@ module ts.NavigateTo {
     type RawNavigateToItem = { name: string; fileName: string; matchKind: PatternMatchKind; isCaseSensitive: boolean; declaration: Declaration };
 
     export function getNavigateToItems(program: Program, cancellationToken: CancellationTokenObject, searchValue: string, maxResultCount: number): NavigateToItem[] {
-        var patternMatcher = createPatternMatcher(searchValue);
-        var rawItems: RawNavigateToItem[] = [];
+        let patternMatcher = createPatternMatcher(searchValue);
+        let rawItems: RawNavigateToItem[] = [];
 
         // Search the declarations in all files and output matched NavigateToItem into array of NavigateToItem[] 
         forEach(program.getSourceFiles(), sourceFile => {
             cancellationToken.throwIfCancellationRequested();
 
-            var declarations = sourceFile.getNamedDeclarations();
-            for (var i = 0, n = declarations.length; i < n; i++) {
-                var declaration = declarations[i];
+            let declarations = sourceFile.getNamedDeclarations();
+            for (let declaration of declarations) {
                 var name = getDeclarationName(declaration);
                 if (name !== undefined) {
 
                     // First do a quick check to see if the name of the declaration matches the 
                     // last portion of the (possibly) dotted name they're searching for.
-                    var matches = patternMatcher.getMatchesForLastSegmentOfPattern(name);
+                    let matches = patternMatcher.getMatchesForLastSegmentOfPattern(name);
 
                     if (!matches) {
                         continue;
@@ -26,7 +25,7 @@ module ts.NavigateTo {
                     // It was a match!  If the pattern has dots in it, then also see if hte 
                     // declaration container matches as well.
                     if (patternMatcher.patternContainsDots) {
-                        var containers = getContainers(declaration);
+                        let containers = getContainers(declaration);
                         if (!containers) {
                             return undefined;
                         }
@@ -38,8 +37,8 @@ module ts.NavigateTo {
                         }
                     }
 
-                    var fileName = sourceFile.fileName;
-                    var matchKind = bestMatchKind(matches);
+                    let fileName = sourceFile.fileName;
+                    let matchKind = bestMatchKind(matches);
                     rawItems.push({ name, fileName, matchKind, isCaseSensitive: allMatchesAreCaseSensitive(matches), declaration });
                 }
             }
@@ -50,7 +49,7 @@ module ts.NavigateTo {
             rawItems = rawItems.slice(0, maxResultCount);
         }
 
-        var items = map(rawItems, createNavigateToItem);
+        let items = map(rawItems, createNavigateToItem);
 
         return items;
 
@@ -58,8 +57,8 @@ module ts.NavigateTo {
             Debug.assert(matches.length > 0);
 
             // This is a case sensitive match, only if all the submatches were case sensitive.
-            for (var i = 0, n = matches.length; i < n; i++) {
-                if (!matches[i].isCaseSensitive) {
+            for (let match of matches) {
+                if (!match.isCaseSensitive) {
                     return false;
                 }
             }
@@ -68,13 +67,13 @@ module ts.NavigateTo {
         }
 
         function getDeclarationName(declaration: Declaration): string {
-            var result = getTextOfIdentifierOrLiteral(declaration.name);
+            let result = getTextOfIdentifierOrLiteral(declaration.name);
             if (result !== undefined) {
                 return result;
             }
 
             if (declaration.name.kind === SyntaxKind.ComputedPropertyName) {
-                var expr = (<ComputedPropertyName>declaration.name).expression;
+                let expr = (<ComputedPropertyName>declaration.name).expression;
                 if (expr.kind === SyntaxKind.PropertyAccessExpression) {
                     return (<PropertyAccessExpression>expr).name.text;
                 }
@@ -98,7 +97,7 @@ module ts.NavigateTo {
 
         function tryAddSingleDeclarationName(declaration: Declaration, containers: string[]) {
             if (declaration && declaration.name) {
-                var text = getTextOfIdentifierOrLiteral(declaration.name);
+                let text = getTextOfIdentifierOrLiteral(declaration.name);
                 if (text !== undefined) {
                     containers.unshift(text);
                 }
@@ -118,7 +117,7 @@ module ts.NavigateTo {
         //
         //      [X.Y.Z]() { }
         function tryAddComputedPropertyName(expression: Expression, containers: string[], includeLastPortion: boolean): boolean {
-            var text = getTextOfIdentifierOrLiteral(expression);
+            let text = getTextOfIdentifierOrLiteral(expression);
             if (text !== undefined) {
                 if (includeLastPortion) {
                     containers.unshift(text);
@@ -127,7 +126,7 @@ module ts.NavigateTo {
             }
 
             if (expression.kind === SyntaxKind.PropertyAccessExpression) {
-                var propertyAccess = <PropertyAccessExpression>expression;
+                let propertyAccess = <PropertyAccessExpression>expression;
                 if (includeLastPortion) {
                     containers.unshift(propertyAccess.name.text);
                 }
@@ -139,7 +138,7 @@ module ts.NavigateTo {
         }
 
         function getContainers(declaration: Declaration) {
-            var containers: string[] = [];
+            let containers: string[] = [];
 
             // First, if we started with a computed property name, then add all but the last
             // portion into the container array.
@@ -165,10 +164,10 @@ module ts.NavigateTo {
 
         function bestMatchKind(matches: PatternMatch[]) {
             Debug.assert(matches.length > 0);
-            var bestMatchKind = PatternMatchKind.camelCase;
+            let bestMatchKind = PatternMatchKind.camelCase;
 
-            for (var i = 0, n = matches.length; i < n; i++) {
-                var kind = matches[i].kind;
+            for (let match of matches) {
+                let kind = match.kind;
                 if (kind < bestMatchKind) {
                     bestMatchKind = kind;
                 }
@@ -178,7 +177,7 @@ module ts.NavigateTo {
         }
 
         // This means "compare in a case insensitive manner."
-        var baseSensitivity: Intl.CollatorOptions = { sensitivity: "base" };
+        let baseSensitivity: Intl.CollatorOptions = { sensitivity: "base" };
         function compareNavigateToItems(i1: RawNavigateToItem, i2: RawNavigateToItem) {
             // TODO(cyrusn): get the gamut of comparisons that VS already uses here.
             // Right now we just sort by kind first, and then by name of the item.
@@ -190,8 +189,8 @@ module ts.NavigateTo {
         }
 
         function createNavigateToItem(rawItem: RawNavigateToItem): NavigateToItem {
-            var declaration = rawItem.declaration;
-            var container = <Declaration>getContainerNode(declaration);
+            let declaration = rawItem.declaration;
+            let container = <Declaration>getContainerNode(declaration);
             return {
                 name: rawItem.name,
                 kind: getNodeKind(declaration),
diff --git a/src/services/navigationBar.ts b/src/services/navigationBar.ts
index 20e80cc88c0..06eaa481dfb 100644
--- a/src/services/navigationBar.ts
+++ b/src/services/navigationBar.ts
@@ -4,16 +4,16 @@ module ts.NavigationBar {
     export function getNavigationBarItems(sourceFile: SourceFile): ts.NavigationBarItem[]  {
         // If the source file has any child items, then it included in the tree
         // and takes lexical ownership of all other top-level items.
-        var hasGlobalNode = false;
+        let hasGlobalNode = false;
 
         return getItemsWorker(getTopLevelNodes(sourceFile), createTopLevelItem);
 
         function getIndent(node: Node): number {
             // If we have a global node in the tree,
             // then it adds an extra layer of depth to all subnodes.
-            var indent = hasGlobalNode ? 1 : 0;
+            let indent = hasGlobalNode ? 1 : 0;
 
-            var current = node.parent;
+            let current = node.parent;
             while (current) {
                 switch (current.kind) {
                     case SyntaxKind.ModuleDeclaration:
@@ -39,7 +39,7 @@ module ts.NavigationBar {
         }
 
         function getChildNodes(nodes: Node[]): Node[] {
-            var childNodes: Node[] = [];
+            let childNodes: Node[] = [];
 
             function visit(node: Node) {
                 switch (node.kind) {
@@ -60,7 +60,7 @@ module ts.NavigationBar {
                         break;
 
                     case SyntaxKind.ImportDeclaration:
-                        var importClause = (<ImportDeclaration>node).importClause;
+                        let importClause = (<ImportDeclaration>node).importClause;
                         if (importClause) {
                             // Handle default import case e.g.:
                             //    import d from "mod";
@@ -102,8 +102,8 @@ module ts.NavigationBar {
                 }
             }
 
-            //for (var i = 0, n = nodes.length; i < n; i++) {
-            //    var node = nodes[i];
+            //for (let i = 0, n = nodes.length; i < n; i++) {
+            //    let node = nodes[i];
 
             //    if (node.kind === SyntaxKind.ClassDeclaration ||
             //        node.kind === SyntaxKind.EnumDeclaration ||
@@ -122,7 +122,7 @@ module ts.NavigationBar {
         }
 
         function getTopLevelNodes(node: SourceFile): Node[] {
-            var topLevelNodes: Node[] = [];
+            let topLevelNodes: Node[] = [];
             topLevelNodes.push(node);
 
             addTopLevelNodes(node.statements, topLevelNodes);
@@ -150,8 +150,7 @@ module ts.NavigationBar {
         function addTopLevelNodes(nodes: Node[], topLevelNodes: Node[]): void {
             nodes = sortNodes(nodes);
 
-            for (var i = 0, n = nodes.length; i < n; i++) {
-                var node = nodes[i];
+            for (let node of nodes) {
                 switch (node.kind) {
                     case SyntaxKind.ClassDeclaration:
                     case SyntaxKind.EnumDeclaration:
@@ -160,13 +159,13 @@ module ts.NavigationBar {
                         break;
 
                     case SyntaxKind.ModuleDeclaration:
-                        var moduleDeclaration = <ModuleDeclaration>node;
+                        let moduleDeclaration = <ModuleDeclaration>node;
                         topLevelNodes.push(node);
                         addTopLevelNodes((<Block>getInnermostModule(moduleDeclaration).body).statements, topLevelNodes);
                         break;
 
                     case SyntaxKind.FunctionDeclaration:
-                        var functionDeclaration = <FunctionLikeDeclaration>node;
+                        let functionDeclaration = <FunctionLikeDeclaration>node;
                         if (isTopLevelFunctionDeclaration(functionDeclaration)) {
                             topLevelNodes.push(node);
                             addTopLevelNodes((<Block>functionDeclaration.body).statements, topLevelNodes);
@@ -200,18 +199,17 @@ module ts.NavigationBar {
         }
         
         function getItemsWorker(nodes: Node[], createItem: (n: Node) => ts.NavigationBarItem): ts.NavigationBarItem[] {
-            var items: ts.NavigationBarItem[] = [];
+            let items: ts.NavigationBarItem[] = [];
 
-            var keyToItem: Map<NavigationBarItem> = {};
+            let keyToItem: Map<NavigationBarItem> = {};
 
-            for (var i = 0, n = nodes.length; i < n; i++) {
-                var child = nodes[i];
-                var item = createItem(child);
+            for (let child of nodes) {
+                let item = createItem(child);
                 if (item !== undefined) {
                     if (item.text.length > 0) {
-                        var key = item.text + "-" + item.kind + "-" + item.indent;
+                        let key = item.text + "-" + item.kind + "-" + item.indent;
 
-                        var itemWithSameName = keyToItem[key];
+                        let itemWithSameName = keyToItem[key];
                         if (itemWithSameName) {
                             // We had an item with the same name.  Merge these items together.
                             merge(itemWithSameName, item);
@@ -238,12 +236,8 @@ module ts.NavigationBar {
 
                 // Next, recursively merge or add any children in the source as appropriate.
                 outer:
-                for (var i = 0, n = source.childItems.length; i < n; i++) {
-                    var sourceChild = source.childItems[i];
-
-                    for (var j = 0, m = target.childItems.length; j < m; j++) {
-                        var targetChild = target.childItems[j];
-
+                for (let sourceChild of source.childItems) {
+                    for (let targetChild of target.childItems) {
                         if (targetChild.text === sourceChild.text && targetChild.kind === sourceChild.kind) {
                             // Found a match.  merge them.
                             merge(targetChild, sourceChild);
@@ -299,8 +293,8 @@ module ts.NavigationBar {
 
                 case SyntaxKind.VariableDeclaration:
                 case SyntaxKind.BindingElement:
-                    var variableDeclarationNode: Node;
-                    var name: Node;
+                    let variableDeclarationNode: Node;
+                    let name: Node;
 
                     if (node.kind === SyntaxKind.BindingElement) {
                         name = (<BindingElement>node).name;
@@ -397,7 +391,7 @@ module ts.NavigationBar {
                 }
 
                 // Otherwise, we need to aggregate each identifier to build up the qualified name.
-                var result: string[] = [];
+                let result: string[] = [];
 
                 result.push(moduleDeclaration.name.text);
                 
@@ -411,9 +405,9 @@ module ts.NavigationBar {
             }
 
             function createModuleItem(node: ModuleDeclaration): NavigationBarItem {
-                var moduleName = getModuleName(node);
+                let moduleName = getModuleName(node);
                 
-                var childItems = getItemsWorker(getChildNodes((<Block>getInnermostModule(node).body).statements), createChildItem);
+                let childItems = getItemsWorker(getChildNodes((<Block>getInnermostModule(node).body).statements), createChildItem);
 
                 return getNavigationBarItem(moduleName,
                     ts.ScriptElementKind.moduleElement,
@@ -425,7 +419,7 @@ module ts.NavigationBar {
 
             function createFunctionItem(node: FunctionDeclaration) {
                 if (node.name && node.body && node.body.kind === SyntaxKind.Block) {
-                    var childItems = getItemsWorker(sortNodes((<Block>node.body).statements), createChildItem);
+                    let childItems = getItemsWorker(sortNodes((<Block>node.body).statements), createChildItem);
 
                     return getNavigationBarItem(node.name.text,
                         ts.ScriptElementKind.functionElement,
@@ -439,14 +433,14 @@ module ts.NavigationBar {
             }
 
             function createSourceFileItem(node: SourceFile): ts.NavigationBarItem {
-                var childItems = getItemsWorker(getChildNodes(node.statements), createChildItem);
+                let childItems = getItemsWorker(getChildNodes(node.statements), createChildItem);
 
                 if (childItems === undefined || childItems.length === 0) {
                     return undefined;
                 }
 
                 hasGlobalNode = true;
-                var rootName = isExternalModule(node)
+                let rootName = isExternalModule(node)
                     ? "\"" + escapeString(getBaseFileName(removeFileExtension(normalizePath(node.fileName)))) + "\""
                     : "<global>"
 
@@ -463,22 +457,22 @@ module ts.NavigationBar {
                     return undefined;
                 }
 
-                var childItems: NavigationBarItem[];
+                let childItems: NavigationBarItem[];
 
                 if (node.members) {
-                    var constructor = <ConstructorDeclaration>forEach(node.members, member => {
+                    let constructor = <ConstructorDeclaration>forEach(node.members, member => {
                         return member.kind === SyntaxKind.Constructor && member;
                     });
 
                     // Add the constructor parameters in as children of the class (for property parameters).
                     // Note that *all non-binding pattern named* parameters will be added to the nodes array, but parameters that
                     // are not properties will be filtered out later by createChildItem.
-                    var nodes: Node[] = removeDynamicallyNamedProperties(node);
+                    let nodes: Node[] = removeDynamicallyNamedProperties(node);
                     if (constructor) {
                         nodes.push.apply(nodes, filter(constructor.parameters, p => !isBindingPattern(p.name)));
                     }
 
-                    var childItems = getItemsWorker(sortNodes(nodes), createChildItem);
+                    childItems = getItemsWorker(sortNodes(nodes), createChildItem);
                 }
 
                 return getNavigationBarItem(
@@ -491,7 +485,7 @@ module ts.NavigationBar {
             }
 
             function createEnumItem(node: EnumDeclaration): ts.NavigationBarItem {
-                var childItems = getItemsWorker(sortNodes(removeComputedProperties(node)), createChildItem);
+                let childItems = getItemsWorker(sortNodes(removeComputedProperties(node)), createChildItem);
                 return getNavigationBarItem(
                     node.name.text,
                     ts.ScriptElementKind.enumElement,
@@ -502,7 +496,7 @@ module ts.NavigationBar {
             }
 
             function createIterfaceItem(node: InterfaceDeclaration): ts.NavigationBarItem {
-                var childItems = getItemsWorker(sortNodes(removeDynamicallyNamedProperties(node)), createChildItem);
+                let childItems = getItemsWorker(sortNodes(removeDynamicallyNamedProperties(node)), createChildItem);
                 return getNavigationBarItem(
                     node.name.text,
                     ts.ScriptElementKind.interfaceElement,
diff --git a/src/services/outliningElementsCollector.ts b/src/services/outliningElementsCollector.ts
index 54b548336de..4c9dcedc7a4 100644
--- a/src/services/outliningElementsCollector.ts
+++ b/src/services/outliningElementsCollector.ts
@@ -16,12 +16,12 @@
 module ts {
     export module OutliningElementsCollector {
         export function collectElements(sourceFile: SourceFile): OutliningSpan[] {
-            var elements: OutliningSpan[] = [];
-            var collapseText = "...";
+            let elements: OutliningSpan[] = [];
+            let collapseText = "...";
 
             function addOutliningSpan(hintSpanNode: Node, startElement: Node, endElement: Node, autoCollapse: boolean) {
                 if (hintSpanNode && startElement && endElement) {
-                    var span: OutliningSpan = {
+                    let span: OutliningSpan = {
                         textSpan: createTextSpanFromBounds(startElement.pos, endElement.end),
                         hintSpan: createTextSpanFromBounds(hintSpanNode.getStart(), hintSpanNode.end),
                         bannerText: collapseText,
@@ -35,8 +35,8 @@ module ts {
                 return isFunctionBlock(node) && node.parent.kind !== SyntaxKind.ArrowFunction;
             }
 
-            var depth = 0;
-            var maxDepth = 20;
+            let depth = 0;
+            let maxDepth = 20;
             function walk(n: Node): void {
                 if (depth > maxDepth) {
                     return;
@@ -44,9 +44,9 @@ module ts {
                 switch (n.kind) {
                     case SyntaxKind.Block:
                         if (!isFunctionBlock(n)) {
-                            var parent = n.parent;
-                            var openBrace = findChildOfKind(n, SyntaxKind.OpenBraceToken, sourceFile);
-                            var closeBrace = findChildOfKind(n, SyntaxKind.CloseBraceToken, sourceFile);
+                            let parent = n.parent;
+                            let openBrace = findChildOfKind(n, SyntaxKind.OpenBraceToken, sourceFile);
+                            let closeBrace = findChildOfKind(n, SyntaxKind.CloseBraceToken, sourceFile);
 
                             // Check if the block is standalone, or 'attached' to some parent statement.
                             // If the latter, we want to collaps the block, but consider its hint span
@@ -66,13 +66,13 @@ module ts {
 
                             if (parent.kind === SyntaxKind.TryStatement) {
                                 // Could be the try-block, or the finally-block.
-                                var tryStatement = <TryStatement>parent;
+                                let tryStatement = <TryStatement>parent;
                                 if (tryStatement.tryBlock === n) {
                                     addOutliningSpan(parent, openBrace, closeBrace, autoCollapse(n));
                                     break;
                                 }
                                 else if (tryStatement.finallyBlock === n) {
-                                    var finallyKeyword = findChildOfKind(tryStatement, SyntaxKind.FinallyKeyword, sourceFile);
+                                    let finallyKeyword = findChildOfKind(tryStatement, SyntaxKind.FinallyKeyword, sourceFile);
                                     if (finallyKeyword) {
                                         addOutliningSpan(finallyKeyword, openBrace, closeBrace, autoCollapse(n));
                                         break;
@@ -84,7 +84,7 @@ module ts {
 
                             // Block was a standalone block.  In this case we want to only collapse
                             // the span of the block, independent of any parent span.
-                            var span = createTextSpanFromBounds(n.getStart(), n.end);
+                            let span = createTextSpanFromBounds(n.getStart(), n.end);
                             elements.push({
                                 textSpan: span,
                                 hintSpan: span,
@@ -95,23 +95,25 @@ module ts {
                         }
                         // Fallthrough.
 
-                    case SyntaxKind.ModuleBlock:
-                        var openBrace = findChildOfKind(n, SyntaxKind.OpenBraceToken, sourceFile);
-                        var closeBrace = findChildOfKind(n, SyntaxKind.CloseBraceToken, sourceFile);
+                    case SyntaxKind.ModuleBlock: {
+                        let openBrace = findChildOfKind(n, SyntaxKind.OpenBraceToken, sourceFile);
+                        let closeBrace = findChildOfKind(n, SyntaxKind.CloseBraceToken, sourceFile);
                         addOutliningSpan(n.parent, openBrace, closeBrace, autoCollapse(n));
                         break;
+                    }
                     case SyntaxKind.ClassDeclaration:
                     case SyntaxKind.InterfaceDeclaration:
                     case SyntaxKind.EnumDeclaration:
                     case SyntaxKind.ObjectLiteralExpression:
-                    case SyntaxKind.SwitchStatement:
-                        var openBrace = findChildOfKind(n, SyntaxKind.OpenBraceToken, sourceFile);
-                        var closeBrace = findChildOfKind(n, SyntaxKind.CloseBraceToken, sourceFile);
+                    case SyntaxKind.CaseBlock: {
+                        let openBrace = findChildOfKind(n, SyntaxKind.OpenBraceToken, sourceFile);
+                        let closeBrace = findChildOfKind(n, SyntaxKind.CloseBraceToken, sourceFile);
                         addOutliningSpan(n, openBrace, closeBrace, autoCollapse(n));
                         break;
+                    }
                     case SyntaxKind.ArrayLiteralExpression:
-                        var openBracket = findChildOfKind(n, SyntaxKind.OpenBracketToken, sourceFile);
-                        var closeBracket = findChildOfKind(n, SyntaxKind.CloseBracketToken, sourceFile);
+                        let openBracket = findChildOfKind(n, SyntaxKind.OpenBracketToken, sourceFile);
+                        let closeBracket = findChildOfKind(n, SyntaxKind.CloseBracketToken, sourceFile);
                         addOutliningSpan(n, openBracket, closeBracket, autoCollapse(n));
                         break;
                 }
diff --git a/src/services/patternMatcher.ts b/src/services/patternMatcher.ts
index 9bcd3e1d000..61642552cab 100644
--- a/src/services/patternMatcher.ts
+++ b/src/services/patternMatcher.ts
@@ -112,13 +112,13 @@ module ts {
         // we see the name of a module that is used everywhere, or the name of an overload).  As 
         // such, we cache the information we compute about the candidate for the life of this 
         // pattern matcher so we don't have to compute it multiple times.
-        var stringToWordSpans: Map<TextSpan[]> = {};
+        let stringToWordSpans: Map<TextSpan[]> = {};
 
         pattern = pattern.trim();
 
-        var fullPatternSegment = createSegment(pattern);
-        var dotSeparatedSegments = pattern.split(".").map(p => createSegment(p.trim()));
-        var invalidPattern = dotSeparatedSegments.length === 0 || forEach(dotSeparatedSegments, segmentIsInvalid);
+        let fullPatternSegment = createSegment(pattern);
+        let dotSeparatedSegments = pattern.split(".").map(p => createSegment(p.trim()));
+        let invalidPattern = dotSeparatedSegments.length === 0 || forEach(dotSeparatedSegments, segmentIsInvalid);
 
         return {
             getMatches,
@@ -147,7 +147,7 @@ module ts {
             // First, check that the last part of the dot separated pattern matches the name of the
             // candidate.  If not, then there's no point in proceeding and doing the more
             // expensive work.
-            var candidateMatch = matchSegment(candidate, lastOrUndefined(dotSeparatedSegments));
+            let candidateMatch = matchSegment(candidate, lastOrUndefined(dotSeparatedSegments));
             if (!candidateMatch) {
                 return undefined;
             }
@@ -164,16 +164,16 @@ module ts {
 
             // So far so good.  Now break up the container for the candidate and check if all
             // the dotted parts match up correctly.
-            var totalMatch = candidateMatch;
+            let totalMatch = candidateMatch;
 
-            for (var i = dotSeparatedSegments.length - 2, j = candidateContainers.length - 1;
+            for (let i = dotSeparatedSegments.length - 2, j = candidateContainers.length - 1;
                  i >= 0;
                  i--, j--) {
 
-                var segment = dotSeparatedSegments[i];
-                var containerName = candidateContainers[j];
+                let segment = dotSeparatedSegments[i];
+                let containerName = candidateContainers[j];
 
-                var containerMatch = matchSegment(containerName, segment);
+                let containerMatch = matchSegment(containerName, segment);
                 if (!containerMatch) {
                     // This container didn't match the pattern piece.  So there's no match at all.
                     return undefined;
@@ -196,7 +196,7 @@ module ts {
         }
 
         function matchTextChunk(candidate: string, chunk: TextChunk, punctuationStripped: boolean): PatternMatch {
-            var index = indexOfIgnoringCase(candidate, chunk.textLowerCase);
+            let index = indexOfIgnoringCase(candidate, chunk.textLowerCase);
             if (index === 0) {
                 if (chunk.text.length === candidate.length) {
                     // a) Check if the part matches the candidate entirely, in an case insensitive or
@@ -210,7 +210,7 @@ module ts {
                 }
             }
 
-            var isLowercase = chunk.isLowerCase;
+            let isLowercase = chunk.isLowerCase;
             if (isLowercase) {
                 if (index > 0) {
                     // c) If the part is entirely lowercase, then check if it is contained anywhere in the
@@ -220,9 +220,8 @@ module ts {
                     //    Note: We only have a substring match if the lowercase part is prefix match of some
                     //    word part. That way we don't match something like 'Class' when the user types 'a'.
                     //    But we would match 'FooAttribute' (since 'Attribute' starts with 'a').
-                    var wordSpans = getWordSpans(candidate);
-                    for (var i = 0, n = wordSpans.length; i < n; i++) {
-                        var span = wordSpans[i]
+                    let wordSpans = getWordSpans(candidate);
+                    for (let span of wordSpans) {
                         if (partStartsWith(candidate, span, chunk.text, /*ignoreCase:*/ true)) {
                             return createPatternMatch(PatternMatchKind.substring, punctuationStripped,
                                 /*isCaseSensitive:*/ partStartsWith(candidate, span, chunk.text, /*ignoreCase:*/ false));
@@ -242,8 +241,8 @@ module ts {
             if (!isLowercase) {
                 // e) If the part was not entirely lowercase, then attempt a camel cased match as well.
                 if (chunk.characterSpans.length > 0) {
-                    var candidateParts = getWordSpans(candidate);
-                    var camelCaseWeight = tryCamelCaseMatch(candidate, candidateParts, chunk, /*ignoreCase:*/ false);
+                    let candidateParts = getWordSpans(candidate);
+                    let camelCaseWeight = tryCamelCaseMatch(candidate, candidateParts, chunk, /*ignoreCase:*/ false);
                     if (camelCaseWeight !== undefined) {
                         return createPatternMatch(PatternMatchKind.camelCase, punctuationStripped, /*isCaseSensitive:*/ true, /*camelCaseWeight:*/ camelCaseWeight);
                     }
@@ -274,8 +273,8 @@ module ts {
         }
 
         function containsSpaceOrAsterisk(text: string): boolean {
-            for (var i = 0; i < text.length; i++) {
-                var ch = text.charCodeAt(i);
+            for (let i = 0; i < text.length; i++) {
+                let ch = text.charCodeAt(i);
                 if (ch === CharacterCodes.space || ch === CharacterCodes.asterisk) {
                     return true;
                 }
@@ -293,7 +292,7 @@ module ts {
             // Note: if the segment contains a space or an asterisk then we must assume that it's a
             // multi-word segment.
             if (!containsSpaceOrAsterisk(segment.totalTextChunk.text)) {
-                var match = matchTextChunk(candidate, segment.totalTextChunk, /*punctuationStripped:*/ false);
+                let match = matchTextChunk(candidate, segment.totalTextChunk, /*punctuationStripped:*/ false);
                 if (match) {
                     return [match];
                 }
@@ -336,14 +335,12 @@ module ts {
             //
             // Only if all words have some sort of match is the pattern considered matched.
 
-            var subWordTextChunks = segment.subWordTextChunks;
-            var matches: PatternMatch[] = undefined;
-
-            for (var i = 0, n = subWordTextChunks.length; i < n; i++) {
-                var subWordTextChunk = subWordTextChunks[i];
+            let subWordTextChunks = segment.subWordTextChunks;
+            let matches: PatternMatch[] = undefined;
 
+            for (let subWordTextChunk of subWordTextChunks) {
                 // Try to match the candidate with this word
-                var result = matchTextChunk(candidate, subWordTextChunk, /*punctuationStripped:*/ true);
+                let result = matchTextChunk(candidate, subWordTextChunk, /*punctuationStripped:*/ true);
                 if (!result) {
                     return undefined;
                 }
@@ -356,8 +353,8 @@ module ts {
         }
 
         function partStartsWith(candidate: string, candidateSpan: TextSpan, pattern: string, ignoreCase: boolean, patternSpan?: TextSpan): boolean {
-            var patternPartStart = patternSpan ? patternSpan.start : 0;
-            var patternPartLength = patternSpan ? patternSpan.length : pattern.length;
+            let patternPartStart = patternSpan ? patternSpan.start : 0;
+            let patternPartLength = patternSpan ? patternSpan.length : pattern.length;
 
             if (patternPartLength > candidateSpan.length) {
                 // Pattern part is longer than the candidate part. There can never be a match.
@@ -365,18 +362,18 @@ module ts {
             }
             
             if (ignoreCase) {
-                for (var i = 0; i < patternPartLength; i++) {
-                    var ch1 = pattern.charCodeAt(patternPartStart + i);
-                    var ch2 = candidate.charCodeAt(candidateSpan.start + i);
+                for (let i = 0; i < patternPartLength; i++) {
+                    let ch1 = pattern.charCodeAt(patternPartStart + i);
+                    let ch2 = candidate.charCodeAt(candidateSpan.start + i);
                     if (toLowerCase(ch1) !== toLowerCase(ch2)) {
                         return false;
                     }
                 }
             }
             else {
-                for (var i = 0; i < patternPartLength; i++) {
-                    var ch1 = pattern.charCodeAt(patternPartStart + i);
-                    var ch2 = candidate.charCodeAt(candidateSpan.start + i);
+                for (let i = 0; i < patternPartLength; i++) {
+                    let ch1 = pattern.charCodeAt(patternPartStart + i);
+                    let ch2 = candidate.charCodeAt(candidateSpan.start + i);
                     if (ch1 !== ch2) {
                         return false;
                     }
@@ -387,23 +384,23 @@ module ts {
         }
 
         function tryCamelCaseMatch(candidate: string, candidateParts: TextSpan[], chunk: TextChunk, ignoreCase: boolean): number {
-            var chunkCharacterSpans = chunk.characterSpans;
+            let chunkCharacterSpans = chunk.characterSpans;
 
             // Note: we may have more pattern parts than candidate parts.  This is because multiple
             // pattern parts may match a candidate part.  For example "SiUI" against "SimpleUI".
             // We'll have 3 pattern parts Si/U/I against two candidate parts Simple/UI.  However, U
             // and I will both match in UI. 
 
-            var currentCandidate = 0;
-            var currentChunkSpan = 0;
-            var firstMatch: number = undefined;
-            var contiguous: boolean = undefined;
+            let currentCandidate = 0;
+            let currentChunkSpan = 0;
+            let firstMatch: number = undefined;
+            let contiguous: boolean = undefined;
 
             while (true) {
                 // Let's consider our termination cases
                 if (currentChunkSpan === chunkCharacterSpans.length) {
                     // We did match! We shall assign a weight to this
-                    var weight = 0;
+                    let weight = 0;
 
                     // Was this contiguous?
                     if (contiguous) {
@@ -422,15 +419,15 @@ module ts {
                     return undefined;
                 }
 
-                var candidatePart = candidateParts[currentCandidate];
-                var gotOneMatchThisCandidate = false;
+                let candidatePart = candidateParts[currentCandidate];
+                let gotOneMatchThisCandidate = false;
 
                 // Consider the case of matching SiUI against SimpleUIElement. The candidate parts
                 // will be Simple/UI/Element, and the pattern parts will be Si/U/I.  We'll match 'Si'
                 // against 'Simple' first.  Then we'll match 'U' against 'UI'. However, we want to
                 // still keep matching pattern parts against that candidate part. 
                 for (; currentChunkSpan < chunkCharacterSpans.length; currentChunkSpan++) {
-                    var chunkCharacterSpan = chunkCharacterSpans[currentChunkSpan];
+                    let chunkCharacterSpan = chunkCharacterSpans[currentChunkSpan];
 
                     if (gotOneMatchThisCandidate) {
                         // We've already gotten one pattern part match in this candidate.  We will
@@ -540,7 +537,7 @@ module ts {
 
         // TODO: find a way to determine this for any unicode characters in a 
         // non-allocating manner.
-        var str = String.fromCharCode(ch);
+        let str = String.fromCharCode(ch);
         return str === str.toUpperCase();
     }
 
@@ -557,12 +554,12 @@ module ts {
 
         // TODO: find a way to determine this for any unicode characters in a 
         // non-allocating manner.
-        var str = String.fromCharCode(ch);
+        let str = String.fromCharCode(ch);
         return str === str.toLowerCase();
     }
 
     function containsUpperCaseLetter(string: string): boolean {
-        for (var i = 0, n = string.length; i < n; i++) {
+        for (let i = 0, n = string.length; i < n; i++) {
             if (isUpperCaseLetter(string.charCodeAt(i))) {
                 return true;
             }
@@ -572,7 +569,7 @@ module ts {
     }
 
     function startsWith(string: string, search: string) {
-        for (var i = 0, n = search.length; i < n; i++) {
+        for (let i = 0, n = search.length; i < n; i++) {
             if (string.charCodeAt(i) !== search.charCodeAt(i)) {
                 return false;
             }
@@ -583,7 +580,7 @@ module ts {
 
     // Assumes 'value' is already lowercase.
     function indexOfIgnoringCase(string: string, value: string): number {
-        for (var i = 0, n = string.length - value.length; i <= n; i++) {
+        for (let i = 0, n = string.length - value.length; i <= n; i++) {
             if (startsWithIgnoringCase(string, value, i)) {
                 return i;
             }
@@ -594,9 +591,9 @@ module ts {
 
     // Assumes 'value' is already lowercase.
     function startsWithIgnoringCase(string: string, value: string, start: number): boolean {
-        for (var i = 0, n = value.length; i < n; i++) {
-            var ch1 = toLowerCase(string.charCodeAt(i + start));
-            var ch2 = value.charCodeAt(i);
+        for (let i = 0, n = value.length; i < n; i++) {
+            let ch1 = toLowerCase(string.charCodeAt(i + start));
+            let ch2 = value.charCodeAt(i);
 
             if (ch1 !== ch2) {
                 return false;
@@ -631,12 +628,12 @@ module ts {
     }
 
     function breakPatternIntoTextChunks(pattern: string): TextChunk[] {
-        var result: TextChunk[] = [];
-        var wordStart = 0;
-        var wordLength = 0;
+        let result: TextChunk[] = [];
+        let wordStart = 0;
+        let wordLength = 0;
 
-        for (var i = 0; i < pattern.length; i++) {
-            var ch = pattern.charCodeAt(i);
+        for (let i = 0; i < pattern.length; i++) {
+            let ch = pattern.charCodeAt(i);
             if (isWordChar(ch)) {
                 if (wordLength++ === 0) {
                     wordStart = i;
@@ -658,7 +655,7 @@ module ts {
     }
 
     function createTextChunk(text: string): TextChunk {
-        var textLowerCase = text.toLowerCase();
+        let textLowerCase = text.toLowerCase();
         return {
             text,
             textLowerCase,
@@ -676,15 +673,15 @@ module ts {
     }
 
     function breakIntoSpans(identifier: string, word: boolean): TextSpan[] {
-        var result: TextSpan[] = [];
+        let result: TextSpan[] = [];
 
-        var wordStart = 0;
-        for (var i = 1, n = identifier.length; i < n; i++) {
-            var lastIsDigit = isDigit(identifier.charCodeAt(i - 1));
-            var currentIsDigit = isDigit(identifier.charCodeAt(i));
+        let wordStart = 0;
+        for (let i = 1, n = identifier.length; i < n; i++) {
+            let lastIsDigit = isDigit(identifier.charCodeAt(i - 1));
+            let currentIsDigit = isDigit(identifier.charCodeAt(i));
 
-            var hasTransitionFromLowerToUpper = transitionFromLowerToUpper(identifier, word, i);
-            var hasTransitionFromUpperToLower = transitionFromUpperToLower(identifier, word, i, wordStart);
+            let hasTransitionFromLowerToUpper = transitionFromLowerToUpper(identifier, word, i);
+            let hasTransitionFromUpperToLower = transitionFromUpperToLower(identifier, word, i, wordStart);
 
             if (charIsPunctuation(identifier.charCodeAt(i - 1)) ||
                 charIsPunctuation(identifier.charCodeAt(i)) ||
@@ -739,8 +736,8 @@ module ts {
     }
 
     function isAllPunctuation(identifier: string, start: number, end: number): boolean {
-        for (var i = start; i < end; i++) {
-            var ch = identifier.charCodeAt(i);
+        for (let i = start; i < end; i++) {
+            let ch = identifier.charCodeAt(i);
 
             // We don't consider _ or $ as punctuation as there may be things with that name.
             if (!charIsPunctuation(ch) || ch === CharacterCodes._ || ch === CharacterCodes.$) {
@@ -761,8 +758,8 @@ module ts {
             // etc.
             if (index != wordStart &&
                 index + 1 < identifier.length) {
-                var currentIsUpper = isUpperCaseLetter(identifier.charCodeAt(index));
-                var nextIsLower = isLowerCaseLetter(identifier.charCodeAt(index + 1));
+                let currentIsUpper = isUpperCaseLetter(identifier.charCodeAt(index));
+                let nextIsLower = isLowerCaseLetter(identifier.charCodeAt(index + 1));
 
                 if (currentIsUpper && nextIsLower) {
                     // We have a transition from an upper to a lower letter here.  But we only
@@ -773,7 +770,7 @@ module ts {
                     // that follows.  Note: this will make the following not split properly:
                     // "HELLOthere".  However, these sorts of names do not show up in .Net
                     // programs.
-                    for (var i = wordStart; i < index; i++) {
+                    for (let i = wordStart; i < index; i++) {
                         if (!isUpperCaseLetter(identifier.charCodeAt(i))) {
                             return false;
                         }
@@ -788,8 +785,8 @@ module ts {
     }
 
     function transitionFromLowerToUpper(identifier: string, word: boolean, index: number): boolean {
-        var lastIsUpper = isUpperCaseLetter(identifier.charCodeAt(index - 1));
-        var currentIsUpper = isUpperCaseLetter(identifier.charCodeAt(index));
+        let lastIsUpper = isUpperCaseLetter(identifier.charCodeAt(index - 1));
+        let currentIsUpper = isUpperCaseLetter(identifier.charCodeAt(index));
 
         // See if the casing indicates we're starting a new word. Note: if we're breaking on
         // words, then just seeing an upper case character isn't enough.  Instead, it has to
@@ -804,7 +801,7 @@ module ts {
         // on characters would be: A M
         //
         // We break the search string on characters.  But we break the symbol name on words.
-        var transition = word
+        let transition = word
             ? (currentIsUpper && !lastIsUpper)
             : currentIsUpper;
         return transition;
diff --git a/src/services/services.ts b/src/services/services.ts
index 6ef044ad75a..1bf5f6336d4 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -12,7 +12,7 @@
 
 module ts {
     /** The version of the language service API */
-    export var servicesVersion = "0.4"
+    export let servicesVersion = "0.4"
 
     export interface Node {
         getSourceFile(): SourceFile;
@@ -124,12 +124,12 @@ module ts {
         isLibFile: boolean
     }
 
-    var scanner: Scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ true);
+    let scanner: Scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ true);
 
-    var emptyArray: any[] = [];
+    let emptyArray: any[] = [];
 
     function createNode(kind: SyntaxKind, pos: number, end: number, flags: NodeFlags, parent?: Node): NodeObject {
-        var node = <NodeObject> new (getNodeConstructor(kind))();
+        let node = <NodeObject> new (getNodeConstructor(kind))();
         node.pos = pos;
         node.end = end;
         node.flags = flags;
@@ -184,8 +184,8 @@ module ts {
         private addSyntheticNodes(nodes: Node[], pos: number, end: number): number {
             scanner.setTextPos(pos);
             while (pos < end) {
-                var token = scanner.scan();
-                var textPos = scanner.getTextPos();
+                let token = scanner.scan();
+                let textPos = scanner.getTextPos();
                 nodes.push(createNode(token, pos, textPos, NodeFlags.Synthetic, this));
                 pos = textPos;
             }
@@ -193,11 +193,10 @@ module ts {
         }
 
         private createSyntaxList(nodes: NodeArray<Node>): Node {
-            var list = createNode(SyntaxKind.SyntaxList, nodes.pos, nodes.end, NodeFlags.Synthetic, this);
+            let list = createNode(SyntaxKind.SyntaxList, nodes.pos, nodes.end, NodeFlags.Synthetic, this);
             list._children = [];
-            var pos = nodes.pos;
-            for (var i = 0, len = nodes.length; i < len; i++) {
-                var node = nodes[i];
+            let pos = nodes.pos;
+            for (let node of nodes) {
                 if (pos < node.pos) {
                     pos = this.addSyntheticNodes(list._children, pos, node.pos);
                 }
@@ -211,18 +210,19 @@ module ts {
         }
 
         private createChildren(sourceFile?: SourceFile) {
+            let children: Node[];
             if (this.kind >= SyntaxKind.FirstNode) {
                 scanner.setText((sourceFile || this.getSourceFile()).text);
-                var children: Node[] = [];
-                var pos = this.pos;
-                var processNode = (node: Node) => {
+                children = [];
+                let pos = this.pos;
+                let processNode = (node: Node) => {
                     if (pos < node.pos) {
                         pos = this.addSyntheticNodes(children, pos, node.pos);
                     }
                     children.push(node);
                     pos = node.end;
                 };
-                var processNodes = (nodes: NodeArray<Node>) => {
+                let processNodes = (nodes: NodeArray<Node>) => {
                     if (pos < nodes.pos) {
                         pos = this.addSyntheticNodes(children, pos, nodes.pos);
                     }
@@ -254,9 +254,8 @@ module ts {
         }
 
         public getFirstToken(sourceFile?: SourceFile): Node {
-            var children = this.getChildren();
-            for (var i = 0; i < children.length; i++) {
-                var child = children[i];
+            let children = this.getChildren();
+            for (let child of children) {
                 if (child.kind < SyntaxKind.FirstNode) {
                     return child;
                 }
@@ -266,9 +265,9 @@ module ts {
         }
 
         public getLastToken(sourceFile?: SourceFile): Node {
-            var children = this.getChildren(sourceFile);
-            for (var i = children.length - 1; i >= 0; i--) {
-                var child = children[i];
+            let children = this.getChildren(sourceFile);
+            for (let i = children.length - 1; i >= 0; i--) {
+                let child = children[i];
                 if (child.kind < SyntaxKind.FirstNode) {
                     return child;
                 }
@@ -314,8 +313,8 @@ module ts {
     }
 
     function getJsDocCommentsFromDeclarations(declarations: Declaration[], name: string, canUseParsedParamTagComments: boolean) {
-        var documentationComment = <SymbolDisplayPart[]>[];
-        var docComments = getJsDocCommentsSeparatedByNewLines();
+        let documentationComment = <SymbolDisplayPart[]>[];
+        let docComments = getJsDocCommentsSeparatedByNewLines();
         ts.forEach(docComments, docComment => {
             if (documentationComment.length) {
                 documentationComment.push(lineBreakPart());
@@ -326,22 +325,22 @@ module ts {
         return documentationComment;
 
         function getJsDocCommentsSeparatedByNewLines() {
-            var paramTag = "@param";
-            var jsDocCommentParts: SymbolDisplayPart[] = [];
+            let paramTag = "@param";
+            let jsDocCommentParts: SymbolDisplayPart[] = [];
 
             ts.forEach(declarations, (declaration, indexOfDeclaration) => {
                 // Make sure we are collecting doc comment from declaration once,
                 // In case of union property there might be same declaration multiple times 
                 // which only varies in type parameter
-                // Eg. var a: Array<string> | Array<number>; a.length
+                // Eg. let a: Array<string> | Array<number>; a.length
                 // The property length will have two declarations of property length coming 
                 // from Array<T> - Array<string> and Array<number>
                 if (indexOf(declarations, declaration) === indexOfDeclaration) {
-                    var sourceFileOfDeclaration = getSourceFileOfNode(declaration);
+                    let sourceFileOfDeclaration = getSourceFileOfNode(declaration);
                     // If it is parameter - try and get the jsDoc comment with @param tag from function declaration's jsDoc comments
                     if (canUseParsedParamTagComments && declaration.kind === SyntaxKind.Parameter) {
                         ts.forEach(getJsDocCommentTextRange(declaration.parent, sourceFileOfDeclaration), jsDocCommentTextRange => {
-                            var cleanedParamJsDocComment = getCleanedParamJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration);
+                            let cleanedParamJsDocComment = getCleanedParamJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration);
                             if (cleanedParamJsDocComment) {
                                 jsDocCommentParts.push.apply(jsDocCommentParts, cleanedParamJsDocComment);
                             }
@@ -361,7 +360,7 @@ module ts {
                     // Get the cleaned js doc comment text from the declaration
                     ts.forEach(getJsDocCommentTextRange(
                         declaration.kind === SyntaxKind.VariableDeclaration ? declaration.parent.parent : declaration, sourceFileOfDeclaration), jsDocCommentTextRange => {
-                            var cleanedJsDocComment = getCleanedJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration);
+                            let cleanedJsDocComment = getCleanedJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration);
                             if (cleanedJsDocComment) {
                                 jsDocCommentParts.push.apply(jsDocCommentParts, cleanedJsDocComment);
                             }
@@ -387,7 +386,7 @@ module ts {
                 }
 
                 for (; pos < end; pos++) {
-                    var ch = sourceFile.text.charCodeAt(pos);
+                    let ch = sourceFile.text.charCodeAt(pos);
                     if (!isWhiteSpace(ch) || isLineBreak(ch)) {
                         // Either found lineBreak or non whiteSpace
                         return pos;
@@ -424,19 +423,19 @@ module ts {
             }
 
             function getCleanedJsDocComment(pos: number, end: number, sourceFile: SourceFile) {
-                var spacesToRemoveAfterAsterisk: number;
-                var docComments: SymbolDisplayPart[] = [];
-                var blankLineCount = 0;
-                var isInParamTag = false;
+                let spacesToRemoveAfterAsterisk: number;
+                let docComments: SymbolDisplayPart[] = [];
+                let blankLineCount = 0;
+                let isInParamTag = false;
 
                 while (pos < end) {
-                    var docCommentTextOfLine = "";
+                    let docCommentTextOfLine = "";
                     // First consume leading white space
                     pos = consumeWhiteSpacesOnTheLine(pos, end, sourceFile);
 
                     // If the comment starts with '*' consume the spaces on this line
                     if (pos < end && sourceFile.text.charCodeAt(pos) === CharacterCodes.asterisk) {
-                        var lineStartPos = pos + 1;
+                        let lineStartPos = pos + 1;
                         pos = consumeWhiteSpacesOnTheLine(pos + 1, end, sourceFile, spacesToRemoveAfterAsterisk);
 
                         // Set the spaces to remove after asterisk as margin if not already set
@@ -450,7 +449,7 @@ module ts {
 
                     // Analyse text on this line
                     while (pos < end && !isLineBreak(sourceFile.text.charCodeAt(pos))) {
-                        var ch = sourceFile.text.charAt(pos);
+                        let ch = sourceFile.text.charAt(pos);
                         if (ch === "@") {
                             // If it is @param tag
                             if (isParamTag(pos, end, sourceFile)) {
@@ -488,12 +487,12 @@ module ts {
             }
 
             function getCleanedParamJsDocComment(pos: number, end: number, sourceFile: SourceFile) {
-                var paramHelpStringMargin: number;
-                var paramDocComments: SymbolDisplayPart[] = [];
+                let paramHelpStringMargin: number;
+                let paramDocComments: SymbolDisplayPart[] = [];
                 while (pos < end) {
                     if (isParamTag(pos, end, sourceFile)) {
-                        var blankLineCount = 0;
-                        var recordedParamTag = false;
+                        let blankLineCount = 0;
+                        let recordedParamTag = false;
                         // Consume leading spaces 
                         pos = consumeWhiteSpaces(pos + paramTag.length);
                         if (pos >= end) {
@@ -503,8 +502,8 @@ module ts {
                         // Ignore type expression
                         if (sourceFile.text.charCodeAt(pos) === CharacterCodes.openBrace) {
                             pos++;
-                            for (var curlies = 1; pos < end; pos++) {
-                                var charCode = sourceFile.text.charCodeAt(pos);
+                            for (let curlies = 1; pos < end; pos++) {
+                                let charCode = sourceFile.text.charCodeAt(pos);
 
                                 // { character means we need to find another } to match the found one
                                 if (charCode === CharacterCodes.openBrace) {
@@ -547,10 +546,10 @@ module ts {
                                 break;
                             }
 
-                            var paramHelpString = "";
-                            var firstLineParamHelpStringPos = pos;
+                            let paramHelpString = "";
+                            let firstLineParamHelpStringPos = pos;
                             while (pos < end) {
-                                var ch = sourceFile.text.charCodeAt(pos);
+                                let ch = sourceFile.text.charCodeAt(pos);
 
                                 // at line break, set this comment line text and go to next line 
                                 if (isLineBreak(ch)) {
@@ -619,15 +618,15 @@ module ts {
                     }
 
                     // Now consume white spaces max 
-                    var startOfLinePos = pos;
+                    let startOfLinePos = pos;
                     pos = consumeWhiteSpacesOnTheLine(pos, end, sourceFile, paramHelpStringMargin);
                     if (pos >= end) {
                         return;
                     }
 
-                    var consumedSpaces = pos - startOfLinePos;
+                    let consumedSpaces = pos - startOfLinePos;
                     if (consumedSpaces < paramHelpStringMargin) {
-                        var ch = sourceFile.text.charCodeAt(pos);
+                        let ch = sourceFile.text.charCodeAt(pos);
                         if (ch === CharacterCodes.asterisk) {
                             // Consume more spaces after asterisk
                             pos = consumeWhiteSpacesOnTheLine(pos + 1, end, sourceFile, paramHelpStringMargin - consumedSpaces - 1);
@@ -767,18 +766,18 @@ module ts {
 
         public getNamedDeclarations() {
             if (!this.namedDeclarations) {
-                var sourceFile = this;
-                var namedDeclarations: Declaration[] = [];
+                let sourceFile = this;
+                let namedDeclarations: Declaration[] = [];
 
                 forEachChild(sourceFile, function visit(node: Node): void {
                     switch (node.kind) {
                         case SyntaxKind.FunctionDeclaration:
                         case SyntaxKind.MethodDeclaration:
                         case SyntaxKind.MethodSignature:
-                            var functionDeclaration = <FunctionLikeDeclaration>node;
+                            let functionDeclaration = <FunctionLikeDeclaration>node;
 
                             if (functionDeclaration.name && functionDeclaration.name.getFullWidth() > 0) {
-                                var lastDeclaration = namedDeclarations.length > 0 ?
+                                let lastDeclaration = namedDeclarations.length > 0 ?
                                     namedDeclarations[namedDeclarations.length - 1] :
                                     undefined;
 
@@ -858,7 +857,7 @@ module ts {
                             break;
 
                         case SyntaxKind.ImportDeclaration:
-                            var importClause = (<ImportDeclaration>node).importClause;
+                            let importClause = (<ImportDeclaration>node).importClause;
                             if (importClause) {
                                 // Handle default import case e.g.:
                                 //    import d from "mod";
@@ -1326,7 +1325,7 @@ module ts {
         static enumElement = "enum";
 
         // Inside module and script only
-        // var v = ..
+        // let v = ..
         static variableElement = "var";
 
         // Inside function
@@ -1470,7 +1469,7 @@ module ts {
             }
 
             // If the parent is not sourceFile or module block it is local variable
-            for (var parent = declaration.parent; !isFunctionBlock(parent); parent = parent.parent) {
+            for (let parent = declaration.parent; !isFunctionBlock(parent); parent = parent.parent) {
                 // Reached source file or module block
                 if (parent.kind === SyntaxKind.SourceFile || parent.kind === SyntaxKind.ModuleBlock) {
                     return false;
@@ -1522,9 +1521,9 @@ module ts {
             this.fileNameToEntry = {};
 
             // Initialize the list with the root file names
-            var rootFileNames = host.getScriptFileNames();
-            for (var i = 0, n = rootFileNames.length; i < n; i++) {
-                this.createEntry(rootFileNames[i]);
+            let rootFileNames = host.getScriptFileNames();
+            for (let fileName of rootFileNames) {
+                this.createEntry(fileName);
             }
 
             // store the compilation settings
@@ -1536,8 +1535,8 @@ module ts {
         }
 
         private createEntry(fileName: string) {
-            var entry: HostFileInformation;
-            var scriptSnapshot = this.host.getScriptSnapshot(fileName);
+            let entry: HostFileInformation;
+            let scriptSnapshot = this.host.getScriptSnapshot(fileName);
             if (scriptSnapshot) {
                 entry = {
                     hostFileName: fileName,
@@ -1566,7 +1565,7 @@ module ts {
         }
 
         public getRootFileNames(): string[] {
-            var fileNames: string[] = [];
+            let fileNames: string[] = [];
 
             forEachKey(this.fileNameToEntry, key => {
                 if (hasProperty(this.fileNameToEntry, key) && this.fileNameToEntry[key])
@@ -1577,12 +1576,12 @@ module ts {
         }
 
         public getVersion(fileName: string): string {
-            var file = this.getEntry(fileName);
+            let file = this.getEntry(fileName);
             return file && file.version;
         }
 
         public getScriptSnapshot(fileName: string): IScriptSnapshot {
-            var file = this.getEntry(fileName);
+            let file = this.getEntry(fileName);
             return file && file.scriptSnapshot;
         }
     }
@@ -1599,14 +1598,14 @@ module ts {
         }
 
         public getCurrentSourceFile(fileName: string): SourceFile {
-            var scriptSnapshot = this.host.getScriptSnapshot(fileName);
+            let scriptSnapshot = this.host.getScriptSnapshot(fileName);
             if (!scriptSnapshot) {
                 // The host does not know about this file.
                 throw new Error("Could not find file: '" + fileName + "'.");
             }
 
-            var version = this.host.getScriptVersion(fileName);
-            var sourceFile: SourceFile;
+            let version = this.host.getScriptVersion(fileName);
+            let sourceFile: SourceFile;
 
             if (this.currentFileName !== fileName) {
                 // This is a new file, just parse it
@@ -1614,7 +1613,7 @@ module ts {
             }
             else if (this.currentFileVersion !== version) {
                 // This is the same file, just a newer version. Incrementally parse the file.
-                var editRange = scriptSnapshot.getChangeRange(this.currentFileScriptSnapshot);
+                let editRange = scriptSnapshot.getChangeRange(this.currentFileScriptSnapshot);
                 sourceFile = updateLanguageServiceSourceFile(this.currentSourceFile, scriptSnapshot, version, editRange);
             }
 
@@ -1636,14 +1635,14 @@ module ts {
     }
 
     export function createLanguageServiceSourceFile(fileName: string, scriptSnapshot: IScriptSnapshot, scriptTarget: ScriptTarget, version: string, setNodeParents: boolean): SourceFile {
-        var sourceFile = createSourceFile(fileName, scriptSnapshot.getText(0, scriptSnapshot.getLength()), scriptTarget, setNodeParents);
+        let sourceFile = createSourceFile(fileName, scriptSnapshot.getText(0, scriptSnapshot.getLength()), scriptTarget, setNodeParents);
         setSourceFileFields(sourceFile, scriptSnapshot, version);
         // after full parsing we can use table with interned strings as name table
         sourceFile.nameTable = sourceFile.identifiers;
         return sourceFile;
     }
 
-    export var disableIncrementalParsing = false;
+    export let disableIncrementalParsing = false;
 
     export function updateLanguageServiceSourceFile(sourceFile: SourceFile, scriptSnapshot: IScriptSnapshot, version: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile {
         // If we were given a text change range, and our version or open-ness changed, then 
@@ -1652,7 +1651,7 @@ module ts {
             if (version !== sourceFile.version) {
                 // Once incremental parsing is ready, then just call into this function.
                 if (!disableIncrementalParsing) {
-                    var newSourceFile = updateSourceFile(sourceFile, scriptSnapshot.getText(0, scriptSnapshot.getLength()), textChangeRange, aggressiveChecks);
+                    let newSourceFile = updateSourceFile(sourceFile, scriptSnapshot.getText(0, scriptSnapshot.getLength()), textChangeRange, aggressiveChecks);
                     setSourceFileFields(newSourceFile, scriptSnapshot, version);
                     // after incremental parsing nameTable might not be up-to-date
                     // drop it so it can be lazily recreated later
@@ -1669,15 +1668,15 @@ module ts {
     export function createDocumentRegistry(): DocumentRegistry {
         // Maps from compiler setting target (ES3, ES5, etc.) to all the cached documents we have
         // for those settings.
-        var buckets: Map<Map<DocumentRegistryEntry>> = {};
+        let buckets: Map<Map<DocumentRegistryEntry>> = {};
 
         function getKeyFromCompilationSettings(settings: CompilerOptions): string {
             return "_" + settings.target; //  + "|" + settings.propagateEnumConstantoString()
         }
 
         function getBucketForCompilationSettings(settings: CompilerOptions, createIfMissing: boolean): Map<DocumentRegistryEntry> {
-            var key = getKeyFromCompilationSettings(settings);
-            var bucket = lookUp(buckets, key);
+            let key = getKeyFromCompilationSettings(settings);
+            let bucket = lookUp(buckets, key);
             if (!bucket && createIfMissing) {
                 buckets[key] = bucket = {};
             }
@@ -1685,11 +1684,11 @@ module ts {
         }
 
         function reportStats() {
-            var bucketInfoArray = Object.keys(buckets).filter(name => name && name.charAt(0) === '_').map(name => {
-                var entries = lookUp(buckets, name);
-                var sourceFiles: { name: string; refCount: number; references: string[]; }[] = [];
-                for (var i in entries) {
-                    var entry = entries[i];
+            let bucketInfoArray = Object.keys(buckets).filter(name => name && name.charAt(0) === '_').map(name => {
+                let entries = lookUp(buckets, name);
+                let sourceFiles: { name: string; refCount: number; references: string[]; }[] = [];
+                for (let i in entries) {
+                    let entry = entries[i];
                     sourceFiles.push({
                         name: i,
                         refCount: entry.languageServiceRefCount,
@@ -1720,13 +1719,13 @@ module ts {
             version: string,
             acquiring: boolean): SourceFile {
 
-            var bucket = getBucketForCompilationSettings(compilationSettings, /*createIfMissing*/ true);
-            var entry = lookUp(bucket, fileName);
+            let bucket = getBucketForCompilationSettings(compilationSettings, /*createIfMissing*/ true);
+            let entry = lookUp(bucket, fileName);
             if (!entry) {
                 Debug.assert(acquiring, "How could we be trying to update a document that the registry doesn't have?");
 
                 // Have never seen this file with these settings.  Create a new source file for it.
-                var sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, compilationSettings.target, version, /*setNodeParents:*/ false);
+                let sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, compilationSettings.target, version, /*setNodeParents:*/ false);
 
                 bucket[fileName] = entry = {
                     sourceFile: sourceFile,
@@ -1757,10 +1756,10 @@ module ts {
         }
 
         function releaseDocument(fileName: string, compilationSettings: CompilerOptions): void {
-            var bucket = getBucketForCompilationSettings(compilationSettings, false);
+            let bucket = getBucketForCompilationSettings(compilationSettings, false);
             Debug.assert(bucket !== undefined);
 
-            var entry = lookUp(bucket, fileName);
+            let entry = lookUp(bucket, fileName);
             entry.languageServiceRefCount--;
 
             Debug.assert(entry.languageServiceRefCount >= 0);
@@ -1778,18 +1777,18 @@ module ts {
     }
 
     export function preProcessFile(sourceText: string, readImportFiles = true): PreProcessedFileInfo {
-        var referencedFiles: FileReference[] = [];
-        var importedFiles: FileReference[] = [];
-        var isNoDefaultLib = false;
+        let referencedFiles: FileReference[] = [];
+        let importedFiles: FileReference[] = [];
+        let isNoDefaultLib = false;
 
         function processTripleSlashDirectives(): void {
-            var commentRanges = getLeadingCommentRanges(sourceText, 0);
+            let commentRanges = getLeadingCommentRanges(sourceText, 0);
             forEach(commentRanges, commentRange => {
-                var comment = sourceText.substring(commentRange.pos, commentRange.end);
-                var referencePathMatchResult = getFileReferenceFromReferencePath(comment, commentRange);
+                let comment = sourceText.substring(commentRange.pos, commentRange.end);
+                let referencePathMatchResult = getFileReferenceFromReferencePath(comment, commentRange);
                 if (referencePathMatchResult) {
                     isNoDefaultLib = referencePathMatchResult.isNoDefaultLib;
-                    var fileReference = referencePathMatchResult.fileReference;
+                    let fileReference = referencePathMatchResult.fileReference;
                     if (fileReference) {
                         referencedFiles.push(fileReference);
                     }
@@ -1798,8 +1797,8 @@ module ts {
         }
 
         function recordModuleName() {
-            var importPath = scanner.getTokenValue();
-            var pos = scanner.getTokenPos();
+            let importPath = scanner.getTokenValue();
+            let pos = scanner.getTokenPos();
             importedFiles.push({
                 fileName: importPath,
                 pos: pos,
@@ -1809,7 +1808,7 @@ module ts {
 
         function processImport(): void {
             scanner.setText(sourceText);
-            var token = scanner.scan();
+            let token = scanner.scan();
             // Look for:
             //    import "mod";
             //    import d from "mod"
@@ -1974,7 +1973,7 @@ module ts {
      * Note: 'node' cannot be a SourceFile.
      */
     function isLabeledBy(node: Node, labelName: string) {
-        for (var owner = node.parent; owner.kind === SyntaxKind.LabeledStatement; owner = owner.parent) {
+        for (let owner = node.parent; owner.kind === SyntaxKind.LabeledStatement; owner = owner.parent) {
             if ((<LabeledStatement>owner).label.text === labelName) {
                 return true;
             }
@@ -2068,8 +2067,8 @@ module ts {
                     return true;
                 }
                 else if (position === comment.end) {
-                    var text = sourceFile.text;
-                    var width = comment.end - comment.pos;
+                    let text = sourceFile.text;
+                    let width = comment.end - comment.pos;
                     // is single line comment or just /*
                     if (width <= 2 || text.charCodeAt(comment.pos + 1) === CharacterCodes.slash) {
                         return true;
@@ -2101,8 +2100,8 @@ module ts {
     }
 
     // A cache of completion entries for keywords, these do not change between sessions
-    var keywordCompletions: CompletionEntry[] = [];
-    for (var i = SyntaxKind.FirstKeyword; i <= SyntaxKind.LastKeyword; i++) {
+    let keywordCompletions: CompletionEntry[] = [];
+    for (let i = SyntaxKind.FirstKeyword; i <= SyntaxKind.LastKeyword; i++) {
         keywordCompletions.push({
             name: tokenToString(i),
             kind: ScriptElementKind.keyword,
@@ -2173,15 +2172,15 @@ module ts {
     }
 
     export function createLanguageService(host: LanguageServiceHost, documentRegistry: DocumentRegistry = createDocumentRegistry()): LanguageService {
-        var syntaxTreeCache: SyntaxTreeCache = new SyntaxTreeCache(host);
-        var ruleProvider: formatting.RulesProvider;
-        var program: Program;
+        let syntaxTreeCache: SyntaxTreeCache = new SyntaxTreeCache(host);
+        let ruleProvider: formatting.RulesProvider;
+        let program: Program;
 
         // this checker is used to answer all LS questions except errors 
-        var typeInfoResolver: TypeChecker;
-        var useCaseSensitivefileNames = false;
-        var cancellationToken = new CancellationTokenObject(host.getCancellationToken && host.getCancellationToken());
-        var activeCompletionSession: CompletionSession;         // The current active completion session, used to get the completion entry details
+        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) {
@@ -2200,7 +2199,7 @@ module ts {
 
         function getValidSourceFile(fileName: string): SourceFile {
             fileName = normalizeSlashes(fileName);
-            var sourceFile = program.getSourceFile(getCanonicalFileName(fileName));
+            let sourceFile = program.getSourceFile(getCanonicalFileName(fileName));
             if (!sourceFile) {
                 throw new Error("Could not find file: '" + fileName + "'.");
             }
@@ -2219,7 +2218,7 @@ module ts {
 
         function synchronizeHostData(): void {
             // Get a fresh cache of the host information
-            var hostCache = new HostCache(host);
+            let hostCache = new HostCache(host);
 
             // If the program is already up-to-date, we can reuse it
             if (programUpToDate()) {
@@ -2232,12 +2231,12 @@ module ts {
             // the program points to old source files that have been invalidated because of 
             // incremental parsing.
 
-            var oldSettings = program && program.getCompilerOptions();
-            var newSettings = hostCache.compilationSettings();
-            var changesInCompilationSettingsAffectSyntax = oldSettings && oldSettings.target !== newSettings.target;
+            let oldSettings = program && program.getCompilerOptions();
+            let newSettings = hostCache.compilationSettings();
+            let changesInCompilationSettingsAffectSyntax = oldSettings && oldSettings.target !== newSettings.target;
 
             // Now create a new compiler
-            var newProgram = createProgram(hostCache.getRootFileNames(), newSettings, {
+            let newProgram = createProgram(hostCache.getRootFileNames(), newSettings, {
                 getSourceFile: getOrCreateSourceFile,
                 getCancellationToken: () => cancellationToken,
                 getCanonicalFileName: (fileName) => useCaseSensitivefileNames ? fileName : fileName.toLowerCase(),
@@ -2251,9 +2250,9 @@ module ts {
             // Release any files we have acquired in the old program but are 
             // not part of the new program.
             if (program) {
-                var oldSourceFiles = program.getSourceFiles();
-                for (var i = 0, n = oldSourceFiles.length; i < n; i++) {
-                    var fileName = oldSourceFiles[i].fileName;
+                let oldSourceFiles = program.getSourceFiles();
+                for (let oldSourceFile of oldSourceFiles) {
+                    let fileName = oldSourceFile.fileName;
                     if (!newProgram.getSourceFile(fileName) || changesInCompilationSettingsAffectSyntax) {
                         documentRegistry.releaseDocument(fileName, oldSettings);
                     }
@@ -2269,7 +2268,7 @@ module ts {
                 // The program is asking for this file, check first if the host can locate it.
                 // If the host can not locate the file, then it does not exist. return undefined
                 // to the program to allow reporting of errors for missing files.
-                var hostFileInformation = hostCache.getOrCreateEntry(fileName);
+                let hostFileInformation = hostCache.getOrCreateEntry(fileName);
                 if (!hostFileInformation) {
                     return undefined;
                 }
@@ -2279,7 +2278,7 @@ module ts {
                 // can not be reused. we have to dump all syntax trees and create new ones.
                 if (!changesInCompilationSettingsAffectSyntax) {
                     // Check if the old program had this file already
-                    var oldSourceFile = program && program.getSourceFile(fileName);
+                    let oldSourceFile = program && program.getSourceFile(fileName);
                     if (oldSourceFile) {
                         // We already had a source file for this file name.  Go to the registry to 
                         // ensure that we get the right up to date version of it.  We need this to
@@ -2323,14 +2322,14 @@ module ts {
                 }
 
                 // If number of files in the program do not match, it is not up-to-date
-                var rootFileNames = hostCache.getRootFileNames();
+                let rootFileNames = hostCache.getRootFileNames();
                 if (program.getSourceFiles().length !== rootFileNames.length) {
                     return false;
                 }
 
                 // If any file is not up-to-date, then the whole program is not up-to-date
-                for (var i = 0, n = rootFileNames.length; i < n; i++) {
-                    if (!sourceFileUpToDate(program.getSourceFile(rootFileNames[i]))) {
+                for (let fileName of rootFileNames) {
+                    if (!sourceFileUpToDate(program.getSourceFile(fileName))) {
                         return false;
                     }
                 }
@@ -2378,18 +2377,18 @@ module ts {
         function getSemanticDiagnostics(fileName: string) {
             synchronizeHostData();
 
-            var targetSourceFile = getValidSourceFile(fileName);
+            let targetSourceFile = getValidSourceFile(fileName);
 
             // Only perform the action per file regardless of '-out' flag as LanguageServiceHost is expected to call this function per file.
             // Therefore only get diagnostics for given file.
 
-            var semanticDiagnostics = program.getSemanticDiagnostics(targetSourceFile);
+            let semanticDiagnostics = program.getSemanticDiagnostics(targetSourceFile);
             if (!program.getCompilerOptions().declaration) {
                 return semanticDiagnostics;
             }
 
             // If '-d' is enabled, check for emitter error. One example of emitter error is export class implements non-export interface
-            var declarationDiagnostics = program.getDeclarationDiagnostics(targetSourceFile);
+            let declarationDiagnostics = program.getDeclarationDiagnostics(targetSourceFile);
             return semanticDiagnostics.concat(declarationDiagnostics);
         }
 
@@ -2400,13 +2399,13 @@ module ts {
 
         /// Completion
         function getValidCompletionEntryDisplayName(symbol: Symbol, target: ScriptTarget): string {
-            var displayName = symbol.getName();
+            let displayName = symbol.getName();
             if (displayName && displayName.length > 0) {
-                var firstCharCode = displayName.charCodeAt(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" { var x; } | // <= request completion here, "http" should not be there)
+                    // (i.e declare module "http" { let x; } | // <= request completion here, "http" should not be there)
                     return undefined;
                 }
 
@@ -2417,8 +2416,8 @@ module ts {
                     displayName = displayName.substring(1, displayName.length - 1);
                 }
 
-                var isValid = isIdentifierStart(displayName.charCodeAt(0), target);
-                for (var i = 1, n = displayName.length; isValid && i < n; i++) {
+                let isValid = isIdentifierStart(displayName.charCodeAt(0), target);
+                for (let i = 1, n = displayName.length; isValid && i < n; i++) {
                     isValid = isIdentifierPart(displayName.charCodeAt(i), target);
                 }
 
@@ -2435,7 +2434,7 @@ module ts {
             // 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)
-            var displayName = getValidCompletionEntryDisplayName(symbol, program.getCompilerOptions().target);
+            let displayName = getValidCompletionEntryDisplayName(symbol, program.getCompilerOptions().target);
             if (!displayName) {
                 return undefined;
             }
@@ -2454,16 +2453,16 @@ module ts {
         function getCompletionsAtPosition(fileName: string, position: number) {
             synchronizeHostData();
 
-            var syntacticStart = new Date().getTime();
-            var sourceFile = getValidSourceFile(fileName);
+            let syntacticStart = new Date().getTime();
+            let sourceFile = getValidSourceFile(fileName);
 
-            var start = new Date().getTime();
-            var currentToken = getTokenAtPosition(sourceFile, position);
+            let start = new Date().getTime();
+            let currentToken = getTokenAtPosition(sourceFile, position);
             log("getCompletionsAtPosition: Get current token: " + (new Date().getTime() - start));
 
-            var start = new Date().getTime();
+            start = new Date().getTime();
             // Completion not allowed inside comments, bail out if this is the case
-            var insideComment = isInsideComment(sourceFile, currentToken, position);
+            let insideComment = isInsideComment(sourceFile, currentToken, position);
             log("getCompletionsAtPosition: Is inside comment: " + (new Date().getTime() - start));
 
             if (insideComment) {
@@ -2473,14 +2472,14 @@ module ts {
 
             // The decision to provide completion depends on the previous token, so find it
             // Note: previousToken can be undefined if we are the beginning of the file
-            var start = new Date().getTime();
-            var previousToken = findPrecedingToken(position, sourceFile);
+            start = new Date().getTime();
+            let previousToken = findPrecedingToken(position, sourceFile);
             log("getCompletionsAtPosition: 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) {
-                var start = new Date().getTime();
+                let start = new Date().getTime();
                 previousToken = findPrecedingToken(previousToken.pos, sourceFile);
                 log("getCompletionsAtPosition: Get previous token 2: " + (new Date().getTime() - start));
             }
@@ -2493,8 +2492,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
-            var node: Node;
-            var isRightOfDot: boolean;
+            let node: Node;
+            let isRightOfDot: boolean;
             if (previousToken && previousToken.kind === SyntaxKind.DotToken && previousToken.parent.kind === SyntaxKind.PropertyAccessExpression) {
                 node = (<PropertyAccessExpression>previousToken.parent).expression;
                 isRightOfDot = true;
@@ -2518,17 +2517,20 @@ module ts {
             };
             log("getCompletionsAtPosition: Syntactic work: " + (new Date().getTime() - syntacticStart));
 
-            var location = getTouchingPropertyName(sourceFile, position);
+            let location = getTouchingPropertyName(sourceFile, position);
             // Populate the completion list
-            var semanticStart = new Date().getTime();
+            let semanticStart = new Date().getTime();
+            let isMemberCompletion: boolean;
+            let isNewIdentifierLocation: boolean;
+
             if (isRightOfDot) {
                 // Right of dot member completion list
-                var symbols: Symbol[] = [];
-                var isMemberCompletion = true;
-                var isNewIdentifierLocation = false;
+                let symbols: Symbol[] = [];
+                isMemberCompletion = true;
+                isNewIdentifierLocation = false;
 
                 if (node.kind === SyntaxKind.Identifier || node.kind === SyntaxKind.QualifiedName || node.kind === SyntaxKind.PropertyAccessExpression) {
-                    var symbol = typeInfoResolver.getSymbolAtLocation(node);
+                    let symbol = typeInfoResolver.getSymbolAtLocation(node);
 
                     // This is an alias, follow what it aliases
                     if (symbol && symbol.flags & SymbolFlags.Alias) {
@@ -2545,7 +2547,7 @@ module ts {
                     }
                 }
 
-                var type = typeInfoResolver.getTypeAtLocation(node);
+                let type = typeInfoResolver.getTypeAtLocation(node);
                 if (type) {
                     // Filter private properties
                     forEach(type.getApparentProperties(), symbol => {
@@ -2558,21 +2560,21 @@ module ts {
                 getCompletionEntriesFromSymbols(symbols, activeCompletionSession);
             }
             else {
-                var containingObjectLiteral = getContainingObjectLiteralApplicableForCompletion(previousToken);
+                let containingObjectLiteral = getContainingObjectLiteralApplicableForCompletion(previousToken);
                 if (containingObjectLiteral) {
                     // Object literal expression, look up possible property names from contextual type
                     isMemberCompletion = true;
                     isNewIdentifierLocation = true;
 
-                    var contextualType = typeInfoResolver.getContextualType(containingObjectLiteral);
+                    let contextualType = typeInfoResolver.getContextualType(containingObjectLiteral);
                     if (!contextualType) {
                         return undefined;
                     }
 
-                    var contextualTypeMembers = typeInfoResolver.getPropertiesOfType(contextualType);
+                    let contextualTypeMembers = typeInfoResolver.getPropertiesOfType(contextualType);
                     if (contextualTypeMembers && contextualTypeMembers.length > 0) {
                         // Add filtered items to the completion list
-                        var filteredMembers = filterContextualMembersList(contextualTypeMembers, containingObjectLiteral.properties);
+                        let filteredMembers = filterContextualMembersList(contextualTypeMembers, containingObjectLiteral.properties);
                         getCompletionEntriesFromSymbols(filteredMembers, activeCompletionSession);
                     }
                 }
@@ -2582,10 +2584,10 @@ module ts {
                     isMemberCompletion = true;
                     isNewIdentifierLocation = true;
                     if (showCompletionsInImportsClause(previousToken)) {
-                        var importDeclaration = <ImportDeclaration>getAncestor(previousToken, SyntaxKind.ImportDeclaration);
+                        let importDeclaration = <ImportDeclaration>getAncestor(previousToken, SyntaxKind.ImportDeclaration);
                         Debug.assert(importDeclaration !== undefined);
-                        var exports = typeInfoResolver.getExportsOfExternalModule(importDeclaration);
-                        var filteredExports = filterModuleExports(exports, importDeclaration);
+                        let exports = typeInfoResolver.getExportsOfExternalModule(importDeclaration);
+                        let filteredExports = filterModuleExports(exports, importDeclaration);
                         getCompletionEntriesFromSymbols(filteredExports, activeCompletionSession);
                     }
                 }
@@ -2595,8 +2597,8 @@ module ts {
                     isNewIdentifierLocation = isNewIdentifierDefinitionLocation(previousToken);
 
                     /// TODO filter meaning based on the current context
-                    var symbolMeanings = SymbolFlags.Type | SymbolFlags.Value | SymbolFlags.Namespace | SymbolFlags.Alias;
-                    var symbols = typeInfoResolver.getSymbolsInScope(node, symbolMeanings);
+                    let symbolMeanings = SymbolFlags.Type | SymbolFlags.Value | SymbolFlags.Namespace | SymbolFlags.Alias;
+                    let symbols = typeInfoResolver.getSymbolsInScope(node, symbolMeanings);
 
                     getCompletionEntriesFromSymbols(symbols, activeCompletionSession);
                 }
@@ -2616,11 +2618,11 @@ module ts {
             };
 
             function getCompletionEntriesFromSymbols(symbols: Symbol[], session: CompletionSession): void {
-                var start = new Date().getTime();
+                let start = new Date().getTime();
                 forEach(symbols, symbol => {
-                    var entry = createCompletionEntry(symbol, session.typeChecker, location);
+                    let entry = createCompletionEntry(symbol, session.typeChecker, location);
                     if (entry) {
-                        var id = escapeIdentifier(entry.name);
+                        let id = escapeIdentifier(entry.name);
                         if (!lookUp(session.symbols, id)) {
                             session.entries.push(entry);
                             session.symbols[id] = symbol;
@@ -2631,8 +2633,8 @@ module ts {
             }
 
             function isCompletionListBlocker(previousToken: Node): boolean {
-                var start = new Date().getTime();
-                var result = isInStringOrRegularExpressionOrTemplateLiteral(previousToken) ||
+                let start = new Date().getTime();
+                let result = isInStringOrRegularExpressionOrTemplateLiteral(previousToken) ||
                     isIdentifierDefinitionLocation(previousToken) ||
                     isRightOfIllegalDot(previousToken);
                 log("getCompletionsAtPosition: isCompletionListBlocker: " + (new Date().getTime() - start));
@@ -2653,21 +2655,21 @@ module ts {
 
             function isNewIdentifierDefinitionLocation(previousToken: Node): boolean {
                 if (previousToken) {
-                    var containingNodeKind = previousToken.parent.kind;
+                    let containingNodeKind = previousToken.parent.kind;
                     switch (previousToken.kind) {
                         case SyntaxKind.CommaToken:
                             return containingNodeKind === SyntaxKind.CallExpression                         // func( a, |
                                 || containingNodeKind === SyntaxKind.Constructor                            // constructor( a, |   public, protected, private keywords are allowed here, so show completion
                                 || containingNodeKind === SyntaxKind.NewExpression                          // new C(a, |
                                 || containingNodeKind === SyntaxKind.ArrayLiteralExpression                 // [a, |
-                                || containingNodeKind === SyntaxKind.BinaryExpression;                      // var x = (a, |
+                                || containingNodeKind === SyntaxKind.BinaryExpression;                      // let x = (a, |
 
               
                         case SyntaxKind.OpenParenToken:
                             return containingNodeKind === SyntaxKind.CallExpression               // func( |
                                 || containingNodeKind === SyntaxKind.Constructor                  // constructor( |
                                 || containingNodeKind === SyntaxKind.NewExpression                // new C(a|
-                                || containingNodeKind === SyntaxKind.ParenthesizedExpression;     // var x = (a|
+                                || containingNodeKind === SyntaxKind.ParenthesizedExpression;     // let x = (a|
 
                         case SyntaxKind.OpenBracketToken:
                             return containingNodeKind === SyntaxKind.ArrayLiteralExpression;                 // [ |
@@ -2682,7 +2684,7 @@ module ts {
                             return containingNodeKind === SyntaxKind.ClassDeclaration;  // class A{ |
 
                         case SyntaxKind.EqualsToken:
-                            return containingNodeKind === SyntaxKind.VariableDeclaration // var x = a|
+                            return containingNodeKind === SyntaxKind.VariableDeclaration // let x = a|
                             || containingNodeKind === SyntaxKind.BinaryExpression;       // x = a|
 
                         case SyntaxKind.TemplateHead:
@@ -2715,8 +2717,8 @@ module ts {
                     || isTemplateLiteralKind(previousToken.kind)) {
                     // The position has to be either: 1. entirely within the token text, or 
                     // 2. at the end position of an unterminated token.
-                    var start = previousToken.getStart();
-                    var end = previousToken.getEnd();
+                    let start = previousToken.getStart();
+                    let end = previousToken.getEnd();
 
                     if (start < position && position < end) {
                         return true;
@@ -2733,11 +2735,11 @@ module ts {
                 // The locations in an object literal expression that are applicable for completion are property name definition locations.
 
                 if (previousToken) {
-                    var parent = previousToken.parent;
+                    let parent = previousToken.parent;
 
                     switch (previousToken.kind) {
-                        case SyntaxKind.OpenBraceToken:  // var x = { |
-                        case SyntaxKind.CommaToken:      // var x = { a: 0, |
+                        case SyntaxKind.OpenBraceToken:  // let x = { |
+                        case SyntaxKind.CommaToken:      // let x = { a: 0, |
                             if (parent && parent.kind === SyntaxKind.ObjectLiteralExpression) {
                                 return <ObjectLiteralExpression>parent;
                             }
@@ -2767,7 +2769,7 @@ module ts {
 
             function isIdentifierDefinitionLocation(previousToken: Node): boolean {
                 if (previousToken) {
-                    var containingNodeKind = previousToken.parent.kind;
+                    let containingNodeKind = previousToken.parent.kind;
                     switch (previousToken.kind) {
                         case SyntaxKind.CommaToken:
                             return containingNodeKind === SyntaxKind.VariableDeclaration ||
@@ -2794,13 +2796,13 @@ module ts {
                         case SyntaxKind.OpenBraceToken:
                             return containingNodeKind === SyntaxKind.EnumDeclaration ||        // enum a { |
                                 containingNodeKind === SyntaxKind.InterfaceDeclaration ||      // interface a { |
-                                containingNodeKind === SyntaxKind.TypeLiteral ||               // var x : { |
+                                containingNodeKind === SyntaxKind.TypeLiteral ||               // let x : { |
                                 containingNodeKind === SyntaxKind.ObjectBindingPattern;        // function func({ x|
 
                         case SyntaxKind.SemicolonToken:
                             return containingNodeKind === SyntaxKind.PropertySignature &&
                                 (previousToken.parent.parent.kind === SyntaxKind.InterfaceDeclaration ||    // interface a { f; |
-                                 previousToken.parent.parent.kind === SyntaxKind.TypeLiteral);           //  var x : { a; |
+                                 previousToken.parent.parent.kind === SyntaxKind.TypeLiteral);           //  let x : { a; |
 
                         case SyntaxKind.LessThanToken:
                             return containingNodeKind === SyntaxKind.ClassDeclaration ||        // class A< |
@@ -2855,7 +2857,7 @@ module ts {
 
             function isRightOfIllegalDot(previousToken: Node): boolean {
                 if (previousToken && previousToken.kind === SyntaxKind.NumericLiteral) {
-                    var text = previousToken.getFullText();
+                    let text = previousToken.getFullText();
                     return text.charAt(text.length - 1) === ".";
                 }
 
@@ -2863,7 +2865,7 @@ module ts {
             }
 
             function filterModuleExports(exports: Symbol[], importDeclaration: ImportDeclaration): Symbol[] {
-                var exisingImports: Map<boolean> = {};
+                let exisingImports: Map<boolean> = {};
 
                 if (!importDeclaration.importClause) {
                     return exports;
@@ -2873,7 +2875,7 @@ module ts {
                     importDeclaration.importClause.namedBindings.kind === SyntaxKind.NamedImports) {
 
                     forEach((<NamedImports>importDeclaration.importClause.namedBindings).elements, el => {
-                        var name = el.propertyName || el.name;
+                        let name = el.propertyName || el.name;
                         exisingImports[name.text] = true;
                     });
                 }
@@ -2889,7 +2891,7 @@ module ts {
                     return contextualMemberSymbols;
                 }
 
-                var existingMemberNames: Map<boolean> = {};
+                let existingMemberNames: Map<boolean> = {};
                 forEach(existingMembers, m => {
                     if (m.kind !== SyntaxKind.PropertyAssignment && m.kind !== SyntaxKind.ShorthandPropertyAssignment) {
                         // Ignore omitted expressions for missing members in the object literal
@@ -2905,7 +2907,7 @@ module ts {
                     existingMemberNames[(<Identifier>m.name).text] = true;
                 });
 
-                var filteredMembers: Symbol[] = [];
+                let filteredMembers: Symbol[] = [];
                 forEach(contextualMemberSymbols, s => {
                     if (!existingMemberNames[s.name]) {
                         filteredMembers.push(s);
@@ -2919,25 +2921,25 @@ 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
-            var sourceFile = getValidSourceFile(fileName);
+            let sourceFile = getValidSourceFile(fileName);
 
-            var session = activeCompletionSession;
+            let session = activeCompletionSession;
 
             // Ensure that the current active completion session is still valid for this request
             if (!session || session.fileName !== fileName || session.position !== position) {
                 return undefined;
             }
 
-            var symbol = lookUp(activeCompletionSession.symbols, escapeIdentifier(entryName));
+            let symbol = lookUp(activeCompletionSession.symbols, escapeIdentifier(entryName));
             if (symbol) {
-                var location = getTouchingPropertyName(sourceFile, position);
-                var completionEntry = createCompletionEntry(symbol, session.typeChecker, location);
+                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");
-                var displayPartsDocumentationsAndSymbolKind = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, getValidSourceFile(fileName), location, session.typeChecker, location, SemanticMeaning.All);
+                let displayPartsDocumentationsAndSymbolKind = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, getValidSourceFile(fileName), location, session.typeChecker, location, SemanticMeaning.All);
                 return {
                     name: entryName,
                     kind: displayPartsDocumentationsAndSymbolKind.symbolKind,
@@ -2960,7 +2962,7 @@ module ts {
 
         // TODO(drosen): use contextual SemanticMeaning.
         function getSymbolKind(symbol: Symbol, typeResolver: TypeChecker, location: Node): string {
-            var flags = symbol.getFlags();
+            let flags = symbol.getFlags();
 
             if (flags & SymbolFlags.Class) return ScriptElementKind.classElement;
             if (flags & SymbolFlags.Enum) return ScriptElementKind.enumElement;
@@ -2968,7 +2970,7 @@ module ts {
             if (flags & SymbolFlags.Interface) return ScriptElementKind.interfaceElement;
             if (flags & SymbolFlags.TypeParameter) return ScriptElementKind.typeParameterElement;
 
-            var result = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(symbol, flags, typeResolver, location);
+            let result = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(symbol, flags, typeResolver, location);
             if (result === ScriptElementKind.unknown) {
                 if (flags & SymbolFlags.TypeParameter) return ScriptElementKind.typeParameterElement;
                 if (flags & SymbolFlags.EnumMember) return ScriptElementKind.variableElement;
@@ -3007,8 +3009,8 @@ module ts {
             if (flags & SymbolFlags.Property) {
                 if (flags & SymbolFlags.UnionProperty) {
                     // If union property is result of union of non method (property/accessors/variables), it is labeled as property
-                    var unionPropertyKind = forEach(typeInfoResolver.getRootSymbols(symbol), rootSymbol => {
-                        var rootSymbolFlags = rootSymbol.getFlags();
+                    let unionPropertyKind = forEach(typeInfoResolver.getRootSymbols(symbol), rootSymbol => {
+                        let rootSymbolFlags = rootSymbol.getFlags();
                         if (rootSymbolFlags & (SymbolFlags.PropertyOrAccessor | SymbolFlags.Variable)) {
                             return ScriptElementKind.memberVariableElement;
                         }
@@ -3017,7 +3019,7 @@ module ts {
                     if (!unionPropertyKind) {
                         // If this was union of all methods, 
                         //make sure it has call signatures before we can label it as method
-                        var typeOfUnionProperty = typeInfoResolver.getTypeOfSymbolAtLocation(symbol, location);
+                        let typeOfUnionProperty = typeInfoResolver.getTypeOfSymbolAtLocation(symbol, location);
                         if (typeOfUnionProperty.getCallSignatures().length) {
                             return ScriptElementKind.memberFunctionElement;
                         }
@@ -3032,7 +3034,7 @@ module ts {
         }
 
         function getTypeKind(type: Type): string {
-            var flags = type.getFlags();
+            let flags = type.getFlags();
 
             if (flags & TypeFlags.Enum) return ScriptElementKind.enumElement;
             if (flags & TypeFlags.Class) return ScriptElementKind.classElement;
@@ -3054,11 +3056,12 @@ 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)) {
-            var displayParts: SymbolDisplayPart[] = [];
-            var documentation: SymbolDisplayPart[];
-            var symbolFlags = symbol.flags;
-            var symbolKind = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(symbol, symbolFlags, typeResolver, location);
-            var hasAddedSymbolInfo: boolean;
+            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
@@ -3066,10 +3069,11 @@ module ts {
                     symbolKind = ScriptElementKind.memberVariableElement;
                 }
 
-                var type = typeResolver.getTypeOfSymbolAtLocation(symbol, location);
+                let signature: Signature;
+                type = typeResolver.getTypeOfSymbolAtLocation(symbol, location);
                 if (type) {
                     if (location.parent && location.parent.kind === SyntaxKind.PropertyAccessExpression) {
-                        var right = (<PropertyAccessExpression>location.parent).name;
+                        let right = (<PropertyAccessExpression>location.parent).name;
                         // Either the location is on the right of a property access, or on the left and the right is missing
                         if (right === location || (right && right.getFullWidth() === 0)) {
                             location = location.parent;
@@ -3077,7 +3081,7 @@ module ts {
                     }
 
                     // try get the call/construct signature from the type if it matches
-                    var callExpression: CallExpression;
+                    let callExpression: CallExpression;
                     if (location.kind === SyntaxKind.CallExpression || location.kind === SyntaxKind.NewExpression) {
                         callExpression = <CallExpression> location;
                     }
@@ -3086,15 +3090,15 @@ module ts {
                     }
 
                     if (callExpression) {
-                        var candidateSignatures: Signature[] = [];
+                        let candidateSignatures: Signature[] = [];
                         signature = typeResolver.getResolvedSignature(callExpression, candidateSignatures);
                         if (!signature && candidateSignatures.length) {
                             // Use the first candidate:
                             signature = candidateSignatures[0];
                         }
 
-                        var useConstructSignatures = callExpression.kind === SyntaxKind.NewExpression || callExpression.expression.kind === SyntaxKind.SuperKeyword;
-                        var allSignatures = useConstructSignatures ? type.getConstructSignatures() : type.getCallSignatures();
+                        let useConstructSignatures = callExpression.kind === SyntaxKind.NewExpression || callExpression.expression.kind === SyntaxKind.SuperKeyword;
+                        let allSignatures = useConstructSignatures ? type.getConstructSignatures() : type.getCallSignatures();
 
                         if (!contains(allSignatures, signature.target || signature)) {
                             // Get the first signature if there 
@@ -3153,9 +3157,8 @@ module ts {
                     else if ((isNameOfFunctionDeclaration(location) && !(symbol.flags & SymbolFlags.Accessor)) || // name of function declaration
                         (location.kind === SyntaxKind.ConstructorKeyword && location.parent.kind === SyntaxKind.Constructor)) { // At constructor keyword of constructor declaration
                         // get the signature from the declaration and write it
-                        var signature: Signature;
-                        var functionDeclaration = <FunctionLikeDeclaration>location.parent;
-                        var allSignatures = functionDeclaration.kind === SyntaxKind.Constructor ? type.getConstructSignatures() : type.getCallSignatures();
+                        let functionDeclaration = <FunctionLikeDeclaration>location.parent;
+                        let allSignatures = functionDeclaration.kind === SyntaxKind.Constructor ? type.getConstructSignatures() : type.getCallSignatures();
                         if (!typeResolver.isImplementationOfOverload(functionDeclaration)) {
                             signature = typeResolver.getSignatureFromDeclaration(functionDeclaration);
                         }
@@ -3235,8 +3238,8 @@ module ts {
                 }
                 else {
                     // Method/function type parameter
-                    var signatureDeclaration = <SignatureDeclaration>getDeclarationOfKind(symbol, SyntaxKind.TypeParameter).parent;
-                    var signature = typeResolver.getSignatureFromDeclaration(signatureDeclaration);
+                    let signatureDeclaration = <SignatureDeclaration>getDeclarationOfKind(symbol, SyntaxKind.TypeParameter).parent;
+                    let signature = typeResolver.getSignatureFromDeclaration(signatureDeclaration);
                     if (signatureDeclaration.kind === SyntaxKind.ConstructSignature) {
                         displayParts.push(keywordPart(SyntaxKind.NewKeyword));
                         displayParts.push(spacePart());
@@ -3249,9 +3252,9 @@ module ts {
             }
             if (symbolFlags & SymbolFlags.EnumMember) {
                 addPrefixForAnyFunctionOrVar(symbol, "enum member");
-                var declaration = symbol.declarations[0];
+                let declaration = symbol.declarations[0];
                 if (declaration.kind === SyntaxKind.EnumMember) {
-                    var constantValue = typeResolver.getConstantValue(<EnumMember>declaration);
+                    let constantValue = typeResolver.getConstantValue(<EnumMember>declaration);
                     if (constantValue !== undefined) {
                         displayParts.push(spacePart());
                         displayParts.push(operatorPart(SyntaxKind.EqualsToken));
@@ -3267,7 +3270,7 @@ module ts {
                 addFullSymbolName(symbol);
                 ts.forEach(symbol.declarations, declaration => {
                     if (declaration.kind === SyntaxKind.ImportEqualsDeclaration) {
-                        var importEqualsDeclaration = <ImportEqualsDeclaration>declaration;
+                        let importEqualsDeclaration = <ImportEqualsDeclaration>declaration;
                         if (isExternalModuleImportEqualsDeclaration(importEqualsDeclaration)) {
                             displayParts.push(spacePart());
                             displayParts.push(operatorPart(SyntaxKind.EqualsToken));
@@ -3278,7 +3281,7 @@ module ts {
                             displayParts.push(punctuationPart(SyntaxKind.CloseParenToken));
                         }
                         else {
-                            var internalAliasSymbol = typeResolver.getSymbolAtLocation(importEqualsDeclaration.moduleReference);
+                            let internalAliasSymbol = typeResolver.getSymbolAtLocation(importEqualsDeclaration.moduleReference);
                             if (internalAliasSymbol) {
                                 displayParts.push(spacePart());
                                 displayParts.push(operatorPart(SyntaxKind.EqualsToken));
@@ -3302,7 +3305,7 @@ module ts {
                             displayParts.push(spacePart());
                             // If the type is type parameter, format it specially
                             if (type.symbol && type.symbol.flags & SymbolFlags.TypeParameter) {
-                                var typeParameterParts = mapToDisplayParts(writer => {
+                                let typeParameterParts = mapToDisplayParts(writer => {
                                     typeResolver.getSymbolDisplayBuilder().buildTypeParameterDisplay(<TypeParameter>type, writer, enclosingDeclaration);
                                 });
                                 displayParts.push.apply(displayParts, typeParameterParts);
@@ -3317,7 +3320,7 @@ module ts {
                             symbolFlags & SymbolFlags.Signature ||
                             symbolFlags & SymbolFlags.Accessor ||
                             symbolKind === ScriptElementKind.memberFunctionElement) {
-                            var allSignatures = type.getCallSignatures();
+                            let allSignatures = type.getCallSignatures();
                             addSignatureDisplayParts(allSignatures[0], allSignatures);
                         }
                     }
@@ -3340,7 +3343,7 @@ module ts {
             }
 
             function addFullSymbolName(symbol: Symbol, enclosingDeclaration?: Node) {
-                var fullSymbolDisplayParts = symbolToDisplayParts(typeResolver, symbol, enclosingDeclaration || sourceFile, /*meaning*/ undefined,
+                let fullSymbolDisplayParts = symbolToDisplayParts(typeResolver, symbol, enclosingDeclaration || sourceFile, /*meaning*/ undefined,
                     SymbolFormatFlags.WriteTypeParametersOrArguments | SymbolFormatFlags.UseOnlyExternalAliasing);
                 displayParts.push.apply(displayParts, fullSymbolDisplayParts);
             }
@@ -3371,7 +3374,7 @@ module ts {
             }
 
             function writeTypeParametersOfSymbol(symbol: Symbol, enclosingDeclaration: Node) {
-                var typeParameterParts = mapToDisplayParts(writer => {
+                let typeParameterParts = mapToDisplayParts(writer => {
                     typeResolver.getSymbolDisplayBuilder().buildTypeParameterDisplayFromSymbol(symbol, writer, enclosingDeclaration);
                 });
                 displayParts.push.apply(displayParts, typeParameterParts);
@@ -3381,13 +3384,13 @@ module ts {
         function getQuickInfoAtPosition(fileName: string, position: number): QuickInfo {
             synchronizeHostData();
 
-            var sourceFile = getValidSourceFile(fileName);
-            var node = getTouchingPropertyName(sourceFile, position);
+            let sourceFile = getValidSourceFile(fileName);
+            let node = getTouchingPropertyName(sourceFile, position);
             if (!node) {
                 return undefined;
             }
 
-            var symbol = typeInfoResolver.getSymbolAtLocation(node);
+            let symbol = typeInfoResolver.getSymbolAtLocation(node);
             if (!symbol) {
                 // Try getting just type at this position and show
                 switch (node.kind) {
@@ -3397,7 +3400,7 @@ module ts {
                     case SyntaxKind.ThisKeyword:
                     case SyntaxKind.SuperKeyword:
                         // For the identifiers/this/super etc get the type at position
-                        var type = typeInfoResolver.getTypeAtLocation(node);
+                        let type = typeInfoResolver.getTypeAtLocation(node);
                         if (type) {
                             return {
                                 kind: ScriptElementKind.unknown,
@@ -3412,7 +3415,7 @@ module ts {
                 return undefined;
             }
 
-            var displayPartsDocumentationsAndKind = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, sourceFile, getContainerNode(node), typeInfoResolver, node);
+            let displayPartsDocumentationsAndKind = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, sourceFile, getContainerNode(node), typeInfoResolver, node);
             return {
                 kind: displayPartsDocumentationsAndKind.symbolKind,
                 kindModifiers: getSymbolModifiers(symbol),
@@ -3426,24 +3429,24 @@ module ts {
         function getDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[] {
             synchronizeHostData();
 
-            var sourceFile = getValidSourceFile(fileName);
+            let sourceFile = getValidSourceFile(fileName);
 
-            var node = getTouchingPropertyName(sourceFile, position);
+            let node = getTouchingPropertyName(sourceFile, position);
             if (!node) {
                 return undefined;
             }
 
             // Labels
             if (isJumpStatementTarget(node)) {
-                var labelName = (<Identifier>node).text;
-                var label = getTargetLabel((<BreakOrContinueStatement>node.parent), (<Identifier>node).text);
+                let labelName = (<Identifier>node).text;
+                let label = getTargetLabel((<BreakOrContinueStatement>node.parent), (<Identifier>node).text);
                 return label ? [getDefinitionInfo(label, ScriptElementKind.label, labelName, /*containerName*/ undefined)] : undefined;
             }
 
             /// Triple slash reference comments
-            var comment = forEach(sourceFile.referencedFiles, r => (r.pos <= position && position < r.end) ? r : undefined);
+            let comment = forEach(sourceFile.referencedFiles, r => (r.pos <= position && position < r.end) ? r : undefined);
             if (comment) {
-                var referenceFile = tryResolveScriptReference(program, sourceFile, comment);
+                let referenceFile = tryResolveScriptReference(program, sourceFile, comment);
                 if (referenceFile) {
                     return [{
                         fileName: referenceFile.fileName,
@@ -3457,7 +3460,7 @@ module ts {
                 return undefined;
             }
 
-            var symbol = typeInfoResolver.getSymbolAtLocation(node);
+            let symbol = typeInfoResolver.getSymbolAtLocation(node);
 
             // Could not find a symbol e.g. node is string or number keyword,
             // or the symbol was an internal symbol and does not have a declaration e.g. undefined symbol
@@ -3470,13 +3473,13 @@ module ts {
             //   import {A, B} from "mod";
             // to jump to the implementation directelly.
             if (symbol.flags & SymbolFlags.Alias) {
-                var declaration = symbol.declarations[0];
+                let declaration = symbol.declarations[0];
                 if (node.kind === SyntaxKind.Identifier && node.parent === declaration) {
                     symbol = typeInfoResolver.getAliasedSymbol(symbol);
                 }
             }
 
-            var result: DefinitionInfo[] = [];
+            let result: DefinitionInfo[] = [];
 
             // Because name in short-hand property assignment has two different meanings: property name and property value,
             // using go-to-definition at such position should go to the variable declaration of the property value rather than
@@ -3484,22 +3487,22 @@ module ts {
             // is performed at the location of property access, we would like to go to definition of the property in the short-hand
             // assignment. This case and others are handled by the following code.
             if (node.parent.kind === SyntaxKind.ShorthandPropertyAssignment) {
-                var shorthandSymbol = typeInfoResolver.getShorthandAssignmentValueSymbol(symbol.valueDeclaration);
-                var shorthandDeclarations = shorthandSymbol.getDeclarations();
-                var shorthandSymbolKind = getSymbolKind(shorthandSymbol, typeInfoResolver, node);
-                var shorthandSymbolName = typeInfoResolver.symbolToString(shorthandSymbol);
-                var shorthandContainerName = typeInfoResolver.symbolToString(symbol.parent, node);
+                let shorthandSymbol = typeInfoResolver.getShorthandAssignmentValueSymbol(symbol.valueDeclaration);
+                let shorthandDeclarations = shorthandSymbol.getDeclarations();
+                let shorthandSymbolKind = getSymbolKind(shorthandSymbol, typeInfoResolver, node);
+                let shorthandSymbolName = typeInfoResolver.symbolToString(shorthandSymbol);
+                let shorthandContainerName = typeInfoResolver.symbolToString(symbol.parent, node);
                 forEach(shorthandDeclarations, declaration => {
                     result.push(getDefinitionInfo(declaration, shorthandSymbolKind, shorthandSymbolName, shorthandContainerName));
                 });
                 return result
             }
 
-            var declarations = symbol.getDeclarations();
-            var symbolName = typeInfoResolver.symbolToString(symbol); // Do not get scoped name, just the name of the symbol
-            var symbolKind = getSymbolKind(symbol, typeInfoResolver, node);
-            var containerSymbol = symbol.parent;
-            var containerName = containerSymbol ? typeInfoResolver.symbolToString(containerSymbol, node) : "";
+            let declarations = symbol.getDeclarations();
+            let symbolName = typeInfoResolver.symbolToString(symbol); // Do not get scoped name, just the name of the symbol
+            let symbolKind = getSymbolKind(symbol, typeInfoResolver, node);
+            let containerSymbol = symbol.parent;
+            let containerName = containerSymbol ? typeInfoResolver.symbolToString(containerSymbol, node) : "";
 
             if (!tryAddConstructSignature(symbol, node, symbolKind, symbolName, containerName, result) &&
                 !tryAddCallSignature(symbol, node, symbolKind, symbolName, containerName, result)) {
@@ -3523,8 +3526,8 @@ module ts {
             }
 
             function tryAddSignature(signatureDeclarations: Declaration[], selectConstructors: boolean, symbolKind: string, symbolName: string, containerName: string, result: DefinitionInfo[]) {
-                var declarations: Declaration[] = [];
-                var definition: Declaration;
+                let declarations: Declaration[] = [];
+                let definition: Declaration;
 
                 forEach(signatureDeclarations, d => {
                     if ((selectConstructors && d.kind === SyntaxKind.Constructor) ||
@@ -3551,7 +3554,7 @@ module ts {
                 // and in either case the symbol has a construct signature definition, i.e. class
                 if (isNewExpressionTarget(location) || location.kind === SyntaxKind.ConstructorKeyword) {
                     if (symbol.flags & SymbolFlags.Class) {
-                        var classDeclaration = <ClassDeclaration>symbol.getDeclarations()[0];
+                        let classDeclaration = <ClassDeclaration>symbol.getDeclarations()[0];
                         Debug.assert(classDeclaration && classDeclaration.kind === SyntaxKind.ClassDeclaration);
 
                         return tryAddSignature(classDeclaration.members, /*selectConstructors*/ true, symbolKind, symbolName, containerName, result);
@@ -3572,9 +3575,9 @@ module ts {
         function getOccurrencesAtPosition(fileName: string, position: number): ReferenceEntry[] {
             synchronizeHostData();
 
-            var sourceFile = getValidSourceFile(fileName);
+            let sourceFile = getValidSourceFile(fileName);
 
-            var node = getTouchingWord(sourceFile, position);
+            let node = getTouchingWord(sourceFile, position);
             if (!node) {
                 return undefined;
             }
@@ -3619,8 +3622,8 @@ module ts {
                     break;
                 case SyntaxKind.CaseKeyword:
                 case SyntaxKind.DefaultKeyword:
-                    if (hasKind(parent(parent(node)), SyntaxKind.SwitchStatement)) {
-                        return getSwitchCaseDefaultOccurrences(<SwitchStatement>node.parent.parent);
+                    if (hasKind(parent(parent(parent(node))), SyntaxKind.SwitchStatement)) {
+                        return getSwitchCaseDefaultOccurrences(<SwitchStatement>node.parent.parent.parent);
                     }
                     break;
                 case SyntaxKind.BreakKeyword:
@@ -3662,7 +3665,7 @@ module ts {
             return undefined;
 
             function getIfElseOccurrences(ifStatement: IfStatement): ReferenceEntry[] {
-                var keywords: Node[] = [];
+                let keywords: Node[] = [];
 
                 // Traverse upwards through all parent if-statements linked by their else-branches.
                 while (hasKind(ifStatement.parent, SyntaxKind.IfStatement) && (<IfStatement>ifStatement.parent).elseStatement === ifStatement) {
@@ -3671,11 +3674,11 @@ module ts {
 
                 // Now traverse back down through the else branches, aggregating if/else keywords of if-statements.
                 while (ifStatement) {
-                    var children = ifStatement.getChildren();
+                    let children = ifStatement.getChildren();
                     pushKeywordIf(keywords, children[0], SyntaxKind.IfKeyword);
 
                     // Generally the 'else' keyword is second-to-last, so we traverse backwards.
-                    for (var i = children.length - 1; i >= 0; i--) {
+                    for (let i = children.length - 1; i >= 0; i--) {
                         if (pushKeywordIf(keywords, children[i], SyntaxKind.ElseKeyword)) {
                             break;
                         }
@@ -3688,19 +3691,19 @@ module ts {
                     ifStatement = <IfStatement>ifStatement.elseStatement;
                 }
 
-                var result: ReferenceEntry[] = [];
+                let result: ReferenceEntry[] = [];
 
                 // We'd like to highlight else/ifs together if they are only separated by whitespace
                 // (i.e. the keywords are separated by no comments, no newlines).
-                for (var i = 0; i < keywords.length; i++) {
+                for (let i = 0; i < keywords.length; i++) {
                     if (keywords[i].kind === SyntaxKind.ElseKeyword && i < keywords.length - 1) {
-                        var elseKeyword = keywords[i];
-                        var ifKeyword = keywords[i + 1]; // this *should* always be an 'if' keyword.
+                        let elseKeyword = keywords[i];
+                        let ifKeyword = keywords[i + 1]; // this *should* always be an 'if' keyword.
 
-                        var shouldHighlightNextKeyword = true;
+                        let shouldHighlightNextKeyword = true;
 
                         // Avoid recalculating getStart() by iterating backwards.
-                        for (var j = ifKeyword.getStart() - 1; j >= elseKeyword.end; j--) {
+                        for (let j = ifKeyword.getStart() - 1; j >= elseKeyword.end; j--) {
                             if (!isWhiteSpace(sourceFile.text.charCodeAt(j))) {
                                 shouldHighlightNextKeyword = false;
                                 break;
@@ -3726,14 +3729,14 @@ module ts {
             }
 
             function getReturnOccurrences(returnStatement: ReturnStatement): ReferenceEntry[] {
-                var func = <FunctionLikeDeclaration>getContainingFunction(returnStatement);
+                let func = <FunctionLikeDeclaration>getContainingFunction(returnStatement);
 
                 // If we didn't find a containing function with a block body, bail out.
                 if (!(func && hasKind(func.body, SyntaxKind.Block))) {
                     return undefined;
                 }
 
-                var keywords: Node[] = []
+                let keywords: Node[] = []
                 forEachReturnStatement(<Block>func.body, returnStatement => {
                     pushKeywordIf(keywords, returnStatement.getFirstToken(), SyntaxKind.ReturnKeyword);
                 });
@@ -3747,13 +3750,13 @@ module ts {
             }
 
             function getThrowOccurrences(throwStatement: ThrowStatement) {
-                var owner = getThrowStatementOwner(throwStatement);
+                let owner = getThrowStatementOwner(throwStatement);
 
                 if (!owner) {
                     return undefined;
                 }
 
-                var keywords: Node[] = [];
+                let keywords: Node[] = [];
 
                 forEach(aggregateOwnedThrowStatements(owner), throwStatement => {
                     pushKeywordIf(keywords, throwStatement.getFirstToken(), SyntaxKind.ThrowKeyword);
@@ -3775,7 +3778,7 @@ module ts {
              * into function boundaries and try-blocks with catch-clauses.
              */
             function aggregateOwnedThrowStatements(node: Node): ThrowStatement[] {
-                var statementAccumulator: ThrowStatement[] = []
+                let statementAccumulator: ThrowStatement[] = []
                 aggregate(node);
                 return statementAccumulator;
 
@@ -3784,7 +3787,7 @@ module ts {
                         statementAccumulator.push(<ThrowStatement>node);
                     }
                     else if (node.kind === SyntaxKind.TryStatement) {
-                        var tryStatement = <TryStatement>node;
+                        let tryStatement = <TryStatement>node;
 
                         if (tryStatement.catchClause) {
                             aggregate(tryStatement.catchClause);
@@ -3812,10 +3815,10 @@ module ts {
              * function-block, or source file.
              */
             function getThrowStatementOwner(throwStatement: ThrowStatement): Node {
-                var child: Node = throwStatement;
+                let child: Node = throwStatement;
 
                 while (child.parent) {
-                    var parent = child.parent;
+                    let parent = child.parent;
 
                     if (isFunctionBlock(parent) || parent.kind === SyntaxKind.SourceFile) {
                         return parent;
@@ -3824,7 +3827,7 @@ module ts {
                     // A throw-statement is only owned by a try-statement if the try-statement has
                     // a catch clause, and if the throw-statement occurs within the try block.
                     if (parent.kind === SyntaxKind.TryStatement) {
-                        var tryStatement = <TryStatement>parent;
+                        let tryStatement = <TryStatement>parent;
 
                         if (tryStatement.tryBlock === child && tryStatement.catchClause) {
                             return child;
@@ -3838,7 +3841,7 @@ module ts {
             }
 
             function getTryCatchFinallyOccurrences(tryStatement: TryStatement): ReferenceEntry[] {
-                var keywords: Node[] = [];
+                let keywords: Node[] = [];
 
                 pushKeywordIf(keywords, tryStatement.getFirstToken(), SyntaxKind.TryKeyword);
 
@@ -3847,7 +3850,7 @@ module ts {
                 }
 
                 if (tryStatement.finallyBlock) {
-                    var finallyKeyword = findChildOfKind(tryStatement, SyntaxKind.FinallyKeyword, sourceFile);
+                    let finallyKeyword = findChildOfKind(tryStatement, SyntaxKind.FinallyKeyword, sourceFile);
                     pushKeywordIf(keywords, finallyKeyword, SyntaxKind.FinallyKeyword);
                 }
 
@@ -3855,14 +3858,14 @@ module ts {
             }
 
             function getLoopBreakContinueOccurrences(loopNode: IterationStatement): ReferenceEntry[] {
-                var keywords: Node[] = [];
+                let keywords: Node[] = [];
 
                 if (pushKeywordIf(keywords, loopNode.getFirstToken(), SyntaxKind.ForKeyword, SyntaxKind.WhileKeyword, SyntaxKind.DoKeyword)) {
                     // If we succeeded and got a do-while loop, then start looking for a 'while' keyword.
                     if (loopNode.kind === SyntaxKind.DoStatement) {
-                        var loopTokens = loopNode.getChildren();
+                        let loopTokens = loopNode.getChildren();
 
-                        for (var i = loopTokens.length - 1; i >= 0; i--) {
+                        for (let i = loopTokens.length - 1; i >= 0; i--) {
                             if (pushKeywordIf(keywords, loopTokens[i], SyntaxKind.WhileKeyword)) {
                                 break;
                             }
@@ -3870,7 +3873,7 @@ module ts {
                     }
                 }
 
-                var breaksAndContinues = aggregateAllBreakAndContinueStatements(loopNode.statement);
+                let breaksAndContinues = aggregateAllBreakAndContinueStatements(loopNode.statement);
 
                 forEach(breaksAndContinues, statement => {
                     if (ownsBreakOrContinueStatement(loopNode, statement)) {
@@ -3882,15 +3885,15 @@ module ts {
             }
 
             function getSwitchCaseDefaultOccurrences(switchStatement: SwitchStatement) {
-                var keywords: Node[] = [];
+                let keywords: Node[] = [];
 
                 pushKeywordIf(keywords, switchStatement.getFirstToken(), SyntaxKind.SwitchKeyword);
 
                 // Go through each clause in the switch statement, collecting the 'case'/'default' keywords.
-                forEach(switchStatement.clauses, clause => {
+                forEach(switchStatement.caseBlock.clauses, clause => {
                     pushKeywordIf(keywords, clause.getFirstToken(), SyntaxKind.CaseKeyword, SyntaxKind.DefaultKeyword);
 
-                    var breaksAndContinues = aggregateAllBreakAndContinueStatements(clause);
+                    let breaksAndContinues = aggregateAllBreakAndContinueStatements(clause);
 
                     forEach(breaksAndContinues, statement => {
                         if (ownsBreakOrContinueStatement(switchStatement, statement)) {
@@ -3903,7 +3906,7 @@ module ts {
             }
 
             function getBreakOrContinueStatementOccurences(breakOrContinueStatement: BreakOrContinueStatement): ReferenceEntry[] {
-                var owner = getBreakOrContinueOwner(breakOrContinueStatement);
+                let owner = getBreakOrContinueOwner(breakOrContinueStatement);
 
                 if (owner) {
                     switch (owner.kind) {
@@ -3923,7 +3926,7 @@ module ts {
             }
 
             function aggregateAllBreakAndContinueStatements(node: Node): BreakOrContinueStatement[] {
-                var statementAccumulator: BreakOrContinueStatement[] = []
+                let statementAccumulator: BreakOrContinueStatement[] = []
                 aggregate(node);
                 return statementAccumulator;
 
@@ -3939,13 +3942,13 @@ module ts {
             }
 
             function ownsBreakOrContinueStatement(owner: Node, statement: BreakOrContinueStatement): boolean {
-                var actualOwner = getBreakOrContinueOwner(statement);
+                let actualOwner = getBreakOrContinueOwner(statement);
 
                 return actualOwner && actualOwner === owner;
             }
 
             function getBreakOrContinueOwner(statement: BreakOrContinueStatement): Node {
-                for (var node = statement.parent; node; node = node.parent) {
+                for (let node = statement.parent; node; node = node.parent) {
                     switch (node.kind) {
                         case SyntaxKind.SwitchStatement:
                             if (statement.kind === SyntaxKind.ContinueStatement) {
@@ -3974,9 +3977,9 @@ module ts {
             }
 
             function getConstructorOccurrences(constructorDeclaration: ConstructorDeclaration): ReferenceEntry[] {
-                var declarations = constructorDeclaration.symbol.getDeclarations()
+                let declarations = constructorDeclaration.symbol.getDeclarations()
 
-                var keywords: Node[] = [];
+                let keywords: Node[] = [];
 
                 forEach(declarations, declaration => {
                     forEach(declaration.getChildren(), token => {
@@ -3988,7 +3991,7 @@ module ts {
             }
 
             function getGetAndSetOccurrences(accessorDeclaration: AccessorDeclaration): ReferenceEntry[] {
-                var keywords: Node[] = [];
+                let keywords: Node[] = [];
 
                 tryPushAccessorKeyword(accessorDeclaration.symbol, SyntaxKind.GetAccessor);
                 tryPushAccessorKeyword(accessorDeclaration.symbol, SyntaxKind.SetAccessor);
@@ -3996,7 +3999,7 @@ module ts {
                 return map(keywords, getReferenceEntryFromNode);
 
                 function tryPushAccessorKeyword(accessorSymbol: Symbol, accessorKind: SyntaxKind): void {
-                    var accessor = getDeclarationOfKind(accessorSymbol, accessorKind);
+                    let accessor = getDeclarationOfKind(accessorSymbol, accessorKind);
 
                     if (accessor) {
                         forEach(accessor.getChildren(), child => pushKeywordIf(keywords, child, SyntaxKind.GetKeyword, SyntaxKind.SetKeyword));
@@ -4005,7 +4008,7 @@ module ts {
             }
 
             function getModifierOccurrences(modifier: SyntaxKind, declaration: Node) {
-                var container = declaration.parent;
+                let container = declaration.parent;
 
                 // Make sure we only highlight the keyword when it makes sense to do so.
                 if (declaration.flags & NodeFlags.AccessibilityModifier) {
@@ -4029,10 +4032,10 @@ module ts {
                     return undefined;
                 }
 
-                var keywords: Node[] = [];
-                var modifierFlag: NodeFlags = getFlagFromModifier(modifier);
+                let keywords: Node[] = [];
+                let modifierFlag: NodeFlags = getFlagFromModifier(modifier);
 
-                var nodes: Node[];
+                let nodes: Node[];
                 switch (container.kind) {
                     case SyntaxKind.ModuleBlock:
                     case SyntaxKind.SourceFile:
@@ -4048,7 +4051,7 @@ module ts {
                         // If we're an accessibility modifier, we're in an instance member and should search
                         // the constructor's parameter list for instance members as well.
                         if (modifierFlag & NodeFlags.AccessibilityModifier) {
-                            var constructor = forEach((<ClassDeclaration>container).members, member => {
+                            let constructor = forEach((<ClassDeclaration>container).members, member => {
                                 return member.kind === SyntaxKind.Constructor && <ConstructorDeclaration>member;
                             });
 
@@ -4120,9 +4123,9 @@ module ts {
         function findReferences(fileName: string, position: number, findInStrings: boolean, findInComments: boolean): ReferenceEntry[] {
             synchronizeHostData();
 
-            var sourceFile = getValidSourceFile(fileName);
+            let sourceFile = getValidSourceFile(fileName);
 
-            var node = getTouchingPropertyName(sourceFile, position);
+            let node = getTouchingPropertyName(sourceFile, position);
             if (!node) {
                 return undefined;
             }
@@ -4144,7 +4147,7 @@ module ts {
             // Labels
             if (isLabelName(node)) {
                 if (isJumpStatementTarget(node)) {
-                    var labelDefinition = getTargetLabel((<BreakOrContinueStatement>node.parent), (<Identifier>node).text);
+                    let labelDefinition = getTargetLabel((<BreakOrContinueStatement>node.parent), (<Identifier>node).text);
                     // if we have a label definition, look within its statement for references, if not, then
                     // the label is undefined, just return a set of one for the current node.
                     return labelDefinition ? getLabelReferencesInNode(labelDefinition.parent, labelDefinition) : [getReferenceEntryFromNode(node)];
@@ -4163,7 +4166,7 @@ module ts {
                 return getReferencesForSuperKeyword(node);
             }
 
-            var symbol = typeInfoResolver.getSymbolAtLocation(node);
+            let symbol = typeInfoResolver.getSymbolAtLocation(node);
 
             // Could not find a symbol e.g. unknown identifier
             if (!symbol) {
@@ -4172,24 +4175,24 @@ module ts {
                 return [getReferenceEntryFromNode(node)];
             }
 
-            var declarations = symbol.declarations;
+            let declarations = symbol.declarations;
 
             // The symbol was an internal symbol and does not have a declaration e.g.undefined symbol
             if (!declarations || !declarations.length) {
                 return undefined;
             }
 
-            var result: ReferenceEntry[];
+            let result: ReferenceEntry[];
 
             // Compute the meaning from the location and the symbol it references
-            var searchMeaning = getIntersectingMeaningFromDeclarations(getMeaningFromLocation(node), declarations);
+            let searchMeaning = getIntersectingMeaningFromDeclarations(getMeaningFromLocation(node), declarations);
 
             // Get the text to search for, we need to normalize it as external module names will have quote
-            var declaredName = getDeclaredName(symbol, node);
+            let declaredName = getDeclaredName(symbol, node);
 
             // Try to get the smallest valid scope that we can limit our search to;
             // otherwise we'll need to search globally (i.e. include each file).
-            var scope = getSymbolScope(symbol);
+            let scope = getSymbolScope(symbol);
 
             if (scope) {
                 result = [];
@@ -4202,11 +4205,11 @@ module ts {
                     getReferencesInNode(sourceFiles[0], symbol, declaredName, node, searchMeaning, findInStrings, findInComments, result);
                 }
                 else {
-                    var internedName = getInternedName(symbol, node, declarations)
+                    let internedName = getInternedName(symbol, node, declarations)
                     forEach(sourceFiles, sourceFile => {
                         cancellationToken.throwIfCancellationRequested();
 
-                        var nameTable = getNameTable(sourceFile);
+                        let nameTable = getNameTable(sourceFile);
 
                         if (lookUp(nameTable, internedName)) {
                             result = result || [];
@@ -4232,15 +4235,16 @@ module ts {
 
             function getDeclaredName(symbol: Symbol, location: Node) {
                 // Special case for function expressions, whose names are solely local to their bodies.
-                var functionExpression = forEach(symbol.declarations, d => d.kind === SyntaxKind.FunctionExpression ? <FunctionExpression>d : undefined);
+                let functionExpression = forEach(symbol.declarations, d => d.kind === SyntaxKind.FunctionExpression ? <FunctionExpression>d : undefined);
 
                 // When a name gets interned into a SourceFile's 'identifiers' Map,
                 // its name is escaped and stored in the same way its symbol name/identifier
                 // name should be stored. Function expressions, however, are a special case,
                 // because despite sometimes having a name, the binder unconditionally binds them
                 // to a symbol with the name "__function".
+                let name: string;
                 if (functionExpression && functionExpression.name) {
-                    var name = functionExpression.name.text;
+                    name = functionExpression.name.text;
                 }
 
                 // If this is an export or import specifier it could have been renamed using the as syntax.
@@ -4250,7 +4254,7 @@ module ts {
                     return location.getText();
                 }
 
-                var name = typeInfoResolver.symbolToString(symbol);
+                name = typeInfoResolver.symbolToString(symbol);
 
                 return stripQuotes(name);
             }
@@ -4264,25 +4268,22 @@ module ts {
                 }
 
                 // Special case for function expressions, whose names are solely local to their bodies.
-                var functionExpression = forEach(declarations, d => d.kind === SyntaxKind.FunctionExpression ? <FunctionExpression>d : undefined);
+                let functionExpression = forEach(declarations, d => d.kind === SyntaxKind.FunctionExpression ? <FunctionExpression>d : undefined);
 
                 // When a name gets interned into a SourceFile's 'identifiers' Map,
                 // its name is escaped and stored in the same way its symbol name/identifier
                 // name should be stored. Function expressions, however, are a special case,
                 // because despite sometimes having a name, the binder unconditionally binds them
                 // to a symbol with the name "__function".
-                if (functionExpression && functionExpression.name) {
-                    var name = functionExpression.name.text;
-                }
-                else {
-                    var name = symbol.name;
-                }
+                let name = functionExpression && functionExpression.name
+                    ? functionExpression.name.text
+                    : symbol.name;
 
                 return stripQuotes(name);
             }
 
             function stripQuotes(name: string) {
-                var length = name.length;
+                let length = name.length;
                 if (length >= 2 && name.charCodeAt(0) === CharacterCodes.doubleQuote && name.charCodeAt(length - 1) === CharacterCodes.doubleQuote) {
                     return name.substring(1, length - 1);
                 };
@@ -4292,7 +4293,7 @@ module ts {
             function getSymbolScope(symbol: Symbol): Node {
                 // If this is private property or method, the scope is the containing class
                 if (symbol.flags & (SymbolFlags.Property | SymbolFlags.Method)) {
-                    var privateDeclaration = forEach(symbol.getDeclarations(), d => (d.flags & NodeFlags.Private) ? d : undefined);
+                    let privateDeclaration = forEach(symbol.getDeclarations(), d => (d.flags & NodeFlags.Private) ? d : undefined);
                     if (privateDeclaration) {
                         return getAncestor(privateDeclaration, SyntaxKind.ClassDeclaration);
                     }
@@ -4310,12 +4311,12 @@ module ts {
                     return undefined;
                 }
 
-                var scope: Node = undefined;
+                let scope: Node = undefined;
 
-                var declarations = symbol.getDeclarations();
+                let declarations = symbol.getDeclarations();
                 if (declarations) {
-                    for (var i = 0, n = declarations.length; i < n; i++) {
-                        var container = getContainerNode(declarations[i]);
+                    for (let declaration of declarations) {
+                        let container = getContainerNode(declaration);
 
                         if (!container) {
                             return undefined;
@@ -4341,7 +4342,7 @@ module ts {
             }
 
             function getPossibleSymbolReferencePositions(sourceFile: SourceFile, symbolName: string, start: number, end: number): number[] {
-                var positions: number[] = [];
+                let positions: number[] = [];
 
                 /// TODO: Cache symbol existence for files to save text search
                 // Also, need to make this work for unicode escapes.
@@ -4351,11 +4352,11 @@ module ts {
                     return positions;
                 }
 
-                var text = sourceFile.text;
-                var sourceLength = text.length;
-                var symbolNameLength = symbolName.length;
+                let text = sourceFile.text;
+                let sourceLength = text.length;
+                let symbolNameLength = symbolName.length;
 
-                var position = text.indexOf(symbolName, start);
+                let position = text.indexOf(symbolName, start);
                 while (position >= 0) {
                     cancellationToken.throwIfCancellationRequested();
 
@@ -4364,7 +4365,7 @@ module ts {
 
                     // We found a match.  Make sure it's not part of a larger word (i.e. the char 
                     // before and after it have to be a non-identifier char).
-                    var endPosition = position + symbolNameLength;
+                    let endPosition = position + symbolNameLength;
 
                     if ((position === 0 || !isIdentifierPart(text.charCodeAt(position - 1), ScriptTarget.Latest)) &&
                         (endPosition === sourceLength || !isIdentifierPart(text.charCodeAt(endPosition), ScriptTarget.Latest))) {
@@ -4378,14 +4379,14 @@ module ts {
             }
 
             function getLabelReferencesInNode(container: Node, targetLabel: Identifier): ReferenceEntry[] {
-                var result: ReferenceEntry[] = [];
-                var sourceFile = container.getSourceFile();
-                var labelName = targetLabel.text;
-                var possiblePositions = getPossibleSymbolReferencePositions(sourceFile, labelName, container.getStart(), container.getEnd());
+                let result: ReferenceEntry[] = [];
+                let sourceFile = container.getSourceFile();
+                let labelName = targetLabel.text;
+                let possiblePositions = getPossibleSymbolReferencePositions(sourceFile, labelName, container.getStart(), container.getEnd());
                 forEach(possiblePositions, position => {
                     cancellationToken.throwIfCancellationRequested();
 
-                    var node = getTouchingWord(sourceFile, position);
+                    let node = getTouchingWord(sourceFile, position);
                     if (!node || node.getWidth() !== labelName.length) {
                         return;
                     }
@@ -4437,19 +4438,19 @@ module ts {
                 findInStrings: boolean,
                 findInComments: boolean,
                 result: ReferenceEntry[]): void {
-                var sourceFile = container.getSourceFile();
-                var tripleSlashDirectivePrefixRegex = /^\/\/\/\s*</
+                let sourceFile = container.getSourceFile();
+                let tripleSlashDirectivePrefixRegex = /^\/\/\/\s*</
 
-                var possiblePositions = getPossibleSymbolReferencePositions(sourceFile, searchText, container.getStart(), container.getEnd());
+                let possiblePositions = getPossibleSymbolReferencePositions(sourceFile, searchText, container.getStart(), container.getEnd());
 
                 if (possiblePositions.length) {
                     // Build the set of symbols to search for, initially it has only the current symbol
-                    var searchSymbols = populateSearchSymbolSet(searchSymbol, searchLocation);
+                    let searchSymbols = populateSearchSymbolSet(searchSymbol, searchLocation);
 
                     forEach(possiblePositions, position => {
                         cancellationToken.throwIfCancellationRequested();
 
-                        var referenceLocation = getTouchingPropertyName(sourceFile, position);
+                        let referenceLocation = getTouchingPropertyName(sourceFile, position);
                         if (!isValidReferencePosition(referenceLocation, searchText)) {
                             // This wasn't the start of a token.  Check to see if it might be a 
                             // match in a comment or string if that's what the caller is asking
@@ -4469,10 +4470,10 @@ module ts {
                             return;
                         }
 
-                        var referenceSymbol = typeInfoResolver.getSymbolAtLocation(referenceLocation);
+                        let referenceSymbol = typeInfoResolver.getSymbolAtLocation(referenceLocation);
                         if (referenceSymbol) {
-                            var referenceSymbolDeclaration = referenceSymbol.valueDeclaration;
-                            var shorthandValueSymbol = typeInfoResolver.getShorthandAssignmentValueSymbol(referenceSymbolDeclaration);
+                            let referenceSymbolDeclaration = referenceSymbol.valueDeclaration;
+                            let shorthandValueSymbol = typeInfoResolver.getShorthandAssignmentValueSymbol(referenceSymbolDeclaration);
                             if (isRelatableToSearchSet(searchSymbols, referenceSymbol, referenceLocation)) {
                                 result.push(getReferenceEntryFromNode(referenceLocation));
                             }
@@ -4490,21 +4491,21 @@ module ts {
                 }
 
                 function isInString(position: number) {
-                    var token = getTokenAtPosition(sourceFile, position);
+                    let token = getTokenAtPosition(sourceFile, position);
                     return token && token.kind === SyntaxKind.StringLiteral && position > token.getStart();
                 }
 
                 function isInComment(position: number) {
-                    var token = getTokenAtPosition(sourceFile, position);
+                    let token = getTokenAtPosition(sourceFile, position);
                     if (token && position < token.getStart()) {
                         // First, we have to see if this position actually landed in a comment.
-                        var commentRanges = getLeadingCommentRanges(sourceFile.text, token.pos);
+                        let commentRanges = getLeadingCommentRanges(sourceFile.text, token.pos);
 
                         // Then we want to make sure that it wasn't in a "///<" directive comment
                         // We don't want to unintentionally update a file name.
                         return forEach(commentRanges, c => {
                             if (c.pos < position && position < c.end) {
-                                var commentText = sourceFile.text.substring(c.pos, c.end);
+                                let commentText = sourceFile.text.substring(c.pos, c.end);
                                 if (!tripleSlashDirectivePrefixRegex.test(commentText)) {
                                     return true;
                                 }
@@ -4517,12 +4518,12 @@ module ts {
             }
 
             function getReferencesForSuperKeyword(superKeyword: Node): ReferenceEntry[] {
-                var searchSpaceNode = getSuperContainer(superKeyword, /*includeFunctions*/ false);
+                let searchSpaceNode = getSuperContainer(superKeyword, /*includeFunctions*/ false);
                 if (!searchSpaceNode) {
                     return undefined;
                 }
                 // Whether 'super' occurs in a static context within a class.
-                var staticFlag = NodeFlags.Static;
+                let staticFlag = NodeFlags.Static;
 
                 switch (searchSpaceNode.kind) {
                     case SyntaxKind.PropertyDeclaration:
@@ -4539,20 +4540,20 @@ module ts {
                         return undefined;
                 }
 
-                var result: ReferenceEntry[] = [];
+                let result: ReferenceEntry[] = [];
 
-                var sourceFile = searchSpaceNode.getSourceFile();
-                var possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "super", searchSpaceNode.getStart(), searchSpaceNode.getEnd());
+                let sourceFile = searchSpaceNode.getSourceFile();
+                let possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "super", searchSpaceNode.getStart(), searchSpaceNode.getEnd());
                 forEach(possiblePositions, position => {
                     cancellationToken.throwIfCancellationRequested();
 
-                    var node = getTouchingWord(sourceFile, position);
+                    let node = getTouchingWord(sourceFile, position);
 
                     if (!node || node.kind !== SyntaxKind.SuperKeyword) {
                         return;
                     }
 
-                    var container = getSuperContainer(node, /*includeFunctions*/ false);
+                    let container = getSuperContainer(node, /*includeFunctions*/ false);
 
                     // If we have a 'super' container, we must have an enclosing class.
                     // Now make sure the owning class is the same as the search-space
@@ -4566,10 +4567,10 @@ module ts {
             }
 
             function getReferencesForThisKeyword(thisOrSuperKeyword: Node, sourceFiles: SourceFile[]): ReferenceEntry[] {
-                var searchSpaceNode = getThisContainer(thisOrSuperKeyword, /* includeArrowFunctions */ false);
+                let searchSpaceNode = getThisContainer(thisOrSuperKeyword, /* includeArrowFunctions */ false);
 
                 // Whether 'this' occurs in a static context within a class.
-                var staticFlag = NodeFlags.Static;
+                let staticFlag = NodeFlags.Static;
 
                 switch (searchSpaceNode.kind) {
                     case SyntaxKind.MethodDeclaration:
@@ -4600,17 +4601,18 @@ module ts {
                         return undefined;
                 }
 
-                var result: ReferenceEntry[] = [];
+                let result: ReferenceEntry[] = [];
 
+                let possiblePositions: number[];
                 if (searchSpaceNode.kind === SyntaxKind.SourceFile) {
                     forEach(sourceFiles, sourceFile => {
-                        var possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "this", sourceFile.getStart(), sourceFile.getEnd());
+                        possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "this", sourceFile.getStart(), sourceFile.getEnd());
                         getThisReferencesInFile(sourceFile, sourceFile, possiblePositions, result);
                     });
                 }
                 else {
-                    var sourceFile = searchSpaceNode.getSourceFile();
-                    var possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "this", searchSpaceNode.getStart(), searchSpaceNode.getEnd());
+                    let sourceFile = searchSpaceNode.getSourceFile();
+                    possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "this", searchSpaceNode.getStart(), searchSpaceNode.getEnd());
                     getThisReferencesInFile(sourceFile, searchSpaceNode, possiblePositions, result);
                 }
 
@@ -4620,12 +4622,12 @@ module ts {
                     forEach(possiblePositions, position => {
                         cancellationToken.throwIfCancellationRequested();
 
-                        var node = getTouchingWord(sourceFile, position);
+                        let node = getTouchingWord(sourceFile, position);
                         if (!node || node.kind !== SyntaxKind.ThisKeyword) {
                             return;
                         }
 
-                        var container = getThisContainer(node, /* includeArrowFunctions */ false);
+                        let container = getThisContainer(node, /* includeArrowFunctions */ false);
 
                         switch (searchSpaceNode.kind) {
                             case SyntaxKind.FunctionExpression:
@@ -4659,7 +4661,7 @@ module ts {
 
             function populateSearchSymbolSet(symbol: Symbol, location: Node): Symbol[] {
                 // The search set contains at least the current symbol
-                var result = [symbol];
+                let result = [symbol];
 
                 // If the symbol is an alias, add what it alaises to the list
                 if (isImportOrExportSpecifierImportSymbol(symbol)) {
@@ -4679,13 +4681,13 @@ module ts {
                      * property name and variable declaration of the identifier.
                      * Like in below example, when querying for all references for an identifier 'name', of the property assignment, the language service
                      * should show both 'name' in 'obj' and 'name' in variable declaration
-                     *      var name = "Foo";
-                     *      var obj = { name };
+                     *      let name = "Foo";
+                     *      let obj = { name };
                      * In order to do that, we will populate the search set with the value symbol of the identifier as a value of the property assignment
                      * so that when matching with potential reference symbol, both symbols from property declaration and variable declaration
                      * will be included correctly.
                      */
-                    var shorthandValueSymbol = typeInfoResolver.getShorthandAssignmentValueSymbol(location.parent);
+                    let shorthandValueSymbol = typeInfoResolver.getShorthandAssignmentValueSymbol(location.parent);
                     if (shorthandValueSymbol) {
                         result.push(shorthandValueSymbol);
                     }
@@ -4723,9 +4725,9 @@ module ts {
 
                 function getPropertySymbolFromTypeReference(typeReference: TypeReferenceNode) {
                     if (typeReference) {
-                        var type = typeInfoResolver.getTypeAtLocation(typeReference);
+                        let type = typeInfoResolver.getTypeAtLocation(typeReference);
                         if (type) {
-                            var propertySymbol = typeInfoResolver.getPropertyOfType(type, propertyName);
+                            let propertySymbol = typeInfoResolver.getPropertyOfType(type, propertyName);
                             if (propertySymbol) {
                                 result.push(propertySymbol);
                             }
@@ -4769,7 +4771,7 @@ module ts {
                     // Finally, try all properties with the same name in any type the containing type extended or implemented, and 
                     // see if any is in the list
                     if (rootSymbol.parent && rootSymbol.parent.flags & (SymbolFlags.Class | SymbolFlags.Interface)) {
-                        var result: Symbol[] = [];
+                        let result: Symbol[] = [];
                         getPropertySymbolsFromBaseTypes(rootSymbol.parent, rootSymbol.getName(), result);
                         return forEach(result, s => searchSymbols.indexOf(s) >= 0);
                     }
@@ -4780,21 +4782,21 @@ module ts {
 
             function getPropertySymbolsFromContextualType(node: Node): Symbol[] {
                 if (isNameOfPropertyAssignment(node)) {
-                    var objectLiteral = <ObjectLiteralExpression>node.parent.parent;
-                    var contextualType = typeInfoResolver.getContextualType(objectLiteral);
-                    var name = (<Identifier>node).text;
+                    let objectLiteral = <ObjectLiteralExpression>node.parent.parent;
+                    let contextualType = typeInfoResolver.getContextualType(objectLiteral);
+                    let name = (<Identifier>node).text;
                     if (contextualType) {
                         if (contextualType.flags & TypeFlags.Union) {
                             // This is a union type, first see if the property we are looking for is a union property (i.e. exists in all types)
                             // if not, search the constituent types for the property
-                            var unionProperty = contextualType.getProperty(name)
+                            let unionProperty = contextualType.getProperty(name)
                             if (unionProperty) {
                                 return [unionProperty];
                             }
                             else {
-                                var result: Symbol[] = [];
+                                let result: Symbol[] = [];
                                 forEach((<UnionType>contextualType).types, t => {
-                                    var symbol = t.getProperty(name);
+                                    let symbol = t.getProperty(name);
                                     if (symbol) {
                                         result.push(symbol);
                                     }
@@ -4803,7 +4805,7 @@ module ts {
                             }
                         }
                         else {
-                            var symbol = contextualType.getProperty(name);
+                            let symbol = contextualType.getProperty(name);
                             if (symbol) {
                                 return [symbol];
                             }
@@ -4822,6 +4824,7 @@ module ts {
               */
             function getIntersectingMeaningFromDeclarations(meaning: SemanticMeaning, declarations: Declaration[]): SemanticMeaning {
                 if (declarations) {
+                    let lastIterationMeaning: SemanticMeaning;
                     do {
                         // The result is order-sensitive, for instance if initialMeaning === Namespace, and declarations = [class, instantiated module]
                         // we need to consider both as they initialMeaning intersects with the module in the namespace space, and the module
@@ -4829,24 +4832,25 @@ module ts {
                         // To achieve that we will keep iterating until the result stabilizes.
 
                         // Remember the last meaning
-                        var lastIterationMeaning = meaning;
+                        lastIterationMeaning = meaning;
 
-                        for (var i = 0, n = declarations.length; i < n; i++) {
-                            var declarationMeaning = getMeaningFromDeclaration(declarations[i]);
+                        for (let declaration of declarations) {
+                            let declarationMeaning = getMeaningFromDeclaration(declaration);
 
                             if (declarationMeaning & meaning) {
                                 meaning |= declarationMeaning;
                             }
                         }
-                    } while (meaning !== lastIterationMeaning);
+                    }
+                    while (meaning !== lastIterationMeaning);
                 }
                 return meaning;
             }
         }
 
         function getReferenceEntryFromNode(node: Node): ReferenceEntry {
-            var start = node.getStart();
-            var end = node.getEnd();
+            let start = node.getStart();
+            let end = node.getEnd();
 
             if (node.kind === SyntaxKind.StringLiteral) {
                 start += 1;
@@ -4866,13 +4870,13 @@ module ts {
                 return true;
             }
 
-            var parent = node.parent;
+            let parent = node.parent;
             if (parent) {
                 if (parent.kind === SyntaxKind.PostfixUnaryExpression || parent.kind === SyntaxKind.PrefixUnaryExpression) {
                     return true;
                 }
                 else if (parent.kind === SyntaxKind.BinaryExpression && (<BinaryExpression>parent).left === node) {
-                    var operator = (<BinaryExpression>parent).operatorToken.kind;
+                    let operator = (<BinaryExpression>parent).operatorToken.kind;
                     return SyntaxKind.FirstAssignment <= operator && operator <= SyntaxKind.LastAssignment;
                 }
             }
@@ -4894,9 +4898,9 @@ module ts {
         function getEmitOutput(fileName: string): EmitOutput {
             synchronizeHostData();
 
-            var sourceFile = getValidSourceFile(fileName);
+            let sourceFile = getValidSourceFile(fileName);
 
-            var outputFiles: OutputFile[] = [];
+            let outputFiles: OutputFile[] = [];
 
             function writeFile(fileName: string, data: string, writeByteOrderMark: boolean) {
                 outputFiles.push({
@@ -4906,7 +4910,7 @@ module ts {
                 });
             }
 
-            var emitOutput = program.emit(sourceFile, writeFile);
+            let emitOutput = program.emit(sourceFile, writeFile);
 
             return {
                 outputFiles,
@@ -4983,8 +4987,8 @@ module ts {
         }
 
         function isNamespaceReference(node: Node): boolean {
-            var root = node;
-            var isLastClause = true;
+            let root = node;
+            let isLastClause = true;
             if (root.parent.kind === SyntaxKind.QualifiedName) {
                 while (root.parent && root.parent.kind === SyntaxKind.QualifiedName)
                     root = root.parent;
@@ -5045,7 +5049,7 @@ module ts {
         function getSignatureHelpItems(fileName: string, position: number): SignatureHelpItems {
             synchronizeHostData();
 
-            var sourceFile = getValidSourceFile(fileName);
+            let sourceFile = getValidSourceFile(fileName);
 
             return SignatureHelp.getSignatureHelpItems(sourceFile, position, typeInfoResolver, cancellationToken);
         }
@@ -5056,10 +5060,10 @@ module ts {
         }
 
         function getNameOrDottedNameSpan(fileName: string, startPos: number, endPos: number): TextSpan {
-            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
+            let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
 
             // Get node at the location
-            var node = getTouchingPropertyName(sourceFile, startPos);
+            let node = getTouchingPropertyName(sourceFile, startPos);
 
             if (!node) {
                 return;
@@ -5082,7 +5086,7 @@ module ts {
                     return;
             }
 
-            var nodeForStartPos = node;
+            let nodeForStartPos = node;
             while (true) {
                 if (isRightSideOfPropertyAccess(nodeForStartPos) || isRightSideOfQualifiedName(nodeForStartPos)) {
                     // If on the span is in right side of the the property or qualified name, return the span from the qualified name pos to end of this node
@@ -5113,13 +5117,13 @@ module ts {
 
         function getBreakpointStatementAtPosition(fileName: string, position: number) {
             // doesn't use compiler - no need to synchronize with host
-            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
+            let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
 
             return BreakpointResolver.spanInSourceFileAtLocation(sourceFile, position);
         }
 
         function getNavigationBarItems(fileName: string): NavigationBarItem[]{
-            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
+            let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
 
             return NavigationBar.getNavigationBarItems(sourceFile);
         }
@@ -5127,15 +5131,15 @@ module ts {
         function getSemanticClassifications(fileName: string, span: TextSpan): ClassifiedSpan[] {
             synchronizeHostData();
 
-            var sourceFile = getValidSourceFile(fileName);
+            let sourceFile = getValidSourceFile(fileName);
 
-            var result: ClassifiedSpan[] = [];
+            let result: ClassifiedSpan[] = [];
             processNode(sourceFile);
 
             return result;
 
             function classifySymbol(symbol: Symbol, meaningAtPosition: SemanticMeaning) {
-                var flags = symbol.getFlags();
+                let flags = symbol.getFlags();
 
                 if (flags & SymbolFlags.Class) {
                     return ClassificationTypeNames.className;
@@ -5180,9 +5184,9 @@ module ts {
                 // Only walk into nodes that intersect the requested span.
                 if (node && textSpanIntersectsWith(span, node.getStart(), node.getWidth())) {
                     if (node.kind === SyntaxKind.Identifier && node.getWidth() > 0) {
-                        var symbol = typeInfoResolver.getSymbolAtLocation(node);
+                        let symbol = typeInfoResolver.getSymbolAtLocation(node);
                         if (symbol) {
-                            var type = classifySymbol(symbol, getMeaningFromLocation(node));
+                            let type = classifySymbol(symbol, getMeaningFromLocation(node));
                             if (type) {
                                 result.push({
                                     textSpan: createTextSpan(node.getStart(), node.getWidth()),
@@ -5199,19 +5203,19 @@ module ts {
 
         function getSyntacticClassifications(fileName: string, span: TextSpan): ClassifiedSpan[] {
             // doesn't use compiler - no need to synchronize with host
-            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
+            let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
 
             // Make a scanner we can get trivia from.
-            var triviaScanner = createScanner(ScriptTarget.Latest, /*skipTrivia:*/ false, sourceFile.text);
-            var mergeConflictScanner = createScanner(ScriptTarget.Latest, /*skipTrivia:*/ false, sourceFile.text);
+            let triviaScanner = createScanner(ScriptTarget.Latest, /*skipTrivia:*/ false, sourceFile.text);
+            let mergeConflictScanner = createScanner(ScriptTarget.Latest, /*skipTrivia:*/ false, sourceFile.text);
 
-            var result: ClassifiedSpan[] = [];
+            let result: ClassifiedSpan[] = [];
             processElement(sourceFile);
 
             return result;
 
             function classifyLeadingTrivia(token: Node): void {
-                var tokenStart = skipTrivia(sourceFile.text, token.pos, /*stopAfterLineBreak:*/ false);
+                let tokenStart = skipTrivia(sourceFile.text, token.pos, /*stopAfterLineBreak:*/ false);
                 if (tokenStart === token.pos) {
                     return;
                 }
@@ -5219,10 +5223,10 @@ module ts {
                 // token has trivia.  Classify them appropriately.
                 triviaScanner.setTextPos(token.pos);
                 while (true) {
-                    var start = triviaScanner.getTextPos();
-                    var kind = triviaScanner.scan();
-                    var end = triviaScanner.getTextPos();
-                    var width = end - start;
+                    let start = triviaScanner.getTextPos();
+                    let kind = triviaScanner.scan();
+                    let end = triviaScanner.getTextPos();
+                    let width = end - start;
 
                     if (textSpanIntersectsWith(span, start, width)) {
                         if (!isTrivia(kind)) {
@@ -5239,8 +5243,8 @@ module ts {
                         }
 
                         if (kind === SyntaxKind.ConflictMarkerTrivia) {
-                            var text = sourceFile.text;
-                            var ch = text.charCodeAt(start);
+                            let text = sourceFile.text;
+                            let ch = text.charCodeAt(start);
 
                             // for the <<<<<<< and >>>>>>> markers, we just add them in as comments
                             // in the classification stream.
@@ -5282,11 +5286,11 @@ module ts {
             }
 
             function classifyDisabledCodeToken() {
-                var start = mergeConflictScanner.getTextPos();
-                var tokenKind = mergeConflictScanner.scan();
-                var end = mergeConflictScanner.getTextPos();
+                let start = mergeConflictScanner.getTextPos();
+                let tokenKind = mergeConflictScanner.scan();
+                let end = mergeConflictScanner.getTextPos();
 
-                var type = classifyTokenType(tokenKind);
+                let type = classifyTokenType(tokenKind);
                 if (type) {
                     result.push({
                         textSpan: createTextSpanFromBounds(start, end),
@@ -5299,7 +5303,7 @@ module ts {
                 classifyLeadingTrivia(token);
 
                 if (token.getWidth() > 0) {
-                    var type = classifyTokenType(token.kind, token);
+                    let type = classifyTokenType(token.kind, token);
                     if (type) {
                         result.push({
                             textSpan: createTextSpan(token.getStart(), token.getWidth()),
@@ -5400,9 +5404,8 @@ module ts {
             function processElement(element: Node) {
                 // Ignore nodes that don't intersect the original span to classify.
                 if (textSpanIntersectsWith(span, element.getFullStart(), element.getFullWidth())) {
-                    var children = element.getChildren();
-                    for (var i = 0, n = children.length; i < n; i++) {
-                        var child = children[i];
+                    let children = element.getChildren();
+                    for (let child of children) {
                         if (isToken(child)) {
                             classifyToken(child);
                         }
@@ -5417,30 +5420,28 @@ module ts {
 
         function getOutliningSpans(fileName: string): OutliningSpan[] {
             // doesn't use compiler - no need to synchronize with host
-            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
+            let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
             return OutliningElementsCollector.collectElements(sourceFile);
         }
 
         function getBraceMatchingAtPosition(fileName: string, position: number) {
-            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
-            var result: TextSpan[] = [];
+            let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
+            let result: TextSpan[] = [];
 
-            var token = getTouchingToken(sourceFile, position);
+            let token = getTouchingToken(sourceFile, position);
 
             if (token.getStart(sourceFile) === position) {
-                var matchKind = getMatchingTokenKind(token);
+                let matchKind = getMatchingTokenKind(token);
 
                 // Ensure that there is a corresponding token to match ours.
                 if (matchKind) {
-                    var parentElement = token.parent;
-
-                    var childNodes = parentElement.getChildren(sourceFile);
-                    for (var i = 0, n = childNodes.length; i < n; i++) {
-                        var current = childNodes[i];
+                    let parentElement = token.parent;
 
+                    let childNodes = parentElement.getChildren(sourceFile);
+                    for (let current of childNodes) {
                         if (current.kind === matchKind) {
-                            var range1 = createTextSpan(token.getStart(sourceFile), token.getWidth(sourceFile));
-                            var range2 = createTextSpan(current.getStart(sourceFile), current.getWidth(sourceFile));
+                            let range1 = createTextSpan(token.getStart(sourceFile), token.getWidth(sourceFile));
+                            let range2 = createTextSpan(current.getStart(sourceFile), current.getWidth(sourceFile));
 
                             // We want to order the braces when we return the result.
                             if (range1.start < range2.start) {
@@ -5475,30 +5476,30 @@ module ts {
         }
 
         function getIndentationAtPosition(fileName: string, position: number, editorOptions: EditorOptions) {
-            var start = new Date().getTime();
-            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
+            let start = new Date().getTime();
+            let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
             log("getIndentationAtPosition: getCurrentSourceFile: " + (new Date().getTime() - start));
 
-            var start = new Date().getTime();
+            start = new Date().getTime();
 
-            var result = formatting.SmartIndenter.getIndentation(position, sourceFile, editorOptions);
+            let result = formatting.SmartIndenter.getIndentation(position, sourceFile, editorOptions);
             log("getIndentationAtPosition: computeIndentation  : " + (new Date().getTime() - start));
 
             return result;
         }
 
         function getFormattingEditsForRange(fileName: string, start: number, end: number, options: FormatCodeOptions): TextChange[] {
-            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
+            let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
             return formatting.formatSelection(start, end, sourceFile, getRuleProvider(options), options);
         }
 
         function getFormattingEditsForDocument(fileName: string, options: FormatCodeOptions): TextChange[] {
-            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
+            let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
             return formatting.formatDocument(sourceFile, getRuleProvider(options), options);
         }
 
         function getFormattingEditsAfterKeystroke(fileName: string, position: number, key: string, options: FormatCodeOptions): TextChange[] {
-            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
+            let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
 
             if (key === "}") {
                 return formatting.formatOnClosingCurly(position, sourceFile, getRuleProvider(options), options);
@@ -5522,17 +5523,17 @@ module ts {
             // anything away.
             synchronizeHostData();
 
-            var sourceFile = getValidSourceFile(fileName);
+            let sourceFile = getValidSourceFile(fileName);
 
             cancellationToken.throwIfCancellationRequested();
 
-            var fileContents = sourceFile.text;
-            var result: TodoComment[] = [];
+            let fileContents = sourceFile.text;
+            let result: TodoComment[] = [];
 
             if (descriptors.length > 0) {
-                var regExp = getTodoCommentsRegExp();
+                let regExp = getTodoCommentsRegExp();
 
-                var matchArray: RegExpExecArray;
+                let matchArray: RegExpExecArray;
                 while (matchArray = regExp.exec(fileContents)) {
                     cancellationToken.throwIfCancellationRequested();
 
@@ -5553,21 +5554,21 @@ module ts {
                     //
                     //  i.e. 'undefined' in position 3 above means TODO(jason) didn't match.
                     //       "hack"      in position 4 means HACK did match.
-                    var firstDescriptorCaptureIndex = 3;
+                    let firstDescriptorCaptureIndex = 3;
                     Debug.assert(matchArray.length === descriptors.length + firstDescriptorCaptureIndex);
 
-                    var preamble = matchArray[1];
-                    var matchPosition = matchArray.index + preamble.length;
+                    let preamble = matchArray[1];
+                    let matchPosition = matchArray.index + preamble.length;
 
                     // OK, we have found a match in the file.  This is only an acceptable match if
                     // it is contained within a comment.
-                    var token = getTokenAtPosition(sourceFile, matchPosition);
+                    let token = getTokenAtPosition(sourceFile, matchPosition);
                     if (!isInsideComment(sourceFile, token, matchPosition)) {
                         continue;
                     }
 
-                    var descriptor: TodoCommentDescriptor = undefined;
-                    for (var i = 0, n = descriptors.length; i < n; i++) {
+                    let descriptor: TodoCommentDescriptor = undefined;
+                    for (let i = 0, n = descriptors.length; i < n; i++) {
                         if (matchArray[i + firstDescriptorCaptureIndex]) {
                             descriptor = descriptors[i];
                         }
@@ -5580,7 +5581,7 @@ module ts {
                         continue;
                     }
 
-                    var message = matchArray[2];
+                    let message = matchArray[2];
                     result.push({
                         descriptor: descriptor,
                         message: message,
@@ -5611,14 +5612,14 @@ module ts {
                 //
                 // The following three regexps are used to match the start of the text up to the TODO
                 // comment portion.
-                var singleLineCommentStart = /(?:\/\/+\s*)/.source;
-                var multiLineCommentStart = /(?:\/\*+\s*)/.source;
-                var anyNumberOfSpacesAndAsterixesAtStartOfLine = /(?:^(?:\s|\*)*)/.source;
+                let singleLineCommentStart = /(?:\/\/+\s*)/.source;
+                let multiLineCommentStart = /(?:\/\*+\s*)/.source;
+                let anyNumberOfSpacesAndAsterixesAtStartOfLine = /(?:^(?:\s|\*)*)/.source;
 
                 // Match any of the above three TODO comment start regexps.
                 // Note that the outermost group *is* a capture group.  We want to capture the preamble
                 // so that we can determine the starting position of the TODO comment match.
-                var preamble = "(" + anyNumberOfSpacesAndAsterixesAtStartOfLine + "|" + singleLineCommentStart + "|" + multiLineCommentStart + ")";
+                let preamble = "(" + anyNumberOfSpacesAndAsterixesAtStartOfLine + "|" + singleLineCommentStart + "|" + multiLineCommentStart + ")";
 
                 // Takes the descriptors and forms a regexp that matches them as if they were literals.
                 // For example, if the descriptors are "TODO(jason)" and "HACK", then this will be:
@@ -5628,17 +5629,17 @@ module ts {
                 // Note that the outermost group is *not* a capture group, but the innermost groups
                 // *are* capture groups.  By capturing the inner literals we can determine after 
                 // matching which descriptor we are dealing with.
-                var literals = "(?:" + map(descriptors, d => "(" + escapeRegExp(d.text) + ")").join("|") + ")";
+                let literals = "(?:" + map(descriptors, d => "(" + escapeRegExp(d.text) + ")").join("|") + ")";
 
                 // After matching a descriptor literal, the following regexp matches the rest of the 
                 // text up to the end of the line (or */).
-                var endOfLineOrEndOfComment = /(?:$|\*\/)/.source
-                var messageRemainder = /(?:.*?)/.source
+                let endOfLineOrEndOfComment = /(?:$|\*\/)/.source
+                let messageRemainder = /(?:.*?)/.source
 
                 // This is the portion of the match we'll return as part of the TODO comment result. We
                 // match the literal portion up to the end of the line or end of comment.
-                var messagePortion = "(" + literals + messageRemainder + ")";
-                var regExpString = preamble + messagePortion + endOfLineOrEndOfComment;
+                let messagePortion = "(" + literals + messageRemainder + ")";
+                let regExpString = preamble + messagePortion + endOfLineOrEndOfComment;
 
                 // The final regexp will look like this:
                 // /((?:\/\/+\s*)|(?:\/\*+\s*)|(?:^(?:\s|\*)*))((?:(TODO\(jason\))|(HACK))(?:.*?))(?:$|\*\/)/gim
@@ -5664,30 +5665,30 @@ module ts {
         function getRenameInfo(fileName: string, position: number): RenameInfo {
             synchronizeHostData();
 
-            var sourceFile = getValidSourceFile(fileName);
+            let sourceFile = getValidSourceFile(fileName);
 
-            var node = getTouchingWord(sourceFile, position);
+            let node = getTouchingWord(sourceFile, position);
 
             // Can only rename an identifier.
             if (node && node.kind === SyntaxKind.Identifier) {
-                var symbol = typeInfoResolver.getSymbolAtLocation(node);
+                let symbol = typeInfoResolver.getSymbolAtLocation(node);
 
                 // Only allow a symbol to be renamed if it actually has at least one declaration.
                 if (symbol) {
-                    var declarations = symbol.getDeclarations();
+                    let declarations = symbol.getDeclarations();
                     if (declarations && declarations.length > 0) {
                         // Disallow rename for elements that are defined in the standard TypeScript library.
-                        var defaultLibFileName = host.getDefaultLibFileName(host.getCompilationSettings());
+                        let defaultLibFileName = host.getDefaultLibFileName(host.getCompilationSettings());
                         if (defaultLibFileName) {
-                            for (var i = 0; i < declarations.length; i++) {
-                                var sourceFile = declarations[i].getSourceFile();
+                            for (let current of declarations) {
+                                let sourceFile = current.getSourceFile();
                                 if (sourceFile && getCanonicalFileName(ts.normalizePath(sourceFile.fileName)) === getCanonicalFileName(ts.normalizePath(defaultLibFileName))) {
                                     return getRenameInfoError(getLocaleSpecificMessage(Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library.key));
                                 }
                             }
                         }
 
-                        var kind = getSymbolKind(symbol, typeInfoResolver, node);
+                        let kind = getSymbolKind(symbol, typeInfoResolver, node);
                         if (kind) {
                             return {
                                 canRename: true,
@@ -5762,7 +5763,7 @@ module ts {
     }
 
     function initializeNameTable(sourceFile: SourceFile): void {
-        var nameTable: Map<string> = {};
+        let nameTable: Map<string> = {};
 
         walk(sourceFile);
         sourceFile.nameTable = nameTable;
@@ -5800,13 +5801,13 @@ module ts {
 
     /// Classifier
     export function createClassifier(): Classifier {
-        var scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ false);
+        let scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ false);
 
         /// We do not have a full parser support to know when we should parse a regex or not
         /// If we consider every slash token to be a regex, we could be missing cases like "1/2/3", where
         /// we have a series of divide operator. this list allows us to be more accurate by ruling out 
         /// locations where a regexp cannot exist.
-        var noRegexTable: boolean[] = [];
+        let noRegexTable: boolean[] = [];
         noRegexTable[SyntaxKind.Identifier] = true;
         noRegexTable[SyntaxKind.StringLiteral] = true;
         noRegexTable[SyntaxKind.NumericLiteral] = true;
@@ -5840,7 +5841,7 @@ module ts {
         //
         //     Where on the second line, you will get the 'return' keyword,
         //     a string literal, and a template end consisting of '} } `'.
-        var templateStack: SyntaxKind[] = [];
+        let templateStack: SyntaxKind[] = [];
 
         function isAccessibilityModifier(kind: SyntaxKind) {
             switch (kind) {
@@ -5879,9 +5880,9 @@ module ts {
         // If there is a syntactic classifier ('syntacticClassifierAbsent' is false),
         // we will be more conservative in order to avoid conflicting with the syntactic classifier.
         function getClassificationsForLine(text: string, lexState: EndOfLineState, syntacticClassifierAbsent: boolean): ClassificationResult {
-            var offset = 0;
-            var token = SyntaxKind.Unknown;
-            var lastNonTriviaToken = SyntaxKind.Unknown;
+            let offset = 0;
+            let token = SyntaxKind.Unknown;
+            let lastNonTriviaToken = SyntaxKind.Unknown;
 
             // Empty out the template stack for reuse.
             while (templateStack.length > 0) {
@@ -5921,7 +5922,7 @@ module ts {
 
             scanner.setText(text);
 
-            var result: ClassificationResult = {
+            let result: ClassificationResult = {
                 finalLexState: EndOfLineState.Start,
                 entries: []
             };
@@ -5945,7 +5946,7 @@ module ts {
             // In order to determine if the user is potentially typing something generic, we use a 
             // weak heuristic where we track < and > tokens.  It's a weak heuristic, but should
             // work well enough in practice.
-            var angleBracketStack = 0;
+            let angleBracketStack = 0;
 
             do {
                 token = scanner.scan();
@@ -6003,7 +6004,7 @@ module ts {
                         // If we don't have anything on the template stack,
                         // then we aren't trying to keep track of a previously scanned template head.
                         if (templateStack.length > 0) {
-                            var lastTemplateStackToken = lastOrUndefined(templateStack);
+                            let lastTemplateStackToken = lastOrUndefined(templateStack);
 
                             if (lastTemplateStackToken === SyntaxKind.TemplateHead) {
                                 token = scanner.reScanTemplateToken();
@@ -6033,26 +6034,26 @@ module ts {
             return result;
 
             function processToken(): void {
-                var start = scanner.getTokenPos();
-                var end = scanner.getTextPos();
+                let start = scanner.getTokenPos();
+                let end = scanner.getTextPos();
 
                 addResult(end - start, classFromKind(token));
 
                 if (end >= text.length) {
                     if (token === SyntaxKind.StringLiteral) {
                         // Check to see if we finished up on a multiline string literal.
-                        var tokenText = scanner.getTokenText();
+                        let tokenText = scanner.getTokenText();
                         if (scanner.isUnterminated()) {
-                            var lastCharIndex = tokenText.length - 1;
+                            let lastCharIndex = tokenText.length - 1;
 
-                            var numBackslashes = 0;
+                            let numBackslashes = 0;
                             while (tokenText.charCodeAt(lastCharIndex - numBackslashes) === CharacterCodes.backslash) {
                                 numBackslashes++;
                             }
 
                             // If we have an odd number of backslashes, then the multiline string is unclosed
                             if (numBackslashes & 1) {
-                                var quoteChar = tokenText.charCodeAt(0);
+                                let quoteChar = tokenText.charCodeAt(0);
                                 result.finalLexState = quoteChar === CharacterCodes.doubleQuote
                                     ? EndOfLineState.InDoubleQuoteStringLiteral
                                     : EndOfLineState.InSingleQuoteStringLiteral;
@@ -6197,7 +6198,7 @@ module ts {
     }
 
     /// getDefaultLibraryFilePath
-    declare var __dirname: string;
+    declare let __dirname: string;
     
     /**
       * Get the path of the default library file (lib.d.ts) as distributed with the typescript
@@ -6218,7 +6219,7 @@ module ts {
             getNodeConstructor: kind => {
                 function Node() {
                 }
-                var proto = kind === SyntaxKind.SourceFile ? new SourceFileObject() : new NodeObject();
+                let proto = kind === SyntaxKind.SourceFile ? new SourceFileObject() : new NodeObject();
                 proto.kind = kind;
                 proto.pos = 0;
                 proto.end = 0;
diff --git a/src/services/signatureHelp.ts b/src/services/signatureHelp.ts
index 6f4f38aa736..419d4819ba6 100644
--- a/src/services/signatureHelp.ts
+++ b/src/services/signatureHelp.ts
@@ -8,15 +8,15 @@ module ts.SignatureHelp {
     // will return the generic identifier that started the expression (e.g. "foo" in "foo<any, |"). It is then up to the caller to ensure that this is a valid generic expression through 
     // looking up the type. The method will also keep track of the parameter index inside the expression.
     //public static isInPartiallyWrittenTypeArgumentList(syntaxTree: TypeScript.SyntaxTree, position: number): any {
-    //    var token = Syntax.findTokenOnLeft(syntaxTree.sourceUnit(), position, /*includeSkippedTokens*/ true);
+    //    let token = Syntax.findTokenOnLeft(syntaxTree.sourceUnit(), position, /*includeSkippedTokens*/ true);
 
     //    if (token && TypeScript.Syntax.hasAncestorOfKind(token, TypeScript.SyntaxKind.TypeParameterList)) {
     //        // We are in the wrong generic list. bail out
     //        return null;
     //    }
 
-    //    var stack = 0;
-    //    var argumentIndex = 0;
+    //    let stack = 0;
+    //    let argumentIndex = 0;
 
     //    whileLoop:
     //    while (token) {
@@ -24,7 +24,7 @@ module ts.SignatureHelp {
     //            case TypeScript.SyntaxKind.LessThanToken:
     //                if (stack === 0) {
     //                    // Found the beginning of the generic argument expression
-    //                    var lessThanToken = token;
+    //                    let lessThanToken = token;
     //                    token = previousToken(token, /*includeSkippedTokens*/ true);
     //                    if (!token || token.kind() !== TypeScript.SyntaxKind.IdentifierName) {
     //                        break whileLoop;
@@ -64,7 +64,7 @@ module ts.SignatureHelp {
 
     //            case TypeScript.SyntaxKind.CloseBraceToken:
     //                // This can be object type, skip untill we find the matching open brace token
-    //                var unmatchedOpenBraceTokens = 0;
+    //                let unmatchedOpenBraceTokens = 0;
 
     //                // Skip untill the matching open brace token
     //                token = SignatureInfoHelpers.moveBackUpTillMatchingTokenKind(token, TypeScript.SyntaxKind.CloseBraceToken, TypeScript.SyntaxKind.OpenBraceToken);
@@ -135,7 +135,7 @@ module ts.SignatureHelp {
     //    // Skip the current token
     //    token = previousToken(token, /*includeSkippedTokens*/ true);
 
-    //    var stack = 0;
+    //    let stack = 0;
 
     //    while (token) {
     //        if (token.kind() === matchingTokenKind) {
@@ -162,7 +162,7 @@ module ts.SignatureHelp {
     //    // Did not find matching token
     //    return null;
     //}
-    var emptyArray: any[] = [];
+    let emptyArray: any[] = [];
 
     const enum ArgumentListKind {
         TypeArguments,
@@ -180,13 +180,13 @@ module ts.SignatureHelp {
 
     export function getSignatureHelpItems(sourceFile: SourceFile, position: number, typeInfoResolver: TypeChecker, cancellationToken: CancellationTokenObject): SignatureHelpItems {
         // Decide whether to show signature help
-        var startingToken = findTokenOnLeftOfPosition(sourceFile, position);
+        let startingToken = findTokenOnLeftOfPosition(sourceFile, position);
         if (!startingToken) {
             // We are at the beginning of the file
             return undefined;
         }
 
-        var argumentInfo = getContainingArgumentInfo(startingToken);
+        let argumentInfo = getContainingArgumentInfo(startingToken);
         cancellationToken.throwIfCancellationRequested();
 
         // Semantic filtering of signature help
@@ -194,9 +194,9 @@ module ts.SignatureHelp {
             return undefined;
         }
 
-        var call = argumentInfo.invocation;
-        var candidates = <Signature[]>[];
-        var resolvedSignature = typeInfoResolver.getResolvedSignature(call, candidates);
+        let call = argumentInfo.invocation;
+        let candidates = <Signature[]>[];
+        let resolvedSignature = typeInfoResolver.getResolvedSignature(call, candidates);
         cancellationToken.throwIfCancellationRequested();
 
         if (!candidates.length) {
@@ -211,7 +211,7 @@ module ts.SignatureHelp {
          */
         function getImmediatelyContainingArgumentInfo(node: Node): ArgumentListInfo {
             if (node.parent.kind === SyntaxKind.CallExpression || node.parent.kind === SyntaxKind.NewExpression) {
-                var callExpression = <CallExpression>node.parent;
+                let callExpression = <CallExpression>node.parent;
                 // There are 3 cases to handle:
                 //   1. The token introduces a list, and should begin a sig help session
                 //   2. The token is either not associated with a list, or ends a list, so the session should end
@@ -230,15 +230,15 @@ module ts.SignatureHelp {
                     node.kind === SyntaxKind.OpenParenToken) {
                     // Find the list that starts right *after* the < or ( token.
                     // If the user has just opened a list, consider this item 0.
-                    var list = getChildListThatStartsWithOpenerToken(callExpression, node, sourceFile);
-                    var isTypeArgList = callExpression.typeArguments && callExpression.typeArguments.pos === list.pos;
+                    let list = getChildListThatStartsWithOpenerToken(callExpression, node, sourceFile);
+                    let isTypeArgList = callExpression.typeArguments && callExpression.typeArguments.pos === list.pos;
                     Debug.assert(list !== undefined);
                     return {
                         kind: isTypeArgList ? ArgumentListKind.TypeArguments : ArgumentListKind.CallArguments,
                         invocation: callExpression,
                         argumentsSpan: getApplicableSpanForArguments(list),
                         argumentIndex: 0,
-                        argumentCount: getCommaBasedArgCount(list)
+                        argumentCount: getArgumentCount(list)
                     };
                 }
 
@@ -248,25 +248,16 @@ module ts.SignatureHelp {
                 //   - Between the type arguments and the arguments (greater than token)
                 //   - On the target of the call (parent.func)
                 //   - On the 'new' keyword in a 'new' expression
-                var listItemInfo = findListItemInfo(node);
+                let listItemInfo = findListItemInfo(node);
                 if (listItemInfo) {
-                    var list = listItemInfo.list;
-                    var isTypeArgList = callExpression.typeArguments && callExpression.typeArguments.pos === list.pos;
+                    let list = listItemInfo.list;
+                    let isTypeArgList = callExpression.typeArguments && callExpression.typeArguments.pos === list.pos;
 
-                    // The listItemIndex we got back includes commas. Our goal is to return the index of the proper
-                    // item (not including commas). Here are some examples:
-                    //    1. foo(a, b, c #) -> the listItemIndex is 4, we want to return 2
-                    //    2. foo(a, b, # c) -> listItemIndex is 3, we want to return 2
-                    //    3. foo(#a) -> listItemIndex is 0, we want to return 0
-                    //
-                    // In general, we want to subtract the number of commas before the current index.
-                    // But if we are on a comma, we also want to pretend we are on the argument *following*
-                    // the comma. That amounts to taking the ceiling of half the index.
-                    var argumentIndex = (listItemInfo.listItemIndex + 1) >> 1;
+                    let argumentIndex = getArgumentIndex(list, node);
+                    let argumentCount = getArgumentCount(list);
 
-                    var argumentCount = getCommaBasedArgCount(list);
-
-                    Debug.assert(argumentIndex === 0 || argumentIndex < argumentCount, `argumentCount < argumentIndex, ${argumentCount} < ${argumentIndex}`); 
+                    Debug.assert(argumentIndex === 0 || argumentIndex < argumentCount,
+                        `argumentCount < argumentIndex, ${argumentCount} < ${argumentIndex}`); 
 
                     return {
                         kind: isTypeArgList ? ArgumentListKind.TypeArguments : ArgumentListKind.CallArguments,
@@ -285,18 +276,18 @@ module ts.SignatureHelp {
                 }
             }
             else if (node.kind === SyntaxKind.TemplateHead && node.parent.parent.kind === SyntaxKind.TaggedTemplateExpression) {
-                var templateExpression = <TemplateExpression>node.parent;
-                var tagExpression = <TaggedTemplateExpression>templateExpression.parent;
+                let templateExpression = <TemplateExpression>node.parent;
+                let tagExpression = <TaggedTemplateExpression>templateExpression.parent;
                 Debug.assert(templateExpression.kind === SyntaxKind.TemplateExpression);
 
-                var argumentIndex = isInsideTemplateLiteral(<LiteralExpression>node, position) ? 0 : 1;
+                let argumentIndex = isInsideTemplateLiteral(<LiteralExpression>node, position) ? 0 : 1;
 
                 return getArgumentListInfoForTemplate(tagExpression, argumentIndex);
             }
             else if (node.parent.kind === SyntaxKind.TemplateSpan && node.parent.parent.parent.kind === SyntaxKind.TaggedTemplateExpression) {
-                var templateSpan = <TemplateSpan>node.parent;
-                var templateExpression = <TemplateExpression>templateSpan.parent;
-                var tagExpression = <TaggedTemplateExpression>templateExpression.parent;
+                let templateSpan = <TemplateSpan>node.parent;
+                let templateExpression = <TemplateExpression>templateSpan.parent;
+                let tagExpression = <TaggedTemplateExpression>templateExpression.parent;
                 Debug.assert(templateExpression.kind === SyntaxKind.TemplateExpression);
 
                 // If we're just after a template tail, don't show signature help.
@@ -304,8 +295,8 @@ module ts.SignatureHelp {
                     return undefined;
                 }
 
-                var spanIndex = templateExpression.templateSpans.indexOf(templateSpan);
-                var argumentIndex = getArgumentIndexForTemplatePiece(spanIndex, node);
+                let spanIndex = templateExpression.templateSpans.indexOf(templateSpan);
+                let argumentIndex = getArgumentIndexForTemplatePiece(spanIndex, node);
 
                 return getArgumentListInfoForTemplate(tagExpression, argumentIndex);
             }
@@ -313,12 +304,52 @@ module ts.SignatureHelp {
             return undefined;
         }
 
-        function getCommaBasedArgCount(argumentsList: Node) {
-            // The number of arguments is the number of commas plus one, unless the list
-            // is completely empty, in which case there are 0 arguments.
-            return argumentsList.getChildCount() === 0
-                ? 0
-                : 1 + countWhere(argumentsList.getChildren(), arg => arg.kind === SyntaxKind.CommaToken);
+        function getArgumentIndex(argumentsList: Node, node: Node) {
+            // The list we got back can include commas.  In the presence of errors it may 
+            // also just have nodes without commas.  For example "Foo(a b c)" will have 3 
+            // args without commas.   We want to find what index we're at.  So we count
+            // forward until we hit ourselves, only incrementing the index if it isn't a
+            // comma.
+            //
+            // Note: the subtlety around trailing commas (in getArgumentCount) does not apply
+            // here.  That's because we're only walking forward until we hit the node we're
+            // on.  In that case, even if we're after the trailing comma, we'll still see
+            // that trailing comma in the list, and we'll have generated the appropriate
+            // arg index.
+            let argumentIndex = 0;
+            let listChildren = argumentsList.getChildren();
+            for (let child of listChildren) {
+                if (child === node) {
+                    break;
+                }
+                if (child.kind !== SyntaxKind.CommaToken) {
+                    argumentIndex++;
+                }
+            }
+
+            return argumentIndex;
+        }
+
+        function getArgumentCount(argumentsList: Node) {
+            // The argument count for a list is normally the number of non-comma children it has.
+            // For example, if you have "Foo(a,b)" then there will be three children of the arg
+            // list 'a' '<comma>' 'b'.  So, in this case the arg count will be 2.  However, there
+            // is a small subtlety.  If you have  "Foo(a,)", then the child list will just have
+            // 'a' '<comma>'.  So, in the case where the last child is a comma, we increase the
+            // arg count by one to compensate.
+            //
+            // Note: this subtlety only applies to the last comma.  If you had "Foo(a,,"  then 
+            // we'll have:  'a' '<comma>' '<missing>' 
+            // That will give us 2 non-commas.  We then add one for the last comma, givin us an
+            // arg count of 3.
+            let listChildren = argumentsList.getChildren();
+
+            let argumentCount = countWhere(listChildren, arg => arg.kind !== SyntaxKind.CommaToken);
+            if (listChildren.length > 0 && lastOrUndefined(listChildren).kind === SyntaxKind.CommaToken) {
+                argumentCount++;
+            }
+
+            return argumentCount;
         }
 
         // spanIndex is either the index for a given template span.
@@ -347,7 +378,7 @@ module ts.SignatureHelp {
 
         function getArgumentListInfoForTemplate(tagExpression: TaggedTemplateExpression, argumentIndex: number): ArgumentListInfo {
             // argumentCount is either 1 or (numSpans + 1) to account for the template strings array argument.
-            var argumentCount = tagExpression.template.kind === SyntaxKind.NoSubstitutionTemplateLiteral
+            let argumentCount = tagExpression.template.kind === SyntaxKind.NoSubstitutionTemplateLiteral
                 ? 1
                 : (<TemplateExpression>tagExpression.template).templateSpans.length + 1;
 
@@ -371,15 +402,15 @@ module ts.SignatureHelp {
             //
             // The applicable span is from the first bar to the second bar (inclusive,
             // but not including parentheses)
-            var applicableSpanStart = argumentsList.getFullStart();
-            var applicableSpanEnd = skipTrivia(sourceFile.text, argumentsList.getEnd(), /*stopAfterLineBreak*/ false);
+            let applicableSpanStart = argumentsList.getFullStart();
+            let applicableSpanEnd = skipTrivia(sourceFile.text, argumentsList.getEnd(), /*stopAfterLineBreak*/ false);
             return createTextSpan(applicableSpanStart, applicableSpanEnd - applicableSpanStart);
         }
 
         function getApplicableSpanForTaggedTemplate(taggedTemplate: TaggedTemplateExpression): TextSpan {
-            var template = taggedTemplate.template;
-            var applicableSpanStart = template.getStart();
-            var applicableSpanEnd = template.getEnd();
+            let template = taggedTemplate.template;
+            let applicableSpanStart = template.getStart();
+            let applicableSpanEnd = template.getEnd();
 
             // We need to adjust the end position for the case where the template does not have a tail.
             // Otherwise, we will not show signature help past the expression.
@@ -391,7 +422,7 @@ module ts.SignatureHelp {
             // This is because a Missing node has no width. However, what we actually want is to include trivia
             // leading up to the next token in case the user is about to type in a TemplateMiddle or TemplateTail.
             if (template.kind === SyntaxKind.TemplateExpression) {
-                var lastSpan = lastOrUndefined((<TemplateExpression>template).templateSpans);
+                let lastSpan = lastOrUndefined((<TemplateExpression>template).templateSpans);
                 if (lastSpan.literal.getFullWidth() === 0) {
                     applicableSpanEnd = skipTrivia(sourceFile.text, applicableSpanEnd, /*stopAfterLineBreak*/ false);
                 }
@@ -401,7 +432,7 @@ module ts.SignatureHelp {
         }
 
         function getContainingArgumentInfo(node: Node): ArgumentListInfo {
-            for (var n = node; n.kind !== SyntaxKind.SourceFile; n = n.parent) {
+            for (let n = node; n.kind !== SyntaxKind.SourceFile; n = n.parent) {
                 if (isFunctionBlock(n)) {
                     return undefined;
                 }
@@ -412,7 +443,7 @@ module ts.SignatureHelp {
                     Debug.fail("Node of kind " + n.kind + " is not a subspan of its parent of kind " + n.parent.kind);
                 }
 
-                var argumentInfo = getImmediatelyContainingArgumentInfo(n);
+                let argumentInfo = getImmediatelyContainingArgumentInfo(n);
                 if (argumentInfo) {
                     return argumentInfo;
                 }
@@ -424,8 +455,8 @@ module ts.SignatureHelp {
         }
 
         function getChildListThatStartsWithOpenerToken(parent: Node, openerToken: Node, sourceFile: SourceFile): Node {
-            var children = parent.getChildren(sourceFile);
-            var indexOfOpenerToken = children.indexOf(openerToken);
+            let children = parent.getChildren(sourceFile);
+            let indexOfOpenerToken = children.indexOf(openerToken);
             Debug.assert(indexOfOpenerToken >= 0 && children.length > indexOfOpenerToken + 1);
             return children[indexOfOpenerToken + 1];
         }
@@ -439,10 +470,10 @@ module ts.SignatureHelp {
          * or the one with the most parameters.
          */
         function selectBestInvalidOverloadIndex(candidates: Signature[], argumentCount: number): number {
-            var maxParamsSignatureIndex = -1;
-            var maxParams = -1;
-            for (var i = 0; i < candidates.length; i++) {
-                var candidate = candidates[i];
+            let maxParamsSignatureIndex = -1;
+            let maxParams = -1;
+            for (let i = 0; i < candidates.length; i++) {
+                let candidate = candidates[i];
 
                 if (candidate.hasRestParameter || candidate.parameters.length >= argumentCount) {
                     return i;
@@ -458,17 +489,17 @@ module ts.SignatureHelp {
         }
 
         function createSignatureHelpItems(candidates: Signature[], bestSignature: Signature, argumentListInfo: ArgumentListInfo): SignatureHelpItems {
-            var applicableSpan = argumentListInfo.argumentsSpan;
-            var isTypeParameterList = argumentListInfo.kind === ArgumentListKind.TypeArguments;
+            let applicableSpan = argumentListInfo.argumentsSpan;
+            let isTypeParameterList = argumentListInfo.kind === ArgumentListKind.TypeArguments;
 
-            var invocation = argumentListInfo.invocation;
-            var callTarget = getInvokedExpression(invocation)
-            var callTargetSymbol = typeInfoResolver.getSymbolAtLocation(callTarget);
-            var callTargetDisplayParts = callTargetSymbol && symbolToDisplayParts(typeInfoResolver, callTargetSymbol, /*enclosingDeclaration*/ undefined, /*meaning*/ undefined);
-            var items: SignatureHelpItem[] = map(candidates, candidateSignature => {
-                var signatureHelpParameters: SignatureHelpParameter[];
-                var prefixDisplayParts: SymbolDisplayPart[] = [];
-                var suffixDisplayParts: SymbolDisplayPart[] = [];
+            let invocation = argumentListInfo.invocation;
+            let callTarget = getInvokedExpression(invocation)
+            let callTargetSymbol = typeInfoResolver.getSymbolAtLocation(callTarget);
+            let callTargetDisplayParts = callTargetSymbol && symbolToDisplayParts(typeInfoResolver, callTargetSymbol, /*enclosingDeclaration*/ undefined, /*meaning*/ undefined);
+            let items: SignatureHelpItem[] = map(candidates, candidateSignature => {
+                let signatureHelpParameters: SignatureHelpParameter[];
+                let prefixDisplayParts: SymbolDisplayPart[] = [];
+                let suffixDisplayParts: SymbolDisplayPart[] = [];
 
                 if (callTargetDisplayParts) {
                     prefixDisplayParts.push.apply(prefixDisplayParts, callTargetDisplayParts);
@@ -476,25 +507,25 @@ module ts.SignatureHelp {
 
                 if (isTypeParameterList) {
                     prefixDisplayParts.push(punctuationPart(SyntaxKind.LessThanToken));
-                    var typeParameters = candidateSignature.typeParameters;
+                    let typeParameters = candidateSignature.typeParameters;
                     signatureHelpParameters = typeParameters && typeParameters.length > 0 ? map(typeParameters, createSignatureHelpParameterForTypeParameter) : emptyArray;
                     suffixDisplayParts.push(punctuationPart(SyntaxKind.GreaterThanToken));
-                    var parameterParts = mapToDisplayParts(writer =>
+                    let parameterParts = mapToDisplayParts(writer =>
                         typeInfoResolver.getSymbolDisplayBuilder().buildDisplayForParametersAndDelimiters(candidateSignature.parameters, writer, invocation));
                     suffixDisplayParts.push.apply(suffixDisplayParts, parameterParts);
                 }
                 else {
-                    var typeParameterParts = mapToDisplayParts(writer =>
+                    let typeParameterParts = mapToDisplayParts(writer =>
                         typeInfoResolver.getSymbolDisplayBuilder().buildDisplayForTypeParametersAndDelimiters(candidateSignature.typeParameters, writer, invocation));
                     prefixDisplayParts.push.apply(prefixDisplayParts, typeParameterParts);
                     prefixDisplayParts.push(punctuationPart(SyntaxKind.OpenParenToken));
 
-                    var parameters = candidateSignature.parameters;
+                    let parameters = candidateSignature.parameters;
                     signatureHelpParameters = parameters.length > 0 ? map(parameters, createSignatureHelpParameterForParameter) : emptyArray;
                     suffixDisplayParts.push(punctuationPart(SyntaxKind.CloseParenToken));
                 }
 
-                var returnTypeParts = mapToDisplayParts(writer =>
+                let returnTypeParts = mapToDisplayParts(writer =>
                     typeInfoResolver.getSymbolDisplayBuilder().buildReturnTypeDisplay(candidateSignature, writer, invocation));
                 suffixDisplayParts.push.apply(suffixDisplayParts, returnTypeParts);
                 
@@ -508,12 +539,12 @@ module ts.SignatureHelp {
                 };
             });
 
-            var argumentIndex = argumentListInfo.argumentIndex;
+            let argumentIndex = argumentListInfo.argumentIndex;
 
             // argumentCount is the *apparent* number of arguments.
-            var argumentCount = argumentListInfo.argumentCount;
+            let argumentCount = argumentListInfo.argumentCount;
 
-            var selectedItemIndex = candidates.indexOf(bestSignature);
+            let selectedItemIndex = candidates.indexOf(bestSignature);
             if (selectedItemIndex < 0) {
                 selectedItemIndex = selectBestInvalidOverloadIndex(candidates, argumentCount);
             }
@@ -529,10 +560,10 @@ module ts.SignatureHelp {
             };
 
             function createSignatureHelpParameterForParameter(parameter: Symbol): SignatureHelpParameter {
-                var displayParts = mapToDisplayParts(writer =>
+                let displayParts = mapToDisplayParts(writer =>
                     typeInfoResolver.getSymbolDisplayBuilder().buildParameterDisplay(parameter, writer, invocation));
 
-                var isOptional = hasQuestionToken(parameter.valueDeclaration);
+                let isOptional = hasQuestionToken(parameter.valueDeclaration);
 
                 return {
                     name: parameter.name,
@@ -543,7 +574,7 @@ module ts.SignatureHelp {
             }
 
             function createSignatureHelpParameterForTypeParameter(typeParameter: TypeParameter): SignatureHelpParameter {
-                var displayParts = mapToDisplayParts(writer =>
+                let displayParts = mapToDisplayParts(writer =>
                     typeInfoResolver.getSymbolDisplayBuilder().buildTypeParameterDisplay(typeParameter, writer, invocation));
 
                 return {
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
index e0ff5293546..452395f454a 100644
--- a/src/services/utilities.ts
+++ b/src/services/utilities.ts
@@ -7,18 +7,18 @@ module ts {
 
     export function getEndLinePosition(line: number, sourceFile: SourceFile): number {
         Debug.assert(line >= 0);
-        var lineStarts = sourceFile.getLineStarts();
+        let lineStarts = sourceFile.getLineStarts();
         
-        var lineIndex = line;
+        let lineIndex = line;
         if (lineIndex + 1 === lineStarts.length) {
             // last line - return EOF
             return sourceFile.text.length - 1;
         }
         else {
             // current line start
-            var start = lineStarts[lineIndex];
+            let start = lineStarts[lineIndex];
             // take the start position of the next line -1 = it should be some line break
-            var pos = lineStarts[lineIndex + 1] - 1;
+            let pos = lineStarts[lineIndex + 1] - 1;
             Debug.assert(isLineBreak(sourceFile.text.charCodeAt(pos)));
             // walk backwards skipping line breaks, stop the the beginning of current line.
             // i.e:
@@ -32,8 +32,8 @@ module ts {
     }
 
     export function getLineStartPositionForPosition(position: number, sourceFile: SourceFile): number {
-        var lineStarts = sourceFile.getLineStarts();
-        var line = sourceFile.getLineAndCharacterOfPosition(position).line;
+        let lineStarts = sourceFile.getLineStarts();
+        let line = sourceFile.getLineAndCharacterOfPosition(position).line;
         return lineStarts[line];
     }
 
@@ -54,13 +54,13 @@ module ts {
     }
 
     export function startEndOverlapsWithStartEnd(start1: number, end1: number, start2: number, end2: number) {
-        var start = Math.max(start1, start2);
-        var end = Math.min(end1, end2);
+        let start = Math.max(start1, start2);
+        let end = Math.min(end1, end2);
         return start < end;
     }
 
     export function findListItemInfo(node: Node): ListItemInfo {
-        var list = findContainingList(node);
+        let list = findContainingList(node);
 
         // It is possible at this point for syntaxList to be undefined, either if
         // node.parent had no list child, or if none of its list children contained
@@ -70,8 +70,8 @@ module ts {
             return undefined;
         }
 
-        var children = list.getChildren();
-        var listItemIndex = indexOf(children, node);
+        let children = list.getChildren();
+        let listItemIndex = indexOf(children, node);
 
         return {
             listItemIndex,
@@ -88,13 +88,15 @@ module ts {
         // be parented by the container of the SyntaxList, not the SyntaxList itself.
         // In order to find the list item index, we first need to locate SyntaxList itself and then search
         // for the position of the relevant node (or comma).
-        var syntaxList = forEach(node.parent.getChildren(), c => {
+        let syntaxList = forEach(node.parent.getChildren(), c => {
             // find syntax list that covers the span of the node
             if (c.kind === SyntaxKind.SyntaxList && c.pos <= node.pos && c.end >= node.end) {
                 return c;
             }
         });
 
+        // Either we didn't find an appropriate list, or the list must contain us.
+        Debug.assert(!syntaxList || contains(syntaxList.getChildren(), node)); 
         return syntaxList;
     }
 
@@ -124,7 +126,7 @@ module ts {
 
     /** Get the token whose text contains the position */
     function getTokenAtPositionWorker(sourceFile: SourceFile, position: number, allowPositionInLeadingTrivia: boolean, includeItemAtEndPosition: (n: Node) => boolean): Node {
-        var current: Node = sourceFile;
+        let current: Node = sourceFile;
         outer: while (true) {
             if (isToken(current)) {
                 // exit early
@@ -132,17 +134,17 @@ module ts {
             }
 
             // find the child that contains 'position'
-            for (var i = 0, n = current.getChildCount(sourceFile); i < n; i++) {
-                var child = current.getChildAt(i);
-                var start = allowPositionInLeadingTrivia ? child.getFullStart() : child.getStart(sourceFile);
+            for (let i = 0, n = current.getChildCount(sourceFile); i < n; i++) {
+                let child = current.getChildAt(i);
+                let start = allowPositionInLeadingTrivia ? child.getFullStart() : child.getStart(sourceFile);
                 if (start <= position) {
-                    var end = child.getEnd();
+                    let end = child.getEnd();
                     if (position < end || (position === end && child.kind === SyntaxKind.EndOfFileToken)) {
                         current = child;
                         continue outer;
                     }
                     else if (includeItemAtEndPosition && end === position) {
-                        var previousToken = findPrecedingToken(position, sourceFile, child);
+                        let previousToken = findPrecedingToken(position, sourceFile, child);
                         if (previousToken && includeItemAtEndPosition(previousToken)) {
                             return previousToken;
                         }
@@ -164,7 +166,7 @@ module ts {
     export function findTokenOnLeftOfPosition(file: SourceFile, position: number): Node {
         // Ideally, getTokenAtPosition should return a token. However, it is currently
         // broken, so we do a check to make sure the result was indeed a token.
-        var tokenAtPosition = getTokenAtPosition(file, position);
+        let tokenAtPosition = getTokenAtPosition(file, position);
         if (isToken(tokenAtPosition) && position > tokenAtPosition.getStart(file) && position < tokenAtPosition.getEnd()) {
             return tokenAtPosition;
         }
@@ -181,10 +183,9 @@ module ts {
                 return n;
             }
 
-            var children = n.getChildren();
-            for (var i = 0, len = children.length; i < len; ++i) {
-                var child = children[i];
-                var shouldDiveInChildNode =
+            let children = n.getChildren();
+            for (let child of children) {
+                let shouldDiveInChildNode =
                     // previous token is enclosed somewhere in the child
                     (child.pos <= previousToken.pos && child.end > previousToken.end) ||
                     // previous token ends exactly at the beginning of child
@@ -207,8 +208,8 @@ module ts {
                 return n;
             }
 
-            var children = n.getChildren();
-            var candidate = findRightmostChildNodeWithTokens(children, /*exclusiveStartPosition*/ children.length);
+            let children = n.getChildren();
+            let candidate = findRightmostChildNodeWithTokens(children, /*exclusiveStartPosition*/ children.length);
             return candidate && findRightmostToken(candidate);
 
         }
@@ -218,14 +219,14 @@ module ts {
                 return n;
             }
 
-            var children = n.getChildren();
-            for (var i = 0, len = children.length; i < len; ++i) {
-                var child = children[i];
+            let children = n.getChildren();
+            for (let i = 0, len = children.length; i < len; i++) {
+                let child = children[i];
                 if (nodeHasTokens(child)) {
                     if (position <= child.end) {
                         if (child.getStart(sourceFile) >= position) {
                             // actual start of the node is past the position - previous token should be at the end of previous child
-                            var candidate = findRightmostChildNodeWithTokens(children, /*exclusiveStartPosition*/ i);
+                            let candidate = findRightmostChildNodeWithTokens(children, /*exclusiveStartPosition*/ i);
                             return candidate && findRightmostToken(candidate)
                         }
                         else {
@@ -243,14 +244,14 @@ module ts {
             // Try to find the rightmost token in the file without filtering.
             // Namely we are skipping the check: 'position < node.end'
             if (children.length) {
-                var candidate = findRightmostChildNodeWithTokens(children, /*exclusiveStartPosition*/ children.length);
+                let candidate = findRightmostChildNodeWithTokens(children, /*exclusiveStartPosition*/ children.length);
                 return candidate && findRightmostToken(candidate);
             }
         }
 
         /// finds last node that is considered as candidate for search (isCandidate(node) === true) starting from 'exclusiveStartPosition'
         function findRightmostChildNodeWithTokens(children: Node[], exclusiveStartPosition: number): Node {
-            for (var i = exclusiveStartPosition - 1; i >= 0; --i) {
+            for (let i = exclusiveStartPosition - 1; i >= 0; --i) {
                 if (nodeHasTokens(children[i])) {
                     return children[i];
                 }
@@ -265,8 +266,8 @@ module ts {
     }
 
     export function getNodeModifiers(node: Node): string {
-        var flags = getCombinedNodeFlags(node);
-        var result: string[] = [];
+        let flags = getCombinedNodeFlags(node);
+        let result: string[] = [];
 
         if (flags & NodeFlags.Private) result.push(ScriptElementKindModifier.privateMemberModifier);
         if (flags & NodeFlags.Protected) result.push(ScriptElementKindModifier.protectedMemberModifier);
@@ -316,7 +317,7 @@ module ts {
     }
 
     export function compareDataObjects(dst: any, src: any): boolean {
-        for (var e in dst) {
+        for (let e in dst) {
             if (typeof dst[e] === "object") {
                 if (!compareDataObjects(dst[e], src[e])) {
                     return false;
@@ -338,11 +339,11 @@ module ts {
         return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === SyntaxKind.Parameter;
     }
 
-    var displayPartWriter = getDisplayPartWriter();
+    let displayPartWriter = getDisplayPartWriter();
     function getDisplayPartWriter(): DisplayPartsSymbolWriter {
-        var displayParts: SymbolDisplayPart[];
-        var lineStart: boolean;
-        var indent: number;
+        let displayParts: SymbolDisplayPart[];
+        let lineStart: boolean;
+        let indent: number;
 
         resetWriter();
         return {
@@ -363,7 +364,7 @@ module ts {
 
         function writeIndent() {
             if (lineStart) {
-                var indentString = getIndentString(indent);
+                let indentString = getIndentString(indent);
                 if (indentString) {
                     displayParts.push(displayPart(indentString, SymbolDisplayPartKind.space));
                 }
@@ -397,7 +398,7 @@ module ts {
         return displayPart(text, displayPartKind(symbol), symbol);
 
         function displayPartKind(symbol: Symbol): SymbolDisplayPartKind {
-            var flags = symbol.flags;
+            let flags = symbol.flags;
 
             if (flags & SymbolFlags.Variable) {
                 return isFirstDeclarationOfSymbolParameter(symbol) ? SymbolDisplayPartKind.parameterName : SymbolDisplayPartKind.localName;
@@ -454,7 +455,7 @@ module ts {
 
     export function mapToDisplayParts(writeDisplayParts: (writer: DisplayPartsSymbolWriter) => void): SymbolDisplayPart[] {
         writeDisplayParts(displayPartWriter);
-        var result = displayPartWriter.displayParts();
+        let result = displayPartWriter.displayParts();
         displayPartWriter.clear();
         return result;
     }
diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js
index a94858d9154..a03f254e699 100644
--- a/tests/baselines/reference/APISample_compile.js
+++ b/tests/baselines/reference/APISample_compile.js
@@ -261,27 +261,28 @@ declare module "typescript" {
         EnumDeclaration = 199,
         ModuleDeclaration = 200,
         ModuleBlock = 201,
-        ImportEqualsDeclaration = 202,
-        ImportDeclaration = 203,
-        ImportClause = 204,
-        NamespaceImport = 205,
-        NamedImports = 206,
-        ImportSpecifier = 207,
-        ExportAssignment = 208,
-        ExportDeclaration = 209,
-        NamedExports = 210,
-        ExportSpecifier = 211,
-        ExternalModuleReference = 212,
-        CaseClause = 213,
-        DefaultClause = 214,
-        HeritageClause = 215,
-        CatchClause = 216,
-        PropertyAssignment = 217,
-        ShorthandPropertyAssignment = 218,
-        EnumMember = 219,
-        SourceFile = 220,
-        SyntaxList = 221,
-        Count = 222,
+        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,
@@ -656,6 +657,9 @@ declare module "typescript" {
     }
     interface SwitchStatement extends Statement {
         expression: Expression;
+        caseBlock: CaseBlock;
+    }
+    interface CaseBlock extends Node {
         clauses: NodeArray<CaseOrDefaultClause>;
     }
     interface CaseClause extends Node {
@@ -1484,7 +1488,7 @@ declare module "typescript" {
 }
 declare module "typescript" {
     /** The version of the language service API */
-    var servicesVersion: string;
+    let servicesVersion: string;
     interface Node {
         getSourceFile(): SourceFile;
         getChildCount(sourceFile?: SourceFile): number;
@@ -1971,7 +1975,7 @@ declare module "typescript" {
         throwIfCancellationRequested(): void;
     }
     function createLanguageServiceSourceFile(fileName: string, scriptSnapshot: IScriptSnapshot, scriptTarget: ScriptTarget, version: string, setNodeParents: boolean): SourceFile;
-    var disableIncrementalParsing: boolean;
+    let disableIncrementalParsing: boolean;
     function updateLanguageServiceSourceFile(sourceFile: SourceFile, scriptSnapshot: IScriptSnapshot, version: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;
     function createDocumentRegistry(): DocumentRegistry;
     function preProcessFile(sourceText: string, readImportFiles?: boolean): PreProcessedFileInfo;
diff --git a/tests/baselines/reference/APISample_compile.types b/tests/baselines/reference/APISample_compile.types
index 40096915869..bd19b3bbf9f 100644
--- a/tests/baselines/reference/APISample_compile.types
+++ b/tests/baselines/reference/APISample_compile.types
@@ -801,67 +801,70 @@ declare module "typescript" {
         ModuleBlock = 201,

 >ModuleBlock : SyntaxKind
 
-        ImportEqualsDeclaration = 202,

+        CaseBlock = 202,

+>CaseBlock : SyntaxKind
+
+        ImportEqualsDeclaration = 203,

 >ImportEqualsDeclaration : SyntaxKind
 
-        ImportDeclaration = 203,

+        ImportDeclaration = 204,

 >ImportDeclaration : SyntaxKind
 
-        ImportClause = 204,

+        ImportClause = 205,

 >ImportClause : SyntaxKind
 
-        NamespaceImport = 205,

+        NamespaceImport = 206,

 >NamespaceImport : SyntaxKind
 
-        NamedImports = 206,

+        NamedImports = 207,

 >NamedImports : SyntaxKind
 
-        ImportSpecifier = 207,

+        ImportSpecifier = 208,

 >ImportSpecifier : SyntaxKind
 
-        ExportAssignment = 208,

+        ExportAssignment = 209,

 >ExportAssignment : SyntaxKind
 
-        ExportDeclaration = 209,

+        ExportDeclaration = 210,

 >ExportDeclaration : SyntaxKind
 
-        NamedExports = 210,

+        NamedExports = 211,

 >NamedExports : SyntaxKind
 
-        ExportSpecifier = 211,

+        ExportSpecifier = 212,

 >ExportSpecifier : SyntaxKind
 
-        ExternalModuleReference = 212,

+        ExternalModuleReference = 213,

 >ExternalModuleReference : SyntaxKind
 
-        CaseClause = 213,

+        CaseClause = 214,

 >CaseClause : SyntaxKind
 
-        DefaultClause = 214,

+        DefaultClause = 215,

 >DefaultClause : SyntaxKind
 
-        HeritageClause = 215,

+        HeritageClause = 216,

 >HeritageClause : SyntaxKind
 
-        CatchClause = 216,

+        CatchClause = 217,

 >CatchClause : SyntaxKind
 
-        PropertyAssignment = 217,

+        PropertyAssignment = 218,

 >PropertyAssignment : SyntaxKind
 
-        ShorthandPropertyAssignment = 218,

+        ShorthandPropertyAssignment = 219,

 >ShorthandPropertyAssignment : SyntaxKind
 
-        EnumMember = 219,

+        EnumMember = 220,

 >EnumMember : SyntaxKind
 
-        SourceFile = 220,

+        SourceFile = 221,

 >SourceFile : SyntaxKind
 
-        SyntaxList = 221,

+        SyntaxList = 222,

 >SyntaxList : SyntaxKind
 
-        Count = 222,

+        Count = 223,

 >Count : SyntaxKind
 
         FirstAssignment = 52,

@@ -1980,6 +1983,14 @@ declare module "typescript" {
 >expression : Expression
 >Expression : Expression
 
+        caseBlock: CaseBlock;

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

+    interface CaseBlock extends Node {

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

 >clauses : NodeArray<CaseClause | DefaultClause>
 >NodeArray : NodeArray<T>
@@ -4757,7 +4768,7 @@ declare module "typescript" {
 }

 declare module "typescript" {

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

-    var servicesVersion: string;

+    let servicesVersion: string;

 >servicesVersion : string
 
     interface Node {

@@ -6107,7 +6118,7 @@ declare module "typescript" {
 >setNodeParents : boolean
 >SourceFile : SourceFile
 
-    var disableIncrementalParsing: boolean;

+    let disableIncrementalParsing: boolean;

 >disableIncrementalParsing : boolean
 
     function updateLanguageServiceSourceFile(sourceFile: SourceFile, scriptSnapshot: IScriptSnapshot, version: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;

diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js
index aa94796e3f1..99b7bc6d549 100644
--- a/tests/baselines/reference/APISample_linter.js
+++ b/tests/baselines/reference/APISample_linter.js
@@ -292,27 +292,28 @@ declare module "typescript" {
         EnumDeclaration = 199,
         ModuleDeclaration = 200,
         ModuleBlock = 201,
-        ImportEqualsDeclaration = 202,
-        ImportDeclaration = 203,
-        ImportClause = 204,
-        NamespaceImport = 205,
-        NamedImports = 206,
-        ImportSpecifier = 207,
-        ExportAssignment = 208,
-        ExportDeclaration = 209,
-        NamedExports = 210,
-        ExportSpecifier = 211,
-        ExternalModuleReference = 212,
-        CaseClause = 213,
-        DefaultClause = 214,
-        HeritageClause = 215,
-        CatchClause = 216,
-        PropertyAssignment = 217,
-        ShorthandPropertyAssignment = 218,
-        EnumMember = 219,
-        SourceFile = 220,
-        SyntaxList = 221,
-        Count = 222,
+        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,
@@ -687,6 +688,9 @@ declare module "typescript" {
     }
     interface SwitchStatement extends Statement {
         expression: Expression;
+        caseBlock: CaseBlock;
+    }
+    interface CaseBlock extends Node {
         clauses: NodeArray<CaseOrDefaultClause>;
     }
     interface CaseClause extends Node {
@@ -1515,7 +1519,7 @@ declare module "typescript" {
 }
 declare module "typescript" {
     /** The version of the language service API */
-    var servicesVersion: string;
+    let servicesVersion: string;
     interface Node {
         getSourceFile(): SourceFile;
         getChildCount(sourceFile?: SourceFile): number;
@@ -2002,7 +2006,7 @@ declare module "typescript" {
         throwIfCancellationRequested(): void;
     }
     function createLanguageServiceSourceFile(fileName: string, scriptSnapshot: IScriptSnapshot, scriptTarget: ScriptTarget, version: string, setNodeParents: boolean): SourceFile;
-    var disableIncrementalParsing: boolean;
+    let disableIncrementalParsing: boolean;
     function updateLanguageServiceSourceFile(sourceFile: SourceFile, scriptSnapshot: IScriptSnapshot, version: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;
     function createDocumentRegistry(): DocumentRegistry;
     function preProcessFile(sourceText: string, readImportFiles?: boolean): PreProcessedFileInfo;
diff --git a/tests/baselines/reference/APISample_linter.types b/tests/baselines/reference/APISample_linter.types
index f061125220d..0970d0cc2fb 100644
--- a/tests/baselines/reference/APISample_linter.types
+++ b/tests/baselines/reference/APISample_linter.types
@@ -947,67 +947,70 @@ declare module "typescript" {
         ModuleBlock = 201,

 >ModuleBlock : SyntaxKind
 
-        ImportEqualsDeclaration = 202,

+        CaseBlock = 202,

+>CaseBlock : SyntaxKind
+
+        ImportEqualsDeclaration = 203,

 >ImportEqualsDeclaration : SyntaxKind
 
-        ImportDeclaration = 203,

+        ImportDeclaration = 204,

 >ImportDeclaration : SyntaxKind
 
-        ImportClause = 204,

+        ImportClause = 205,

 >ImportClause : SyntaxKind
 
-        NamespaceImport = 205,

+        NamespaceImport = 206,

 >NamespaceImport : SyntaxKind
 
-        NamedImports = 206,

+        NamedImports = 207,

 >NamedImports : SyntaxKind
 
-        ImportSpecifier = 207,

+        ImportSpecifier = 208,

 >ImportSpecifier : SyntaxKind
 
-        ExportAssignment = 208,

+        ExportAssignment = 209,

 >ExportAssignment : SyntaxKind
 
-        ExportDeclaration = 209,

+        ExportDeclaration = 210,

 >ExportDeclaration : SyntaxKind
 
-        NamedExports = 210,

+        NamedExports = 211,

 >NamedExports : SyntaxKind
 
-        ExportSpecifier = 211,

+        ExportSpecifier = 212,

 >ExportSpecifier : SyntaxKind
 
-        ExternalModuleReference = 212,

+        ExternalModuleReference = 213,

 >ExternalModuleReference : SyntaxKind
 
-        CaseClause = 213,

+        CaseClause = 214,

 >CaseClause : SyntaxKind
 
-        DefaultClause = 214,

+        DefaultClause = 215,

 >DefaultClause : SyntaxKind
 
-        HeritageClause = 215,

+        HeritageClause = 216,

 >HeritageClause : SyntaxKind
 
-        CatchClause = 216,

+        CatchClause = 217,

 >CatchClause : SyntaxKind
 
-        PropertyAssignment = 217,

+        PropertyAssignment = 218,

 >PropertyAssignment : SyntaxKind
 
-        ShorthandPropertyAssignment = 218,

+        ShorthandPropertyAssignment = 219,

 >ShorthandPropertyAssignment : SyntaxKind
 
-        EnumMember = 219,

+        EnumMember = 220,

 >EnumMember : SyntaxKind
 
-        SourceFile = 220,

+        SourceFile = 221,

 >SourceFile : SyntaxKind
 
-        SyntaxList = 221,

+        SyntaxList = 222,

 >SyntaxList : SyntaxKind
 
-        Count = 222,

+        Count = 223,

 >Count : SyntaxKind
 
         FirstAssignment = 52,

@@ -2126,6 +2129,14 @@ declare module "typescript" {
 >expression : Expression
 >Expression : Expression
 
+        caseBlock: CaseBlock;

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

+    interface CaseBlock extends Node {

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

 >clauses : NodeArray<CaseClause | DefaultClause>
 >NodeArray : NodeArray<T>
@@ -4903,7 +4914,7 @@ declare module "typescript" {
 }

 declare module "typescript" {

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

-    var servicesVersion: string;

+    let servicesVersion: string;

 >servicesVersion : string
 
     interface Node {

@@ -6253,7 +6264,7 @@ declare module "typescript" {
 >setNodeParents : boolean
 >SourceFile : SourceFile
 
-    var disableIncrementalParsing: boolean;

+    let disableIncrementalParsing: boolean;

 >disableIncrementalParsing : boolean
 
     function updateLanguageServiceSourceFile(sourceFile: SourceFile, scriptSnapshot: IScriptSnapshot, version: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;

diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js
index 6defcf64c70..105acc069be 100644
--- a/tests/baselines/reference/APISample_transform.js
+++ b/tests/baselines/reference/APISample_transform.js
@@ -293,27 +293,28 @@ declare module "typescript" {
         EnumDeclaration = 199,
         ModuleDeclaration = 200,
         ModuleBlock = 201,
-        ImportEqualsDeclaration = 202,
-        ImportDeclaration = 203,
-        ImportClause = 204,
-        NamespaceImport = 205,
-        NamedImports = 206,
-        ImportSpecifier = 207,
-        ExportAssignment = 208,
-        ExportDeclaration = 209,
-        NamedExports = 210,
-        ExportSpecifier = 211,
-        ExternalModuleReference = 212,
-        CaseClause = 213,
-        DefaultClause = 214,
-        HeritageClause = 215,
-        CatchClause = 216,
-        PropertyAssignment = 217,
-        ShorthandPropertyAssignment = 218,
-        EnumMember = 219,
-        SourceFile = 220,
-        SyntaxList = 221,
-        Count = 222,
+        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,
@@ -688,6 +689,9 @@ declare module "typescript" {
     }
     interface SwitchStatement extends Statement {
         expression: Expression;
+        caseBlock: CaseBlock;
+    }
+    interface CaseBlock extends Node {
         clauses: NodeArray<CaseOrDefaultClause>;
     }
     interface CaseClause extends Node {
@@ -1516,7 +1520,7 @@ declare module "typescript" {
 }
 declare module "typescript" {
     /** The version of the language service API */
-    var servicesVersion: string;
+    let servicesVersion: string;
     interface Node {
         getSourceFile(): SourceFile;
         getChildCount(sourceFile?: SourceFile): number;
@@ -2003,7 +2007,7 @@ declare module "typescript" {
         throwIfCancellationRequested(): void;
     }
     function createLanguageServiceSourceFile(fileName: string, scriptSnapshot: IScriptSnapshot, scriptTarget: ScriptTarget, version: string, setNodeParents: boolean): SourceFile;
-    var disableIncrementalParsing: boolean;
+    let disableIncrementalParsing: boolean;
     function updateLanguageServiceSourceFile(sourceFile: SourceFile, scriptSnapshot: IScriptSnapshot, version: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;
     function createDocumentRegistry(): DocumentRegistry;
     function preProcessFile(sourceText: string, readImportFiles?: boolean): PreProcessedFileInfo;
diff --git a/tests/baselines/reference/APISample_transform.types b/tests/baselines/reference/APISample_transform.types
index 9fb0771cb2d..17cbd063332 100644
--- a/tests/baselines/reference/APISample_transform.types
+++ b/tests/baselines/reference/APISample_transform.types
@@ -897,67 +897,70 @@ declare module "typescript" {
         ModuleBlock = 201,

 >ModuleBlock : SyntaxKind
 
-        ImportEqualsDeclaration = 202,

+        CaseBlock = 202,

+>CaseBlock : SyntaxKind
+
+        ImportEqualsDeclaration = 203,

 >ImportEqualsDeclaration : SyntaxKind
 
-        ImportDeclaration = 203,

+        ImportDeclaration = 204,

 >ImportDeclaration : SyntaxKind
 
-        ImportClause = 204,

+        ImportClause = 205,

 >ImportClause : SyntaxKind
 
-        NamespaceImport = 205,

+        NamespaceImport = 206,

 >NamespaceImport : SyntaxKind
 
-        NamedImports = 206,

+        NamedImports = 207,

 >NamedImports : SyntaxKind
 
-        ImportSpecifier = 207,

+        ImportSpecifier = 208,

 >ImportSpecifier : SyntaxKind
 
-        ExportAssignment = 208,

+        ExportAssignment = 209,

 >ExportAssignment : SyntaxKind
 
-        ExportDeclaration = 209,

+        ExportDeclaration = 210,

 >ExportDeclaration : SyntaxKind
 
-        NamedExports = 210,

+        NamedExports = 211,

 >NamedExports : SyntaxKind
 
-        ExportSpecifier = 211,

+        ExportSpecifier = 212,

 >ExportSpecifier : SyntaxKind
 
-        ExternalModuleReference = 212,

+        ExternalModuleReference = 213,

 >ExternalModuleReference : SyntaxKind
 
-        CaseClause = 213,

+        CaseClause = 214,

 >CaseClause : SyntaxKind
 
-        DefaultClause = 214,

+        DefaultClause = 215,

 >DefaultClause : SyntaxKind
 
-        HeritageClause = 215,

+        HeritageClause = 216,

 >HeritageClause : SyntaxKind
 
-        CatchClause = 216,

+        CatchClause = 217,

 >CatchClause : SyntaxKind
 
-        PropertyAssignment = 217,

+        PropertyAssignment = 218,

 >PropertyAssignment : SyntaxKind
 
-        ShorthandPropertyAssignment = 218,

+        ShorthandPropertyAssignment = 219,

 >ShorthandPropertyAssignment : SyntaxKind
 
-        EnumMember = 219,

+        EnumMember = 220,

 >EnumMember : SyntaxKind
 
-        SourceFile = 220,

+        SourceFile = 221,

 >SourceFile : SyntaxKind
 
-        SyntaxList = 221,

+        SyntaxList = 222,

 >SyntaxList : SyntaxKind
 
-        Count = 222,

+        Count = 223,

 >Count : SyntaxKind
 
         FirstAssignment = 52,

@@ -2076,6 +2079,14 @@ declare module "typescript" {
 >expression : Expression
 >Expression : Expression
 
+        caseBlock: CaseBlock;

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

+    interface CaseBlock extends Node {

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

 >clauses : NodeArray<CaseClause | DefaultClause>
 >NodeArray : NodeArray<T>
@@ -4853,7 +4864,7 @@ declare module "typescript" {
 }

 declare module "typescript" {

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

-    var servicesVersion: string;

+    let servicesVersion: string;

 >servicesVersion : string
 
     interface Node {

@@ -6203,7 +6214,7 @@ declare module "typescript" {
 >setNodeParents : boolean
 >SourceFile : SourceFile
 
-    var disableIncrementalParsing: boolean;

+    let disableIncrementalParsing: boolean;

 >disableIncrementalParsing : boolean
 
     function updateLanguageServiceSourceFile(sourceFile: SourceFile, scriptSnapshot: IScriptSnapshot, version: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;

diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js
index 6fabb4d8b3b..1d67d4df950 100644
--- a/tests/baselines/reference/APISample_watcher.js
+++ b/tests/baselines/reference/APISample_watcher.js
@@ -330,27 +330,28 @@ declare module "typescript" {
         EnumDeclaration = 199,
         ModuleDeclaration = 200,
         ModuleBlock = 201,
-        ImportEqualsDeclaration = 202,
-        ImportDeclaration = 203,
-        ImportClause = 204,
-        NamespaceImport = 205,
-        NamedImports = 206,
-        ImportSpecifier = 207,
-        ExportAssignment = 208,
-        ExportDeclaration = 209,
-        NamedExports = 210,
-        ExportSpecifier = 211,
-        ExternalModuleReference = 212,
-        CaseClause = 213,
-        DefaultClause = 214,
-        HeritageClause = 215,
-        CatchClause = 216,
-        PropertyAssignment = 217,
-        ShorthandPropertyAssignment = 218,
-        EnumMember = 219,
-        SourceFile = 220,
-        SyntaxList = 221,
-        Count = 222,
+        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,
@@ -725,6 +726,9 @@ declare module "typescript" {
     }
     interface SwitchStatement extends Statement {
         expression: Expression;
+        caseBlock: CaseBlock;
+    }
+    interface CaseBlock extends Node {
         clauses: NodeArray<CaseOrDefaultClause>;
     }
     interface CaseClause extends Node {
@@ -1553,7 +1557,7 @@ declare module "typescript" {
 }
 declare module "typescript" {
     /** The version of the language service API */
-    var servicesVersion: string;
+    let servicesVersion: string;
     interface Node {
         getSourceFile(): SourceFile;
         getChildCount(sourceFile?: SourceFile): number;
@@ -2040,7 +2044,7 @@ declare module "typescript" {
         throwIfCancellationRequested(): void;
     }
     function createLanguageServiceSourceFile(fileName: string, scriptSnapshot: IScriptSnapshot, scriptTarget: ScriptTarget, version: string, setNodeParents: boolean): SourceFile;
-    var disableIncrementalParsing: boolean;
+    let disableIncrementalParsing: boolean;
     function updateLanguageServiceSourceFile(sourceFile: SourceFile, scriptSnapshot: IScriptSnapshot, version: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;
     function createDocumentRegistry(): DocumentRegistry;
     function preProcessFile(sourceText: string, readImportFiles?: boolean): PreProcessedFileInfo;
diff --git a/tests/baselines/reference/APISample_watcher.types b/tests/baselines/reference/APISample_watcher.types
index e2ad04b970e..7ecf2dca8ef 100644
--- a/tests/baselines/reference/APISample_watcher.types
+++ b/tests/baselines/reference/APISample_watcher.types
@@ -1070,67 +1070,70 @@ declare module "typescript" {
         ModuleBlock = 201,

 >ModuleBlock : SyntaxKind
 
-        ImportEqualsDeclaration = 202,

+        CaseBlock = 202,

+>CaseBlock : SyntaxKind
+
+        ImportEqualsDeclaration = 203,

 >ImportEqualsDeclaration : SyntaxKind
 
-        ImportDeclaration = 203,

+        ImportDeclaration = 204,

 >ImportDeclaration : SyntaxKind
 
-        ImportClause = 204,

+        ImportClause = 205,

 >ImportClause : SyntaxKind
 
-        NamespaceImport = 205,

+        NamespaceImport = 206,

 >NamespaceImport : SyntaxKind
 
-        NamedImports = 206,

+        NamedImports = 207,

 >NamedImports : SyntaxKind
 
-        ImportSpecifier = 207,

+        ImportSpecifier = 208,

 >ImportSpecifier : SyntaxKind
 
-        ExportAssignment = 208,

+        ExportAssignment = 209,

 >ExportAssignment : SyntaxKind
 
-        ExportDeclaration = 209,

+        ExportDeclaration = 210,

 >ExportDeclaration : SyntaxKind
 
-        NamedExports = 210,

+        NamedExports = 211,

 >NamedExports : SyntaxKind
 
-        ExportSpecifier = 211,

+        ExportSpecifier = 212,

 >ExportSpecifier : SyntaxKind
 
-        ExternalModuleReference = 212,

+        ExternalModuleReference = 213,

 >ExternalModuleReference : SyntaxKind
 
-        CaseClause = 213,

+        CaseClause = 214,

 >CaseClause : SyntaxKind
 
-        DefaultClause = 214,

+        DefaultClause = 215,

 >DefaultClause : SyntaxKind
 
-        HeritageClause = 215,

+        HeritageClause = 216,

 >HeritageClause : SyntaxKind
 
-        CatchClause = 216,

+        CatchClause = 217,

 >CatchClause : SyntaxKind
 
-        PropertyAssignment = 217,

+        PropertyAssignment = 218,

 >PropertyAssignment : SyntaxKind
 
-        ShorthandPropertyAssignment = 218,

+        ShorthandPropertyAssignment = 219,

 >ShorthandPropertyAssignment : SyntaxKind
 
-        EnumMember = 219,

+        EnumMember = 220,

 >EnumMember : SyntaxKind
 
-        SourceFile = 220,

+        SourceFile = 221,

 >SourceFile : SyntaxKind
 
-        SyntaxList = 221,

+        SyntaxList = 222,

 >SyntaxList : SyntaxKind
 
-        Count = 222,

+        Count = 223,

 >Count : SyntaxKind
 
         FirstAssignment = 52,

@@ -2249,6 +2252,14 @@ declare module "typescript" {
 >expression : Expression
 >Expression : Expression
 
+        caseBlock: CaseBlock;

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

+    interface CaseBlock extends Node {

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

 >clauses : NodeArray<CaseClause | DefaultClause>
 >NodeArray : NodeArray<T>
@@ -5026,7 +5037,7 @@ declare module "typescript" {
 }

 declare module "typescript" {

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

-    var servicesVersion: string;

+    let servicesVersion: string;

 >servicesVersion : string
 
     interface Node {

@@ -6376,7 +6387,7 @@ declare module "typescript" {
 >setNodeParents : boolean
 >SourceFile : SourceFile
 
-    var disableIncrementalParsing: boolean;

+    let disableIncrementalParsing: boolean;

 >disableIncrementalParsing : boolean
 
     function updateLanguageServiceSourceFile(sourceFile: SourceFile, scriptSnapshot: IScriptSnapshot, version: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;

diff --git a/tests/baselines/reference/ES3For-ofTypeCheck1.errors.txt b/tests/baselines/reference/ES3For-ofTypeCheck1.errors.txt
new file mode 100644
index 00000000000..6437cfbc73d
--- /dev/null
+++ b/tests/baselines/reference/ES3For-ofTypeCheck1.errors.txt
@@ -0,0 +1,7 @@
+tests/cases/conformance/statements/for-ofStatements/ES3For-ofTypeCheck1.ts(1,15): error TS2494: Using a string in a 'for...of' statement is only supported in ECMAScript 5 and higher.
+
+
+==== tests/cases/conformance/statements/for-ofStatements/ES3For-ofTypeCheck1.ts (1 errors) ====
+    for (var v of "") { }
+                  ~~
+!!! error TS2494: Using a string in a 'for...of' statement is only supported in ECMAScript 5 and higher.
\ No newline at end of file
diff --git a/tests/baselines/reference/ES3For-ofTypeCheck1.js b/tests/baselines/reference/ES3For-ofTypeCheck1.js
new file mode 100644
index 00000000000..19efa96808b
--- /dev/null
+++ b/tests/baselines/reference/ES3For-ofTypeCheck1.js
@@ -0,0 +1,7 @@
+//// [ES3For-ofTypeCheck1.ts]
+for (var v of "") { }
+
+//// [ES3For-ofTypeCheck1.js]
+for (var _i = 0, _a = ""; _i < _a.length; _i++) {
+    var v = _a[_i];
+}
diff --git a/tests/baselines/reference/ES3For-ofTypeCheck2.js b/tests/baselines/reference/ES3For-ofTypeCheck2.js
new file mode 100644
index 00000000000..952eade6cfb
--- /dev/null
+++ b/tests/baselines/reference/ES3For-ofTypeCheck2.js
@@ -0,0 +1,9 @@
+//// [ES3For-ofTypeCheck2.ts]
+for (var v of [true]) { }
+
+//// [ES3For-ofTypeCheck2.js]
+for (var _i = 0, _a = [
+    true
+]; _i < _a.length; _i++) {
+    var v = _a[_i];
+}
diff --git a/tests/baselines/reference/ES3For-ofTypeCheck2.types b/tests/baselines/reference/ES3For-ofTypeCheck2.types
new file mode 100644
index 00000000000..f5ca0ab17e8
--- /dev/null
+++ b/tests/baselines/reference/ES3For-ofTypeCheck2.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/statements/for-ofStatements/ES3For-ofTypeCheck2.ts ===
+for (var v of [true]) { }
+>v : boolean
+>[true] : boolean[]
+
diff --git a/tests/baselines/reference/ES3For-ofTypeCheck4.errors.txt b/tests/baselines/reference/ES3For-ofTypeCheck4.errors.txt
new file mode 100644
index 00000000000..80e60008da4
--- /dev/null
+++ b/tests/baselines/reference/ES3For-ofTypeCheck4.errors.txt
@@ -0,0 +1,8 @@
+tests/cases/conformance/statements/for-ofStatements/ES3For-ofTypeCheck4.ts(2,17): error TS2494: Using a string in a 'for...of' statement is only supported in ECMAScript 5 and higher.
+
+
+==== tests/cases/conformance/statements/for-ofStatements/ES3For-ofTypeCheck4.ts (1 errors) ====
+    var union: string | string[];
+    for (const v of union) { }
+                    ~~~~~
+!!! error TS2494: Using a string in a 'for...of' statement is only supported in ECMAScript 5 and higher.
\ No newline at end of file
diff --git a/tests/baselines/reference/ES3For-ofTypeCheck4.js b/tests/baselines/reference/ES3For-ofTypeCheck4.js
new file mode 100644
index 00000000000..7386a1967eb
--- /dev/null
+++ b/tests/baselines/reference/ES3For-ofTypeCheck4.js
@@ -0,0 +1,9 @@
+//// [ES3For-ofTypeCheck4.ts]
+var union: string | string[];
+for (const v of union) { }
+
+//// [ES3For-ofTypeCheck4.js]
+var union;
+for (var _i = 0; _i < union.length; _i++) {
+    var v = union[_i];
+}
diff --git a/tests/baselines/reference/ES3For-ofTypeCheck6.js b/tests/baselines/reference/ES3For-ofTypeCheck6.js
new file mode 100644
index 00000000000..ddc11808b18
--- /dev/null
+++ b/tests/baselines/reference/ES3For-ofTypeCheck6.js
@@ -0,0 +1,9 @@
+//// [ES3For-ofTypeCheck6.ts]
+var union: string[] | number[];
+for (var v of union) { }
+
+//// [ES3For-ofTypeCheck6.js]
+var union;
+for (var _i = 0; _i < union.length; _i++) {
+    var v = union[_i];
+}
diff --git a/tests/baselines/reference/ES3For-ofTypeCheck6.types b/tests/baselines/reference/ES3For-ofTypeCheck6.types
new file mode 100644
index 00000000000..d7e6045b029
--- /dev/null
+++ b/tests/baselines/reference/ES3For-ofTypeCheck6.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/statements/for-ofStatements/ES3For-ofTypeCheck6.ts ===
+var union: string[] | number[];
+>union : string[] | number[]
+
+for (var v of union) { }
+>v : string | number
+>union : string[] | number[]
+
diff --git a/tests/baselines/reference/ES5For-of1.errors.txt b/tests/baselines/reference/ES5For-of1.errors.txt
new file mode 100644
index 00000000000..16222725b3d
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of1.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/statements/for-ofStatements/ES5For-of1.ts(2,5): error TS2304: Cannot find name 'console'.
+
+
+==== tests/cases/conformance/statements/for-ofStatements/ES5For-of1.ts (1 errors) ====
+    for (var v of ['a', 'b', 'c']) {
+        console.log(v);
+        ~~~~~~~
+!!! error TS2304: Cannot find name 'console'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of1.js b/tests/baselines/reference/ES5For-of1.js
new file mode 100644
index 00000000000..afdded3418c
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of1.js
@@ -0,0 +1,15 @@
+//// [ES5For-of1.ts]
+for (var v of ['a', 'b', 'c']) {
+    console.log(v);
+}
+
+//// [ES5For-of1.js]
+for (var _i = 0, _a = [
+    'a',
+    'b',
+    'c'
+]; _i < _a.length; _i++) {
+    var v = _a[_i];
+    console.log(v);
+}
+//# sourceMappingURL=ES5For-of1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of1.js.map b/tests/baselines/reference/ES5For-of1.js.map
new file mode 100644
index 00000000000..4fa49b0f02b
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of1.js.map
@@ -0,0 +1,2 @@
+//// [ES5For-of1.js.map]
+{"version":3,"file":"ES5For-of1.js","sourceRoot":"","sources":["ES5For-of1.ts"],"names":[],"mappings":"AAAA,GAAG,CAAC,CAAU,UAAe,EAAf;IAAC,GAAG;IAAE,GAAG;IAAE,GAAG;CAAC,EAAxB,cAAK,EAAL,IAAwB,CAAC;IAAzB,IAAI,CAAC,SAAA;IACN,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAClB"}
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of1.sourcemap.txt b/tests/baselines/reference/ES5For-of1.sourcemap.txt
new file mode 100644
index 00000000000..c07414d1d85
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of1.sourcemap.txt
@@ -0,0 +1,127 @@
+===================================================================
+JsFile: ES5For-of1.js
+mapUrl: ES5For-of1.js.map
+sourceRoot: 
+sources: ES5For-of1.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/conformance/statements/for-ofStatements/ES5For-of1.js
+sourceFile:ES5For-of1.ts
+-------------------------------------------------------------------
+>>>for (var _i = 0, _a = [
+1 >
+2 >^^^
+3 >   ^
+4 >    ^
+5 >     ^^^^^^^^^^
+6 >               ^^
+1 >
+2 >for
+3 >    
+4 >    (var v of 
+5 >     ['a', 'b', 'c']
+6 >               
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 4) Source(1, 4) + SourceIndex(0)
+3 >Emitted(1, 5) Source(1, 5) + SourceIndex(0)
+4 >Emitted(1, 6) Source(1, 15) + SourceIndex(0)
+5 >Emitted(1, 16) Source(1, 30) + SourceIndex(0)
+6 >Emitted(1, 18) Source(1, 15) + SourceIndex(0)
+---
+>>>    'a',
+1 >^^^^
+2 >    ^^^
+3 >       ^^->
+1 >[
+2 >    'a'
+1 >Emitted(2, 5) Source(1, 16) + SourceIndex(0)
+2 >Emitted(2, 8) Source(1, 19) + SourceIndex(0)
+---
+>>>    'b',
+1->^^^^
+2 >    ^^^
+3 >       ^->
+1->, 
+2 >    'b'
+1->Emitted(3, 5) Source(1, 21) + SourceIndex(0)
+2 >Emitted(3, 8) Source(1, 24) + SourceIndex(0)
+---
+>>>    'c'
+1->^^^^
+2 >    ^^^
+3 >       ^^^^^^^^^^^^^^^^^^^^->
+1->, 
+2 >    'c'
+1->Emitted(4, 5) Source(1, 26) + SourceIndex(0)
+2 >Emitted(4, 8) Source(1, 29) + SourceIndex(0)
+---
+>>>]; _i < _a.length; _i++) {
+1->^
+2 > ^^
+3 >   ^^^^^^^^^^^^^^
+4 >                 ^^
+5 >                   ^^^^
+6 >                       ^
+1->]
+2 > 
+3 >   var v
+4 >                 
+5 >                   var v of ['a', 'b', 'c']
+6 >                       )
+1->Emitted(5, 2) Source(1, 30) + SourceIndex(0)
+2 >Emitted(5, 4) Source(1, 6) + SourceIndex(0)
+3 >Emitted(5, 18) Source(1, 11) + SourceIndex(0)
+4 >Emitted(5, 20) Source(1, 6) + SourceIndex(0)
+5 >Emitted(5, 24) Source(1, 30) + SourceIndex(0)
+6 >Emitted(5, 25) Source(1, 31) + SourceIndex(0)
+---
+>>>    var v = _a[_i];
+1 >^^^^
+2 >    ^^^^
+3 >        ^
+4 >         ^^^^^^^^^
+5 >                  ^^->
+1 >
+2 >    var 
+3 >        v
+4 >         
+1 >Emitted(6, 5) Source(1, 6) + SourceIndex(0)
+2 >Emitted(6, 9) Source(1, 10) + SourceIndex(0)
+3 >Emitted(6, 10) Source(1, 11) + SourceIndex(0)
+4 >Emitted(6, 19) Source(1, 11) + SourceIndex(0)
+---
+>>>    console.log(v);
+1->^^^^
+2 >    ^^^^^^^
+3 >           ^
+4 >            ^^^
+5 >               ^
+6 >                ^
+7 >                 ^
+8 >                  ^
+1-> of ['a', 'b', 'c']) {
+  >    
+2 >    console
+3 >           .
+4 >            log
+5 >               (
+6 >                v
+7 >                 )
+8 >                  ;
+1->Emitted(7, 5) Source(2, 5) + SourceIndex(0)
+2 >Emitted(7, 12) Source(2, 12) + SourceIndex(0)
+3 >Emitted(7, 13) Source(2, 13) + SourceIndex(0)
+4 >Emitted(7, 16) Source(2, 16) + SourceIndex(0)
+5 >Emitted(7, 17) Source(2, 17) + SourceIndex(0)
+6 >Emitted(7, 18) Source(2, 18) + SourceIndex(0)
+7 >Emitted(7, 19) Source(2, 19) + SourceIndex(0)
+8 >Emitted(7, 20) Source(2, 20) + SourceIndex(0)
+---
+>>>}
+1 >^
+2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >}
+1 >Emitted(8, 2) Source(3, 2) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=ES5For-of1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of10.js b/tests/baselines/reference/ES5For-of10.js
new file mode 100644
index 00000000000..673e2ae0f77
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of10.js
@@ -0,0 +1,22 @@
+//// [ES5For-of10.ts]
+function foo() {
+    return { x: 0 };
+}
+for (foo().x of []) {
+    for (foo().x of [])
+        var p = foo().x;
+}
+
+//// [ES5For-of10.js]
+function foo() {
+    return {
+        x: 0
+    };
+}
+for (var _i = 0, _a = []; _i < _a.length; _i++) {
+    foo().x = _a[_i];
+    for (var _b = 0, _c = []; _b < _c.length; _b++) {
+        foo().x = _c[_b];
+        var p = foo().x;
+    }
+}
diff --git a/tests/baselines/reference/ES5For-of10.types b/tests/baselines/reference/ES5For-of10.types
new file mode 100644
index 00000000000..32a2adcf3da
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of10.types
@@ -0,0 +1,29 @@
+=== tests/cases/conformance/statements/for-ofStatements/ES5For-of10.ts ===
+function foo() {
+>foo : () => { x: number; }
+
+    return { x: 0 };
+>{ x: 0 } : { x: number; }
+>x : number
+}
+for (foo().x of []) {
+>foo().x : number
+>foo() : { x: number; }
+>foo : () => { x: number; }
+>x : number
+>[] : undefined[]
+
+    for (foo().x of [])
+>foo().x : number
+>foo() : { x: number; }
+>foo : () => { x: number; }
+>x : number
+>[] : undefined[]
+
+        var p = foo().x;
+>p : number
+>foo().x : number
+>foo() : { x: number; }
+>foo : () => { x: number; }
+>x : number
+}
diff --git a/tests/baselines/reference/ES5For-of11.js b/tests/baselines/reference/ES5For-of11.js
new file mode 100644
index 00000000000..dc1268524f1
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of11.js
@@ -0,0 +1,9 @@
+//// [ES5For-of11.ts]
+var v;
+for (v of []) { }
+
+//// [ES5For-of11.js]
+var v;
+for (var _i = 0, _a = []; _i < _a.length; _i++) {
+    v = _a[_i];
+}
diff --git a/tests/baselines/reference/ES5For-of11.types b/tests/baselines/reference/ES5For-of11.types
new file mode 100644
index 00000000000..e51bc46f157
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of11.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/statements/for-ofStatements/ES5For-of11.ts ===
+var v;
+>v : any
+
+for (v of []) { }
+>v : any
+>[] : undefined[]
+
diff --git a/tests/baselines/reference/ES5For-of12.errors.txt b/tests/baselines/reference/ES5For-of12.errors.txt
new file mode 100644
index 00000000000..02ed4c335a6
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of12.errors.txt
@@ -0,0 +1,7 @@
+tests/cases/conformance/statements/for-ofStatements/ES5For-of12.ts(1,7): error TS2364: Invalid left-hand side of assignment expression.
+
+
+==== tests/cases/conformance/statements/for-ofStatements/ES5For-of12.ts (1 errors) ====
+    for ([""] of [[""]]) { }
+          ~~
+!!! error TS2364: Invalid left-hand side of assignment expression.
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of12.js b/tests/baselines/reference/ES5For-of12.js
new file mode 100644
index 00000000000..7a5534f4aa1
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of12.js
@@ -0,0 +1,11 @@
+//// [ES5For-of12.ts]
+for ([""] of [[""]]) { }
+
+//// [ES5For-of12.js]
+for (var _i = 0, _a = [
+    [
+        ""
+    ]
+]; _i < _a.length; _i++) {
+    "" = _a[_i][0];
+}
diff --git a/tests/baselines/reference/ES5For-of13.js b/tests/baselines/reference/ES5For-of13.js
new file mode 100644
index 00000000000..ba9c24eebfe
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of13.js
@@ -0,0 +1,15 @@
+//// [ES5For-of13.ts]
+for (let v of ['a', 'b', 'c']) {
+    var x = v;
+}
+
+//// [ES5For-of13.js]
+for (var _i = 0, _a = [
+    'a',
+    'b',
+    'c'
+]; _i < _a.length; _i++) {
+    var v = _a[_i];
+    var x = v;
+}
+//# sourceMappingURL=ES5For-of13.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of13.js.map b/tests/baselines/reference/ES5For-of13.js.map
new file mode 100644
index 00000000000..3027624c54d
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of13.js.map
@@ -0,0 +1,2 @@
+//// [ES5For-of13.js.map]
+{"version":3,"file":"ES5For-of13.js","sourceRoot":"","sources":["ES5For-of13.ts"],"names":[],"mappings":"AAAA,GAAG,CAAC,CAAU,UAAe,EAAf;IAAC,GAAG;IAAE,GAAG;IAAE,GAAG;CAAC,EAAxB,cAAK,EAAL,IAAwB,CAAC;IAAzB,IAAI,CAAC,SAAA;IACN,IAAI,CAAC,GAAG,CAAC,CAAC;CACb"}
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of13.sourcemap.txt b/tests/baselines/reference/ES5For-of13.sourcemap.txt
new file mode 100644
index 00000000000..d2c3b6847e6
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of13.sourcemap.txt
@@ -0,0 +1,120 @@
+===================================================================
+JsFile: ES5For-of13.js
+mapUrl: ES5For-of13.js.map
+sourceRoot: 
+sources: ES5For-of13.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/conformance/statements/for-ofStatements/ES5For-of13.js
+sourceFile:ES5For-of13.ts
+-------------------------------------------------------------------
+>>>for (var _i = 0, _a = [
+1 >
+2 >^^^
+3 >   ^
+4 >    ^
+5 >     ^^^^^^^^^^
+6 >               ^^
+1 >
+2 >for
+3 >    
+4 >    (let v of 
+5 >     ['a', 'b', 'c']
+6 >               
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 4) Source(1, 4) + SourceIndex(0)
+3 >Emitted(1, 5) Source(1, 5) + SourceIndex(0)
+4 >Emitted(1, 6) Source(1, 15) + SourceIndex(0)
+5 >Emitted(1, 16) Source(1, 30) + SourceIndex(0)
+6 >Emitted(1, 18) Source(1, 15) + SourceIndex(0)
+---
+>>>    'a',
+1 >^^^^
+2 >    ^^^
+3 >       ^^->
+1 >[
+2 >    'a'
+1 >Emitted(2, 5) Source(1, 16) + SourceIndex(0)
+2 >Emitted(2, 8) Source(1, 19) + SourceIndex(0)
+---
+>>>    'b',
+1->^^^^
+2 >    ^^^
+3 >       ^->
+1->, 
+2 >    'b'
+1->Emitted(3, 5) Source(1, 21) + SourceIndex(0)
+2 >Emitted(3, 8) Source(1, 24) + SourceIndex(0)
+---
+>>>    'c'
+1->^^^^
+2 >    ^^^
+3 >       ^^^^^^^^^^^^^^^^^^^^->
+1->, 
+2 >    'c'
+1->Emitted(4, 5) Source(1, 26) + SourceIndex(0)
+2 >Emitted(4, 8) Source(1, 29) + SourceIndex(0)
+---
+>>>]; _i < _a.length; _i++) {
+1->^
+2 > ^^
+3 >   ^^^^^^^^^^^^^^
+4 >                 ^^
+5 >                   ^^^^
+6 >                       ^
+1->]
+2 > 
+3 >   let v
+4 >                 
+5 >                   let v of ['a', 'b', 'c']
+6 >                       )
+1->Emitted(5, 2) Source(1, 30) + SourceIndex(0)
+2 >Emitted(5, 4) Source(1, 6) + SourceIndex(0)
+3 >Emitted(5, 18) Source(1, 11) + SourceIndex(0)
+4 >Emitted(5, 20) Source(1, 6) + SourceIndex(0)
+5 >Emitted(5, 24) Source(1, 30) + SourceIndex(0)
+6 >Emitted(5, 25) Source(1, 31) + SourceIndex(0)
+---
+>>>    var v = _a[_i];
+1 >^^^^
+2 >    ^^^^
+3 >        ^
+4 >         ^^^^^^^^^
+1 >
+2 >    let 
+3 >        v
+4 >         
+1 >Emitted(6, 5) Source(1, 6) + SourceIndex(0)
+2 >Emitted(6, 9) Source(1, 10) + SourceIndex(0)
+3 >Emitted(6, 10) Source(1, 11) + SourceIndex(0)
+4 >Emitted(6, 19) Source(1, 11) + SourceIndex(0)
+---
+>>>    var x = v;
+1 >^^^^
+2 >    ^^^^
+3 >        ^
+4 >         ^^^
+5 >            ^
+6 >             ^
+1 > of ['a', 'b', 'c']) {
+  >    
+2 >    var 
+3 >        x
+4 >          = 
+5 >            v
+6 >             ;
+1 >Emitted(7, 5) Source(2, 5) + SourceIndex(0)
+2 >Emitted(7, 9) Source(2, 9) + SourceIndex(0)
+3 >Emitted(7, 10) Source(2, 10) + SourceIndex(0)
+4 >Emitted(7, 13) Source(2, 13) + SourceIndex(0)
+5 >Emitted(7, 14) Source(2, 14) + SourceIndex(0)
+6 >Emitted(7, 15) Source(2, 15) + SourceIndex(0)
+---
+>>>}
+1 >^
+2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >}
+1 >Emitted(8, 2) Source(3, 2) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=ES5For-of13.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of13.types b/tests/baselines/reference/ES5For-of13.types
new file mode 100644
index 00000000000..64aac2ae4b2
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of13.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/statements/for-ofStatements/ES5For-of13.ts ===
+for (let v of ['a', 'b', 'c']) {
+>v : string
+>['a', 'b', 'c'] : string[]
+
+    var x = v;
+>x : string
+>v : string
+}
diff --git a/tests/baselines/reference/ES5For-of14.js b/tests/baselines/reference/ES5For-of14.js
new file mode 100644
index 00000000000..1011bc3558c
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of14.js
@@ -0,0 +1,10 @@
+//// [ES5For-of14.ts]
+for (const v of []) {
+    var x = v;
+}
+
+//// [ES5For-of14.js]
+for (var _i = 0, _a = []; _i < _a.length; _i++) {
+    var v = _a[_i];
+    var x = v;
+}
diff --git a/tests/baselines/reference/ES5For-of14.types b/tests/baselines/reference/ES5For-of14.types
new file mode 100644
index 00000000000..0a4f9a78453
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of14.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/statements/for-ofStatements/ES5For-of14.ts ===
+for (const v of []) {
+>v : any
+>[] : undefined[]
+
+    var x = v;
+>x : any
+>v : any
+}
diff --git a/tests/baselines/reference/ES5For-of15.js b/tests/baselines/reference/ES5For-of15.js
new file mode 100644
index 00000000000..46d3dbd1d6e
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of15.js
@@ -0,0 +1,17 @@
+//// [ES5For-of15.ts]
+for (let v of []) {
+    v;
+    for (const v of []) {
+        var x = v;
+    }
+}
+
+//// [ES5For-of15.js]
+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;
+    }
+}
diff --git a/tests/baselines/reference/ES5For-of15.types b/tests/baselines/reference/ES5For-of15.types
new file mode 100644
index 00000000000..90409b8b167
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of15.types
@@ -0,0 +1,17 @@
+=== tests/cases/conformance/statements/for-ofStatements/ES5For-of15.ts ===
+for (let v of []) {
+>v : any
+>[] : undefined[]
+
+    v;
+>v : any
+
+    for (const v of []) {
+>v : any
+>[] : undefined[]
+
+        var x = v;
+>x : any
+>v : any
+    }
+}
diff --git a/tests/baselines/reference/ES5For-of16.js b/tests/baselines/reference/ES5For-of16.js
new file mode 100644
index 00000000000..1649e4481f2
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of16.js
@@ -0,0 +1,19 @@
+//// [ES5For-of16.ts]
+for (let v of []) {
+    v;
+    for (let v of []) {
+        var x = v;
+        v++;
+    }
+}
+
+//// [ES5For-of16.js]
+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++;
+    }
+}
diff --git a/tests/baselines/reference/ES5For-of16.types b/tests/baselines/reference/ES5For-of16.types
new file mode 100644
index 00000000000..94f01509711
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of16.types
@@ -0,0 +1,21 @@
+=== tests/cases/conformance/statements/for-ofStatements/ES5For-of16.ts ===
+for (let v of []) {
+>v : any
+>[] : undefined[]
+
+    v;
+>v : any
+
+    for (let v of []) {
+>v : any
+>[] : undefined[]
+
+        var x = v;
+>x : any
+>v : any
+
+        v++;
+>v++ : number
+>v : any
+    }
+}
diff --git a/tests/baselines/reference/ES5For-of17.errors.txt b/tests/baselines/reference/ES5For-of17.errors.txt
new file mode 100644
index 00000000000..3b9ab93a565
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of17.errors.txt
@@ -0,0 +1,13 @@
+tests/cases/conformance/statements/for-ofStatements/ES5For-of17.ts(3,20): error TS2448: Block-scoped variable 'v' used before its declaration.
+
+
+==== tests/cases/conformance/statements/for-ofStatements/ES5For-of17.ts (1 errors) ====
+    for (let v of []) {
+        v;
+        for (let v of [v]) {
+                       ~
+!!! error TS2448: Block-scoped variable 'v' used before its declaration.
+            var x = v;
+            v++;
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of17.js b/tests/baselines/reference/ES5For-of17.js
new file mode 100644
index 00000000000..b728074ae93
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of17.js
@@ -0,0 +1,21 @@
+//// [ES5For-of17.ts]
+for (let v of []) {
+    v;
+    for (let v of [v]) {
+        var x = v;
+        v++;
+    }
+}
+
+//// [ES5For-of17.js]
+for (var _i = 0, _a = []; _i < _a.length; _i++) {
+    var v = _a[_i];
+    v;
+    for (var _b = 0, _c = [
+        v
+    ]; _b < _c.length; _b++) {
+        var _v = _c[_b];
+        var x = _v;
+        _v++;
+    }
+}
diff --git a/tests/baselines/reference/ES5For-of18.js b/tests/baselines/reference/ES5For-of18.js
new file mode 100644
index 00000000000..a135b8b0463
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of18.js
@@ -0,0 +1,18 @@
+//// [ES5For-of18.ts]
+for (let v of []) {
+    v;
+}
+for (let v of []) {
+    v;
+}
+
+
+//// [ES5For-of18.js]
+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];
+    _v;
+}
diff --git a/tests/baselines/reference/ES5For-of18.types b/tests/baselines/reference/ES5For-of18.types
new file mode 100644
index 00000000000..e78bc846df6
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of18.types
@@ -0,0 +1,16 @@
+=== tests/cases/conformance/statements/for-ofStatements/ES5For-of18.ts ===
+for (let v of []) {
+>v : any
+>[] : undefined[]
+
+    v;
+>v : any
+}
+for (let v of []) {
+>v : any
+>[] : undefined[]
+
+    v;
+>v : any
+}
+
diff --git a/tests/baselines/reference/ES5For-of19.js b/tests/baselines/reference/ES5For-of19.js
new file mode 100644
index 00000000000..7af9418f04f
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of19.js
@@ -0,0 +1,22 @@
+//// [ES5For-of19.ts]
+for (let v of []) {
+    v;
+    function foo() {
+        for (const v of []) {
+            v;
+        }
+    }
+}
+
+
+//// [ES5For-of19.js]
+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;
+        }
+    }
+}
diff --git a/tests/baselines/reference/ES5For-of19.types b/tests/baselines/reference/ES5For-of19.types
new file mode 100644
index 00000000000..d95dc63d262
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of19.types
@@ -0,0 +1,21 @@
+=== tests/cases/conformance/statements/for-ofStatements/ES5For-of19.ts ===
+for (let v of []) {
+>v : any
+>[] : undefined[]
+
+    v;
+>v : any
+
+    function foo() {
+>foo : () => void
+
+        for (const v of []) {
+>v : any
+>[] : undefined[]
+
+            v;
+>v : any
+        }
+    }
+}
+
diff --git a/tests/baselines/reference/ES5For-of2.js b/tests/baselines/reference/ES5For-of2.js
new file mode 100644
index 00000000000..3d83df36c76
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of2.js
@@ -0,0 +1,10 @@
+//// [ES5For-of2.ts]
+for (var v of []) {
+    var x = v;
+}
+
+//// [ES5For-of2.js]
+for (var _i = 0, _a = []; _i < _a.length; _i++) {
+    var v = _a[_i];
+    var x = v;
+}
diff --git a/tests/baselines/reference/ES5For-of2.types b/tests/baselines/reference/ES5For-of2.types
new file mode 100644
index 00000000000..3e680c44bc8
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of2.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/statements/for-ofStatements/ES5For-of2.ts ===
+for (var v of []) {
+>v : any
+>[] : undefined[]
+
+    var x = v;
+>x : any
+>v : any
+}
diff --git a/tests/baselines/reference/ES5For-of20.errors.txt b/tests/baselines/reference/ES5For-of20.errors.txt
new file mode 100644
index 00000000000..772d5143a04
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of20.errors.txt
@@ -0,0 +1,15 @@
+tests/cases/conformance/statements/for-ofStatements/ES5For-of20.ts(3,20): error TS2448: Block-scoped variable 'v' used before its declaration.
+tests/cases/conformance/statements/for-ofStatements/ES5For-of20.ts(4,15): error TS1155: 'const' declarations must be initialized
+
+
+==== tests/cases/conformance/statements/for-ofStatements/ES5For-of20.ts (2 errors) ====
+    for (let v of []) {
+        let v;
+        for (let v of [v]) {
+                       ~
+!!! error TS2448: Block-scoped variable 'v' used before its declaration.
+            const v;
+                  ~
+!!! error TS1155: 'const' declarations must be initialized
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of20.js b/tests/baselines/reference/ES5For-of20.js
new file mode 100644
index 00000000000..3dd707805d8
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of20.js
@@ -0,0 +1,19 @@
+//// [ES5For-of20.ts]
+for (let v of []) {
+    let v;
+    for (let v of [v]) {
+        const v;
+    }
+}
+
+//// [ES5For-of20.js]
+for (var _i = 0, _a = []; _i < _a.length; _i++) {
+    var v = _a[_i];
+    var _v;
+    for (var _b = 0, _c = [
+        v
+    ]; _b < _c.length; _b++) {
+        var _v_1 = _c[_b];
+        var _v_2;
+    }
+}
diff --git a/tests/baselines/reference/ES5For-of21.js b/tests/baselines/reference/ES5For-of21.js
new file mode 100644
index 00000000000..9356514ea6b
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of21.js
@@ -0,0 +1,12 @@
+//// [ES5For-of21.ts]
+for (let v of []) {
+    for (let _i of []) { }
+}
+
+//// [ES5For-of21.js]
+for (var _i = 0, _a = []; _i < _a.length; _i++) {
+    var v = _a[_i];
+    for (var _b = 0, _c = []; _b < _c.length; _b++) {
+        var _i_1 = _c[_b];
+    }
+}
diff --git a/tests/baselines/reference/ES5For-of21.types b/tests/baselines/reference/ES5For-of21.types
new file mode 100644
index 00000000000..a15942fd013
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of21.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/statements/for-ofStatements/ES5For-of21.ts ===
+for (let v of []) {
+>v : any
+>[] : undefined[]
+
+    for (let _i of []) { }
+>_i : any
+>[] : undefined[]
+}
diff --git a/tests/baselines/reference/ES5For-of22.errors.txt b/tests/baselines/reference/ES5For-of22.errors.txt
new file mode 100644
index 00000000000..914be13c63c
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of22.errors.txt
@@ -0,0 +1,10 @@
+tests/cases/conformance/statements/for-ofStatements/ES5For-of22.ts(3,5): error TS2304: Cannot find name 'console'.
+
+
+==== tests/cases/conformance/statements/for-ofStatements/ES5For-of22.ts (1 errors) ====
+    for (var x of [1, 2, 3]) {
+        let _a = 0;
+        console.log(x);
+        ~~~~~~~
+!!! error TS2304: Cannot find name 'console'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of22.js b/tests/baselines/reference/ES5For-of22.js
new file mode 100644
index 00000000000..63608f36e51
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of22.js
@@ -0,0 +1,16 @@
+//// [ES5For-of22.ts]
+for (var x of [1, 2, 3]) {
+    let _a = 0;
+    console.log(x);
+}
+
+//// [ES5For-of22.js]
+for (var _i = 0, _a = [
+    1,
+    2,
+    3
+]; _i < _a.length; _i++) {
+    var x = _a[_i];
+    var _a_1 = 0;
+    console.log(x);
+}
diff --git a/tests/baselines/reference/ES5For-of23.errors.txt b/tests/baselines/reference/ES5For-of23.errors.txt
new file mode 100644
index 00000000000..cbc043e32d2
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of23.errors.txt
@@ -0,0 +1,10 @@
+tests/cases/conformance/statements/for-ofStatements/ES5For-of23.ts(3,5): error TS2304: Cannot find name 'console'.
+
+
+==== tests/cases/conformance/statements/for-ofStatements/ES5For-of23.ts (1 errors) ====
+    for (var x of [1, 2, 3]) {
+        var _a = 0;
+        console.log(x);
+        ~~~~~~~
+!!! error TS2304: Cannot find name 'console'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of23.js b/tests/baselines/reference/ES5For-of23.js
new file mode 100644
index 00000000000..dcecfac69df
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of23.js
@@ -0,0 +1,16 @@
+//// [ES5For-of23.ts]
+for (var x of [1, 2, 3]) {
+    var _a = 0;
+    console.log(x);
+}
+
+//// [ES5For-of23.js]
+for (var _i = 0, _b = [
+    1,
+    2,
+    3
+]; _i < _b.length; _i++) {
+    var x = _b[_i];
+    var _a = 0;
+    console.log(x);
+}
diff --git a/tests/baselines/reference/ES5For-of24.js b/tests/baselines/reference/ES5For-of24.js
new file mode 100644
index 00000000000..418ccc2005c
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of24.js
@@ -0,0 +1,16 @@
+//// [ES5For-of24.ts]
+var a = [1, 2, 3];
+for (var v of a) {
+    let a = 0;
+}
+
+//// [ES5For-of24.js]
+var a = [
+    1,
+    2,
+    3
+];
+for (var _i = 0; _i < a.length; _i++) {
+    var v = a[_i];
+    var _a = 0;
+}
diff --git a/tests/baselines/reference/ES5For-of24.types b/tests/baselines/reference/ES5For-of24.types
new file mode 100644
index 00000000000..7170073b5d9
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of24.types
@@ -0,0 +1,12 @@
+=== tests/cases/conformance/statements/for-ofStatements/ES5For-of24.ts ===
+var a = [1, 2, 3];
+>a : number[]
+>[1, 2, 3] : number[]
+
+for (var v of a) {
+>v : number
+>a : number[]
+
+    let a = 0;
+>a : number
+}
diff --git a/tests/baselines/reference/ES5For-of25.js b/tests/baselines/reference/ES5For-of25.js
new file mode 100644
index 00000000000..14e59a472fc
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of25.js
@@ -0,0 +1,19 @@
+//// [ES5For-of25.ts]
+var a = [1, 2, 3];
+for (var v of a) {
+    v;
+    a;
+}
+
+//// [ES5For-of25.js]
+var a = [
+    1,
+    2,
+    3
+];
+for (var _i = 0; _i < a.length; _i++) {
+    var v = a[_i];
+    v;
+    a;
+}
+//# sourceMappingURL=ES5For-of25.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of25.js.map b/tests/baselines/reference/ES5For-of25.js.map
new file mode 100644
index 00000000000..90f1b9c0750
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of25.js.map
@@ -0,0 +1,2 @@
+//// [ES5For-of25.js.map]
+{"version":3,"file":"ES5For-of25.js","sourceRoot":"","sources":["ES5For-of25.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG;IAAC,CAAC;IAAE,CAAC;IAAE,CAAC;CAAC,CAAC;AAClB,GAAG,CAAC,CAAU,UAAC,EAAV,aAAK,EAAL,IAAU,CAAC;IAAX,IAAI,CAAC,GAAI,CAAC,IAAL;IACN,CAAC,CAAC;IACF,CAAC,CAAC;CACL"}
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of25.sourcemap.txt b/tests/baselines/reference/ES5For-of25.sourcemap.txt
new file mode 100644
index 00000000000..1031764b03a
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of25.sourcemap.txt
@@ -0,0 +1,145 @@
+===================================================================
+JsFile: ES5For-of25.js
+mapUrl: ES5For-of25.js.map
+sourceRoot: 
+sources: ES5For-of25.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/conformance/statements/for-ofStatements/ES5For-of25.js
+sourceFile:ES5For-of25.ts
+-------------------------------------------------------------------
+>>>var a = [
+1 >
+2 >^^^^
+3 >    ^
+4 >     ^^^
+1 >
+2 >var 
+3 >    a
+4 >      = 
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 5) Source(1, 5) + SourceIndex(0)
+3 >Emitted(1, 6) Source(1, 6) + SourceIndex(0)
+4 >Emitted(1, 9) Source(1, 9) + SourceIndex(0)
+---
+>>>    1,
+1 >^^^^
+2 >    ^
+3 >     ^^->
+1 >[
+2 >    1
+1 >Emitted(2, 5) Source(1, 10) + SourceIndex(0)
+2 >Emitted(2, 6) Source(1, 11) + SourceIndex(0)
+---
+>>>    2,
+1->^^^^
+2 >    ^
+3 >     ^->
+1->, 
+2 >    2
+1->Emitted(3, 5) Source(1, 13) + SourceIndex(0)
+2 >Emitted(3, 6) Source(1, 14) + SourceIndex(0)
+---
+>>>    3
+1->^^^^
+2 >    ^
+1->, 
+2 >    3
+1->Emitted(4, 5) Source(1, 16) + SourceIndex(0)
+2 >Emitted(4, 6) Source(1, 17) + SourceIndex(0)
+---
+>>>];
+1 >^
+2 > ^
+3 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >]
+2 > ;
+1 >Emitted(5, 2) Source(1, 18) + SourceIndex(0)
+2 >Emitted(5, 3) Source(1, 19) + SourceIndex(0)
+---
+>>>for (var _i = 0; _i < a.length; _i++) {
+1->
+2 >^^^
+3 >   ^
+4 >    ^
+5 >     ^^^^^^^^^^
+6 >               ^^
+7 >                 ^^^^^^^^^^^^^
+8 >                              ^^
+9 >                                ^^^^
+10>                                    ^
+1->
+  >
+2 >for
+3 >    
+4 >    (var v of 
+5 >     a
+6 >               
+7 >                 var v
+8 >                              
+9 >                                var v of a
+10>                                    )
+1->Emitted(6, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(6, 4) Source(2, 4) + SourceIndex(0)
+3 >Emitted(6, 5) Source(2, 5) + SourceIndex(0)
+4 >Emitted(6, 6) Source(2, 15) + SourceIndex(0)
+5 >Emitted(6, 16) Source(2, 16) + SourceIndex(0)
+6 >Emitted(6, 18) Source(2, 6) + SourceIndex(0)
+7 >Emitted(6, 31) Source(2, 11) + SourceIndex(0)
+8 >Emitted(6, 33) Source(2, 6) + SourceIndex(0)
+9 >Emitted(6, 37) Source(2, 16) + SourceIndex(0)
+10>Emitted(6, 38) Source(2, 17) + SourceIndex(0)
+---
+>>>    var v = a[_i];
+1 >^^^^
+2 >    ^^^^
+3 >        ^
+4 >         ^^^
+5 >            ^
+6 >             ^^^^
+1 >
+2 >    var 
+3 >        v
+4 >          of 
+5 >            a
+6 >             
+1 >Emitted(7, 5) Source(2, 6) + SourceIndex(0)
+2 >Emitted(7, 9) Source(2, 10) + SourceIndex(0)
+3 >Emitted(7, 10) Source(2, 11) + SourceIndex(0)
+4 >Emitted(7, 13) Source(2, 15) + SourceIndex(0)
+5 >Emitted(7, 14) Source(2, 16) + SourceIndex(0)
+6 >Emitted(7, 18) Source(2, 11) + SourceIndex(0)
+---
+>>>    v;
+1 >^^^^
+2 >    ^
+3 >     ^
+4 >      ^->
+1 > of a) {
+  >    
+2 >    v
+3 >     ;
+1 >Emitted(8, 5) Source(3, 5) + SourceIndex(0)
+2 >Emitted(8, 6) Source(3, 6) + SourceIndex(0)
+3 >Emitted(8, 7) Source(3, 7) + SourceIndex(0)
+---
+>>>    a;
+1->^^^^
+2 >    ^
+3 >     ^
+1->
+  >    
+2 >    a
+3 >     ;
+1->Emitted(9, 5) Source(4, 5) + SourceIndex(0)
+2 >Emitted(9, 6) Source(4, 6) + SourceIndex(0)
+3 >Emitted(9, 7) Source(4, 7) + SourceIndex(0)
+---
+>>>}
+1 >^
+2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >}
+1 >Emitted(10, 2) Source(5, 2) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=ES5For-of25.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of25.types b/tests/baselines/reference/ES5For-of25.types
new file mode 100644
index 00000000000..7b306ee9a26
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of25.types
@@ -0,0 +1,15 @@
+=== tests/cases/conformance/statements/for-ofStatements/ES5For-of25.ts ===
+var a = [1, 2, 3];
+>a : number[]
+>[1, 2, 3] : number[]
+
+for (var v of a) {
+>v : number
+>a : number[]
+
+    v;
+>v : number
+
+    a;
+>a : number[]
+}
diff --git a/tests/baselines/reference/ES5For-of26.errors.txt b/tests/baselines/reference/ES5For-of26.errors.txt
new file mode 100644
index 00000000000..324ded25b4f
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of26.errors.txt
@@ -0,0 +1,10 @@
+tests/cases/conformance/statements/for-ofStatements/ES5For-of26.ts(1,10): error TS2461: Type 'number' is not an array type.
+
+
+==== tests/cases/conformance/statements/for-ofStatements/ES5For-of26.ts (1 errors) ====
+    for (var [a = 0, b = 1] of [2, 3]) {
+             ~~~~~~~~~~~~~~
+!!! error TS2461: Type 'number' is not an array type.
+        a;
+        b;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of26.js b/tests/baselines/reference/ES5For-of26.js
new file mode 100644
index 00000000000..2cbb65ad790
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of26.js
@@ -0,0 +1,16 @@
+//// [ES5For-of26.ts]
+for (var [a = 0, b = 1] of [2, 3]) {
+    a;
+    b;
+}
+
+//// [ES5For-of26.js]
+for (var _i = 0, _a = [
+    2,
+    3
+]; _i < _a.length; _i++) {
+    var _b = _a[_i], _c = _b[0], a = _c === void 0 ? 0 : _c, _d = _b[1], b = _d === void 0 ? 1 : _d;
+    a;
+    b;
+}
+//# sourceMappingURL=ES5For-of26.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of26.js.map b/tests/baselines/reference/ES5For-of26.js.map
new file mode 100644
index 00000000000..d80a8a75951
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of26.js.map
@@ -0,0 +1,2 @@
+//// [ES5For-of26.js.map]
+{"version":3,"file":"ES5For-of26.js","sourceRoot":"","sources":["ES5For-of26.ts"],"names":[],"mappings":"AAAA,GAAG,CAAC,CAAuB,UAAM,EAAN;IAAC,CAAC;IAAE,CAAC;CAAC,EAA5B,cAAkB,EAAlB,IAA4B,CAAC;IAA7B,6BAAK,CAAC,mBAAG,CAAC,mBAAE,CAAC,mBAAG,CAAC,KAAC;IACnB,CAAC,CAAC;IACF,CAAC,CAAC;CACL"}
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of26.sourcemap.txt b/tests/baselines/reference/ES5For-of26.sourcemap.txt
new file mode 100644
index 00000000000..4fcc759dca8
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of26.sourcemap.txt
@@ -0,0 +1,134 @@
+===================================================================
+JsFile: ES5For-of26.js
+mapUrl: ES5For-of26.js.map
+sourceRoot: 
+sources: ES5For-of26.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/conformance/statements/for-ofStatements/ES5For-of26.js
+sourceFile:ES5For-of26.ts
+-------------------------------------------------------------------
+>>>for (var _i = 0, _a = [
+1 >
+2 >^^^
+3 >   ^
+4 >    ^
+5 >     ^^^^^^^^^^
+6 >               ^^
+1 >
+2 >for
+3 >    
+4 >    (var [a = 0, b = 1] of 
+5 >     [2, 3]
+6 >               
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 4) Source(1, 4) + SourceIndex(0)
+3 >Emitted(1, 5) Source(1, 5) + SourceIndex(0)
+4 >Emitted(1, 6) Source(1, 28) + SourceIndex(0)
+5 >Emitted(1, 16) Source(1, 34) + SourceIndex(0)
+6 >Emitted(1, 18) Source(1, 28) + SourceIndex(0)
+---
+>>>    2,
+1 >^^^^
+2 >    ^
+3 >     ^->
+1 >[
+2 >    2
+1 >Emitted(2, 5) Source(1, 29) + SourceIndex(0)
+2 >Emitted(2, 6) Source(1, 30) + SourceIndex(0)
+---
+>>>    3
+1->^^^^
+2 >    ^
+3 >     ^^^^^^^^^^^^^^^^^^^^^^->
+1->, 
+2 >    3
+1->Emitted(3, 5) Source(1, 32) + SourceIndex(0)
+2 >Emitted(3, 6) Source(1, 33) + SourceIndex(0)
+---
+>>>]; _i < _a.length; _i++) {
+1->^
+2 > ^^
+3 >   ^^^^^^^^^^^^^^
+4 >                 ^^
+5 >                   ^^^^
+6 >                       ^
+7 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->]
+2 > 
+3 >   var [a = 0, b = 1]
+4 >                 
+5 >                   var [a = 0, b = 1] of [2, 3]
+6 >                       )
+1->Emitted(4, 2) Source(1, 34) + SourceIndex(0)
+2 >Emitted(4, 4) Source(1, 6) + SourceIndex(0)
+3 >Emitted(4, 18) Source(1, 24) + SourceIndex(0)
+4 >Emitted(4, 20) Source(1, 6) + SourceIndex(0)
+5 >Emitted(4, 24) Source(1, 34) + SourceIndex(0)
+6 >Emitted(4, 25) Source(1, 35) + SourceIndex(0)
+---
+>>>    var _b = _a[_i], _c = _b[0], a = _c === void 0 ? 0 : _c, _d = _b[1], b = _d === void 0 ? 1 : _d;
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^
+4 >                                  ^^^^^^^^^^^^^^^^^^^
+5 >                                                     ^
+6 >                                                      ^^^^^^^^^^^^^^^^^^^
+7 >                                                                         ^
+8 >                                                                          ^^^^^^^^^^^^^^^^^^^
+9 >                                                                                             ^
+10>                                                                                              ^^^^^
+1->
+2 >    var [
+3 >                                 a
+4 >                                   = 
+5 >                                                     0
+6 >                                                      , 
+7 >                                                                         b
+8 >                                                                           = 
+9 >                                                                                             1
+10>                                                                                              ]
+1->Emitted(5, 5) Source(1, 6) + SourceIndex(0)
+2 >Emitted(5, 34) Source(1, 11) + SourceIndex(0)
+3 >Emitted(5, 35) Source(1, 12) + SourceIndex(0)
+4 >Emitted(5, 54) Source(1, 15) + SourceIndex(0)
+5 >Emitted(5, 55) Source(1, 16) + SourceIndex(0)
+6 >Emitted(5, 74) Source(1, 18) + SourceIndex(0)
+7 >Emitted(5, 75) Source(1, 19) + SourceIndex(0)
+8 >Emitted(5, 94) Source(1, 22) + SourceIndex(0)
+9 >Emitted(5, 95) Source(1, 23) + SourceIndex(0)
+10>Emitted(5, 100) Source(1, 24) + SourceIndex(0)
+---
+>>>    a;
+1 >^^^^
+2 >    ^
+3 >     ^
+4 >      ^->
+1 > of [2, 3]) {
+  >    
+2 >    a
+3 >     ;
+1 >Emitted(6, 5) Source(2, 5) + SourceIndex(0)
+2 >Emitted(6, 6) Source(2, 6) + SourceIndex(0)
+3 >Emitted(6, 7) Source(2, 7) + SourceIndex(0)
+---
+>>>    b;
+1->^^^^
+2 >    ^
+3 >     ^
+1->
+  >    
+2 >    b
+3 >     ;
+1->Emitted(7, 5) Source(3, 5) + SourceIndex(0)
+2 >Emitted(7, 6) Source(3, 6) + SourceIndex(0)
+3 >Emitted(7, 7) Source(3, 7) + SourceIndex(0)
+---
+>>>}
+1 >^
+2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >}
+1 >Emitted(8, 2) Source(4, 2) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=ES5For-of26.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of27.errors.txt b/tests/baselines/reference/ES5For-of27.errors.txt
new file mode 100644
index 00000000000..0c839859930
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of27.errors.txt
@@ -0,0 +1,13 @@
+tests/cases/conformance/statements/for-ofStatements/ES5For-of27.ts(1,11): error TS2459: Type 'number' has no property 'x' and no string index signature.
+tests/cases/conformance/statements/for-ofStatements/ES5For-of27.ts(1,21): error TS2459: Type 'number' has no property 'y' and no string index signature.
+
+
+==== tests/cases/conformance/statements/for-ofStatements/ES5For-of27.ts (2 errors) ====
+    for (var {x: a = 0, y: b = 1} of [2, 3]) {
+              ~
+!!! error TS2459: Type 'number' has no property 'x' and no string index signature.
+                        ~
+!!! error TS2459: Type 'number' has no property 'y' and no string index signature.
+        a;
+        b;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of27.js b/tests/baselines/reference/ES5For-of27.js
new file mode 100644
index 00000000000..c3993f6da52
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of27.js
@@ -0,0 +1,15 @@
+//// [ES5For-of27.ts]
+for (var {x: a = 0, y: b = 1} of [2, 3]) {
+    a;
+    b;
+}
+
+//// [ES5For-of27.js]
+for (var _i = 0, _a = [
+    2,
+    3
+]; _i < _a.length; _i++) {
+    var _b = _a[_i], _c = _b.x, a = _c === void 0 ? 0 : _c, _d = _b.y, b = _d === void 0 ? 1 : _d;
+    a;
+    b;
+}
diff --git a/tests/baselines/reference/ES5For-of28.errors.txt b/tests/baselines/reference/ES5For-of28.errors.txt
new file mode 100644
index 00000000000..81398fa5a9b
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of28.errors.txt
@@ -0,0 +1,10 @@
+tests/cases/conformance/statements/for-ofStatements/ES5For-of28.ts(1,10): error TS2461: Type 'number' is not an array type.
+
+
+==== tests/cases/conformance/statements/for-ofStatements/ES5For-of28.ts (1 errors) ====
+    for (let [a = 0, b = 1] of [2, 3]) {
+             ~~~~~~~~~~~~~~
+!!! error TS2461: Type 'number' is not an array type.
+        a;
+        b;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of28.js b/tests/baselines/reference/ES5For-of28.js
new file mode 100644
index 00000000000..f1fa44a8453
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of28.js
@@ -0,0 +1,15 @@
+//// [ES5For-of28.ts]
+for (let [a = 0, b = 1] of [2, 3]) {
+    a;
+    b;
+}
+
+//// [ES5For-of28.js]
+for (var _i = 0, _a = [
+    2,
+    3
+]; _i < _a.length; _i++) {
+    var _b = _a[_i], _c = _b[0], a = _c === void 0 ? 0 : _c, _d = _b[1], b = _d === void 0 ? 1 : _d;
+    a;
+    b;
+}
diff --git a/tests/baselines/reference/ES5For-of29.errors.txt b/tests/baselines/reference/ES5For-of29.errors.txt
new file mode 100644
index 00000000000..e669b070222
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of29.errors.txt
@@ -0,0 +1,13 @@
+tests/cases/conformance/statements/for-ofStatements/ES5For-of29.ts(1,13): error TS2459: Type 'number' has no property 'x' and no string index signature.
+tests/cases/conformance/statements/for-ofStatements/ES5For-of29.ts(1,23): error TS2459: Type 'number' has no property 'y' and no string index signature.
+
+
+==== tests/cases/conformance/statements/for-ofStatements/ES5For-of29.ts (2 errors) ====
+    for (const {x: a = 0, y: b = 1} of [2, 3]) {
+                ~
+!!! error TS2459: Type 'number' has no property 'x' and no string index signature.
+                          ~
+!!! error TS2459: Type 'number' has no property 'y' and no string index signature.
+        a;
+        b;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of29.js b/tests/baselines/reference/ES5For-of29.js
new file mode 100644
index 00000000000..11f847262e9
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of29.js
@@ -0,0 +1,15 @@
+//// [ES5For-of29.ts]
+for (const {x: a = 0, y: b = 1} of [2, 3]) {
+    a;
+    b;
+}
+
+//// [ES5For-of29.js]
+for (var _i = 0, _a = [
+    2,
+    3
+]; _i < _a.length; _i++) {
+    var _b = _a[_i], _c = _b.x, a = _c === void 0 ? 0 : _c, _d = _b.y, b = _d === void 0 ? 1 : _d;
+    a;
+    b;
+}
diff --git a/tests/baselines/reference/ES5For-of3.js b/tests/baselines/reference/ES5For-of3.js
new file mode 100644
index 00000000000..9c2808edbba
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of3.js
@@ -0,0 +1,14 @@
+//// [ES5For-of3.ts]
+for (var v of ['a', 'b', 'c'])
+    var x = v;
+
+//// [ES5For-of3.js]
+for (var _i = 0, _a = [
+    'a',
+    'b',
+    'c'
+]; _i < _a.length; _i++) {
+    var v = _a[_i];
+    var x = v;
+}
+//# sourceMappingURL=ES5For-of3.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of3.js.map b/tests/baselines/reference/ES5For-of3.js.map
new file mode 100644
index 00000000000..bfc09619d8e
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of3.js.map
@@ -0,0 +1,2 @@
+//// [ES5For-of3.js.map]
+{"version":3,"file":"ES5For-of3.js","sourceRoot":"","sources":["ES5For-of3.ts"],"names":[],"mappings":"AAAA,GAAG,CAAC,CAAU,UAAe,EAAf;IAAC,GAAG;IAAE,GAAG;IAAE,GAAG;CAAC,EAAxB,cAAK,EAAL,IAAwB,CAAC;IAAzB,IAAI,CAAC,SAAA;IACN,IAAI,CAAC,GAAG,CAAC,CAAC;CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of3.sourcemap.txt b/tests/baselines/reference/ES5For-of3.sourcemap.txt
new file mode 100644
index 00000000000..252a4a7414c
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of3.sourcemap.txt
@@ -0,0 +1,119 @@
+===================================================================
+JsFile: ES5For-of3.js
+mapUrl: ES5For-of3.js.map
+sourceRoot: 
+sources: ES5For-of3.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/conformance/statements/for-ofStatements/ES5For-of3.js
+sourceFile:ES5For-of3.ts
+-------------------------------------------------------------------
+>>>for (var _i = 0, _a = [
+1 >
+2 >^^^
+3 >   ^
+4 >    ^
+5 >     ^^^^^^^^^^
+6 >               ^^
+1 >
+2 >for
+3 >    
+4 >    (var v of 
+5 >     ['a', 'b', 'c']
+6 >               
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 4) Source(1, 4) + SourceIndex(0)
+3 >Emitted(1, 5) Source(1, 5) + SourceIndex(0)
+4 >Emitted(1, 6) Source(1, 15) + SourceIndex(0)
+5 >Emitted(1, 16) Source(1, 30) + SourceIndex(0)
+6 >Emitted(1, 18) Source(1, 15) + SourceIndex(0)
+---
+>>>    'a',
+1 >^^^^
+2 >    ^^^
+3 >       ^^->
+1 >[
+2 >    'a'
+1 >Emitted(2, 5) Source(1, 16) + SourceIndex(0)
+2 >Emitted(2, 8) Source(1, 19) + SourceIndex(0)
+---
+>>>    'b',
+1->^^^^
+2 >    ^^^
+3 >       ^->
+1->, 
+2 >    'b'
+1->Emitted(3, 5) Source(1, 21) + SourceIndex(0)
+2 >Emitted(3, 8) Source(1, 24) + SourceIndex(0)
+---
+>>>    'c'
+1->^^^^
+2 >    ^^^
+3 >       ^^^^^^^^^^^^^^^^^^^^->
+1->, 
+2 >    'c'
+1->Emitted(4, 5) Source(1, 26) + SourceIndex(0)
+2 >Emitted(4, 8) Source(1, 29) + SourceIndex(0)
+---
+>>>]; _i < _a.length; _i++) {
+1->^
+2 > ^^
+3 >   ^^^^^^^^^^^^^^
+4 >                 ^^
+5 >                   ^^^^
+6 >                       ^
+1->]
+2 > 
+3 >   var v
+4 >                 
+5 >                   var v of ['a', 'b', 'c']
+6 >                       )
+1->Emitted(5, 2) Source(1, 30) + SourceIndex(0)
+2 >Emitted(5, 4) Source(1, 6) + SourceIndex(0)
+3 >Emitted(5, 18) Source(1, 11) + SourceIndex(0)
+4 >Emitted(5, 20) Source(1, 6) + SourceIndex(0)
+5 >Emitted(5, 24) Source(1, 30) + SourceIndex(0)
+6 >Emitted(5, 25) Source(1, 31) + SourceIndex(0)
+---
+>>>    var v = _a[_i];
+1 >^^^^
+2 >    ^^^^
+3 >        ^
+4 >         ^^^^^^^^^
+1 >
+2 >    var 
+3 >        v
+4 >         
+1 >Emitted(6, 5) Source(1, 6) + SourceIndex(0)
+2 >Emitted(6, 9) Source(1, 10) + SourceIndex(0)
+3 >Emitted(6, 10) Source(1, 11) + SourceIndex(0)
+4 >Emitted(6, 19) Source(1, 11) + SourceIndex(0)
+---
+>>>    var x = v;
+1 >^^^^
+2 >    ^^^^
+3 >        ^
+4 >         ^^^
+5 >            ^
+6 >             ^
+1 > of ['a', 'b', 'c'])
+  >    
+2 >    var 
+3 >        x
+4 >          = 
+5 >            v
+6 >             ;
+1 >Emitted(7, 5) Source(2, 5) + SourceIndex(0)
+2 >Emitted(7, 9) Source(2, 9) + SourceIndex(0)
+3 >Emitted(7, 10) Source(2, 10) + SourceIndex(0)
+4 >Emitted(7, 13) Source(2, 13) + SourceIndex(0)
+5 >Emitted(7, 14) Source(2, 14) + SourceIndex(0)
+6 >Emitted(7, 15) Source(2, 15) + SourceIndex(0)
+---
+>>>}
+1 >^
+2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+1 >Emitted(8, 2) Source(2, 15) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=ES5For-of3.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of3.types b/tests/baselines/reference/ES5For-of3.types
new file mode 100644
index 00000000000..c47328816e8
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of3.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/statements/for-ofStatements/ES5For-of3.ts ===
+for (var v of ['a', 'b', 'c'])
+>v : string
+>['a', 'b', 'c'] : string[]
+
+    var x = v;
+>x : string
+>v : string
+
diff --git a/tests/baselines/reference/ES5For-of30.errors.txt b/tests/baselines/reference/ES5For-of30.errors.txt
new file mode 100644
index 00000000000..0b02a55ba3f
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of30.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/conformance/statements/for-ofStatements/ES5For-of30.ts(3,6): error TS2461: Type 'string | number' is not an array type.
+
+
+==== tests/cases/conformance/statements/for-ofStatements/ES5For-of30.ts (1 errors) ====
+    var a: string, b: number;
+    var tuple: [number, string] = [2, "3"];
+    for ([a = 1, b = ""] of tuple) {
+         ~~~~~~~~~~~~~~~
+!!! error TS2461: Type 'string | number' is not an array type.
+        a;
+        b;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of30.js b/tests/baselines/reference/ES5For-of30.js
new file mode 100644
index 00000000000..f76a7938dcb
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of30.js
@@ -0,0 +1,20 @@
+//// [ES5For-of30.ts]
+var a: string, b: number;
+var tuple: [number, string] = [2, "3"];
+for ([a = 1, b = ""] of tuple) {
+    a;
+    b;
+}
+
+//// [ES5For-of30.js]
+var a, b;
+var tuple = [
+    2,
+    "3"
+];
+for (var _i = 0; _i < tuple.length; _i++) {
+    _a = tuple[_i], _b = _a[0], a = _b === void 0 ? 1 : _b, _c = _a[1], b = _c === void 0 ? "" : _c;
+    a;
+    b;
+}
+var _a, _b, _c;
diff --git a/tests/baselines/reference/ES5For-of31.errors.txt b/tests/baselines/reference/ES5For-of31.errors.txt
new file mode 100644
index 00000000000..4a49e1fdf92
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of31.errors.txt
@@ -0,0 +1,15 @@
+tests/cases/conformance/statements/for-ofStatements/ES5For-of31.ts(3,8): error TS2459: Type 'undefined' has no property 'a' and no string index signature.
+tests/cases/conformance/statements/for-ofStatements/ES5For-of31.ts(3,18): error TS2459: Type 'undefined' has no property 'b' and no string index signature.
+
+
+==== tests/cases/conformance/statements/for-ofStatements/ES5For-of31.ts (2 errors) ====
+    var a: string, b: number;
+    
+    for ({ a: b = 1, b: a = ""} of []) {
+           ~
+!!! error TS2459: Type 'undefined' has no property 'a' and no string index signature.
+                     ~
+!!! error TS2459: Type 'undefined' has no property 'b' and no string index signature.
+        a;
+        b;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of31.js b/tests/baselines/reference/ES5For-of31.js
new file mode 100644
index 00000000000..6b038e377cb
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of31.js
@@ -0,0 +1,16 @@
+//// [ES5For-of31.ts]
+var a: string, b: number;
+
+for ({ a: b = 1, b: a = ""} of []) {
+    a;
+    b;
+}
+
+//// [ES5For-of31.js]
+var a, b;
+for (var _i = 0, _a = []; _i < _a.length; _i++) {
+    _b = _a[_i], _c = _b.a, b = _c === void 0 ? 1 : _c, _d = _b.b, a = _d === void 0 ? "" : _d;
+    a;
+    b;
+}
+var _b, _c, _d;
diff --git a/tests/baselines/reference/ES5For-of4.js b/tests/baselines/reference/ES5For-of4.js
new file mode 100644
index 00000000000..44d486dddf0
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of4.js
@@ -0,0 +1,11 @@
+//// [ES5For-of4.ts]
+for (var v of [])
+    var x = v;
+var y = v;
+
+//// [ES5For-of4.js]
+for (var _i = 0, _a = []; _i < _a.length; _i++) {
+    var v = _a[_i];
+    var x = v;
+}
+var y = v;
diff --git a/tests/baselines/reference/ES5For-of4.types b/tests/baselines/reference/ES5For-of4.types
new file mode 100644
index 00000000000..9396096746c
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of4.types
@@ -0,0 +1,13 @@
+=== tests/cases/conformance/statements/for-ofStatements/ES5For-of4.ts ===
+for (var v of [])
+>v : any
+>[] : undefined[]
+
+    var x = v;
+>x : any
+>v : any
+
+var y = v;
+>y : any
+>v : any
+
diff --git a/tests/baselines/reference/ES5For-of5.js b/tests/baselines/reference/ES5For-of5.js
new file mode 100644
index 00000000000..8e1a37db061
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of5.js
@@ -0,0 +1,10 @@
+//// [ES5For-of5.ts]
+for (var _a of []) {
+    var x = _a;
+}
+
+//// [ES5For-of5.js]
+for (var _i = 0, _b = []; _i < _b.length; _i++) {
+    var _a = _b[_i];
+    var x = _a;
+}
diff --git a/tests/baselines/reference/ES5For-of5.types b/tests/baselines/reference/ES5For-of5.types
new file mode 100644
index 00000000000..dd9aa285edb
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of5.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/statements/for-ofStatements/ES5For-of5.ts ===
+for (var _a of []) {
+>_a : any
+>[] : undefined[]
+
+    var x = _a;
+>x : any
+>_a : any
+}
diff --git a/tests/baselines/reference/ES5For-of6.js b/tests/baselines/reference/ES5For-of6.js
new file mode 100644
index 00000000000..ac740814d80
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of6.js
@@ -0,0 +1,18 @@
+//// [ES5For-of6.ts]
+for (var w of []) {
+    for (var v of []) {
+        var x = [w, v];
+    }
+}
+
+//// [ES5For-of6.js]
+for (var _i = 0, _a = []; _i < _a.length; _i++) {
+    var w = _a[_i];
+    for (var _b = 0, _c = []; _b < _c.length; _b++) {
+        var v = _c[_b];
+        var x = [
+            w,
+            v
+        ];
+    }
+}
diff --git a/tests/baselines/reference/ES5For-of6.types b/tests/baselines/reference/ES5For-of6.types
new file mode 100644
index 00000000000..e2d2f872809
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of6.types
@@ -0,0 +1,16 @@
+=== tests/cases/conformance/statements/for-ofStatements/ES5For-of6.ts ===
+for (var w of []) {
+>w : any
+>[] : undefined[]
+
+    for (var v of []) {
+>v : any
+>[] : undefined[]
+
+        var x = [w, v];
+>x : any[]
+>[w, v] : any[]
+>w : any
+>v : any
+    }
+}
diff --git a/tests/baselines/reference/ES5For-of7.errors.txt b/tests/baselines/reference/ES5For-of7.errors.txt
new file mode 100644
index 00000000000..a3d40f38814
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of7.errors.txt
@@ -0,0 +1,13 @@
+tests/cases/conformance/statements/for-ofStatements/ES5For-of7.ts(6,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'any', but here has type 'any[]'.
+
+
+==== tests/cases/conformance/statements/for-ofStatements/ES5For-of7.ts (1 errors) ====
+    for (var w of []) {
+        var x = w;
+    }
+    
+    for (var v of []) {
+        var x = [w, v];
+            ~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'any', but here has type 'any[]'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of7.js b/tests/baselines/reference/ES5For-of7.js
new file mode 100644
index 00000000000..b88b6c055ac
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of7.js
@@ -0,0 +1,21 @@
+//// [ES5For-of7.ts]
+for (var w of []) {
+    var x = w;
+}
+
+for (var v of []) {
+    var x = [w, v];
+}
+
+//// [ES5For-of7.js]
+for (var _i = 0, _a = []; _i < _a.length; _i++) {
+    var w = _a[_i];
+    var x = w;
+}
+for (var _b = 0, _c = []; _b < _c.length; _b++) {
+    var v = _c[_b];
+    var x = [
+        w,
+        v
+    ];
+}
diff --git a/tests/baselines/reference/ES5For-of8.errors.txt b/tests/baselines/reference/ES5For-of8.errors.txt
new file mode 100644
index 00000000000..7cc3c871277
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of8.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/conformance/statements/for-ofStatements/ES5For-of8.ts(4,6): error TS2322: Type 'string' is not assignable to type 'number'.
+
+
+==== tests/cases/conformance/statements/for-ofStatements/ES5For-of8.ts (1 errors) ====
+    function foo() {
+        return { x: 0 };
+    }
+    for (foo().x of ['a', 'b', 'c']) {
+         ~~~~~~~
+!!! error TS2322: Type 'string' is not assignable to type 'number'.
+        var p = foo().x;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of8.js b/tests/baselines/reference/ES5For-of8.js
new file mode 100644
index 00000000000..6bf7dc37d1f
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of8.js
@@ -0,0 +1,23 @@
+//// [ES5For-of8.ts]
+function foo() {
+    return { x: 0 };
+}
+for (foo().x of ['a', 'b', 'c']) {
+    var p = foo().x;
+}
+
+//// [ES5For-of8.js]
+function foo() {
+    return {
+        x: 0
+    };
+}
+for (var _i = 0, _a = [
+    'a',
+    'b',
+    'c'
+]; _i < _a.length; _i++) {
+    foo().x = _a[_i];
+    var p = foo().x;
+}
+//# sourceMappingURL=ES5For-of8.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of8.js.map b/tests/baselines/reference/ES5For-of8.js.map
new file mode 100644
index 00000000000..eadf5e8430e
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of8.js.map
@@ -0,0 +1,2 @@
+//// [ES5For-of8.js.map]
+{"version":3,"file":"ES5For-of8.js","sourceRoot":"","sources":["ES5For-of8.ts"],"names":["foo"],"mappings":"AAAA;IACIA,MAAMA,CAACA;QAAEA,CAACA,EAAEA,CAACA;KAAEA,CAACA;AACpBA,CAACA;AACD,GAAG,CAAC,CAAY,UAAe,EAAf;IAAC,GAAG;IAAE,GAAG;IAAE,GAAG;CAAC,EAA1B,cAAO,EAAP,IAA0B,CAAC;IAA3B,GAAG,EAAE,CAAC,CAAC,SAAA;IACR,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC;CACnB"}
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of8.sourcemap.txt b/tests/baselines/reference/ES5For-of8.sourcemap.txt
new file mode 100644
index 00000000000..f4b97ebe696
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of8.sourcemap.txt
@@ -0,0 +1,188 @@
+===================================================================
+JsFile: ES5For-of8.js
+mapUrl: ES5For-of8.js.map
+sourceRoot: 
+sources: ES5For-of8.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/conformance/statements/for-ofStatements/ES5For-of8.js
+sourceFile:ES5For-of8.ts
+-------------------------------------------------------------------
+>>>function foo() {
+1 >
+2 >^^^^^^^^^^^^^->
+1 >
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+---
+>>>    return {
+1->^^^^
+2 >    ^^^^^^
+3 >          ^
+4 >           ^^->
+1->function foo() {
+  >    
+2 >    return
+3 >           
+1->Emitted(2, 5) Source(2, 5) + SourceIndex(0) name (foo)
+2 >Emitted(2, 11) Source(2, 11) + SourceIndex(0) name (foo)
+3 >Emitted(2, 12) Source(2, 12) + SourceIndex(0) name (foo)
+---
+>>>        x: 0
+1->^^^^^^^^
+2 >        ^
+3 >         ^^
+4 >           ^
+1->{ 
+2 >        x
+3 >         : 
+4 >           0
+1->Emitted(3, 9) Source(2, 14) + SourceIndex(0) name (foo)
+2 >Emitted(3, 10) Source(2, 15) + SourceIndex(0) name (foo)
+3 >Emitted(3, 12) Source(2, 17) + SourceIndex(0) name (foo)
+4 >Emitted(3, 13) Source(2, 18) + SourceIndex(0) name (foo)
+---
+>>>    };
+1 >^^^^^
+2 >     ^
+1 > }
+2 >     ;
+1 >Emitted(4, 6) Source(2, 20) + SourceIndex(0) name (foo)
+2 >Emitted(4, 7) Source(2, 21) + SourceIndex(0) name (foo)
+---
+>>>}
+1 >
+2 >^
+3 > ^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+2 >}
+1 >Emitted(5, 1) Source(3, 1) + SourceIndex(0) name (foo)
+2 >Emitted(5, 2) Source(3, 2) + SourceIndex(0) name (foo)
+---
+>>>for (var _i = 0, _a = [
+1->
+2 >^^^
+3 >   ^
+4 >    ^
+5 >     ^^^^^^^^^^
+6 >               ^^
+1->
+  >
+2 >for
+3 >    
+4 >    (foo().x of 
+5 >     ['a', 'b', 'c']
+6 >               
+1->Emitted(6, 1) Source(4, 1) + SourceIndex(0)
+2 >Emitted(6, 4) Source(4, 4) + SourceIndex(0)
+3 >Emitted(6, 5) Source(4, 5) + SourceIndex(0)
+4 >Emitted(6, 6) Source(4, 17) + SourceIndex(0)
+5 >Emitted(6, 16) Source(4, 32) + SourceIndex(0)
+6 >Emitted(6, 18) Source(4, 17) + SourceIndex(0)
+---
+>>>    'a',
+1 >^^^^
+2 >    ^^^
+3 >       ^^->
+1 >[
+2 >    'a'
+1 >Emitted(7, 5) Source(4, 18) + SourceIndex(0)
+2 >Emitted(7, 8) Source(4, 21) + SourceIndex(0)
+---
+>>>    'b',
+1->^^^^
+2 >    ^^^
+3 >       ^->
+1->, 
+2 >    'b'
+1->Emitted(8, 5) Source(4, 23) + SourceIndex(0)
+2 >Emitted(8, 8) Source(4, 26) + SourceIndex(0)
+---
+>>>    'c'
+1->^^^^
+2 >    ^^^
+3 >       ^^^^^^^^^^^^^^^^^^^^->
+1->, 
+2 >    'c'
+1->Emitted(9, 5) Source(4, 28) + SourceIndex(0)
+2 >Emitted(9, 8) Source(4, 31) + SourceIndex(0)
+---
+>>>]; _i < _a.length; _i++) {
+1->^
+2 > ^^
+3 >   ^^^^^^^^^^^^^^
+4 >                 ^^
+5 >                   ^^^^
+6 >                       ^
+1->]
+2 > 
+3 >   foo().x
+4 >                 
+5 >                   foo().x of ['a', 'b', 'c']
+6 >                       )
+1->Emitted(10, 2) Source(4, 32) + SourceIndex(0)
+2 >Emitted(10, 4) Source(4, 6) + SourceIndex(0)
+3 >Emitted(10, 18) Source(4, 13) + SourceIndex(0)
+4 >Emitted(10, 20) Source(4, 6) + SourceIndex(0)
+5 >Emitted(10, 24) Source(4, 32) + SourceIndex(0)
+6 >Emitted(10, 25) Source(4, 33) + SourceIndex(0)
+---
+>>>    foo().x = _a[_i];
+1 >^^^^
+2 >    ^^^
+3 >       ^^
+4 >         ^
+5 >          ^
+6 >           ^^^^^^^^^
+7 >                    ^->
+1 >
+2 >    foo
+3 >       ()
+4 >         .
+5 >          x
+6 >           
+1 >Emitted(11, 5) Source(4, 6) + SourceIndex(0)
+2 >Emitted(11, 8) Source(4, 9) + SourceIndex(0)
+3 >Emitted(11, 10) Source(4, 11) + SourceIndex(0)
+4 >Emitted(11, 11) Source(4, 12) + SourceIndex(0)
+5 >Emitted(11, 12) Source(4, 13) + SourceIndex(0)
+6 >Emitted(11, 21) Source(4, 13) + SourceIndex(0)
+---
+>>>    var p = foo().x;
+1->^^^^
+2 >    ^^^^
+3 >        ^
+4 >         ^^^
+5 >            ^^^
+6 >               ^^
+7 >                 ^
+8 >                  ^
+9 >                   ^
+1-> of ['a', 'b', 'c']) {
+  >    
+2 >    var 
+3 >        p
+4 >          = 
+5 >            foo
+6 >               ()
+7 >                 .
+8 >                  x
+9 >                   ;
+1->Emitted(12, 5) Source(5, 5) + SourceIndex(0)
+2 >Emitted(12, 9) Source(5, 9) + SourceIndex(0)
+3 >Emitted(12, 10) Source(5, 10) + SourceIndex(0)
+4 >Emitted(12, 13) Source(5, 13) + SourceIndex(0)
+5 >Emitted(12, 16) Source(5, 16) + SourceIndex(0)
+6 >Emitted(12, 18) Source(5, 18) + SourceIndex(0)
+7 >Emitted(12, 19) Source(5, 19) + SourceIndex(0)
+8 >Emitted(12, 20) Source(5, 20) + SourceIndex(0)
+9 >Emitted(12, 21) Source(5, 21) + SourceIndex(0)
+---
+>>>}
+1 >^
+2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >}
+1 >Emitted(13, 2) Source(6, 2) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=ES5For-of8.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of9.js b/tests/baselines/reference/ES5For-of9.js
new file mode 100644
index 00000000000..bef83118864
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of9.js
@@ -0,0 +1,23 @@
+//// [ES5For-of9.ts]
+function foo() {
+    return { x: 0 };
+}
+for (foo().x of []) {
+    for (foo().x of []) {
+        var p = foo().x;
+    }
+}
+
+//// [ES5For-of9.js]
+function foo() {
+    return {
+        x: 0
+    };
+}
+for (var _i = 0, _a = []; _i < _a.length; _i++) {
+    foo().x = _a[_i];
+    for (var _b = 0, _c = []; _b < _c.length; _b++) {
+        foo().x = _c[_b];
+        var p = foo().x;
+    }
+}
diff --git a/tests/baselines/reference/ES5For-of9.types b/tests/baselines/reference/ES5For-of9.types
new file mode 100644
index 00000000000..60870c2d642
--- /dev/null
+++ b/tests/baselines/reference/ES5For-of9.types
@@ -0,0 +1,30 @@
+=== tests/cases/conformance/statements/for-ofStatements/ES5For-of9.ts ===
+function foo() {
+>foo : () => { x: number; }
+
+    return { x: 0 };
+>{ x: 0 } : { x: number; }
+>x : number
+}
+for (foo().x of []) {
+>foo().x : number
+>foo() : { x: number; }
+>foo : () => { x: number; }
+>x : number
+>[] : undefined[]
+
+    for (foo().x of []) {
+>foo().x : number
+>foo() : { x: number; }
+>foo : () => { x: number; }
+>x : number
+>[] : undefined[]
+
+        var p = foo().x;
+>p : number
+>foo().x : number
+>foo() : { x: number; }
+>foo : () => { x: number; }
+>x : number
+    }
+}
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck1.js b/tests/baselines/reference/ES5For-ofTypeCheck1.js
new file mode 100644
index 00000000000..f1522e512b6
--- /dev/null
+++ b/tests/baselines/reference/ES5For-ofTypeCheck1.js
@@ -0,0 +1,7 @@
+//// [ES5For-ofTypeCheck1.ts]
+for (var v of "") { }
+
+//// [ES5For-ofTypeCheck1.js]
+for (var _i = 0, _a = ""; _i < _a.length; _i++) {
+    var v = _a[_i];
+}
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck1.types b/tests/baselines/reference/ES5For-ofTypeCheck1.types
new file mode 100644
index 00000000000..4da0ecc0e36
--- /dev/null
+++ b/tests/baselines/reference/ES5For-ofTypeCheck1.types
@@ -0,0 +1,4 @@
+=== tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck1.ts ===
+for (var v of "") { }
+>v : string
+
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck10.errors.txt b/tests/baselines/reference/ES5For-ofTypeCheck10.errors.txt
new file mode 100644
index 00000000000..9551d0467e9
--- /dev/null
+++ b/tests/baselines/reference/ES5For-ofTypeCheck10.errors.txt
@@ -0,0 +1,23 @@
+tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck10.ts(1,15): error TS2461: Type 'StringIterator' is not an array type or a string type.
+tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck10.ts(11,6): error TS2304: Cannot find name 'Symbol'.
+
+
+==== tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck10.ts (2 errors) ====
+    for (var v of new StringIterator) { }
+                  ~~~~~~~~~~~~~~~~~~
+!!! error TS2461: Type 'StringIterator' is not an array type or a string type.
+    
+    // In ES3/5, you cannot for...of over an arbitrary iterable.
+    class StringIterator {
+        next() {
+            return {
+                done: true,
+                value: ""
+            };
+        }
+        [Symbol.iterator]() {
+         ~~~~~~
+!!! error TS2304: Cannot find name 'Symbol'.
+            return this;
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck10.js b/tests/baselines/reference/ES5For-ofTypeCheck10.js
new file mode 100644
index 00000000000..ffef1fde8f8
--- /dev/null
+++ b/tests/baselines/reference/ES5For-ofTypeCheck10.js
@@ -0,0 +1,35 @@
+//// [ES5For-ofTypeCheck10.ts]
+for (var v of new StringIterator) { }
+
+// In ES3/5, you cannot for...of over an arbitrary iterable.
+class StringIterator {
+    next() {
+        return {
+            done: true,
+            value: ""
+        };
+    }
+    [Symbol.iterator]() {
+        return this;
+    }
+}
+
+//// [ES5For-ofTypeCheck10.js]
+for (var _i = 0, _a = new StringIterator; _i < _a.length; _i++) {
+    var v = _a[_i];
+}
+// In ES3/5, you cannot for...of over an arbitrary iterable.
+var StringIterator = (function () {
+    function StringIterator() {
+    }
+    StringIterator.prototype.next = function () {
+        return {
+            done: true,
+            value: ""
+        };
+    };
+    StringIterator.prototype[Symbol.iterator] = function () {
+        return this;
+    };
+    return StringIterator;
+})();
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck11.errors.txt b/tests/baselines/reference/ES5For-ofTypeCheck11.errors.txt
new file mode 100644
index 00000000000..635bb09616a
--- /dev/null
+++ b/tests/baselines/reference/ES5For-ofTypeCheck11.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck11.ts(3,6): error TS2322: Type 'string | number' is not assignable to type 'string'.
+  Type 'number' is not assignable to type 'string'.
+
+
+==== tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck11.ts (1 errors) ====
+    var union: string | number[];
+    var v: string;
+    for (v of union) { }
+         ~
+!!! error TS2322: Type 'string | number' is not assignable to type 'string'.
+!!! error TS2322:   Type 'number' is not assignable to type 'string'.
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck11.js b/tests/baselines/reference/ES5For-ofTypeCheck11.js
new file mode 100644
index 00000000000..c0e46a45452
--- /dev/null
+++ b/tests/baselines/reference/ES5For-ofTypeCheck11.js
@@ -0,0 +1,11 @@
+//// [ES5For-ofTypeCheck11.ts]
+var union: string | number[];
+var v: string;
+for (v of union) { }
+
+//// [ES5For-ofTypeCheck11.js]
+var union;
+var v;
+for (var _i = 0; _i < union.length; _i++) {
+    v = union[_i];
+}
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck12.errors.txt b/tests/baselines/reference/ES5For-ofTypeCheck12.errors.txt
new file mode 100644
index 00000000000..b726aaad6c7
--- /dev/null
+++ b/tests/baselines/reference/ES5For-ofTypeCheck12.errors.txt
@@ -0,0 +1,7 @@
+tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck12.ts(1,17): error TS2461: Type 'number' is not an array type or a string type.
+
+
+==== tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck12.ts (1 errors) ====
+    for (const v of 0) { }
+                    ~
+!!! error TS2461: Type 'number' is not an array type or a string type.
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck12.js b/tests/baselines/reference/ES5For-ofTypeCheck12.js
new file mode 100644
index 00000000000..6004990f6dc
--- /dev/null
+++ b/tests/baselines/reference/ES5For-ofTypeCheck12.js
@@ -0,0 +1,7 @@
+//// [ES5For-ofTypeCheck12.ts]
+for (const v of 0) { }
+
+//// [ES5For-ofTypeCheck12.js]
+for (var _i = 0, _a = 0; _i < _a.length; _i++) {
+    var v = _a[_i];
+}
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck2.js b/tests/baselines/reference/ES5For-ofTypeCheck2.js
new file mode 100644
index 00000000000..2c79054affc
--- /dev/null
+++ b/tests/baselines/reference/ES5For-ofTypeCheck2.js
@@ -0,0 +1,9 @@
+//// [ES5For-ofTypeCheck2.ts]
+for (var v of [true]) { }
+
+//// [ES5For-ofTypeCheck2.js]
+for (var _i = 0, _a = [
+    true
+]; _i < _a.length; _i++) {
+    var v = _a[_i];
+}
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck2.types b/tests/baselines/reference/ES5For-ofTypeCheck2.types
new file mode 100644
index 00000000000..e6b86ce1d81
--- /dev/null
+++ b/tests/baselines/reference/ES5For-ofTypeCheck2.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck2.ts ===
+for (var v of [true]) { }
+>v : boolean
+>[true] : boolean[]
+
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck3.js b/tests/baselines/reference/ES5For-ofTypeCheck3.js
new file mode 100644
index 00000000000..b398f04e0ce
--- /dev/null
+++ b/tests/baselines/reference/ES5For-ofTypeCheck3.js
@@ -0,0 +1,12 @@
+//// [ES5For-ofTypeCheck3.ts]
+var tuple: [string, number] = ["", 0];
+for (var v of tuple) { }
+
+//// [ES5For-ofTypeCheck3.js]
+var tuple = [
+    "",
+    0
+];
+for (var _i = 0; _i < tuple.length; _i++) {
+    var v = tuple[_i];
+}
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck3.types b/tests/baselines/reference/ES5For-ofTypeCheck3.types
new file mode 100644
index 00000000000..5293634c6c5
--- /dev/null
+++ b/tests/baselines/reference/ES5For-ofTypeCheck3.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck3.ts ===
+var tuple: [string, number] = ["", 0];
+>tuple : [string, number]
+>["", 0] : [string, number]
+
+for (var v of tuple) { }
+>v : string | number
+>tuple : [string, number]
+
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck4.js b/tests/baselines/reference/ES5For-ofTypeCheck4.js
new file mode 100644
index 00000000000..630bc869c58
--- /dev/null
+++ b/tests/baselines/reference/ES5For-ofTypeCheck4.js
@@ -0,0 +1,9 @@
+//// [ES5For-ofTypeCheck4.ts]
+var union: string | string[];
+for (const v of union) { }
+
+//// [ES5For-ofTypeCheck4.js]
+var union;
+for (var _i = 0; _i < union.length; _i++) {
+    var v = union[_i];
+}
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck4.types b/tests/baselines/reference/ES5For-ofTypeCheck4.types
new file mode 100644
index 00000000000..4f5721a0604
--- /dev/null
+++ b/tests/baselines/reference/ES5For-ofTypeCheck4.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck4.ts ===
+var union: string | string[];
+>union : string | string[]
+
+for (const v of union) { }
+>v : string
+>union : string | string[]
+
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck5.js b/tests/baselines/reference/ES5For-ofTypeCheck5.js
new file mode 100644
index 00000000000..2e6b47f779d
--- /dev/null
+++ b/tests/baselines/reference/ES5For-ofTypeCheck5.js
@@ -0,0 +1,9 @@
+//// [ES5For-ofTypeCheck5.ts]
+var union: string | number[];
+for (var v of union) { }
+
+//// [ES5For-ofTypeCheck5.js]
+var union;
+for (var _i = 0; _i < union.length; _i++) {
+    var v = union[_i];
+}
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck5.types b/tests/baselines/reference/ES5For-ofTypeCheck5.types
new file mode 100644
index 00000000000..ed3d13f3918
--- /dev/null
+++ b/tests/baselines/reference/ES5For-ofTypeCheck5.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck5.ts ===
+var union: string | number[];
+>union : string | number[]
+
+for (var v of union) { }
+>v : string | number
+>union : string | number[]
+
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck6.js b/tests/baselines/reference/ES5For-ofTypeCheck6.js
new file mode 100644
index 00000000000..9249020b9d4
--- /dev/null
+++ b/tests/baselines/reference/ES5For-ofTypeCheck6.js
@@ -0,0 +1,9 @@
+//// [ES5For-ofTypeCheck6.ts]
+var union: string[] | number[];
+for (var v of union) { }
+
+//// [ES5For-ofTypeCheck6.js]
+var union;
+for (var _i = 0; _i < union.length; _i++) {
+    var v = union[_i];
+}
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck6.types b/tests/baselines/reference/ES5For-ofTypeCheck6.types
new file mode 100644
index 00000000000..87999d9b0ca
--- /dev/null
+++ b/tests/baselines/reference/ES5For-ofTypeCheck6.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck6.ts ===
+var union: string[] | number[];
+>union : string[] | number[]
+
+for (var v of union) { }
+>v : string | number
+>union : string[] | number[]
+
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck7.errors.txt b/tests/baselines/reference/ES5For-ofTypeCheck7.errors.txt
new file mode 100644
index 00000000000..9006b5a2779
--- /dev/null
+++ b/tests/baselines/reference/ES5For-ofTypeCheck7.errors.txt
@@ -0,0 +1,8 @@
+tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck7.ts(2,15): error TS2461: Type 'number' is not an array type.
+
+
+==== tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck7.ts (1 errors) ====
+    var union: string | number;
+    for (var v of union) { }
+                  ~~~~~
+!!! error TS2461: Type 'number' is not an array type.
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck7.js b/tests/baselines/reference/ES5For-ofTypeCheck7.js
new file mode 100644
index 00000000000..d5b74a24728
--- /dev/null
+++ b/tests/baselines/reference/ES5For-ofTypeCheck7.js
@@ -0,0 +1,9 @@
+//// [ES5For-ofTypeCheck7.ts]
+var union: string | number;
+for (var v of union) { }
+
+//// [ES5For-ofTypeCheck7.js]
+var union;
+for (var _i = 0; _i < union.length; _i++) {
+    var v = union[_i];
+}
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck8.errors.txt b/tests/baselines/reference/ES5For-ofTypeCheck8.errors.txt
new file mode 100644
index 00000000000..0cb52dbb21b
--- /dev/null
+++ b/tests/baselines/reference/ES5For-ofTypeCheck8.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck8.ts(3,6): error TS2322: Type 'string | number | symbol' is not assignable to type 'symbol'.
+  Type 'string' is not assignable to type 'symbol'.
+
+
+==== tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck8.ts (1 errors) ====
+    var union: string | string[]| number[]| symbol[];
+    var v: symbol;
+    for (v of union) { }
+         ~
+!!! error TS2322: Type 'string | number | symbol' is not assignable to type 'symbol'.
+!!! error TS2322:   Type 'string' is not assignable to type 'symbol'.
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck8.js b/tests/baselines/reference/ES5For-ofTypeCheck8.js
new file mode 100644
index 00000000000..d73aea1cb7b
--- /dev/null
+++ b/tests/baselines/reference/ES5For-ofTypeCheck8.js
@@ -0,0 +1,11 @@
+//// [ES5For-ofTypeCheck8.ts]
+var union: string | string[]| number[]| symbol[];
+var v: symbol;
+for (v of union) { }
+
+//// [ES5For-ofTypeCheck8.js]
+var union;
+var v;
+for (var _i = 0; _i < union.length; _i++) {
+    v = union[_i];
+}
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck9.errors.txt b/tests/baselines/reference/ES5For-ofTypeCheck9.errors.txt
new file mode 100644
index 00000000000..156eb188803
--- /dev/null
+++ b/tests/baselines/reference/ES5For-ofTypeCheck9.errors.txt
@@ -0,0 +1,8 @@
+tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck9.ts(2,15): error TS2461: Type 'number | symbol | string[]' is not an array type.
+
+
+==== tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck9.ts (1 errors) ====
+    var union: string | string[] | number | symbol;
+    for (let v of union) { }
+                  ~~~~~
+!!! error TS2461: Type 'number | symbol | string[]' is not an array type.
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck9.js b/tests/baselines/reference/ES5For-ofTypeCheck9.js
new file mode 100644
index 00000000000..6c7465d10ec
--- /dev/null
+++ b/tests/baselines/reference/ES5For-ofTypeCheck9.js
@@ -0,0 +1,9 @@
+//// [ES5For-ofTypeCheck9.ts]
+var union: string | string[] | number | symbol;
+for (let v of union) { }
+
+//// [ES5For-ofTypeCheck9.js]
+var union;
+for (var _i = 0; _i < union.length; _i++) {
+    var v = union[_i];
+}
diff --git a/tests/baselines/reference/arityAndOrderCompatibility01.errors.txt b/tests/baselines/reference/arityAndOrderCompatibility01.errors.txt
new file mode 100644
index 00000000000..391fbf42384
--- /dev/null
+++ b/tests/baselines/reference/arityAndOrderCompatibility01.errors.txt
@@ -0,0 +1,147 @@
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(13,12): error TS2493: Tuple type '[string, number]' with length '2' cannot be assigned to tuple with length '3'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(14,12): error TS2460: Type 'StrNum' has no property '2'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(15,5): error TS2461: Type '{ 0: string; 1: number; }' is not an array type.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(16,5): error TS2322: Type '[string, number]' is not assignable to type '[number, number, number]'.
+  Types of property '0' are incompatible.
+    Type 'string' is not assignable to type 'number'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(17,5): error TS2322: Type 'StrNum' is not assignable to type '[number, number, number]'.
+  Types of property '0' are incompatible.
+    Type 'string' is not assignable to type 'number'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(18,5): error TS2322: Type '{ 0: string; 1: number; }' is not assignable to type '[number, number, number]'.
+  Types of property '0' are incompatible.
+    Type 'string' is not assignable to type 'number'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(19,5): error TS2322: Type '[string, number]' is not assignable to type '[string, number, number]'.
+  Property '2' is missing in type '[string, number]'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(20,5): error TS2322: Type 'StrNum' is not assignable to type '[string, number, number]'.
+  Property '2' is missing in type 'StrNum'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(21,5): error TS2322: Type '{ 0: string; 1: number; }' is not assignable to type '[string, number, number]'.
+  Property '2' is missing in type '{ 0: string; 1: number; }'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(22,5): error TS2322: Type '[string, number]' is not assignable to type '[number]'.
+  Types of property '0' are incompatible.
+    Type 'string' is not assignable to type 'number'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(23,5): error TS2322: Type 'StrNum' is not assignable to type '[number]'.
+  Types of property '0' are incompatible.
+    Type 'string' is not assignable to type 'number'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(24,5): error TS2322: Type '{ 0: string; 1: number; }' is not assignable to type '[number]'.
+  Types of property '0' are incompatible.
+    Type 'string' is not assignable to type 'number'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(25,5): error TS2322: Type '[string, number]' is not assignable to type '[string]'.
+  Types of property 'pop' are incompatible.
+    Type '() => string | number' is not assignable to type '() => string'.
+      Type 'string | number' is not assignable to type 'string'.
+        Type 'number' is not assignable to type 'string'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(26,5): error TS2322: Type 'StrNum' is not assignable to type '[string]'.
+  Types of property 'pop' are incompatible.
+    Type '() => string | number' is not assignable to type '() => string'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(27,5): error TS2322: Type '{ 0: string; 1: number; }' is not assignable to type '[string]'.
+  Property 'length' is missing in type '{ 0: string; 1: number; }'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(28,5): error TS2322: Type '[string, number]' is not assignable to type '[number, string]'.
+  Types of property '0' are incompatible.
+    Type 'string' is not assignable to type 'number'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(29,5): error TS2322: Type 'StrNum' is not assignable to type '[number, string]'.
+  Types of property '0' are incompatible.
+    Type 'string' is not assignable to type 'number'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(30,5): error TS2322: Type '{ 0: string; 1: number; }' is not assignable to type '[number, string]'.
+  Types of property '0' are incompatible.
+    Type 'string' is not assignable to type 'number'.
+
+
+==== tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts (18 errors) ====
+    interface StrNum extends Array<string|number> {
+        0: string;
+        1: number;
+    }
+    
+    var x: [string, number];
+    var y: StrNum
+    var z: {
+        0: string;
+        1: number;
+    }
+    
+    var [a, b, c] = x;
+               ~
+!!! error TS2493: Tuple type '[string, number]' with length '2' cannot be assigned to tuple with length '3'.
+    var [d, e, f] = y;
+               ~
+!!! error TS2460: Type 'StrNum' has no property '2'.
+    var [g, h, i] = z;
+        ~~~~~~~~~
+!!! error TS2461: Type '{ 0: string; 1: number; }' is not an array type.
+    var j1: [number, number, number] = x;
+        ~~
+!!! error TS2322: Type '[string, number]' is not assignable to type '[number, number, number]'.
+!!! error TS2322:   Types of property '0' are incompatible.
+!!! error TS2322:     Type 'string' is not assignable to type 'number'.
+    var j2: [number, number, number] = y;
+        ~~
+!!! error TS2322: Type 'StrNum' is not assignable to type '[number, number, number]'.
+!!! error TS2322:   Types of property '0' are incompatible.
+!!! error TS2322:     Type 'string' is not assignable to type 'number'.
+    var j3: [number, number, number] = z;
+        ~~
+!!! error TS2322: Type '{ 0: string; 1: number; }' is not assignable to type '[number, number, number]'.
+!!! error TS2322:   Types of property '0' are incompatible.
+!!! error TS2322:     Type 'string' is not assignable to type 'number'.
+    var k1: [string, number, number] = x;
+        ~~
+!!! error TS2322: Type '[string, number]' is not assignable to type '[string, number, number]'.
+!!! error TS2322:   Property '2' is missing in type '[string, number]'.
+    var k2: [string, number, number] = y;
+        ~~
+!!! error TS2322: Type 'StrNum' is not assignable to type '[string, number, number]'.
+!!! error TS2322:   Property '2' is missing in type 'StrNum'.
+    var k3: [string, number, number] = z;
+        ~~
+!!! error TS2322: Type '{ 0: string; 1: number; }' is not assignable to type '[string, number, number]'.
+!!! error TS2322:   Property '2' is missing in type '{ 0: string; 1: number; }'.
+    var l1: [number] = x;
+        ~~
+!!! error TS2322: Type '[string, number]' is not assignable to type '[number]'.
+!!! error TS2322:   Types of property '0' are incompatible.
+!!! error TS2322:     Type 'string' is not assignable to type 'number'.
+    var l2: [number] = y;
+        ~~
+!!! error TS2322: Type 'StrNum' is not assignable to type '[number]'.
+!!! error TS2322:   Types of property '0' are incompatible.
+!!! error TS2322:     Type 'string' is not assignable to type 'number'.
+    var l3: [number] = z;
+        ~~
+!!! error TS2322: Type '{ 0: string; 1: number; }' is not assignable to type '[number]'.
+!!! error TS2322:   Types of property '0' are incompatible.
+!!! error TS2322:     Type 'string' is not assignable to type 'number'.
+    var m1: [string] = x;
+        ~~
+!!! error TS2322: Type '[string, number]' is not assignable to type '[string]'.
+!!! error TS2322:   Types of property 'pop' are incompatible.
+!!! error TS2322:     Type '() => string | number' is not assignable to type '() => string'.
+!!! error TS2322:       Type 'string | number' is not assignable to type 'string'.
+!!! error TS2322:         Type 'number' is not assignable to type 'string'.
+    var m2: [string] = y;
+        ~~
+!!! error TS2322: Type 'StrNum' is not assignable to type '[string]'.
+!!! error TS2322:   Types of property 'pop' are incompatible.
+!!! error TS2322:     Type '() => string | number' is not assignable to type '() => string'.
+    var m3: [string] = z;
+        ~~
+!!! error TS2322: Type '{ 0: string; 1: number; }' is not assignable to type '[string]'.
+!!! error TS2322:   Property 'length' is missing in type '{ 0: string; 1: number; }'.
+    var n1: [number, string] = x;
+        ~~
+!!! error TS2322: Type '[string, number]' is not assignable to type '[number, string]'.
+!!! error TS2322:   Types of property '0' are incompatible.
+!!! error TS2322:     Type 'string' is not assignable to type 'number'.
+    var n2: [number, string] = y;
+        ~~
+!!! error TS2322: Type 'StrNum' is not assignable to type '[number, string]'.
+!!! error TS2322:   Types of property '0' are incompatible.
+!!! error TS2322:     Type 'string' is not assignable to type 'number'.
+    var n3: [number, string] = z;
+        ~~
+!!! error TS2322: Type '{ 0: string; 1: number; }' is not assignable to type '[number, string]'.
+!!! error TS2322:   Types of property '0' are incompatible.
+!!! error TS2322:     Type 'string' is not assignable to type 'number'.
+    var o1: [string, number] = x;
+    var o2: [string, number] = y;
+    var o3: [string, number] = y;
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/arityAndOrderCompatibility01.js b/tests/baselines/reference/arityAndOrderCompatibility01.js
new file mode 100644
index 00000000000..2eb1bcf8bd8
--- /dev/null
+++ b/tests/baselines/reference/arityAndOrderCompatibility01.js
@@ -0,0 +1,61 @@
+//// [arityAndOrderCompatibility01.ts]
+interface StrNum extends Array<string|number> {
+    0: string;
+    1: number;
+}
+
+var x: [string, number];
+var y: StrNum
+var z: {
+    0: string;
+    1: number;
+}
+
+var [a, b, c] = x;
+var [d, e, f] = y;
+var [g, h, i] = z;
+var j1: [number, number, number] = x;
+var j2: [number, number, number] = y;
+var j3: [number, number, number] = z;
+var k1: [string, number, number] = x;
+var k2: [string, number, number] = y;
+var k3: [string, number, number] = z;
+var l1: [number] = x;
+var l2: [number] = y;
+var l3: [number] = z;
+var m1: [string] = x;
+var m2: [string] = y;
+var m3: [string] = z;
+var n1: [number, string] = x;
+var n2: [number, string] = y;
+var n3: [number, string] = z;
+var o1: [string, number] = x;
+var o2: [string, number] = y;
+var o3: [string, number] = y;
+
+
+//// [arityAndOrderCompatibility01.js]
+var x;
+var y;
+var z;
+var a = x[0], b = x[1], c = x[2];
+var d = y[0], e = y[1], f = y[2];
+var g = z[0], h = z[1], i = z[2];
+var j1 = x;
+var j2 = y;
+var j3 = z;
+var k1 = x;
+var k2 = y;
+var k3 = z;
+var l1 = x;
+var l2 = y;
+var l3 = z;
+var m1 = x;
+var m2 = y;
+var m3 = z;
+var n1 = x;
+var n2 = y;
+var n3 = z;
+var o1 = x;
+var o2 = y;
+var o3 = y;
diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.js.map b/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.js.map
index d4df74499d0..413c98fa456 100644
--- a/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.js.map
+++ b/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.js.map
@@ -1,2 +1,2 @@
 //// [computedPropertyNamesSourceMap2_ES5.js.map]
-{"version":3,"file":"computedPropertyNamesSourceMap2_ES5.js","sourceRoot":"","sources":["computedPropertyNamesSourceMap2_ES5.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,AADA,CAAA,EAAA,GAAA,EAAA;IAAA,EAAA,CAEA,OAAO,CAFA,GAAA;QAGA,QAAQ,CAAC;IACb,CAAC,AAJA;IAAA,EAAA,CAKA,CAAA;IALA,EAAA"}
\ No newline at end of file
+{"version":3,"file":"computedPropertyNamesSourceMap2_ES5.js","sourceRoot":"","sources":["computedPropertyNamesSourceMap2_ES5.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG;OACH,OAAO;QACJ,QAAQ,CAAC;IACb,CAAC;OACJ,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.sourcemap.txt b/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.sourcemap.txt
index e1a4f764f42..03eec606718 100644
--- a/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.sourcemap.txt
+++ b/tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.sourcemap.txt
@@ -13,144 +13,56 @@ sourceFile:computedPropertyNamesSourceMap2_ES5.ts
 2 >^^^^
 3 >    ^
 4 >     ^^^
-5 >        
-6 >        ^
-7 >         ^^
-8 >           ^^^
-9 >              ^^
-10>                ^^^^^^^^^^^^^^^^->
+5 >        ^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
 2 >var 
 3 >    v
 4 >      = 
-5 >        !!^^ !!^^ There was decoding error in the sourcemap at this location: Invalid sourceLine found
-5 >        !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(1, 9) Source(0, 9) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(1, 9) Source(0, NaN) + SourceIndex(0) nameIndex (-1)
-5 >        
-6 >        !!^^ !!^^ There was decoding error in the sourcemap at this location: Unsupported Error Format: No entries after emitted column
-6 >        !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(1, 9) Source(0, 9) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(1, 10) Source(0, NaN) + SourceIndex(0) nameIndex (-1)
-6 >        
-7 >         !!^^ !!^^ There was decoding error in the sourcemap at this location: Invalid sourceLine found
-7 >         !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(1, 10) Source(0, 9) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(1, 12) Source(0, NaN) + SourceIndex(0) nameIndex (-1)
-7 >         
-8 >           !!^^ !!^^ There was decoding error in the sourcemap at this location: Unsupported Error Format: No entries after emitted column
-8 >           !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(1, 10) Source(0, 9) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(1, 15) Source(0, NaN) + SourceIndex(0) nameIndex (-1)
-8 >           
-9 >              !!^^ !!^^ There was decoding error in the sourcemap at this location: Invalid sourceLine found
-9 >              !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(1, 12) Source(0, 9) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(1, 17) Source(0, NaN) + SourceIndex(0) nameIndex (-1)
-9 >              
 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
 2 >Emitted(1, 5) Source(1, 5) + SourceIndex(0)
 3 >Emitted(1, 6) Source(1, 6) + SourceIndex(0)
 4 >Emitted(1, 9) Source(1, 9) + SourceIndex(0)
-5 >Emitted(1, 9) Source(0, NaN) + SourceIndex(0)
-6 >Emitted(1, 10) Source(0, NaN) + SourceIndex(0)
-7 >Emitted(1, 12) Source(0, NaN) + SourceIndex(0)
-8 >Emitted(1, 15) Source(0, NaN) + SourceIndex(0)
-9 >Emitted(1, 17) Source(0, NaN) + SourceIndex(0)
 ---
 >>>    _a["hello"] = function () {
-1->^^^^
-2 >    ^^
-3 >      ^
-4 >       ^^^^^^^
-5 >              ^
-6 >               ^^^
-1->!!^^ !!^^ There was decoding error in the sourcemap at this location: Unsupported Error Format: No entries after emitted column
-1->!!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(1, 12) Source(0, 9) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(2, 5) Source(0, NaN) + SourceIndex(0) nameIndex (-1)
-1->
-2 >    !!^^ !!^^ There was decoding error in the sourcemap at this location: Invalid sourceLine found
-2 >    !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(1, 15) Source(0, 9) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(2, 7) Source(0, NaN) + SourceIndex(0) nameIndex (-1)
-2 >    
-3 >      !!^^ !!^^ There was decoding error in the sourcemap at this location: Unsupported Error Format: No entries after emitted column
-3 >      !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(1, 15) Source(0, 9) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(2, 8) Source(2, 6) + SourceIndex(0) nameIndex (-1)
-3 >      
-4 >       !!^^ !!^^ There was decoding error in the sourcemap at this location: Invalid sourceLine found
-4 >       !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(1, 17) Source(0, 9) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(2, 15) Source(2, 13) + SourceIndex(0) nameIndex (-1)
-4 >       "hello"
-5 >              !!^^ !!^^ There was decoding error in the sourcemap at this location: Unsupported Error Format: No entries after emitted column
-5 >              !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(1, 17) Source(0, 9) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(2, 16) Source(0, NaN) + SourceIndex(0) nameIndex (-1)
-5 >              
-6 >               !!^^ !!^^ There was decoding error in the sourcemap at this location: Invalid sourceLine found
-6 >               !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(2, 5) Source(0, 9) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(2, 19) Source(0, NaN) + SourceIndex(0) nameIndex (-1)
-6 >               
-1->Emitted(2, 5) Source(0, NaN) + SourceIndex(0)
-2 >Emitted(2, 7) Source(0, NaN) + SourceIndex(0)
-3 >Emitted(2, 8) Source(2, 6) + SourceIndex(0)
-4 >Emitted(2, 15) Source(2, 13) + SourceIndex(0)
-5 >Emitted(2, 16) Source(0, NaN) + SourceIndex(0)
-6 >Emitted(2, 19) Source(0, NaN) + SourceIndex(0)
+1->^^^^^^^
+2 >       ^^^^^^^
+3 >              ^^^^->
+1->{
+  >    [
+2 >       "hello"
+1->Emitted(2, 8) Source(2, 6) + SourceIndex(0)
+2 >Emitted(2, 15) Source(2, 13) + SourceIndex(0)
 ---
 >>>        debugger;
-1 >^^^^^^^^
+1->^^^^^^^^
 2 >        ^^^^^^^^
 3 >                ^
-1 >!!^^ !!^^ There was decoding error in the sourcemap at this location: Unsupported Error Format: No entries after emitted column
-1 >!!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(2, 5) Source(0, 9) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(3, 9) Source(3, 9) + SourceIndex(0) nameIndex (-1)
-1 >
-2 >        !!^^ !!^^ There was decoding error in the sourcemap at this location: Invalid sourceLine found
-2 >        !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(2, 7) Source(0, 9) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(3, 17) Source(3, 17) + SourceIndex(0) nameIndex (-1)
+1->]() {
+  >        
 2 >        debugger
-3 >                !!^^ !!^^ There was decoding error in the sourcemap at this location: Unsupported Error Format: No entries after emitted column
-3 >                !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(2, 7) Source(0, 9) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(3, 18) Source(3, 18) + SourceIndex(0) nameIndex (-1)
 3 >                ;
-1 >Emitted(3, 9) Source(3, 9) + SourceIndex(0)
+1->Emitted(3, 9) Source(3, 9) + SourceIndex(0)
 2 >Emitted(3, 17) Source(3, 17) + SourceIndex(0)
 3 >Emitted(3, 18) Source(3, 18) + SourceIndex(0)
 ---
 >>>    },
 1 >^^^^
 2 >    ^
-3 >     
-4 >     ^^^^->
-1 >!!^^ !!^^ The decoded span from sourcemap's mapping entry does not match what was encoded for this span:
-1 >!!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(2, 8) Source(2, 9) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(4, 5) Source(4, 5) + SourceIndex(0) nameIndex (-1)
+3 >     ^^^^->
 1 >
   >    
-2 >    !!^^ !!^^ The decoded span from sourcemap's mapping entry does not match what was encoded for this span:
-2 >    !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(2, 15) Source(2, 16) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(4, 6) Source(4, 6) + SourceIndex(0) nameIndex (-1)
 2 >    }
-3 >     !!^^ !!^^ There was decoding error in the sourcemap at this location: Invalid sourceLine found
-3 >     !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(2, 16) Source(0, 16) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(4, 6) Source(0, NaN) + SourceIndex(0) nameIndex (-1)
-3 >     
 1 >Emitted(4, 5) Source(4, 5) + SourceIndex(0)
 2 >Emitted(4, 6) Source(4, 6) + SourceIndex(0)
-3 >Emitted(4, 6) Source(0, NaN) + SourceIndex(0)
 ---
 >>>    _a);
-1->^^^^
-2 >    ^^
-3 >      ^
-4 >       ^
-1->!!^^ !!^^ There was decoding error in the sourcemap at this location: Unsupported Error Format: No entries after emitted column
-1->!!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(2, 16) Source(0, 16) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(5, 5) Source(0, NaN) + SourceIndex(0) nameIndex (-1)
-1->
-2 >    !!^^ !!^^ There was decoding error in the sourcemap at this location: Invalid sourceLine found
-2 >    !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(2, 19) Source(0, 16) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(5, 7) Source(0, NaN) + SourceIndex(0) nameIndex (-1)
-2 >    
-3 >      !!^^ !!^^ There was decoding error in the sourcemap at this location: Unsupported Error Format: No entries after emitted column
-3 >      !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(2, 19) Source(0, 16) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(5, 8) Source(5, 2) + SourceIndex(0) nameIndex (-1)
-3 >      
-4 >       !!^^ !!^^ The decoded span from sourcemap's mapping entry does not match what was encoded for this span:
-4 >       !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(3, 9) Source(3, 16) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(5, 9) Source(5, 2) + SourceIndex(0) nameIndex (-1)
-4 >       
-1->Emitted(5, 5) Source(0, NaN) + SourceIndex(0)
-2 >Emitted(5, 7) Source(0, NaN) + SourceIndex(0)
-3 >Emitted(5, 8) Source(5, 2) + SourceIndex(0)
-4 >Emitted(5, 9) Source(5, 2) + SourceIndex(0)
+1->^^^^^^^
+2 >       ^
+1->
+  >}
+2 >       
+1->Emitted(5, 8) Source(5, 2) + SourceIndex(0)
+2 >Emitted(5, 9) Source(5, 2) + SourceIndex(0)
 ---
 >>>var _a;
-1 >^^^^
-2 >    ^^
-3 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >!!^^ !!^^ The decoded span from sourcemap's mapping entry does not match what was encoded for this span:
-1 >!!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(3, 17) Source(3, 24) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(6, 5) Source(0, NaN) + SourceIndex(0) nameIndex (-1)
-1 >
-2 >    !!^^ !!^^ The decoded span from sourcemap's mapping entry does not match what was encoded for this span:
-2 >    !!^^ !!^^ Decoded span from sourcemap's mappings entry: Emitted(3, 18) Source(3, 25) + SourceIndex(0) nameIndex (-1) Span encoded by the emitter:Emitted(6, 7) Source(0, NaN) + SourceIndex(0) nameIndex (-1)
-2 >    
-1 >Emitted(6, 5) Source(0, NaN) + SourceIndex(0)
-2 >Emitted(6, 7) Source(0, NaN) + SourceIndex(0)
----
-!!!! **** There are more source map entries in the sourceMap's mapping than what was encoded
-!!!! **** Remaining decoded string: ;IACb,CAAC,AAJA;IAAA,EAAA,CAKA,CAAA;IALA,EAAA
 >>>//# sourceMappingURL=computedPropertyNamesSourceMap2_ES5.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationsAndAssignments.errors.txt b/tests/baselines/reference/declarationsAndAssignments.errors.txt
index 4eefc2fcc23..828083e7687 100644
--- a/tests/baselines/reference/declarationsAndAssignments.errors.txt
+++ b/tests/baselines/reference/declarationsAndAssignments.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(5,16): error TS2460: Type '[number, string]' has no property '2'.
+tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(5,16): error TS2493: Tuple type '[number, string]' with length '2' cannot be assigned to tuple with length '3'.
 tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(56,17): error TS2322: Type 'number' is not assignable to type 'string'.
-tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(63,13): error TS2460: Type '[number]' has no property '1'.
-tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(63,16): error TS2460: Type '[number]' has no property '2'.
+tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(63,13): error TS2493: Tuple type '[number]' with length '1' cannot be assigned to tuple with length '3'.
+tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(63,16): error TS2493: Tuple type '[number]' with length '1' cannot be assigned to tuple with length '3'.
 tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(67,9): error TS2461: Type '{ [x: number]: undefined; }' is not an array type.
 tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(68,9): error TS2461: Type '{ [x: number]: number; 0: number; 1: number; }' is not an array type.
 tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(73,11): error TS2459: Type '{}' has no property 'a' and no string index signature.
@@ -25,7 +25,7 @@ tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(138,9):
         var [x, y] = [1, "hello"];
         var [x, y, z] = [1, "hello"];  // Error
                    ~
-!!! error TS2460: Type '[number, string]' has no property '2'.
+!!! error TS2493: Tuple type '[number, string]' with length '2' cannot be assigned to tuple with length '3'.
         var [,, z] = [0, 1, 2];
         var x: number;
         var y: string;
@@ -87,9 +87,9 @@ tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(138,9):
         var [a, b, c] = [];   // Ok, [] is an array
         var [d, e, f] = [1];  // Error, [1] is a tuple
                 ~
-!!! error TS2460: Type '[number]' has no property '1'.
+!!! error TS2493: Tuple type '[number]' with length '1' cannot be assigned to tuple with length '3'.
                    ~
-!!! error TS2460: Type '[number]' has no property '2'.
+!!! error TS2493: Tuple type '[number]' with length '1' cannot be assigned to tuple with length '3'.
     }
     
     function f9() {
diff --git a/tests/baselines/reference/downlevelLetConst16.errors.txt b/tests/baselines/reference/downlevelLetConst16.errors.txt
index c488e96ca23..94c53360b87 100644
--- a/tests/baselines/reference/downlevelLetConst16.errors.txt
+++ b/tests/baselines/reference/downlevelLetConst16.errors.txt
@@ -1,12 +1,10 @@
-tests/cases/compiler/downlevelLetConst16.ts(189,5): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
-tests/cases/compiler/downlevelLetConst16.ts(196,5): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
-tests/cases/compiler/downlevelLetConst16.ts(203,5): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
-tests/cases/compiler/downlevelLetConst16.ts(210,5): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
-tests/cases/compiler/downlevelLetConst16.ts(217,5): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
-tests/cases/compiler/downlevelLetConst16.ts(224,5): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+tests/cases/compiler/downlevelLetConst16.ts(195,14): error TS2461: Type 'undefined' is not an array type.
+tests/cases/compiler/downlevelLetConst16.ts(202,15): error TS2459: Type 'undefined' has no property 'a' and no string index signature.
+tests/cases/compiler/downlevelLetConst16.ts(216,16): error TS2461: Type 'undefined' is not an array type.
+tests/cases/compiler/downlevelLetConst16.ts(223,17): error TS2459: Type 'undefined' has no property 'a' and no string index signature.
 
 
-==== tests/cases/compiler/downlevelLetConst16.ts (6 errors) ====
+==== tests/cases/compiler/downlevelLetConst16.ts (4 errors) ====
     'use strict'
     
     declare function use(a: any);
@@ -193,11 +191,8 @@ tests/cases/compiler/downlevelLetConst16.ts(224,5): error TS2482: 'for...of' sta
         use(x);
     }
     
-    // TODO: once for-of is supported downlevel
     function foo7() {
         for (let x of []) {
-        ~~~
-!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
             use(x);
         }
         use(x);
@@ -205,8 +200,8 @@ tests/cases/compiler/downlevelLetConst16.ts(224,5): error TS2482: 'for...of' sta
     
     function foo8() {
         for (let [x] of []) {
-        ~~~
-!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+                 ~~~
+!!! error TS2461: Type 'undefined' is not an array type.
             use(x);
         }
         use(x);
@@ -214,8 +209,8 @@ tests/cases/compiler/downlevelLetConst16.ts(224,5): error TS2482: 'for...of' sta
     
     function foo9() {
         for (let {a: x} of []) {
-        ~~~
-!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+                  ~
+!!! error TS2459: Type 'undefined' has no property 'a' and no string index signature.
             use(x);
         }
         use(x);
@@ -223,8 +218,6 @@ tests/cases/compiler/downlevelLetConst16.ts(224,5): error TS2482: 'for...of' sta
     
     function foo10() {
         for (const x of []) {
-        ~~~
-!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
             use(x);
         }
         use(x);
@@ -232,8 +225,8 @@ tests/cases/compiler/downlevelLetConst16.ts(224,5): error TS2482: 'for...of' sta
     
     function foo11() {
         for (const [x] of []) {
-        ~~~
-!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+                   ~~~
+!!! error TS2461: Type 'undefined' is not an array type.
             use(x);
         }
         use(x);
@@ -241,8 +234,8 @@ tests/cases/compiler/downlevelLetConst16.ts(224,5): error TS2482: 'for...of' sta
     
     function foo12() {
         for (const {a: x} of []) {
-        ~~~
-!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+                    ~
+!!! error TS2459: Type 'undefined' has no property 'a' and no string index signature.
             use(x);
         }
         use(x);
diff --git a/tests/baselines/reference/downlevelLetConst16.js b/tests/baselines/reference/downlevelLetConst16.js
index 2f25ee4e897..f83e745c554 100644
--- a/tests/baselines/reference/downlevelLetConst16.js
+++ b/tests/baselines/reference/downlevelLetConst16.js
@@ -185,7 +185,6 @@ function foo6() {
     use(x);
 }
 
-// TODO: once for-of is supported downlevel
 function foo7() {
     for (let x of []) {
         use(x);
@@ -454,39 +453,44 @@ function foo6() {
     }
     use(x);
 }
-// TODO: once for-of is supported downlevel
 function foo7() {
-    for (var _x of []) {
+    for (var _i = 0, _a = []; _i < _a.length; _i++) {
+        var _x = _a[_i];
         use(_x);
     }
     use(x);
 }
 function foo8() {
-    for (var _x = (void 0)[0] of []) {
+    for (var _i = 0, _a = []; _i < _a.length; _i++) {
+        var _x = _a[_i][0];
         use(_x);
     }
     use(x);
 }
 function foo9() {
-    for (var _x = (void 0).a of []) {
+    for (var _i = 0, _a = []; _i < _a.length; _i++) {
+        var _x = _a[_i].a;
         use(_x);
     }
     use(x);
 }
 function foo10() {
-    for (var _x of []) {
+    for (var _i = 0, _a = []; _i < _a.length; _i++) {
+        var _x = _a[_i];
         use(_x);
     }
     use(x);
 }
 function foo11() {
-    for (var _x = (void 0)[0] of []) {
+    for (var _i = 0, _a = []; _i < _a.length; _i++) {
+        var _x = _a[_i][0];
         use(_x);
     }
     use(x);
 }
 function foo12() {
-    for (var _x = (void 0).a of []) {
+    for (var _i = 0, _a = []; _i < _a.length; _i++) {
+        var _x = _a[_i].a;
         use(_x);
     }
     use(x);
diff --git a/tests/baselines/reference/downlevelLetConst17.errors.txt b/tests/baselines/reference/downlevelLetConst17.errors.txt
deleted file mode 100644
index ef8f2b89085..00000000000
--- a/tests/baselines/reference/downlevelLetConst17.errors.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-tests/cases/compiler/downlevelLetConst17.ts(66,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
-
-
-==== tests/cases/compiler/downlevelLetConst17.ts (1 errors) ====
-    'use strict'
-    
-    declare function use(a: any);
-    
-    var x;
-    for (let x = 10; ;) {
-        use(x);
-    }
-    use(x);
-    
-    for (const x = 10; ;) {
-        use(x);
-    }
-    
-    for (; ;) {
-        let x = 10;
-        use(x);
-        x = 1;
-    }
-    
-    for (; ;) {
-        const x = 10;
-        use(x);
-    }
-    
-    for (let x; ;) {
-        use(x);
-        x = 1;
-    }
-    
-    for (; ;) {
-        let x;
-        use(x);
-        x = 1;
-    }
-    
-    while (true) {
-        let x;
-        use(x);
-    }
-    
-    while (true) {
-        const x = true;
-        use(x);
-    }
-    
-    do {
-        let x;
-        use(x);
-    } while (true);
-    
-    do {
-        let x;
-        use(x);
-    } while (true);
-    
-    for (let x in []) {
-        use(x);
-    }
-    
-    for (const x in []) {
-        use(x);
-    }
-    
-    // TODO: update once for-of statements are supported downlevel
-    for (const x of []) {
-    ~~~
-!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
-        use(x);
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/downlevelLetConst17.js b/tests/baselines/reference/downlevelLetConst17.js
index 1fe9c1a01ed..d38ec3fde08 100644
--- a/tests/baselines/reference/downlevelLetConst17.js
+++ b/tests/baselines/reference/downlevelLetConst17.js
@@ -63,7 +63,6 @@ for (const x in []) {
     use(x);
 }
 
-// TODO: update once for-of statements are supported downlevel
 for (const x of []) {
     use(x);
 }
@@ -118,7 +117,7 @@ for (var _x_10 in []) {
 for (var _x_11 in []) {
     use(_x_11);
 }
-// TODO: update once for-of statements are supported downlevel
-for (var _x_12 of []) {
+for (var _i = 0, _a = []; _i < _a.length; _i++) {
+    var _x_12 = _a[_i];
     use(_x_12);
 }
diff --git a/tests/baselines/reference/downlevelLetConst17.types b/tests/baselines/reference/downlevelLetConst17.types
new file mode 100644
index 00000000000..0c5a8eaa86b
--- /dev/null
+++ b/tests/baselines/reference/downlevelLetConst17.types
@@ -0,0 +1,154 @@
+=== tests/cases/compiler/downlevelLetConst17.ts ===
+'use strict'
+
+declare function use(a: any);
+>use : (a: any) => any
+>a : any
+
+var x;
+>x : any
+
+for (let x = 10; ;) {
+>x : number
+
+    use(x);
+>use(x) : any
+>use : (a: any) => any
+>x : number
+}
+use(x);
+>use(x) : any
+>use : (a: any) => any
+>x : any
+
+for (const x = 10; ;) {
+>x : number
+
+    use(x);
+>use(x) : any
+>use : (a: any) => any
+>x : number
+}
+
+for (; ;) {
+    let x = 10;
+>x : number
+
+    use(x);
+>use(x) : any
+>use : (a: any) => any
+>x : number
+
+    x = 1;
+>x = 1 : number
+>x : number
+}
+
+for (; ;) {
+    const x = 10;
+>x : number
+
+    use(x);
+>use(x) : any
+>use : (a: any) => any
+>x : number
+}
+
+for (let x; ;) {
+>x : any
+
+    use(x);
+>use(x) : any
+>use : (a: any) => any
+>x : any
+
+    x = 1;
+>x = 1 : number
+>x : any
+}
+
+for (; ;) {
+    let x;
+>x : any
+
+    use(x);
+>use(x) : any
+>use : (a: any) => any
+>x : any
+
+    x = 1;
+>x = 1 : number
+>x : any
+}
+
+while (true) {
+    let x;
+>x : any
+
+    use(x);
+>use(x) : any
+>use : (a: any) => any
+>x : any
+}
+
+while (true) {
+    const x = true;
+>x : boolean
+
+    use(x);
+>use(x) : any
+>use : (a: any) => any
+>x : boolean
+}
+
+do {
+    let x;
+>x : any
+
+    use(x);
+>use(x) : any
+>use : (a: any) => any
+>x : any
+
+} while (true);
+
+do {
+    let x;
+>x : any
+
+    use(x);
+>use(x) : any
+>use : (a: any) => any
+>x : any
+
+} while (true);
+
+for (let x in []) {
+>x : any
+>[] : undefined[]
+
+    use(x);
+>use(x) : any
+>use : (a: any) => any
+>x : any
+}
+
+for (const x in []) {
+>x : any
+>[] : undefined[]
+
+    use(x);
+>use(x) : any
+>use : (a: any) => any
+>x : any
+}
+
+for (const x of []) {
+>x : any
+>[] : undefined[]
+
+    use(x);
+>use(x) : any
+>use : (a: any) => any
+>x : any
+}
diff --git a/tests/baselines/reference/for-of55.errors.txt b/tests/baselines/reference/for-of55.errors.txt
new file mode 100644
index 00000000000..aa1285afbd6
--- /dev/null
+++ b/tests/baselines/reference/for-of55.errors.txt
@@ -0,0 +1,10 @@
+tests/cases/conformance/es6/for-ofStatements/for-of55.ts(2,15): error TS2448: Block-scoped variable 'v' used before its declaration.
+
+
+==== tests/cases/conformance/es6/for-ofStatements/for-of55.ts (1 errors) ====
+    let v = [1];
+    for (let v of v) {
+                  ~
+!!! error TS2448: Block-scoped variable 'v' used before its declaration.
+        v;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/for-of55.types b/tests/baselines/reference/for-of55.types
deleted file mode 100644
index b0f5aab3fee..00000000000
--- a/tests/baselines/reference/for-of55.types
+++ /dev/null
@@ -1,12 +0,0 @@
-=== tests/cases/conformance/es6/for-ofStatements/for-of55.ts ===
-let v = [1];
->v : number[]
->[1] : number[]
-
-for (let v of v) {
->v : any
->v : any
-
-    v;
->v : any
-}
diff --git a/tests/baselines/reference/letConstInCaseClauses.errors.txt b/tests/baselines/reference/letConstInCaseClauses.errors.txt
new file mode 100644
index 00000000000..af0777d56a4
--- /dev/null
+++ b/tests/baselines/reference/letConstInCaseClauses.errors.txt
@@ -0,0 +1,39 @@
+tests/cases/compiler/letConstInCaseClauses.ts(7,5): error TS2304: Cannot find name 'console'.
+tests/cases/compiler/letConstInCaseClauses.ts(21,5): error TS2304: Cannot find name 'console'.
+
+
+==== tests/cases/compiler/letConstInCaseClauses.ts (2 errors) ====
+    
+    var x = 10;
+    var y = 20;
+    {
+        let x = 1;
+        let y = 2;
+        console.log(x)
+        ~~~~~~~
+!!! error TS2304: Cannot find name 'console'.
+        switch (x) {
+            case 10:
+                let x = 20;
+        }
+        switch (y) {
+            case 10:
+                let y = 20;
+        }
+    }
+    
+    {
+        const x = 1;
+        const y = 2;
+        console.log(x)
+        ~~~~~~~
+!!! error TS2304: Cannot find name 'console'.
+        switch (x) {
+            case 10:
+                const x = 20;
+        }
+        switch (y) {
+            case 10:
+                const y = 20;
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/letConstInCaseClauses.js b/tests/baselines/reference/letConstInCaseClauses.js
new file mode 100644
index 00000000000..94840a11a2c
--- /dev/null
+++ b/tests/baselines/reference/letConstInCaseClauses.js
@@ -0,0 +1,61 @@
+//// [letConstInCaseClauses.ts]
+
+var x = 10;
+var y = 20;
+{
+    let x = 1;
+    let y = 2;
+    console.log(x)
+    switch (x) {
+        case 10:
+            let x = 20;
+    }
+    switch (y) {
+        case 10:
+            let y = 20;
+    }
+}
+
+{
+    const x = 1;
+    const y = 2;
+    console.log(x)
+    switch (x) {
+        case 10:
+            const x = 20;
+    }
+    switch (y) {
+        case 10:
+            const y = 20;
+    }
+}
+
+//// [letConstInCaseClauses.js]
+var x = 10;
+var y = 20;
+{
+    var _x = 1;
+    var _y = 2;
+    console.log(_x);
+    switch (_x) {
+        case 10:
+            var _x_1 = 20;
+    }
+    switch (_y) {
+        case 10:
+            var _y_1 = 20;
+    }
+}
+{
+    var _x_2 = 1;
+    var _y_2 = 2;
+    console.log(_x_2);
+    switch (_x_2) {
+        case 10:
+            var _x_3 = 20;
+    }
+    switch (_y_2) {
+        case 10:
+            var _y_3 = 20;
+    }
+}
diff --git a/tests/baselines/reference/letConstMatchingParameterNames.js b/tests/baselines/reference/letConstMatchingParameterNames.js
new file mode 100644
index 00000000000..a11405b9f83
--- /dev/null
+++ b/tests/baselines/reference/letConstMatchingParameterNames.js
@@ -0,0 +1,28 @@
+//// [letConstMatchingParameterNames.ts]
+let parent = true;
+const parent2 = true;
+declare function use(a: any);
+
+function a() {
+    
+    let parent = 1;
+    const parent2 = 2;
+
+    function b(parent: string, parent2: number) {
+        use(parent);
+        use(parent2);
+    }
+}
+
+
+//// [letConstMatchingParameterNames.js]
+var parent = true;
+var parent2 = true;
+function a() {
+    var _parent = 1;
+    var _parent2 = 2;
+    function b(parent, parent2) {
+        use(parent);
+        use(parent2);
+    }
+}
diff --git a/tests/baselines/reference/letConstMatchingParameterNames.types b/tests/baselines/reference/letConstMatchingParameterNames.types
new file mode 100644
index 00000000000..66fccc637df
--- /dev/null
+++ b/tests/baselines/reference/letConstMatchingParameterNames.types
@@ -0,0 +1,37 @@
+=== tests/cases/compiler/letConstMatchingParameterNames.ts ===
+let parent = true;
+>parent : boolean
+
+const parent2 = true;
+>parent2 : boolean
+
+declare function use(a: any);
+>use : (a: any) => any
+>a : any
+
+function a() {
+>a : () => void
+    
+    let parent = 1;
+>parent : number
+
+    const parent2 = 2;
+>parent2 : number
+
+    function b(parent: string, parent2: number) {
+>b : (parent: string, parent2: number) => void
+>parent : string
+>parent2 : number
+
+        use(parent);
+>use(parent) : any
+>use : (a: any) => any
+>parent : string
+
+        use(parent2);
+>use(parent2) : any
+>use : (a: any) => any
+>parent2 : number
+    }
+}
+
diff --git a/tests/baselines/reference/letInNonStrictMode.js b/tests/baselines/reference/letInNonStrictMode.js
new file mode 100644
index 00000000000..af21ce3281c
--- /dev/null
+++ b/tests/baselines/reference/letInNonStrictMode.js
@@ -0,0 +1,11 @@
+//// [letInNonStrictMode.ts]
+let [x] = [1];
+let {a: y} = {a: 1};
+
+//// [letInNonStrictMode.js]
+var x = ([
+    1
+])[0];
+var y = ({
+    a: 1
+}).a;
diff --git a/tests/baselines/reference/letInNonStrictMode.types b/tests/baselines/reference/letInNonStrictMode.types
new file mode 100644
index 00000000000..4f2cbe4a703
--- /dev/null
+++ b/tests/baselines/reference/letInNonStrictMode.types
@@ -0,0 +1,11 @@
+=== tests/cases/compiler/letInNonStrictMode.ts ===
+let [x] = [1];
+>x : number
+>[1] : [number]
+
+let {a: y} = {a: 1};
+>a : unknown
+>y : number
+>{a: 1} : { a: number; }
+>a : number
+
diff --git a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js
index 86e84ced58f..d0ced992146 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 _i = 1; _i < arguments.length; _i++) {
-                rest[_i - 1] = arguments[_i];
+            for (var _a = 1; _a < arguments.length; _a++) {
+                rest[_a - 1] = arguments[_a];
             }
             var index = rest[0];
             return typeof args[index] !== 'undefined' ? args[index] : match;
diff --git a/tests/baselines/reference/parserES5ForOfStatement1.d.errors.txt b/tests/baselines/reference/parserES5ForOfStatement1.d.errors.txt
index c280b597b2c..d8e186b4d57 100644
--- a/tests/baselines/reference/parserES5ForOfStatement1.d.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement1.d.errors.txt
@@ -1,8 +1,11 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement1.d.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement1.d.ts(1,1): error TS1036: Statements are not allowed in ambient contexts.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement1.d.ts(1,15): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement1.d.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement1.d.ts (2 errors) ====
     for (var i of e) {
     ~~~
-!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+!!! error TS1036: Statements are not allowed in ambient contexts.
+                  ~
+!!! error TS2304: Cannot find name 'e'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement10.errors.txt b/tests/baselines/reference/parserES5ForOfStatement10.errors.txt
index 5cee7472d24..e0ea8928be1 100644
--- a/tests/baselines/reference/parserES5ForOfStatement10.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement10.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement10.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement10.ts(1,17): error TS2304: Cannot find name 'X'.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement10.ts (1 errors) ====
     for (const v of X) {
-    ~~~
-!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+                    ~
+!!! error TS2304: Cannot find name 'X'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement10.js b/tests/baselines/reference/parserES5ForOfStatement10.js
index 2b9dc843887..cac70523022 100644
--- a/tests/baselines/reference/parserES5ForOfStatement10.js
+++ b/tests/baselines/reference/parserES5ForOfStatement10.js
@@ -3,5 +3,6 @@ for (const v of X) {
 }
 
 //// [parserES5ForOfStatement10.js]
-for (var v of X) {
+for (var _i = 0; _i < X.length; _i++) {
+    var v = X[_i];
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement11.errors.txt b/tests/baselines/reference/parserES5ForOfStatement11.errors.txt
index 79b16ed1ad6..098d895e6c3 100644
--- a/tests/baselines/reference/parserES5ForOfStatement11.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement11.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement11.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement11.ts(1,22): error TS2304: Cannot find name 'X'.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement11.ts (1 errors) ====
     for (const [a, b] of X) {
-    ~~~
-!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+                         ~
+!!! error TS2304: Cannot find name 'X'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement11.js b/tests/baselines/reference/parserES5ForOfStatement11.js
index 45a24b109c0..40e4ca68d6b 100644
--- a/tests/baselines/reference/parserES5ForOfStatement11.js
+++ b/tests/baselines/reference/parserES5ForOfStatement11.js
@@ -3,5 +3,6 @@ for (const [a, b] of X) {
 }
 
 //// [parserES5ForOfStatement11.js]
-for (var _a = void 0, a = _a[0], b = _a[1] of X) {
+for (var _i = 0; _i < X.length; _i++) {
+    var _a = X[_i], a = _a[0], b = _a[1];
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement12.errors.txt b/tests/baselines/reference/parserES5ForOfStatement12.errors.txt
index cdb6db690cf..63916799810 100644
--- a/tests/baselines/reference/parserES5ForOfStatement12.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement12.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement12.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement12.ts(1,22): error TS2304: Cannot find name 'X'.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement12.ts (1 errors) ====
     for (const {a, b} of X) {
-    ~~~
-!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+                         ~
+!!! error TS2304: Cannot find name 'X'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement12.js b/tests/baselines/reference/parserES5ForOfStatement12.js
index 30beac5118c..f877ebdb757 100644
--- a/tests/baselines/reference/parserES5ForOfStatement12.js
+++ b/tests/baselines/reference/parserES5ForOfStatement12.js
@@ -3,5 +3,6 @@ for (const {a, b} of X) {
 }
 
 //// [parserES5ForOfStatement12.js]
-for (var _a = void 0, a = _a.a, b = _a.b of X) {
+for (var _i = 0; _i < X.length; _i++) {
+    var _a = X[_i], a = _a.a, b = _a.b;
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement13.errors.txt b/tests/baselines/reference/parserES5ForOfStatement13.errors.txt
index 9d97fd9e249..e197c0c42ee 100644
--- a/tests/baselines/reference/parserES5ForOfStatement13.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement13.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement13.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement13.ts(1,20): error TS2304: Cannot find name 'X'.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement13.ts (1 errors) ====
     for (let {a, b} of X) {
-    ~~~
-!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+                       ~
+!!! error TS2304: Cannot find name 'X'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement13.js b/tests/baselines/reference/parserES5ForOfStatement13.js
index 3fac359c675..45199480518 100644
--- a/tests/baselines/reference/parserES5ForOfStatement13.js
+++ b/tests/baselines/reference/parserES5ForOfStatement13.js
@@ -3,5 +3,6 @@ for (let {a, b} of X) {
 }
 
 //// [parserES5ForOfStatement13.js]
-for (var _a = void 0, a = _a.a, b = _a.b of X) {
+for (var _i = 0; _i < X.length; _i++) {
+    var _a = X[_i], a = _a.a, b = _a.b;
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement14.errors.txt b/tests/baselines/reference/parserES5ForOfStatement14.errors.txt
index 303439ec447..f48a17cbc43 100644
--- a/tests/baselines/reference/parserES5ForOfStatement14.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement14.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement14.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement14.ts(1,20): error TS2304: Cannot find name 'X'.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement14.ts (1 errors) ====
     for (let [a, b] of X) {
-    ~~~
-!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+                       ~
+!!! error TS2304: Cannot find name 'X'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement14.js b/tests/baselines/reference/parserES5ForOfStatement14.js
index 6d1fbbddd67..d05fdb96e57 100644
--- a/tests/baselines/reference/parserES5ForOfStatement14.js
+++ b/tests/baselines/reference/parserES5ForOfStatement14.js
@@ -3,5 +3,6 @@ for (let [a, b] of X) {
 }
 
 //// [parserES5ForOfStatement14.js]
-for (var _a = void 0, a = _a[0], b = _a[1] of X) {
+for (var _i = 0; _i < X.length; _i++) {
+    var _a = X[_i], a = _a[0], b = _a[1];
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement15.errors.txt b/tests/baselines/reference/parserES5ForOfStatement15.errors.txt
index f0eab288fa7..dd4d61c420b 100644
--- a/tests/baselines/reference/parserES5ForOfStatement15.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement15.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement15.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement15.ts(1,20): error TS2304: Cannot find name 'X'.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement15.ts (1 errors) ====
     for (var [a, b] of X) {
-    ~~~
-!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+                       ~
+!!! error TS2304: Cannot find name 'X'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement15.js b/tests/baselines/reference/parserES5ForOfStatement15.js
index efca0b289f6..0af74961145 100644
--- a/tests/baselines/reference/parserES5ForOfStatement15.js
+++ b/tests/baselines/reference/parserES5ForOfStatement15.js
@@ -3,5 +3,6 @@ for (var [a, b] of X) {
 }
 
 //// [parserES5ForOfStatement15.js]
-for (var _a = void 0, a = _a[0], b = _a[1] of X) {
+for (var _i = 0; _i < X.length; _i++) {
+    var _a = X[_i], a = _a[0], b = _a[1];
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement16.errors.txt b/tests/baselines/reference/parserES5ForOfStatement16.errors.txt
index b9248140f33..3879fb64e70 100644
--- a/tests/baselines/reference/parserES5ForOfStatement16.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement16.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement16.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement16.ts(1,20): error TS2304: Cannot find name 'X'.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement16.ts (1 errors) ====
     for (var {a, b} of X) {
-    ~~~
-!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+                       ~
+!!! error TS2304: Cannot find name 'X'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement16.js b/tests/baselines/reference/parserES5ForOfStatement16.js
index 102e91685c3..1e7c6e005a8 100644
--- a/tests/baselines/reference/parserES5ForOfStatement16.js
+++ b/tests/baselines/reference/parserES5ForOfStatement16.js
@@ -3,5 +3,6 @@ for (var {a, b} of X) {
 }
 
 //// [parserES5ForOfStatement16.js]
-for (var _a = void 0, a = _a.a, b = _a.b of X) {
+for (var _i = 0; _i < X.length; _i++) {
+    var _a = X[_i], a = _a.a, b = _a.b;
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement18.errors.txt b/tests/baselines/reference/parserES5ForOfStatement18.errors.txt
deleted file mode 100644
index e123be9c4f7..00000000000
--- a/tests/baselines/reference/parserES5ForOfStatement18.errors.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement18.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
-
-
-==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement18.ts (1 errors) ====
-    for (var of of of) { }
-    ~~~
-!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement18.js b/tests/baselines/reference/parserES5ForOfStatement18.js
index c0d5c1f84a5..905ba9c1d1e 100644
--- a/tests/baselines/reference/parserES5ForOfStatement18.js
+++ b/tests/baselines/reference/parserES5ForOfStatement18.js
@@ -2,5 +2,6 @@
 for (var of of of) { }
 
 //// [parserES5ForOfStatement18.js]
-for (var of of of) {
+for (var _i = 0; _i < of.length; _i++) {
+    var of = of[_i];
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement18.types b/tests/baselines/reference/parserES5ForOfStatement18.types
new file mode 100644
index 00000000000..f9544e39a31
--- /dev/null
+++ b/tests/baselines/reference/parserES5ForOfStatement18.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement18.ts ===
+for (var of of of) { }
+>of : any
+>of : any
+
diff --git a/tests/baselines/reference/parserES5ForOfStatement2.errors.txt b/tests/baselines/reference/parserES5ForOfStatement2.errors.txt
index 618e2f3f0ae..cb249e83785 100644
--- a/tests/baselines/reference/parserES5ForOfStatement2.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement2.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement2.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement2.ts(1,9): error TS1123: Variable declaration list cannot be empty.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement2.ts (1 errors) ====
     for (var of X) {
-    ~~~
-!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+            
+!!! error TS1123: Variable declaration list cannot be empty.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement2.js b/tests/baselines/reference/parserES5ForOfStatement2.js
index dfcfb476172..287602dfb9c 100644
--- a/tests/baselines/reference/parserES5ForOfStatement2.js
+++ b/tests/baselines/reference/parserES5ForOfStatement2.js
@@ -3,5 +3,6 @@ for (var of X) {
 }
 
 //// [parserES5ForOfStatement2.js]
-for ( of X) {
+for (var _i = 0; _i < X.length; _i++) {
+    var _a = X[_i];
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement21.errors.txt b/tests/baselines/reference/parserES5ForOfStatement21.errors.txt
index 14d97f49faf..76f87978cf1 100644
--- a/tests/baselines/reference/parserES5ForOfStatement21.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement21.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement21.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement21.ts(1,9): error TS1123: Variable declaration list cannot be empty.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement21.ts (1 errors) ====
     for (var of of) { }
-    ~~~
-!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
\ No newline at end of file
+            
+!!! error TS1123: Variable declaration list cannot be empty.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement21.js b/tests/baselines/reference/parserES5ForOfStatement21.js
index 36d4c4ba635..dcdffbc3cf0 100644
--- a/tests/baselines/reference/parserES5ForOfStatement21.js
+++ b/tests/baselines/reference/parserES5ForOfStatement21.js
@@ -2,5 +2,6 @@
 for (var of of) { }
 
 //// [parserES5ForOfStatement21.js]
-for ( of of) {
+for (var _i = 0; _i < of.length; _i++) {
+    var _a = of[_i];
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement3.errors.txt b/tests/baselines/reference/parserES5ForOfStatement3.errors.txt
index dd888a3120a..7388676a703 100644
--- a/tests/baselines/reference/parserES5ForOfStatement3.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement3.errors.txt
@@ -1,8 +1,11 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement3.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement3.ts(1,13): error TS1188: Only a single variable declaration is allowed in a 'for...of' statement.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement3.ts(1,18): error TS2304: Cannot find name 'X'.
 
 
-==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement3.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement3.ts (2 errors) ====
     for (var a, b of X) {
-    ~~~
-!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+                ~
+!!! error TS1188: Only a single variable declaration is allowed in a 'for...of' statement.
+                     ~
+!!! error TS2304: Cannot find name 'X'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement3.js b/tests/baselines/reference/parserES5ForOfStatement3.js
index 64892eb5094..a99e96a23b8 100644
--- a/tests/baselines/reference/parserES5ForOfStatement3.js
+++ b/tests/baselines/reference/parserES5ForOfStatement3.js
@@ -3,5 +3,6 @@ for (var a, b of X) {
 }
 
 //// [parserES5ForOfStatement3.js]
-for (var a of X) {
+for (var _i = 0; _i < X.length; _i++) {
+    var a = X[_i];
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement4.errors.txt b/tests/baselines/reference/parserES5ForOfStatement4.errors.txt
index b94de56b17c..8a0d7abf0d0 100644
--- a/tests/baselines/reference/parserES5ForOfStatement4.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement4.errors.txt
@@ -1,8 +1,11 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement4.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement4.ts(1,10): error TS1190: The variable declaration of a 'for...of' statement cannot have an initializer.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement4.ts(1,19): error TS2304: Cannot find name 'X'.
 
 
-==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement4.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement4.ts (2 errors) ====
     for (var a = 1 of X) {
-    ~~~
-!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+             ~
+!!! error TS1190: The variable declaration of a 'for...of' statement cannot have an initializer.
+                      ~
+!!! error TS2304: Cannot find name 'X'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement4.js b/tests/baselines/reference/parserES5ForOfStatement4.js
index e17699a8662..f1558005f20 100644
--- a/tests/baselines/reference/parserES5ForOfStatement4.js
+++ b/tests/baselines/reference/parserES5ForOfStatement4.js
@@ -3,5 +3,6 @@ for (var a = 1 of X) {
 }
 
 //// [parserES5ForOfStatement4.js]
-for (var a = 1 of X) {
+for (var _i = 0; _i < X.length; _i++) {
+    var a = 1 = X[_i];
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement5.errors.txt b/tests/baselines/reference/parserES5ForOfStatement5.errors.txt
index 0b8dafc0b90..43c9161156a 100644
--- a/tests/baselines/reference/parserES5ForOfStatement5.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement5.errors.txt
@@ -1,8 +1,11 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement5.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement5.ts(1,10): error TS2483: The left-hand side of a 'for...of' statement cannot use a type annotation.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement5.ts(1,23): error TS2304: Cannot find name 'X'.
 
 
-==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement5.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement5.ts (2 errors) ====
     for (var a: number of X) {
-    ~~~
-!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+             ~
+!!! error TS2483: The left-hand side of a 'for...of' statement cannot use a type annotation.
+                          ~
+!!! error TS2304: Cannot find name 'X'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement5.js b/tests/baselines/reference/parserES5ForOfStatement5.js
index 2eeb504365e..328b2fba0a7 100644
--- a/tests/baselines/reference/parserES5ForOfStatement5.js
+++ b/tests/baselines/reference/parserES5ForOfStatement5.js
@@ -3,5 +3,6 @@ for (var a: number of X) {
 }
 
 //// [parserES5ForOfStatement5.js]
-for (var a of X) {
+for (var _i = 0; _i < X.length; _i++) {
+    var a = X[_i];
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement6.errors.txt b/tests/baselines/reference/parserES5ForOfStatement6.errors.txt
index 04ac84fbd73..8ddf2273ba8 100644
--- a/tests/baselines/reference/parserES5ForOfStatement6.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement6.errors.txt
@@ -1,8 +1,11 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement6.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement6.ts(1,17): error TS1188: Only a single variable declaration is allowed in a 'for...of' statement.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement6.ts(1,26): error TS2304: Cannot find name 'X'.
 
 
-==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement6.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement6.ts (2 errors) ====
     for (var a = 1, b = 2 of X) {
-    ~~~
-!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+                    ~
+!!! error TS1188: Only a single variable declaration is allowed in a 'for...of' statement.
+                             ~
+!!! error TS2304: Cannot find name 'X'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement6.js b/tests/baselines/reference/parserES5ForOfStatement6.js
index 575368fcd20..15747b93ba9 100644
--- a/tests/baselines/reference/parserES5ForOfStatement6.js
+++ b/tests/baselines/reference/parserES5ForOfStatement6.js
@@ -3,5 +3,6 @@ for (var a = 1, b = 2 of X) {
 }
 
 //// [parserES5ForOfStatement6.js]
-for (var a = 1 of X) {
+for (var _i = 0; _i < X.length; _i++) {
+    var a = 1 = X[_i];
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement7.errors.txt b/tests/baselines/reference/parserES5ForOfStatement7.errors.txt
index 1def5279f65..6bf7f300183 100644
--- a/tests/baselines/reference/parserES5ForOfStatement7.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement7.errors.txt
@@ -1,8 +1,11 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement7.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement7.ts(1,25): error TS1188: Only a single variable declaration is allowed in a 'for...of' statement.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement7.ts(1,43): error TS2304: Cannot find name 'X'.
 
 
-==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement7.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement7.ts (2 errors) ====
     for (var a: number = 1, b: string = "" of X) {
-    ~~~
-!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+                            ~
+!!! error TS1188: Only a single variable declaration is allowed in a 'for...of' statement.
+                                              ~
+!!! error TS2304: Cannot find name 'X'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement7.js b/tests/baselines/reference/parserES5ForOfStatement7.js
index ac240494c18..29e4de8787f 100644
--- a/tests/baselines/reference/parserES5ForOfStatement7.js
+++ b/tests/baselines/reference/parserES5ForOfStatement7.js
@@ -3,5 +3,6 @@ for (var a: number = 1, b: string = "" of X) {
 }
 
 //// [parserES5ForOfStatement7.js]
-for (var a = 1 of X) {
+for (var _i = 0; _i < X.length; _i++) {
+    var a = 1 = X[_i];
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement8.errors.txt b/tests/baselines/reference/parserES5ForOfStatement8.errors.txt
index 829fea57e6e..53b263ad6e1 100644
--- a/tests/baselines/reference/parserES5ForOfStatement8.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement8.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement8.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement8.ts(1,15): error TS2304: Cannot find name 'X'.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement8.ts (1 errors) ====
     for (var v of X) {
-    ~~~
-!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+                  ~
+!!! error TS2304: Cannot find name 'X'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement8.js b/tests/baselines/reference/parserES5ForOfStatement8.js
index c926784adfe..5c449fc6433 100644
--- a/tests/baselines/reference/parserES5ForOfStatement8.js
+++ b/tests/baselines/reference/parserES5ForOfStatement8.js
@@ -3,5 +3,6 @@ for (var v of X) {
 }
 
 //// [parserES5ForOfStatement8.js]
-for (var v of X) {
+for (var _i = 0; _i < X.length; _i++) {
+    var v = X[_i];
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement9.errors.txt b/tests/baselines/reference/parserES5ForOfStatement9.errors.txt
index 4cf082b4f15..869cdfdf647 100644
--- a/tests/baselines/reference/parserES5ForOfStatement9.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement9.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement9.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement9.ts(1,15): error TS2304: Cannot find name 'X'.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement9.ts (1 errors) ====
     for (let v of X) {
-    ~~~
-!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
+                  ~
+!!! error TS2304: Cannot find name 'X'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement9.js b/tests/baselines/reference/parserES5ForOfStatement9.js
index 856dd5982af..6b63d58a88a 100644
--- a/tests/baselines/reference/parserES5ForOfStatement9.js
+++ b/tests/baselines/reference/parserES5ForOfStatement9.js
@@ -3,5 +3,6 @@ for (let v of X) {
 }
 
 //// [parserES5ForOfStatement9.js]
-for (var v of X) {
+for (var _i = 0; _i < X.length; _i++) {
+    var v = X[_i];
 }
diff --git a/tests/baselines/reference/recursiveLetConst.errors.txt b/tests/baselines/reference/recursiveLetConst.errors.txt
new file mode 100644
index 00000000000..b02d0819a3f
--- /dev/null
+++ b/tests/baselines/reference/recursiveLetConst.errors.txt
@@ -0,0 +1,47 @@
+tests/cases/compiler/recursiveLetConst.ts(2,9): error TS2448: Block-scoped variable 'x' used before its declaration.
+tests/cases/compiler/recursiveLetConst.ts(3,12): error TS2448: Block-scoped variable 'x1' used before its declaration.
+tests/cases/compiler/recursiveLetConst.ts(4,11): error TS2448: Block-scoped variable 'y' used before its declaration.
+tests/cases/compiler/recursiveLetConst.ts(5,14): error TS2448: Block-scoped variable 'y1' used before its declaration.
+tests/cases/compiler/recursiveLetConst.ts(6,14): error TS2448: Block-scoped variable 'v' used before its declaration.
+tests/cases/compiler/recursiveLetConst.ts(7,16): error TS2448: Block-scoped variable 'v' used before its declaration.
+tests/cases/compiler/recursiveLetConst.ts(8,15): error TS2448: Block-scoped variable 'v' used before its declaration.
+tests/cases/compiler/recursiveLetConst.ts(9,15): error TS2448: Block-scoped variable 'v' used before its declaration.
+tests/cases/compiler/recursiveLetConst.ts(10,17): error TS2448: Block-scoped variable 'v' used before its declaration.
+tests/cases/compiler/recursiveLetConst.ts(11,11): error TS2448: Block-scoped variable 'x2' used before its declaration.
+
+
+==== tests/cases/compiler/recursiveLetConst.ts (10 errors) ====
+    'use strict'
+    let x = x + 1;
+            ~
+!!! error TS2448: Block-scoped variable 'x' used before its declaration.
+    let [x1] = x1 + 1;
+               ~~
+!!! error TS2448: Block-scoped variable 'x1' used before its declaration.
+    const y = y + 2;
+              ~
+!!! error TS2448: Block-scoped variable 'y' used before its declaration.
+    const [y1] = y1 + 1;
+                 ~~
+!!! error TS2448: Block-scoped variable 'y1' used before its declaration.
+    for (let v = v; ; ) { }
+                 ~
+!!! error TS2448: Block-scoped variable 'v' used before its declaration.
+    for (let [v] = v; ;) { }
+                   ~
+!!! error TS2448: Block-scoped variable 'v' used before its declaration.
+    for (let v in v) { }
+                  ~
+!!! error TS2448: Block-scoped variable 'v' used before its declaration.
+    for (let v of v) { }
+                  ~
+!!! error TS2448: Block-scoped variable 'v' used before its declaration.
+    for (let [v] of v) { }
+                    ~
+!!! error TS2448: Block-scoped variable 'v' used before its declaration.
+    let [x2 = x2] = []
+              ~~
+!!! error TS2448: Block-scoped variable 'x2' used before its declaration.
+    let z0 = () => z0;
+    let z1 = function () { return z1; }
+    let z2 = { f() { return z2;}}
\ No newline at end of file
diff --git a/tests/baselines/reference/recursiveLetConst.js b/tests/baselines/reference/recursiveLetConst.js
new file mode 100644
index 00000000000..7d9aea3a754
--- /dev/null
+++ b/tests/baselines/reference/recursiveLetConst.js
@@ -0,0 +1,42 @@
+//// [recursiveLetConst.ts]
+'use strict'
+let x = x + 1;
+let [x1] = x1 + 1;
+const y = y + 2;
+const [y1] = y1 + 1;
+for (let v = v; ; ) { }
+for (let [v] = v; ;) { }
+for (let v in v) { }
+for (let v of v) { }
+for (let [v] of v) { }
+let [x2 = x2] = []
+let z0 = () => z0;
+let z1 = function () { return z1; }
+let z2 = { f() { return z2;}}
+
+//// [recursiveLetConst.js]
+'use strict';
+let x = x + 1;
+let [x1] = x1 + 1;
+const y = y + 2;
+const [y1] = y1 + 1;
+for (let v = v;;) {
+}
+for (let [v] = v;;) {
+}
+for (let v in v) {
+}
+for (let v of v) {
+}
+for (let [v] of v) {
+}
+let [x2 = x2] = [];
+let z0 = () => z0;
+let z1 = function () {
+    return z1;
+};
+let z2 = {
+    f() {
+        return z2;
+    }
+};
diff --git a/tests/cases/compiler/downlevelLetConst16.ts b/tests/cases/compiler/downlevelLetConst16.ts
index 2d592d253c9..30a27ba61f4 100644
--- a/tests/cases/compiler/downlevelLetConst16.ts
+++ b/tests/cases/compiler/downlevelLetConst16.ts
@@ -185,7 +185,6 @@ function foo6() {
     use(x);
 }
 
-// TODO: once for-of is supported downlevel
 function foo7() {
     for (let x of []) {
         use(x);
diff --git a/tests/cases/compiler/downlevelLetConst17.ts b/tests/cases/compiler/downlevelLetConst17.ts
index 5cbb7b605fe..b581281f679 100644
--- a/tests/cases/compiler/downlevelLetConst17.ts
+++ b/tests/cases/compiler/downlevelLetConst17.ts
@@ -63,7 +63,6 @@ for (const x in []) {
     use(x);
 }
 
-// TODO: update once for-of statements are supported downlevel
 for (const x of []) {
     use(x);
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/letConstInCaseClauses.ts b/tests/cases/compiler/letConstInCaseClauses.ts
new file mode 100644
index 00000000000..4ed1c9fa363
--- /dev/null
+++ b/tests/cases/compiler/letConstInCaseClauses.ts
@@ -0,0 +1,31 @@
+// @target: es5
+
+var x = 10;
+var y = 20;
+{
+    let x = 1;
+    let y = 2;
+    console.log(x)
+    switch (x) {
+        case 10:
+            let x = 20;
+    }
+    switch (y) {
+        case 10:
+            let y = 20;
+    }
+}
+
+{
+    const x = 1;
+    const y = 2;
+    console.log(x)
+    switch (x) {
+        case 10:
+            const x = 20;
+    }
+    switch (y) {
+        case 10:
+            const y = 20;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/letConstMatchingParameterNames.ts b/tests/cases/compiler/letConstMatchingParameterNames.ts
new file mode 100644
index 00000000000..e749912ad82
--- /dev/null
+++ b/tests/cases/compiler/letConstMatchingParameterNames.ts
@@ -0,0 +1,15 @@
+// @target: es5
+let parent = true;
+const parent2 = true;
+declare function use(a: any);
+
+function a() {
+    
+    let parent = 1;
+    const parent2 = 2;
+
+    function b(parent: string, parent2: number) {
+        use(parent);
+        use(parent2);
+    }
+}
diff --git a/tests/cases/compiler/letInNonStrictMode.ts b/tests/cases/compiler/letInNonStrictMode.ts
new file mode 100644
index 00000000000..576246e76a1
--- /dev/null
+++ b/tests/cases/compiler/letInNonStrictMode.ts
@@ -0,0 +1,2 @@
+let [x] = [1];
+let {a: y} = {a: 1};
\ No newline at end of file
diff --git a/tests/cases/compiler/recursiveLetConst.ts b/tests/cases/compiler/recursiveLetConst.ts
new file mode 100644
index 00000000000..9e00ae22e94
--- /dev/null
+++ b/tests/cases/compiler/recursiveLetConst.ts
@@ -0,0 +1,15 @@
+// @target:es6
+'use strict'
+let x = x + 1;
+let [x1] = x1 + 1;
+const y = y + 2;
+const [y1] = y1 + 1;
+for (let v = v; ; ) { }
+for (let [v] = v; ;) { }
+for (let v in v) { }
+for (let v of v) { }
+for (let [v] of v) { }
+let [x2 = x2] = []
+let z0 = () => z0;
+let z1 = function () { return z1; }
+let z2 = { f() { return z2;}}
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES3For-ofTypeCheck1.ts b/tests/cases/conformance/statements/for-ofStatements/ES3For-ofTypeCheck1.ts
new file mode 100644
index 00000000000..ec930d826f9
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES3For-ofTypeCheck1.ts
@@ -0,0 +1,2 @@
+//@target: ES3
+for (var v of "") { }
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES3For-ofTypeCheck2.ts b/tests/cases/conformance/statements/for-ofStatements/ES3For-ofTypeCheck2.ts
new file mode 100644
index 00000000000..d382ef20e4c
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES3For-ofTypeCheck2.ts
@@ -0,0 +1,2 @@
+//@target: ES3
+for (var v of [true]) { }
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES3For-ofTypeCheck4.ts b/tests/cases/conformance/statements/for-ofStatements/ES3For-ofTypeCheck4.ts
new file mode 100644
index 00000000000..b5547b936ae
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES3For-ofTypeCheck4.ts
@@ -0,0 +1,3 @@
+//@target: ES3
+var union: string | string[];
+for (const v of union) { }
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES3For-ofTypeCheck6.ts b/tests/cases/conformance/statements/for-ofStatements/ES3For-ofTypeCheck6.ts
new file mode 100644
index 00000000000..6167d78d179
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES3For-ofTypeCheck6.ts
@@ -0,0 +1,3 @@
+//@target: ES3
+var union: string[] | number[];
+for (var v of union) { }
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of1.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of1.ts
new file mode 100644
index 00000000000..3dd4ec5a360
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of1.ts
@@ -0,0 +1,4 @@
+//@sourcemap: true
+for (var v of ['a', 'b', 'c']) {
+    console.log(v);
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of10.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of10.ts
new file mode 100644
index 00000000000..78cb7668dae
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of10.ts
@@ -0,0 +1,7 @@
+function foo() {
+    return { x: 0 };
+}
+for (foo().x of []) {
+    for (foo().x of [])
+        var p = foo().x;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of11.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of11.ts
new file mode 100644
index 00000000000..9a83efa5135
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of11.ts
@@ -0,0 +1,2 @@
+var v;
+for (v of []) { }
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of12.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of12.ts
new file mode 100644
index 00000000000..eb3017296aa
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of12.ts
@@ -0,0 +1 @@
+for ([""] of [[""]]) { }
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of13.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of13.ts
new file mode 100644
index 00000000000..274d8541bc6
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of13.ts
@@ -0,0 +1,4 @@
+//@sourcemap: true
+for (let v of ['a', 'b', 'c']) {
+    var x = v;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of14.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of14.ts
new file mode 100644
index 00000000000..26dcea71a0e
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of14.ts
@@ -0,0 +1,3 @@
+for (const v of []) {
+    var x = v;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of15.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of15.ts
new file mode 100644
index 00000000000..2124870d7e3
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of15.ts
@@ -0,0 +1,6 @@
+for (let v of []) {
+    v;
+    for (const v of []) {
+        var x = v;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of16.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of16.ts
new file mode 100644
index 00000000000..d1354999340
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of16.ts
@@ -0,0 +1,7 @@
+for (let v of []) {
+    v;
+    for (let v of []) {
+        var x = v;
+        v++;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of17.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of17.ts
new file mode 100644
index 00000000000..6a782dba2a4
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of17.ts
@@ -0,0 +1,7 @@
+for (let v of []) {
+    v;
+    for (let v of [v]) {
+        var x = v;
+        v++;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of18.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of18.ts
new file mode 100644
index 00000000000..e7de82d2785
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of18.ts
@@ -0,0 +1,6 @@
+for (let v of []) {
+    v;
+}
+for (let v of []) {
+    v;
+}
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of19.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of19.ts
new file mode 100644
index 00000000000..447048c374b
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of19.ts
@@ -0,0 +1,8 @@
+for (let v of []) {
+    v;
+    function foo() {
+        for (const v of []) {
+            v;
+        }
+    }
+}
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of2.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of2.ts
new file mode 100644
index 00000000000..5015082a4a9
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of2.ts
@@ -0,0 +1,3 @@
+for (var v of []) {
+    var x = v;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of20.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of20.ts
new file mode 100644
index 00000000000..6a1a77d82ae
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of20.ts
@@ -0,0 +1,6 @@
+for (let v of []) {
+    let v;
+    for (let v of [v]) {
+        const v;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of21.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of21.ts
new file mode 100644
index 00000000000..cb0c3cf2329
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of21.ts
@@ -0,0 +1,3 @@
+for (let v of []) {
+    for (let _i of []) { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of22.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of22.ts
new file mode 100644
index 00000000000..ef35b6efd9c
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of22.ts
@@ -0,0 +1,4 @@
+for (var x of [1, 2, 3]) {
+    let _a = 0;
+    console.log(x);
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of23.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of23.ts
new file mode 100644
index 00000000000..7d93246f2bb
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of23.ts
@@ -0,0 +1,4 @@
+for (var x of [1, 2, 3]) {
+    var _a = 0;
+    console.log(x);
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of24.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of24.ts
new file mode 100644
index 00000000000..7e025183f5f
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of24.ts
@@ -0,0 +1,4 @@
+var a = [1, 2, 3];
+for (var v of a) {
+    let a = 0;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of25.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of25.ts
new file mode 100644
index 00000000000..7017991c7f2
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of25.ts
@@ -0,0 +1,6 @@
+//@sourcemap: true
+var a = [1, 2, 3];
+for (var v of a) {
+    v;
+    a;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of26.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of26.ts
new file mode 100644
index 00000000000..13a386309bb
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of26.ts
@@ -0,0 +1,5 @@
+//@sourcemap: true
+for (var [a = 0, b = 1] of [2, 3]) {
+    a;
+    b;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of27.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of27.ts
new file mode 100644
index 00000000000..4a56779b68d
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of27.ts
@@ -0,0 +1,4 @@
+for (var {x: a = 0, y: b = 1} of [2, 3]) {
+    a;
+    b;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of28.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of28.ts
new file mode 100644
index 00000000000..00f36f7d5d2
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of28.ts
@@ -0,0 +1,4 @@
+for (let [a = 0, b = 1] of [2, 3]) {
+    a;
+    b;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of29.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of29.ts
new file mode 100644
index 00000000000..5b5e52e75c5
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of29.ts
@@ -0,0 +1,4 @@
+for (const {x: a = 0, y: b = 1} of [2, 3]) {
+    a;
+    b;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of3.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of3.ts
new file mode 100644
index 00000000000..c2fb21f68ce
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of3.ts
@@ -0,0 +1,3 @@
+//@sourcemap: true
+for (var v of ['a', 'b', 'c'])
+    var x = v;
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of30.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of30.ts
new file mode 100644
index 00000000000..c25b7b98b5f
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of30.ts
@@ -0,0 +1,6 @@
+var a: string, b: number;
+var tuple: [number, string] = [2, "3"];
+for ([a = 1, b = ""] of tuple) {
+    a;
+    b;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of31.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of31.ts
new file mode 100644
index 00000000000..a00f4516541
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of31.ts
@@ -0,0 +1,6 @@
+var a: string, b: number;
+
+for ({ a: b = 1, b: a = ""} of []) {
+    a;
+    b;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of4.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of4.ts
new file mode 100644
index 00000000000..42fb4c01bdc
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of4.ts
@@ -0,0 +1,3 @@
+for (var v of [])
+    var x = v;
+var y = v;
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of5.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of5.ts
new file mode 100644
index 00000000000..ee968515d65
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of5.ts
@@ -0,0 +1,3 @@
+for (var _a of []) {
+    var x = _a;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of6.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of6.ts
new file mode 100644
index 00000000000..a04ee2d6177
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of6.ts
@@ -0,0 +1,5 @@
+for (var w of []) {
+    for (var v of []) {
+        var x = [w, v];
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of7.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of7.ts
new file mode 100644
index 00000000000..6acb7646779
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of7.ts
@@ -0,0 +1,7 @@
+for (var w of []) {
+    var x = w;
+}
+
+for (var v of []) {
+    var x = [w, v];
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of8.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of8.ts
new file mode 100644
index 00000000000..e902f50031e
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of8.ts
@@ -0,0 +1,7 @@
+//@sourcemap: true
+function foo() {
+    return { x: 0 };
+}
+for (foo().x of ['a', 'b', 'c']) {
+    var p = foo().x;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of9.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of9.ts
new file mode 100644
index 00000000000..5e234df7319
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-of9.ts
@@ -0,0 +1,8 @@
+function foo() {
+    return { x: 0 };
+}
+for (foo().x of []) {
+    for (foo().x of []) {
+        var p = foo().x;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck1.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck1.ts
new file mode 100644
index 00000000000..3b27caf3fe9
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck1.ts
@@ -0,0 +1,2 @@
+//@target: ES5
+for (var v of "") { }
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck10.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck10.ts
new file mode 100644
index 00000000000..185641d0804
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck10.ts
@@ -0,0 +1,15 @@
+//@target: ES5
+for (var v of new StringIterator) { }
+
+// In ES3/5, you cannot for...of over an arbitrary iterable.
+class StringIterator {
+    next() {
+        return {
+            done: true,
+            value: ""
+        };
+    }
+    [Symbol.iterator]() {
+        return this;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck11.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck11.ts
new file mode 100644
index 00000000000..a39371a4843
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck11.ts
@@ -0,0 +1,4 @@
+//@target: ES5
+var union: string | number[];
+var v: string;
+for (v of union) { }
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck12.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck12.ts
new file mode 100644
index 00000000000..2d220dc5f26
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck12.ts
@@ -0,0 +1,2 @@
+//@target: ES5
+for (const v of 0) { }
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck2.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck2.ts
new file mode 100644
index 00000000000..2e22731a78a
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck2.ts
@@ -0,0 +1,2 @@
+//@target: ES5
+for (var v of [true]) { }
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck3.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck3.ts
new file mode 100644
index 00000000000..cc7f09df670
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck3.ts
@@ -0,0 +1,3 @@
+//@target: ES5
+var tuple: [string, number] = ["", 0];
+for (var v of tuple) { }
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck4.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck4.ts
new file mode 100644
index 00000000000..dc8388c0576
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck4.ts
@@ -0,0 +1,3 @@
+//@target: ES5
+var union: string | string[];
+for (const v of union) { }
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck5.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck5.ts
new file mode 100644
index 00000000000..f0218bd57f9
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck5.ts
@@ -0,0 +1,3 @@
+//@target: ES5
+var union: string | number[];
+for (var v of union) { }
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck6.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck6.ts
new file mode 100644
index 00000000000..46cc82af983
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck6.ts
@@ -0,0 +1,3 @@
+//@target: ES5
+var union: string[] | number[];
+for (var v of union) { }
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck7.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck7.ts
new file mode 100644
index 00000000000..4f7dd1c6d3f
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck7.ts
@@ -0,0 +1,3 @@
+//@target: ES5
+var union: string | number;
+for (var v of union) { }
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck8.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck8.ts
new file mode 100644
index 00000000000..2c9f3b63d1d
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck8.ts
@@ -0,0 +1,4 @@
+//@target: ES5
+var union: string | string[]| number[]| symbol[];
+var v: symbol;
+for (v of union) { }
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck9.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck9.ts
new file mode 100644
index 00000000000..3c68f329f0e
--- /dev/null
+++ b/tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck9.ts
@@ -0,0 +1,3 @@
+//@target: ES5
+var union: string | string[] | number | symbol;
+for (let v of union) { }
\ No newline at end of file
diff --git a/tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts b/tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts
new file mode 100644
index 00000000000..0f486d843ea
--- /dev/null
+++ b/tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts
@@ -0,0 +1,33 @@
+interface StrNum extends Array<string|number> {
+    0: string;
+    1: number;
+}
+
+var x: [string, number];
+var y: StrNum
+var z: {
+    0: string;
+    1: number;
+}
+
+var [a, b, c] = x;
+var [d, e, f] = y;
+var [g, h, i] = z;
+var j1: [number, number, number] = x;
+var j2: [number, number, number] = y;
+var j3: [number, number, number] = z;
+var k1: [string, number, number] = x;
+var k2: [string, number, number] = y;
+var k3: [string, number, number] = z;
+var l1: [number] = x;
+var l2: [number] = y;
+var l3: [number] = z;
+var m1: [string] = x;
+var m2: [string] = y;
+var m3: [string] = z;
+var n1: [number, string] = x;
+var n2: [number, string] = y;
+var n3: [number, string] = z;
+var o1: [string, number] = x;
+var o2: [string, number] = y;
+var o3: [string, number] = y;
diff --git a/tests/cases/fourslash/signatureHelpWithInvalidArgumentList1.ts b/tests/cases/fourslash/signatureHelpWithInvalidArgumentList1.ts
new file mode 100644
index 00000000000..f280adb1d9e
--- /dev/null
+++ b/tests/cases/fourslash/signatureHelpWithInvalidArgumentList1.ts
@@ -0,0 +1,9 @@
+/// <reference path='fourslash.ts' />
+
+////function foo(a) { }
+////foo(hello my name /**/is
+
+goTo.marker();
+verify.signatureHelpPresent();
+verify.signatureHelpCountIs(1);
+
diff --git a/tests/cases/fourslash/smartIndentStatementFor.ts b/tests/cases/fourslash/smartIndentStatementFor.ts
index a3fc2a9a0ce..777dd9ac5dc 100644
--- a/tests/cases/fourslash/smartIndentStatementFor.ts
+++ b/tests/cases/fourslash/smartIndentStatementFor.ts
@@ -5,6 +5,8 @@
 ////        /*insideStatement*/
 ////    }
 ////    /*afterStatement*/
+////    for (var i = 0;;) 
+////        /*insideStatement2*/
 ////}
 
 goTo.marker('insideStatement');
@@ -12,3 +14,6 @@ verify.indentationIs(8);
 
 goTo.marker('afterStatement');
 verify.indentationIs(4);
+
+goTo.marker('insideStatement2');
+verify.indentationIs(8);
diff --git a/tests/cases/fourslash/smartIndentStatementForIn.ts b/tests/cases/fourslash/smartIndentStatementForIn.ts
index 355f175b7df..9ae65f27452 100644
--- a/tests/cases/fourslash/smartIndentStatementForIn.ts
+++ b/tests/cases/fourslash/smartIndentStatementForIn.ts
@@ -6,6 +6,8 @@
 ////        /*insideStatement*/
 ////    }
 ////    /*afterStatement*/
+////    for (var i in [])
+////        /*insideStatement2*/
 ////}
 
 goTo.marker('insideStatement');
@@ -13,3 +15,6 @@ verify.indentationIs(8);
 
 goTo.marker('afterStatement');
 verify.indentationIs(4);
+
+goTo.marker('insideStatement2');
+verify.indentationIs(8);
diff --git a/tests/cases/fourslash/smartIndentStatementForOf.ts b/tests/cases/fourslash/smartIndentStatementForOf.ts
new file mode 100644
index 00000000000..3126e63e6a5
--- /dev/null
+++ b/tests/cases/fourslash/smartIndentStatementForOf.ts
@@ -0,0 +1,20 @@
+/// <reference path='fourslash.ts'/>
+
+////function Foo() {
+////    for (var i of [])
+////    {
+////        /*insideStatement*/
+////    }
+////    /*afterStatement*/
+////    for (var i of [])
+////        /*insideStatement2*/
+////}
+
+goTo.marker('insideStatement');
+verify.indentationIs(8);
+
+goTo.marker('afterStatement');
+verify.indentationIs(4);
+
+goTo.marker('insideStatement2');
+verify.indentationIs(8);