Merge remote-tracking branch 'origin/master' into pathMappingModuleResolution

CONTRIBUTING.md

@@ -1,3 +1,45 @@
+# Instructions for Logging Issues
+
+## 1. Read the FAQ
+
+Please [read the FAQ](https://github.com/Microsoft/TypeScript/wiki/FAQ) before logging new issues, even if you think you have found a bug.
+
+Issues that ask questions answered in the FAQ will be closed without elaboration.
+
+## 2. Search for Duplicates
+
+[Search the existing issues](https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=is%3Aissue) before logging a new one.
+
+## 3. Do you have a question?
+
+The issue tracker is for **issues**, in other words, bugs and suggestions.
+If you have a *question*, please use [http://stackoverflow.com/questions/tagged/typescript](Stack Overflow), [https://gitter.im/Microsoft/TypeScript](Gitter), your favorite search engine, or other resources.
+Due to increased traffic, we can no longer answer questions in the issue tracker.
+
+## 4. Did you find a bug?
+
+When logging a bug, please be sure to include the following:
+ * What version of TypeScript you're using (run `tsc --v`)
+ * If at all possible, an *isolated* way to reproduce the behavior
+ * The behavior you expect to see, and the actual behavior
+
+You can try out the nightly build of TypeScript (`npm install typescript@next`) to see if the bug has already been fixed.
+
+## 5. Do you have a suggestion?
+
+We also accept suggestions in the issue tracker.
+Be sure to [check the FAQ](https://github.com/Microsoft/TypeScript/wiki/FAQ) and [search](https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=is%3Aissue) first.
+
+In general, things we find useful when reviewing suggestins are:
+* A description of the problem you're trying to solve
+* An overview of the suggested solution
+* Examples of how the suggestion would work in various places
+  * Code examples showing e.g. "this would be an error, this wouldn't"
+  * Code examples showing the generated JavaScript (if applicable)
+* If relevant, precedent in other languages can be useful for establishing context and expected behavior
+
+# Instructions for Contributing Code
+
 ## Contributing bug fixes
 
 TypeScript is currently accepting contributions in the form of bug fixes. A bug must have an issue tracking it in the issue tracker that has been approved ("Milestone == Community") by the TypeScript team. Your pull request should include a link to the bug that you are fixing. If you've submitted a PR for a bug, please post a comment in the bug to avoid duplication of effort.

Jakefile.js

@@ -163,13 +163,13 @@ var harnessSources = harnessCoreSources.concat([
 }));
 
 var librarySourceMap = [
-        { target: "lib.core.d.ts", sources: ["core.d.ts"] },
+        { target: "lib.core.d.ts", sources: ["header.d.ts", "core.d.ts"] },
         { target: "lib.dom.d.ts", sources: ["importcore.d.ts", "intl.d.ts", "dom.generated.d.ts"], },
         { target: "lib.webworker.d.ts", sources: ["importcore.d.ts", "intl.d.ts", "webworker.generated.d.ts"], },
         { target: "lib.scriptHost.d.ts", sources: ["importcore.d.ts", "scriptHost.d.ts"], },
-        { target: "lib.d.ts", sources: ["core.d.ts", "intl.d.ts", "dom.generated.d.ts", "webworker.importscripts.d.ts", "scriptHost.d.ts"], },
-        { target: "lib.core.es6.d.ts", sources: ["core.d.ts", "es6.d.ts"]},
-        { target: "lib.es6.d.ts", sources: ["es6.d.ts", "core.d.ts", "intl.d.ts", "dom.generated.d.ts", "dom.es6.d.ts", "webworker.importscripts.d.ts", "scriptHost.d.ts"] }
+        { target: "lib.d.ts", sources: ["header.d.ts", "core.d.ts", "intl.d.ts", "dom.generated.d.ts", "webworker.importscripts.d.ts", "scriptHost.d.ts"], },
+        { target: "lib.core.es6.d.ts", sources: ["header.d.ts", "core.d.ts", "es6.d.ts"]},
+        { target: "lib.es6.d.ts", sources: ["header.d.ts", "es6.d.ts", "core.d.ts", "intl.d.ts", "dom.generated.d.ts", "dom.es6.d.ts", "webworker.importscripts.d.ts", "scriptHost.d.ts"] }
 ];
 
 var libraryTargets = librarySourceMap.map(function (f) {
@@ -893,6 +893,7 @@ function getLinterOptions() {
 
 function lintFileContents(options, path, contents) {
     var ll = new Linter(path, contents, options);
+    console.log("Linting '" + path + "'.")
     return ll.lint();
 }
 

lib/typescript.js

@@ -5037,7 +5037,7 @@ var ts;
       * Given an super call\property node returns a closest node where either
       * - super call\property is legal in the node and not legal in the parent node the node.
       *   i.e. super call is legal in constructor but not legal in the class body.
-      * - node is arrow function (so caller might need to call getSuperContainer in case if he needs to climb higher)
+      * - node is arrow function (so caller might need to call getSuperContainer in case it needs to climb higher)
       * - super call\property is definitely illegal in the node (but might be legal in some subnode)
       *   i.e. super property access is illegal in function declaration but can be legal in the statement list
       */

lib/typescriptServices.js

@@ -5037,7 +5037,7 @@ var ts;
       * Given an super call\property node returns a closest node where either
       * - super call\property is legal in the node and not legal in the parent node the node.
       *   i.e. super call is legal in constructor but not legal in the class body.
-      * - node is arrow function (so caller might need to call getSuperContainer in case if he needs to climb higher)
+      * - node is arrow function (so caller might need to call getSuperContainer in case it needs to climb higher)
       * - super call\property is definitely illegal in the node (but might be legal in some subnode)
       *   i.e. super property access is illegal in function declaration but can be legal in the statement list
       */

src/compiler/binder.ts

@@ -131,6 +131,7 @@ namespace ts {
             options = opts;
             inStrictMode = !!file.externalModuleIndicator;
             classifiableNames = {};
+
             Symbol = objectAllocator.getSymbolConstructor();
 
             if (!file.locals) {
@@ -191,8 +192,8 @@ namespace ts {
         // unless it is a well known Symbol.
         function getDeclarationName(node: Declaration): string {
             if (node.name) {
-                if (node.kind === SyntaxKind.ModuleDeclaration && node.name.kind === SyntaxKind.StringLiteral) {
-                    return `"${(<LiteralExpression>node.name).text}"`;
+                if (isAmbientModule(node)) {
+                    return isGlobalScopeAugmentation(<ModuleDeclaration>node) ? "__global" : `"${(<LiteralExpression>node.name).text}"`;
                 }
                 if (node.name.kind === SyntaxKind.ComputedPropertyName) {
                     const nameExpression = (<ComputedPropertyName>node.name).expression;
@@ -348,7 +349,12 @@ namespace ts {
                 //   2. When we checkIdentifier in the checker, we set its resolved symbol to the local symbol,
                 //      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 || container.flags & NodeFlags.ExportContext) {
+
+                // NOTE: Nested ambient modules always should go to to 'locals' table to prevent their automatic merge
+                //       during global merging in the checker. Why? The only case when ambient module is permitted inside another module is module augmentation 
+                //       and this case is specially handled. Module augmentations should only be merged with original module definition 
+                //       and should never be merged directly with other augmentation, and the latter case would be possible if automatic merge is allowed.
+                if (!isAmbientModule(node) && (hasExportModifier || container.flags & NodeFlags.ExportContext)) {
                     const exportKind =
                         (symbolFlags & SymbolFlags.Value ? SymbolFlags.ExportValue : 0) |
                         (symbolFlags & SymbolFlags.Type ? SymbolFlags.ExportType : 0) |
@@ -843,7 +849,10 @@ namespace ts {
 
         function bindModuleDeclaration(node: ModuleDeclaration) {
             setExportContextFlag(node);
-            if (node.name.kind === SyntaxKind.StringLiteral) {
+            if (isAmbientModule(node)) {
+                if (node.flags & NodeFlags.Export) {
+                    errorOnFirstToken(node, Diagnostics.export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always_visible);
+                }
                 declareSymbolAndAddToSymbolTable(node, SymbolFlags.ValueModule, SymbolFlags.ValueModuleExcludes);
             }
             else {

src/compiler/core.ts

@@ -625,7 +625,9 @@ namespace ts {
         return path.substr(0, rootLength) + normalized.join(directorySeparator);
     }
 
-    export function getDirectoryPath(path: string) {
+    export function getDirectoryPath(path: Path): Path;
+    export function getDirectoryPath(path: string): string;
+    export function getDirectoryPath(path: string): any {
         return path.substr(0, Math.max(getRootLength(path), path.lastIndexOf(directorySeparator)));
     }
 
@@ -725,7 +727,8 @@ namespace ts {
         }
 
         // Find the component that differs
-        for (var joinStartIndex = 0; joinStartIndex < pathComponents.length && joinStartIndex < directoryComponents.length; joinStartIndex++) {
+        let joinStartIndex: number;
+        for (joinStartIndex = 0; joinStartIndex < pathComponents.length && joinStartIndex < directoryComponents.length; joinStartIndex++) {
             if (getCanonicalFileName(directoryComponents[joinStartIndex]) !== getCanonicalFileName(pathComponents[joinStartIndex])) {
                 break;
             }
@@ -883,4 +886,11 @@ namespace ts {
         }
         return copiedList;
     }
+
+    export function createGetCanonicalFileName(useCaseSensitivefileNames: boolean): (fileName: string) => string {
+        return useCaseSensitivefileNames
+            ? ((fileName) => fileName)
+            : ((fileName) => fileName.toLowerCase());
+    }
+
 }

src/compiler/declarationEmitter.ts

@@ -54,6 +54,7 @@ namespace ts {
         let writer = createAndSetNewTextWriterWithSymbolWriter();
 
         let enclosingDeclaration: Node;
+        let resultHasExternalModuleIndicator: boolean;
         let currentText: string;
         let currentLineMap: number[];
         let currentIdentifiers: Map<string>;
@@ -101,6 +102,7 @@ namespace ts {
                 });
             }
 
+            resultHasExternalModuleIndicator = false;
             if (!isBundledEmit || !isExternalModule(sourceFile)) {
                 noDeclare = false;
                 emitSourceFile(sourceFile);
@@ -139,6 +141,14 @@ namespace ts {
                 allSourcesModuleElementDeclarationEmitInfo = allSourcesModuleElementDeclarationEmitInfo.concat(moduleElementDeclarationEmitInfo);
                 moduleElementDeclarationEmitInfo = [];
             }
+
+            if (!isBundledEmit && isExternalModule(sourceFile) && sourceFile.moduleAugmentations.length && !resultHasExternalModuleIndicator) {
+                // if file was external module with augmentations - this fact should be preserved in .d.ts as well.
+                // in case if we didn't write any external module specifiers in .d.ts we need to emit something 
+                // that will force compiler to think that this file is an external module - 'export {}' is a reasonable choice here.
+                write("export {};");
+                writeLine();
+            }
         });
 
         return {
@@ -721,16 +731,25 @@ namespace ts {
             writer.writeLine();
         }
 
-        function emitExternalModuleSpecifier(parent: ImportEqualsDeclaration | ImportDeclaration | ExportDeclaration) {
+        function emitExternalModuleSpecifier(parent: ImportEqualsDeclaration | ImportDeclaration | ExportDeclaration | ModuleDeclaration) {
+            // emitExternalModuleSpecifier is usually called when we emit something in the.d.ts file that will make it an external module (i.e. import/export declarations).
+            // the only case when it is not true is when we call it to emit correct name for module augmentation - d.ts files with just module augmentations are not considered 
+            // external modules since they are indistingushable from script files with ambient modules. To fix this in such d.ts files we'll emit top level 'export {}'
+            // so compiler will treat them as external modules.
+            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || parent.kind !== SyntaxKind.ModuleDeclaration;
             let moduleSpecifier: Node;
             if (parent.kind === SyntaxKind.ImportEqualsDeclaration) {
                 const node = parent as ImportEqualsDeclaration;
                 moduleSpecifier = getExternalModuleImportEqualsDeclarationExpression(node);
             }
+            else if (parent.kind === SyntaxKind.ModuleDeclaration) {
+                moduleSpecifier = (<ModuleDeclaration>parent).name;
+            }
             else {
                 const node = parent as (ImportDeclaration | ExportDeclaration);
                 moduleSpecifier = node.moduleSpecifier;
             }
+
             if (moduleSpecifier.kind === SyntaxKind.StringLiteral && isBundledEmit && (compilerOptions.out || compilerOptions.outFile)) {
                 const moduleName = getExternalModuleNameFromDeclaration(host, resolver, parent);
                 if (moduleName) {
@@ -784,13 +803,23 @@ namespace ts {
         function writeModuleDeclaration(node: ModuleDeclaration) {
             emitJsDocComments(node);
             emitModuleElementDeclarationFlags(node);
-            if (node.flags & NodeFlags.Namespace) {
-                write("namespace ");
+            if (isGlobalScopeAugmentation(node)) {
+                write("global ");
             }
             else {
-                write("module ");
+                if (node.flags & NodeFlags.Namespace) {
+                    write("namespace ");
+                }
+                else {
+                    write("module ");
+                }
+                if (isExternalModuleAugmentation(node)) {
+                    emitExternalModuleSpecifier(node);
+                }
+                else {
+                    writeTextOfNode(currentText, node.name);
+                }
             }
-            writeTextOfNode(currentText, node.name);
             while (node.body.kind !== SyntaxKind.ModuleBlock) {
                 node = <ModuleDeclaration>node.body;
                 write(".");

src/compiler/diagnosticMessages.json

@@ -711,10 +711,6 @@
         "category": "Error",
         "code": 1227
     },
-    "A type predicate is only allowed in return type position for functions and methods.": {
-        "category": "Error",
-        "code": 1228
-    },
     "A type predicate cannot reference a rest parameter.": {
         "category": "Error",
         "code": 1229
@@ -1655,10 +1651,6 @@
         "category": "Error",
         "code": 2518
     },
-    "A 'this'-based type predicate is only allowed within a class or interface's members, get accessors, or return type positions for functions and methods.": {
-        "category": "Error",
-        "code": 2519
-    },
     "Duplicate identifier '{0}'. Compiler uses declaration '{1}' to support async functions.": {
         "category": "Error",
         "code": 2520
@@ -1775,6 +1767,42 @@
         "category": "Error",
         "code": 2661
     },
+    "Cannot find name '{0}'. Did you mean the static member '{1}.{0}'?": {
+        "category": "Error",
+        "code": 2662
+    },
+    "Cannot find name '{0}'. Did you mean the instance member 'this.{0}'?": {
+        "category": "Error",
+        "code": 2663
+    },
+    "Invalid module name in augmentation, module '{0}' cannot be found.": {
+        "category": "Error",
+        "code": 2664
+    },
+    "Module augmentation cannot introduce new names in the top level scope.": {
+        "category": "Error",
+        "code": 2665
+    },
+    "Exports and export assignments are not permitted in module augmentations.": {
+        "category": "Error",
+        "code": 2666
+    },
+    "Imports are not permitted in module augmentations. Consider moving them to the enclosing external module.": {
+        "category": "Error",
+        "code": 2667
+    },
+    "'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.": {
+        "category": "Error",
+        "code": 2668
+    },
+    "Augmentations for the global scope can only be directly nested in external modules or ambient module declarations.": {
+        "category": "Error",
+        "code": 2669
+    },
+    "Augmentations for the global scope should have 'declare' modifier unless they appear in already ambient context.": {
+        "category": "Error",
+        "code": 2670
+    },
     "Import declaration '{0}' is using private name '{1}'.": {
         "category": "Error",
         "code": 4000

src/compiler/emitter.ts

@@ -319,17 +319,12 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };`;
 
         const awaiterHelper = `
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promise, generator) {
-    return new Promise(function (resolve, reject) {
-        generator = generator.call(thisArg, _arguments);
-        function cast(value) { return value instanceof Promise && value.constructor === Promise ? value : new Promise(function (resolve) { resolve(value); }); }
-        function onfulfill(value) { try { step("next", value); } catch (e) { reject(e); } }
-        function onreject(value) { try { step("throw", value); } catch (e) { reject(e); } }
-        function step(verb, value) {
-            var result = generator[verb](value);
-            result.done ? resolve(result.value) : cast(result.value).then(onfulfill, onreject);
-        }
-        step("next", void 0);
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new P(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.call(thisArg, _arguments)).next());
     });
 };`;
 
@@ -1250,7 +1245,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                         else {
                             // One object literal with all the attributes in them
                             write("{");
-                            for (var i = 0; i < attrs.length; i++) {
+                            for (let i = 0, n = attrs.length; i < n; i++) {
                                 if (i > 0) {
                                     write(", ");
                                 }
@@ -1262,7 +1257,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
                     // Children
                     if (children) {
-                        for (var i = 0; i < children.length; i++) {
+                        for (let i = 0; i < children.length; i++) {
                             // Don't emit empty expressions
                             if (children[i].kind === SyntaxKind.JsxExpression && !((<JsxExpression>children[i]).expression)) {
                                 continue;
@@ -1356,7 +1351,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 function emitJsxElement(node: JsxElement) {
                     emitJsxOpeningOrSelfClosingElement(node.openingElement);
 
-                    for (var i = 0, n = node.children.length; i < n; i++) {
+                    for (let i = 0, n = node.children.length; i < n; i++) {
                         emit(node.children[i]);
                     }
 
@@ -2886,7 +2881,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     case SyntaxKind.ForStatement:
                     case SyntaxKind.ForInStatement:
                     case SyntaxKind.ForOfStatement:
-                        if ((<ForStatement | ForInStatement | ForOfStatement>node).initializer.kind === SyntaxKind.VariableDeclarationList) {
+                        const initializer = (<ForStatement | ForInStatement | ForOfStatement>node).initializer;
+                        if (initializer && initializer.kind === SyntaxKind.VariableDeclarationList) {
                             loopInitializer = <VariableDeclarationList>(<ForStatement | ForInStatement | ForOfStatement>node).initializer;
                         }
                         break;
@@ -5171,7 +5167,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 //                                  a lexical declaration such as a LexicalDeclaration or a ClassDeclaration.
 
                 if (isClassExpressionWithStaticProperties) {
-                    for (var property of staticProperties) {
+                    for (const property of staticProperties) {
                         write(",");
                         writeLine();
                         emitPropertyDeclaration(node, property, /*receiver*/ tempVariable, /*isExpression*/ true);
@@ -5718,7 +5714,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                         const parameters = valueDeclaration.parameters;
                         const parameterCount = parameters.length;
                         if (parameterCount > 0) {
-                            for (var i = 0; i < parameterCount; i++) {
+                            for (let i = 0; i < parameterCount; i++) {
                                 if (i > 0) {
                                     write(", ");
                                 }

src/compiler/parser.ts

@@ -896,17 +896,19 @@ namespace ts {
             return result;
         }
 
-        // Invokes the provided callback then unconditionally restores the parser to the state it
-        // was in immediately prior to invoking the callback.  The result of invoking the callback
-        // is returned from this function.
+        /** Invokes the provided callback then unconditionally restores the parser to the state it
+         * was in immediately prior to invoking the callback.  The result of invoking the callback
+         * is returned from this function. 
+         */
         function lookAhead<T>(callback: () => T): T {
             return speculationHelper(callback, /*isLookAhead*/ true);
         }
 
-        // Invokes the provided callback.  If the callback returns something falsy, then it restores
-        // the parser to the state it was in immediately prior to invoking the callback.  If the
-        // callback returns something truthy, then the parser state is not rolled back.  The result
-        // of invoking the callback is returned from this function.
+        /** Invokes the provided callback.  If the callback returns something falsy, then it restores
+         * the parser to the state it was in immediately prior to invoking the callback.  If the
+         * callback returns something truthy, then the parser state is not rolled back.  The result
+         * of invoking the callback is returned from this function.
+         */
         function tryParse<T>(callback: () => T): T {
             return speculationHelper(callback, /*isLookAhead*/ false);
         }
@@ -1948,11 +1950,8 @@ namespace ts {
 
         // TYPES
 
-        function parseTypeReferenceOrTypePredicate(): TypeReferenceNode | TypePredicateNode {
+        function parseTypeReference(): TypeReferenceNode {
             const typeName = parseEntityName(/*allowReservedWords*/ false, Diagnostics.Type_expected);
-            if (typeName.kind === SyntaxKind.Identifier && token === SyntaxKind.IsKeyword && !scanner.hasPrecedingLineBreak()) {
-                return parseTypePredicate(typeName as Identifier);
-            }
             const node = <TypeReferenceNode>createNode(SyntaxKind.TypeReference, typeName.pos);
             node.typeName = typeName;
             if (!scanner.hasPrecedingLineBreak() && token === SyntaxKind.LessThanToken) {
@@ -2092,10 +2091,10 @@ namespace ts {
 
             if (returnTokenRequired) {
                 parseExpected(returnToken);
-                signature.type = parseType();
+                signature.type = parseTypeOrTypePredicate();
             }
             else if (parseOptional(returnToken)) {
-                signature.type = parseType();
+                signature.type = parseTypeOrTypePredicate();
             }
         }
 
@@ -2411,7 +2410,7 @@ namespace ts {
                 case SyntaxKind.SymbolKeyword:
                     // If these are followed by a dot, then parse these out as a dotted type reference instead.
                     const node = tryParse(parseKeywordAndNoDot);
-                    return node || parseTypeReferenceOrTypePredicate();
+                    return node || parseTypeReference();
                 case SyntaxKind.StringLiteral:
                     return parseStringLiteralTypeNode();
                 case SyntaxKind.VoidKeyword:
@@ -2434,7 +2433,7 @@ namespace ts {
                 case SyntaxKind.OpenParenToken:
                     return parseParenthesizedType();
                 default:
-                    return parseTypeReferenceOrTypePredicate();
+                    return parseTypeReference();
             }
         }
 
@@ -2541,6 +2540,28 @@ namespace ts {
             return false;
         }
 
+        function parseTypeOrTypePredicate(): TypeNode {
+            const typePredicateVariable = isIdentifier() && tryParse(parseTypePredicatePrefix);
+            const type = parseType();
+            if (typePredicateVariable) {
+                const node = <TypePredicateNode>createNode(SyntaxKind.TypePredicate, typePredicateVariable.pos);
+                node.parameterName = typePredicateVariable;
+                node.type = type;
+                return finishNode(node);
+            }
+            else {
+                return type;
+            }
+        }
+
+        function parseTypePredicatePrefix() {
+            const id = parseIdentifier();
+            if (token === SyntaxKind.IsKeyword && !scanner.hasPrecedingLineBreak()) {
+                nextToken();
+                return id;
+            }
+        }
+
         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.
@@ -4409,6 +4430,9 @@ namespace ts {
                         }
                         continue;
 
+                    case SyntaxKind.GlobalKeyword:
+                        return nextToken() === SyntaxKind.OpenBraceToken;
+
                     case SyntaxKind.ImportKeyword:
                         nextToken();
                         return token === SyntaxKind.StringLiteral || token === SyntaxKind.AsteriskToken ||
@@ -4473,6 +4497,7 @@ namespace ts {
                 case SyntaxKind.ModuleKeyword:
                 case SyntaxKind.NamespaceKeyword:
                 case SyntaxKind.TypeKeyword:
+                case SyntaxKind.GlobalKeyword:
                     // When these don't start a declaration, they're an identifier in an expression statement
                     return true;
 
@@ -4561,6 +4586,7 @@ namespace ts {
                 case SyntaxKind.PublicKeyword:
                 case SyntaxKind.AbstractKeyword:
                 case SyntaxKind.StaticKeyword:
+                case SyntaxKind.GlobalKeyword:
                     if (isStartOfDeclaration()) {
                         return parseDeclaration();
                     }
@@ -4588,6 +4614,7 @@ namespace ts {
                     return parseTypeAliasDeclaration(fullStart, decorators, modifiers);
                 case SyntaxKind.EnumKeyword:
                     return parseEnumDeclaration(fullStart, decorators, modifiers);
+                case SyntaxKind.GlobalKeyword:
                 case SyntaxKind.ModuleKeyword:
                 case SyntaxKind.NamespaceKeyword:
                     return parseModuleDeclaration(fullStart, decorators, modifiers);
@@ -5222,14 +5249,25 @@ namespace ts {
             const node = <ModuleDeclaration>createNode(SyntaxKind.ModuleDeclaration, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
-            node.name = parseLiteralNode(/*internName*/ true);
+            if (token === SyntaxKind.GlobalKeyword) {
+                // parse 'global' as name of global scope augmentation 
+                node.name = parseIdentifier();
+                node.flags |= NodeFlags.GlobalAugmentation;
+            }
+            else {
+                node.name = parseLiteralNode(/*internName*/ true);
+            }
             node.body = parseModuleBlock();
             return finishNode(node);
         }
 
         function parseModuleDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): ModuleDeclaration {
             let flags = modifiers ? modifiers.flags : 0;
-            if (parseOptional(SyntaxKind.NamespaceKeyword)) {
+            if (token === SyntaxKind.GlobalKeyword) {
+                // global augmentation
+                return parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers);
+            }
+            else if (parseOptional(SyntaxKind.NamespaceKeyword)) {
                 flags |= NodeFlags.Namespace;
             }
             else {

src/compiler/program.ts

@@ -730,7 +730,24 @@ namespace ts {
         const currentDirectory = host.getCurrentDirectory();
         const resolveModuleNamesWorker = host.resolveModuleNames
             ? ((moduleNames: string[], containingFile: string) => host.resolveModuleNames(moduleNames, containingFile))
-            : ((moduleNames: string[], containingFile: string) => map(moduleNames, moduleName => resolveModuleName(moduleName, containingFile, options, host).resolvedModule));
+            : ((moduleNames: string[], containingFile: string) => {
+                const resolvedModuleNames: ResolvedModule[] = [];
+                // resolveModuleName does not store any results between calls.
+                // lookup is a local cache to avoid resolving the same module name several times
+                const lookup: Map<ResolvedModule> = {};
+                for (const moduleName of moduleNames) {
+                    let resolvedName: ResolvedModule;
+                    if (hasProperty(lookup, moduleName)) {
+                        resolvedName = lookup[moduleName];
+                    }
+                    else {
+                        resolvedName = resolveModuleName(moduleName, containingFile, options, host).resolvedModule;
+                        lookup[moduleName] = resolvedName;
+                    }
+                    resolvedModuleNames.push(resolvedName);
+                }
+                return resolvedModuleNames;
+            });
 
         const filesByName = createFileMap<SourceFile>();
         // stores 'filename -> file association' ignoring case
@@ -867,15 +884,19 @@ namespace ts {
                         return false;
                     }
 
-                    // check imports
+                    // check imports and module augmentations
                     collectExternalModuleReferences(newSourceFile);
                     if (!arrayIsEqualTo(oldSourceFile.imports, newSourceFile.imports, moduleNameIsEqualTo)) {
                         // imports has changed
                         return false;
                     }
+                    if (!arrayIsEqualTo(oldSourceFile.moduleAugmentations, newSourceFile.moduleAugmentations, moduleNameIsEqualTo)) {
+                        // moduleAugmentations has changed
+                        return false;
+                    }
 
                     if (resolveModuleNamesWorker) {
-                        const moduleNames = map(newSourceFile.imports, name => name.text);
+                        const moduleNames = map(concatenate(newSourceFile.imports, newSourceFile.moduleAugmentations), getTextOfLiteral);
                         const resolutions = resolveModuleNamesWorker(moduleNames, getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory));
                         // ensure that module resolution results are still correct
                         for (let i = 0; i < moduleNames.length; i++) {
@@ -1264,65 +1285,85 @@ namespace ts {
             return a.text === b.text;
         }
 
+        function getTextOfLiteral(literal: LiteralExpression): string {
+            return literal.text;
+        }
+
         function collectExternalModuleReferences(file: SourceFile): void {
             if (file.imports) {
                 return;
             }
 
             const isJavaScriptFile = isSourceFileJavaScript(file);
+            const isExternalModuleFile = isExternalModule(file);
 
             let imports: LiteralExpression[];
+            let moduleAugmentations: LiteralExpression[];
+
             for (const node of file.statements) {
-                collect(node, /*allowRelativeModuleNames*/ true, /*collectOnlyRequireCalls*/ false);
+                collectModuleReferences(node, /*inAmbientModule*/ false);
+                if (isJavaScriptFile) {
+                    collectRequireCalls(node);
+                }
             }
 
             file.imports = imports || emptyArray;
+            file.moduleAugmentations = moduleAugmentations || emptyArray;
 
             return;
 
-            function collect(node: Node, allowRelativeModuleNames: boolean, collectOnlyRequireCalls: boolean): void {
-                if (!collectOnlyRequireCalls) {
-                    switch (node.kind) {
-                        case SyntaxKind.ImportDeclaration:
-                        case SyntaxKind.ImportEqualsDeclaration:
-                        case SyntaxKind.ExportDeclaration:
-                            let moduleNameExpr = getExternalModuleName(node);
-                            if (!moduleNameExpr || moduleNameExpr.kind !== SyntaxKind.StringLiteral) {
-                                break;
-                            }
-                            if (!(<LiteralExpression>moduleNameExpr).text) {
-                                break;
-                            }
-
-                            if (allowRelativeModuleNames || !isExternalModuleNameRelative((<LiteralExpression>moduleNameExpr).text)) {
-                                (imports || (imports = [])).push(<LiteralExpression>moduleNameExpr);
-                            }
+            function collectModuleReferences(node: Node, inAmbientModule: boolean): void {
+                switch (node.kind) {
+                    case SyntaxKind.ImportDeclaration:
+                    case SyntaxKind.ImportEqualsDeclaration:
+                    case SyntaxKind.ExportDeclaration:
+                        let moduleNameExpr = getExternalModuleName(node);
+                        if (!moduleNameExpr || moduleNameExpr.kind !== SyntaxKind.StringLiteral) {
                             break;
-                        case SyntaxKind.ModuleDeclaration:
-                            if ((<ModuleDeclaration>node).name.kind === SyntaxKind.StringLiteral && (node.flags & NodeFlags.Ambient || isDeclarationFile(file))) {
-                                // TypeScript 1.0 spec (April 2014): 12.1.6
+                        }
+                        if (!(<LiteralExpression>moduleNameExpr).text) {
+                            break;
+                        }
+
+                        // TypeScript 1.0 spec (April 2014): 12.1.6
+                        // An ExternalImportDeclaration in an AmbientExternalModuleDeclaration may reference other external modules 
+                        // only through top - level external module names. Relative external module names are not permitted.
+                        if (!inAmbientModule || !isExternalModuleNameRelative((<LiteralExpression>moduleNameExpr).text)) {
+                            (imports || (imports = [])).push(<LiteralExpression>moduleNameExpr);
+                        }
+                        break;
+                    case SyntaxKind.ModuleDeclaration:
+                        if (isAmbientModule(<ModuleDeclaration>node) && (inAmbientModule || node.flags & NodeFlags.Ambient || isDeclarationFile(file))) {
+                            const moduleName = <LiteralExpression>(<ModuleDeclaration>node).name;
+                            // Ambient module declarations can be interpreted as augmentations for some existing external modules.
+                            // This will happen in two cases:
+                            // - if current file is external module then module augmentation is a ambient module declaration defined in the top level scope
+                            // - if current file is not external module then module augmentation is an ambient module declaration with non-relative module name
+                            //   immediately nested in top level ambient module declaration .
+                            if (isExternalModuleFile || (inAmbientModule && !isExternalModuleNameRelative(moduleName.text))) {
+                                (moduleAugmentations || (moduleAugmentations = [])).push(moduleName);
+                            }
+                            else if (!inAmbientModule) {
                                 // An AmbientExternalModuleDeclaration declares an external module. 
                                 // This type of declaration is permitted only in the global module.
                                 // The StringLiteral must specify a top - level external module name.
                                 // Relative external module names are not permitted
-                                forEachChild((<ModuleDeclaration>node).body, node => {
-                                    // TypeScript 1.0 spec (April 2014): 12.1.6
-                                    // An ExternalImportDeclaration in anAmbientExternalModuleDeclaration may reference other external modules 
-                                    // only through top - level external module names. Relative external module names are not permitted.
-                                    collect(node, /*allowRelativeModuleNames*/ false, collectOnlyRequireCalls);
-                                });
-                            }
-                            break;
-                    }
-                }
 
-                if (isJavaScriptFile) {
-                    if (isRequireCall(node)) {
-                        (imports || (imports = [])).push(<StringLiteral>(<CallExpression>node).arguments[0]);
-                    }
-                    else {
-                        forEachChild(node, node => collect(node, allowRelativeModuleNames, /*collectOnlyRequireCalls*/ true));
-                    }
+                                // NOTE: body of ambient module is always a module block
+                                for (const statement of (<ModuleBlock>(<ModuleDeclaration>node).body).statements) {
+                                    collectModuleReferences(statement, /*inAmbientModule*/ true);
+                                }
+                            }
+                        }
+                }
+            }
+
+            function collectRequireCalls(node: Node): void {
+                if (isRequireCall(node)) {
+                    (imports || (imports = [])).push(<StringLiteral>(<CallExpression>node).arguments[0]);
+                }
+                else {
+                    forEachChild(node, collectRequireCalls);
                 }
             }
         }
@@ -1452,14 +1493,22 @@ namespace ts {
 
         function processImportedModules(file: SourceFile, basePath: string) {
             collectExternalModuleReferences(file);
-            if (file.imports.length) {
+            if (file.imports.length || file.moduleAugmentations.length) {
                 file.resolvedModules = {};
-                const moduleNames = map(file.imports, name => name.text);
+                const moduleNames = map(concatenate(file.imports, file.moduleAugmentations), getTextOfLiteral);
                 const resolutions = resolveModuleNamesWorker(moduleNames, getNormalizedAbsolutePath(file.fileName, currentDirectory));
-                for (let i = 0; i < file.imports.length; i++) {
+                for (let i = 0; i < moduleNames.length; i++) {
                     const resolution = resolutions[i];
                     setResolvedModule(file, moduleNames[i], resolution);
-                    if (resolution && !options.noResolve) {
+                    // add file to program only if:
+                    // - resolution was successfull
+                    // - noResolve is falsy
+                    // - module name come from the list fo imports
+                    const shouldAddFile = resolution &&
+                        !options.noResolve &&
+                        i < file.imports.length;
+
+                    if (shouldAddFile) {
                         const importedFile = findSourceFile(resolution.resolvedFileName, toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName), /*isDefaultLib*/ false, file, skipTrivia(file.text, file.imports[i].pos), file.imports[i].end);
 
                         if (importedFile && resolution.isExternalLibraryImport) {
@@ -1537,7 +1586,7 @@ namespace ts {
             if (sourceFiles) {
                 const absoluteRootDirectoryPath = host.getCanonicalFileName(getNormalizedAbsolutePath(rootDirectory, currentDirectory));
 
-                for (var sourceFile of sourceFiles) {
+                for (const sourceFile of sourceFiles) {
                     if (!isDeclarationFile(sourceFile)) {
                         const absoluteSourceFilePath = host.getCanonicalFileName(getNormalizedAbsolutePath(sourceFile.fileName, currentDirectory));
                         if (absoluteSourceFilePath.indexOf(absoluteRootDirectoryPath) !== 0) {

src/compiler/scanner.ts

@@ -94,6 +94,7 @@ namespace ts {
         "protected": SyntaxKind.ProtectedKeyword,
         "public": SyntaxKind.PublicKeyword,
         "require": SyntaxKind.RequireKeyword,
+        "global": SyntaxKind.GlobalKeyword,
         "return": SyntaxKind.ReturnKeyword,
         "set": SyntaxKind.SetKeyword,
         "static": SyntaxKind.StaticKeyword,

src/compiler/sys.ts

@@ -1,6 +1,9 @@
 /// <reference path="core.ts"/>
 
 namespace ts {
+    export type FileWatcherCallback = (path: string, removed?: boolean) => void;
+    export type DirectoryWatcherCallback = (path: string) => void;
+
     export interface System {
         args: string[];
         newLine: string;
@@ -8,8 +11,8 @@ namespace ts {
         write(s: string): void;
         readFile(path: string, encoding?: string): string;
         writeFile(path: string, data: string, writeByteOrderMark?: boolean): void;
-        watchFile?(path: string, callback: (path: string, removed?: boolean) => void): FileWatcher;
-        watchDirectory?(path: string, callback: (path: string) => void, recursive?: boolean): FileWatcher;
+        watchFile?(path: Path, callback: FileWatcherCallback): FileWatcher;
+        watchDirectory?(path: string, callback: DirectoryWatcherCallback, recursive?: boolean): FileWatcher;
         resolvePath(path: string): string;
         fileExists(path: string): boolean;
         directoryExists(path: string): boolean;
@@ -22,15 +25,20 @@ namespace ts {
     }
 
     interface WatchedFile {
-        fileName: string;
-        callback: (fileName: string, removed?: boolean) => void;
-        mtime: Date;
+        filePath: Path;
+        callback: FileWatcherCallback;
+        mtime?: Date;
     }
 
     export interface FileWatcher {
         close(): void;
     }
 
+    export interface DirectoryWatcher extends FileWatcher {
+        directoryPath: Path;
+        referenceCount: number;
+    }
+
     declare var require: any;
     declare var module: any;
     declare var process: any;
@@ -62,8 +70,8 @@ namespace ts {
         readFile(path: string): string;
         writeFile(path: string, contents: string): void;
         readDirectory(path: string, extension?: string, exclude?: string[]): string[];
-        watchFile?(path: string, callback: (path: string, removed?: boolean) => void): FileWatcher;
-        watchDirectory?(path: string, callback: (path: string) => void, recursive?: boolean): FileWatcher;
+        watchFile?(path: string, callback: FileWatcherCallback): FileWatcher;
+        watchDirectory?(path: string, callback: DirectoryWatcherCallback, recursive?: boolean): FileWatcher;
     };
 
     export var sys: System = (function () {
@@ -221,7 +229,7 @@ namespace ts {
 
             // average async stat takes about 30 microseconds
             // set chunk size to do 30 files in < 1 millisecond
-            function createWatchedFileSet(interval = 2500, chunkSize = 30) {
+            function createPollingWatchedFileSet(interval = 2500, chunkSize = 30) {
                 let watchedFiles: WatchedFile[] = [];
                 let nextFileToCheck = 0;
                 let watchTimer: any;
@@ -236,13 +244,13 @@ namespace ts {
                         return;
                     }
 
-                    _fs.stat(watchedFile.fileName, (err: any, stats: any) => {
+                    _fs.stat(watchedFile.filePath, (err: any, stats: any) => {
                         if (err) {
-                            watchedFile.callback(watchedFile.fileName);
+                            watchedFile.callback(watchedFile.filePath);
                         }
                         else if (watchedFile.mtime.getTime() !== stats.mtime.getTime()) {
-                            watchedFile.mtime = getModifiedTime(watchedFile.fileName);
-                            watchedFile.callback(watchedFile.fileName, watchedFile.mtime.getTime() === 0);
+                            watchedFile.mtime = getModifiedTime(watchedFile.filePath);
+                            watchedFile.callback(watchedFile.filePath, watchedFile.mtime.getTime() === 0);
                         }
                     });
                 }
@@ -270,11 +278,11 @@ namespace ts {
                     }, interval);
                 }
 
-                function addFile(fileName: string, callback: (fileName: string, removed?: boolean) => void): WatchedFile {
+                function addFile(filePath: Path, callback: FileWatcherCallback): WatchedFile {
                     const file: WatchedFile = {
-                        fileName,
+                        filePath,
                         callback,
-                        mtime: getModifiedTime(fileName)
+                        mtime: getModifiedTime(filePath)
                     };
 
                     watchedFiles.push(file);
@@ -297,6 +305,90 @@ namespace ts {
                 };
             }
 
+            function createWatchedFileSet() {
+                const dirWatchers = createFileMap<DirectoryWatcher>();
+                // One file can have multiple watchers
+                const fileWatcherCallbacks = createFileMap<FileWatcherCallback[]>();
+                return { addFile, removeFile };
+
+                function reduceDirWatcherRefCountForFile(filePath: Path) {
+                    const dirPath = getDirectoryPath(filePath);
+                    if (dirWatchers.contains(dirPath)) {
+                        const watcher = dirWatchers.get(dirPath);
+                        watcher.referenceCount -= 1;
+                        if (watcher.referenceCount <= 0) {
+                            watcher.close();
+                            dirWatchers.remove(dirPath);
+                        }
+                    }
+                }
+
+                function addDirWatcher(dirPath: Path): void {
+                    if (dirWatchers.contains(dirPath)) {
+                        const watcher = dirWatchers.get(dirPath);
+                        watcher.referenceCount += 1;
+                        return;
+                    }
+
+                    const watcher: DirectoryWatcher = _fs.watch(
+                        dirPath,
+                        { persistent: true },
+                        (eventName: string, relativeFileName: string) => fileEventHandler(eventName, relativeFileName, dirPath)
+                    );
+                    watcher.referenceCount = 1;
+                    dirWatchers.set(dirPath, watcher);
+                    return;
+                }
+
+                function addFileWatcherCallback(filePath: Path, callback: FileWatcherCallback): void {
+                    if (fileWatcherCallbacks.contains(filePath)) {
+                        fileWatcherCallbacks.get(filePath).push(callback);
+                    }
+                    else {
+                        fileWatcherCallbacks.set(filePath, [callback]);
+                    }
+                }
+
+                function addFile(filePath: Path, callback: FileWatcherCallback): WatchedFile {
+                    addFileWatcherCallback(filePath, callback);
+                    addDirWatcher(getDirectoryPath(filePath));
+
+                    return { filePath, callback };
+                }
+
+                function removeFile(watchedFile: WatchedFile) {
+                    removeFileWatcherCallback(watchedFile.filePath, watchedFile.callback);
+                    reduceDirWatcherRefCountForFile(watchedFile.filePath);
+                }
+
+                function removeFileWatcherCallback(filePath: Path, callback: FileWatcherCallback) {
+                    if (fileWatcherCallbacks.contains(filePath)) {
+                        const newCallbacks = copyListRemovingItem(callback, fileWatcherCallbacks.get(filePath));
+                        if (newCallbacks.length === 0) {
+                            fileWatcherCallbacks.remove(filePath);
+                        }
+                        else {
+                            fileWatcherCallbacks.set(filePath, newCallbacks);
+                        }
+                    }
+                }
+
+                /**
+                 * @param watcherPath is the path from which the watcher is triggered.
+                 */
+                function fileEventHandler(eventName: string, relativeFileName: string, baseDirPath: Path) {
+                    // When files are deleted from disk, the triggered "rename" event would have a relativefileName of "undefined"
+                    const filePath = typeof relativeFileName !== "string"
+                        ? undefined
+                        : toPath(relativeFileName, baseDirPath, createGetCanonicalFileName(sys.useCaseSensitiveFileNames));
+                    if (eventName === "change" && fileWatcherCallbacks.contains(filePath)) {
+                        for (const fileCallback of fileWatcherCallbacks.get(filePath)) {
+                            fileCallback(filePath);
+                        }
+                    }
+                }
+            }
+
             // REVIEW: for now this implementation uses polling.
             // The advantage of polling is that it works reliably
             // on all os and with network mounted files.
@@ -310,8 +402,13 @@ namespace ts {
             // changes for large reference sets? If so, do we want
             // to increase the chunk size or decrease the interval
             // time dynamically to match the large reference set?
+            const pollingWatchedFileSet = createPollingWatchedFileSet();
             const watchedFileSet = createWatchedFileSet();
 
+            function isNode4OrLater(): boolean {
+                 return parseInt(process.version.charAt(1)) >= 4;
+             }
+
             const platform: string = _os.platform();
             // win32\win64 are case insensitive platforms, MacOS (darwin) by default is also case insensitive
             const useCaseSensitiveFileNames = platform !== "win32" && platform !== "win64" && platform !== "darwin";
@@ -365,7 +462,7 @@ namespace ts {
             }
 
             function getCanonicalPath(path: string): string {
-                return useCaseSensitiveFileNames ? path.toLowerCase() : path;
+                return useCaseSensitiveFileNames ? path : path.toLowerCase();
             }
 
             function readDirectory(path: string, extension?: string, exclude?: string[]): string[] {
@@ -405,29 +502,38 @@ namespace ts {
                 },
                 readFile,
                 writeFile,
-                watchFile: (fileName, callback) => {
+                watchFile: (filePath, callback) => {
                     // Node 4.0 stablized the `fs.watch` function on Windows which avoids polling
                     // and is more efficient than `fs.watchFile` (ref: https://github.com/nodejs/node/pull/2649
                     // and https://github.com/Microsoft/TypeScript/issues/4643), therefore
                     // if the current node.js version is newer than 4, use `fs.watch` instead.
-                    const watchedFile = watchedFileSet.addFile(fileName, callback);
+                    const watchSet = isNode4OrLater() ? watchedFileSet : pollingWatchedFileSet;
+                    const watchedFile =  watchSet.addFile(filePath, callback);
                     return {
-                        close: () => watchedFileSet.removeFile(watchedFile)
+                        close: () => watchSet.removeFile(watchedFile)
                     };
                 },
                 watchDirectory: (path, callback, recursive) => {
                     // Node 4.0 `fs.watch` function supports the "recursive" option on both OSX and Windows
                     // (ref: https://github.com/nodejs/node/pull/2649 and https://github.com/Microsoft/TypeScript/issues/4643)
+                    let options: any;
+                    if (isNode4OrLater() && (process.platform === "win32" || process.platform === "darwin")) {
+                        options = { persistent: true, recursive: !!recursive };
+                    }
+                    else {
+                        options = { persistent: true };
+                    }
+
                     return _fs.watch(
                         path,
-                        { persistent: true, recursive: !!recursive },
+                        options,
                         (eventName: string, relativeFileName: string) => {
                             // In watchDirectory we only care about adding and removing files (when event name is
                             // "rename"); changes made within files are handled by corresponding fileWatchers (when
                             // event name is "change")
                             if (eventName === "rename") {
                                 // When deleting a file, the passed baseFileName is null
-                                callback(!relativeFileName ? relativeFileName : normalizePath(ts.combinePaths(path, relativeFileName)));
+                                callback(!relativeFileName ? relativeFileName : normalizePath(combinePaths(path, relativeFileName)));
                             };
                         }
                     );
@@ -511,5 +617,3 @@ namespace ts {
         }
     })();
 }
-
-

src/compiler/tsc.ts

@@ -334,7 +334,8 @@ namespace ts {
                 return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
             }
             if (configFileName) {
-                configFileWatcher = sys.watchFile(configFileName, configFileChanged);
+                const configFilePath = toPath(configFileName, sys.getCurrentDirectory(), createGetCanonicalFileName(sys.useCaseSensitiveFileNames));
+                configFileWatcher = sys.watchFile(configFilePath, configFileChanged);
             }
             if (sys.watchDirectory && configFileName) {
                 const directory = ts.getDirectoryPath(configFileName);
@@ -442,7 +443,8 @@ namespace ts {
             const sourceFile = hostGetSourceFile(fileName, languageVersion, onError);
             if (sourceFile && compilerOptions.watch) {
                 // Attach a file watcher
-                sourceFile.fileWatcher = sys.watchFile(sourceFile.fileName, (fileName: string, removed?: boolean) => sourceFileChanged(sourceFile, removed));
+                const filePath = toPath(sourceFile.fileName, sys.getCurrentDirectory(), createGetCanonicalFileName(sys.useCaseSensitiveFileNames));
+                sourceFile.fileWatcher = sys.watchFile(filePath, (fileName: string, removed?: boolean) => sourceFileChanged(sourceFile, removed));
             }
             return sourceFile;
         }

src/compiler/types.ts

@@ -170,6 +170,7 @@ namespace ts {
         SymbolKeyword,
         TypeKeyword,
         FromKeyword,
+        GlobalKeyword,
         OfKeyword, // LastKeyword and LastToken
 
         // Parse tree nodes
@@ -389,6 +390,7 @@ namespace ts {
         ContainsThis =      1 << 18,  // Interface contains references to "this"
         HasImplicitReturn =     1 << 19,  // If function implicitly returns on one of codepaths (initialized by binding)
         HasExplicitReturn =     1 << 20,  // If function has explicit reachable return on one of codepaths (initialized by binding)
+        GlobalAugmentation =    1 << 21,  // Set if module declaration is an augmentation for the global scope
         Modifier = Export | Ambient | Public | Private | Protected | Static | Abstract | Default | Async,
         AccessibilityModifier = Public | Private | Protected,
         BlockScoped = Let | Const,
@@ -1577,6 +1579,7 @@ namespace ts {
         // Content of this fiels should never be used directly - use getResolvedModuleFileName/setResolvedModuleFileName functions instead
         /* @internal */ resolvedModules: Map<ResolvedModule>;
         /* @internal */ imports: LiteralExpression[];
+        /* @internal */ moduleAugmentations: LiteralExpression[];
     }
 
     export interface ScriptReferenceHost {
@@ -1725,6 +1728,7 @@ namespace ts {
         getSymbolAtLocation(node: Node): Symbol;
         getSymbolsOfParameterPropertyDeclaration(parameter: ParameterDeclaration, parameterName: string): Symbol[];
         getShorthandAssignmentValueSymbol(location: Node): Symbol;
+        getExportSpecifierLocalTargetSymbol(location: ExportSpecifier): Symbol;
         getTypeAtLocation(node: Node): Type;
         typeToString(type: Type, enclosingDeclaration?: Node, flags?: TypeFormatFlags): string;
         symbolToString(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags): string;
@@ -1910,7 +1914,7 @@ namespace ts {
         isOptionalParameter(node: ParameterDeclaration): boolean;
         moduleExportsSomeValue(moduleReferenceExpression: Expression): boolean;
         isArgumentsLocalBinding(node: Identifier): boolean;
-        getExternalModuleFileFromDeclaration(declaration: ImportEqualsDeclaration | ImportDeclaration | ExportDeclaration): SourceFile;
+        getExternalModuleFileFromDeclaration(declaration: ImportEqualsDeclaration | ImportDeclaration | ExportDeclaration | ModuleDeclaration): SourceFile;
     }
 
     export const enum SymbolFlags {

src/compiler/utilities.ts

@@ -251,6 +251,31 @@ namespace ts {
             isCatchClauseVariableDeclaration(declaration);
     }
 
+    export function isAmbientModule(node: Node): boolean {
+        return node && node.kind === SyntaxKind.ModuleDeclaration &&
+            ((<ModuleDeclaration>node).name.kind === SyntaxKind.StringLiteral || isGlobalScopeAugmentation(<ModuleDeclaration>node));
+    }
+
+    export function isGlobalScopeAugmentation(module: ModuleDeclaration): boolean {
+        return !!(module.flags & NodeFlags.GlobalAugmentation);
+    }
+
+    export function isExternalModuleAugmentation(node: Node): boolean {
+        // external module augmentation is a ambient module declaration that is either:
+        // - defined in the top level scope and source file is an external module
+        // - defined inside ambient module declaration located in the top level scope and source file not an external module
+        if (!node || !isAmbientModule(node)) {
+            return false;
+        }
+        switch (node.parent.kind) {
+            case SyntaxKind.SourceFile:
+                return isExternalModule(<SourceFile>node.parent);
+            case SyntaxKind.ModuleBlock:
+                return isAmbientModule(node.parent.parent) && !isExternalModule(<SourceFile>node.parent.parent.parent);
+        }
+        return false;
+    }
+
     // Gets the nearest enclosing block scope container that has the provided node
     // as a descendant, that is not the provided node.
     export function getEnclosingBlockScopeContainer(node: Node): Node {
@@ -343,6 +368,7 @@ namespace ts {
             case SyntaxKind.FunctionDeclaration:
             case SyntaxKind.FunctionExpression:
             case SyntaxKind.MethodDeclaration:
+            case SyntaxKind.TypeAliasDeclaration:
                 errorNode = (<Declaration>node).name;
                 break;
         }
@@ -779,7 +805,7 @@ namespace ts {
       * Given an super call\property node returns a closest node where either  
       * - super call\property is legal in the node and not legal in the parent node the node. 
       *   i.e. super call is legal in constructor but not legal in the class body.
-      * - node is arrow function (so caller might need to call getSuperContainer in case if he needs to climb higher)
+      * - node is arrow function (so caller might need to call getSuperContainer in case it needs to climb higher)
       * - super call\property is definitely illegal in the node (but might be legal in some subnode)
       *   i.e. super property access is illegal in function declaration but can be legal in the statement list
       */
@@ -1115,6 +1141,9 @@ namespace ts {
         if (node.kind === SyntaxKind.ExportDeclaration) {
             return (<ExportDeclaration>node).moduleSpecifier;
         }
+        if (node.kind === SyntaxKind.ModuleDeclaration && (<ModuleDeclaration>node).name.kind === SyntaxKind.StringLiteral) {
+            return (<ModuleDeclaration>node).name;
+        }
     }
 
     export function hasQuestionToken(node: Node) {

src/lib/core.d.ts

@@ -1,5 +1,3 @@
-/// <reference no-default-lib="true"/>
-
 /////////////////////////////
 /// ECMAScript APIs
 /////////////////////////////

src/lib/dom.generated.d.ts

@@ -1255,7 +1255,7 @@ interface Console {
     select(element: Element): void;
     time(timerName?: string): void;
     timeEnd(timerName?: string): void;
-    trace(): void;
+    trace(message?: any, ...optionalParams: any[]): void;
     warn(message?: any, ...optionalParams: any[]): void;
 }
 
@@ -1514,9 +1514,9 @@ interface DataTransferItemList {
     length: number;
     add(data: File): DataTransferItem;
     clear(): void;
-    item(index: number): File;
+    item(index: number): DataTransferItem;
     remove(index: number): void;
-    [index: number]: File;
+    [index: number]: DataTransferItem;
 }
 
 declare var DataTransferItemList: {
@@ -2569,6 +2569,8 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * @param content The text and HTML tags to write.
       */
     writeln(...content: string[]): void;
+    createElement(tagName: "picture"): HTMLPictureElement;
+    getElementsByTagName(tagname: "picture"): NodeListOf<HTMLPictureElement>;
     addEventListener(type: "MSContentZoom", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
@@ -2981,6 +2983,7 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     webkitRequestFullscreen(): void;
     getElementsByClassName(classNames: string): NodeListOf<Element>;
     matches(selector: string): boolean;
+    getElementsByTagName(tagname: "picture"): NodeListOf<HTMLPictureElement>;
     addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
@@ -3770,6 +3773,7 @@ interface HTMLCanvasElement extends HTMLElement {
       * @param type The standard MIME type for the image format to return. If you do not specify this parameter, the default value is a PNG format image.
       */
     toDataURL(type?: string, ...args: any[]): string;
+    toBlob(): Blob;
 }
 
 declare var HTMLCanvasElement: {
@@ -6924,7 +6928,7 @@ interface IDBDatabase extends EventTarget {
     objectStoreNames: DOMStringList;
     onabort: (ev: Event) => any;
     onerror: (ev: Event) => any;
-    version: string;
+    version: number;
     close(): void;
     createObjectStore(name: string, optionalParameters?: IDBObjectStoreParameters): IDBObjectStore;
     deleteObjectStore(name: string): void;
@@ -7640,7 +7644,7 @@ declare var MediaQueryList: {
 interface MediaSource extends EventTarget {
     activeSourceBuffers: SourceBufferList;
     duration: number;
-    readyState: number;
+    readyState: string;
     sourceBuffers: SourceBufferList;
     addSourceBuffer(type: string): SourceBuffer;
     endOfStream(error?: number): void;
@@ -10369,17 +10373,16 @@ declare var Storage: {
 }
 
 interface StorageEvent extends Event {
-    key: string;
-    newValue: any;
-    oldValue: any;
-    storageArea: Storage;
     url: string;
-    initStorageEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, keyArg: string, oldValueArg: any, newValueArg: any, urlArg: string, storageAreaArg: Storage): void;
+    key?: string;
+    oldValue?: string;
+    newValue?: string;
+    storageArea?: Storage;
 }
 
 declare var StorageEvent: {
     prototype: StorageEvent;
-    new(): StorageEvent;
+    new (type: string, eventInitDict?: StorageEventInit): StorageEvent;
 }
 
 interface StyleMedia {
@@ -11977,7 +11980,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     msMatchMedia(mediaQuery: string): MediaQueryList;
     msRequestAnimationFrame(callback: FrameRequestCallback): number;
     msWriteProfilerMark(profilerMarkName: string): void;
-    open(url?: string, target?: string, features?: string, replace?: boolean): any;
+    open(url?: string, target?: string, features?: string, replace?: boolean): Window;
     postMessage(message: any, targetOrigin: string, ports?: any): void;
     print(): void;
     prompt(message?: string, _default?: string): string;
@@ -12579,6 +12582,14 @@ interface XMLHttpRequestEventTarget {
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
+interface StorageEventInit extends EventInit {
+    key?: string;
+    oldValue?: string;
+    newValue?: string;
+    url: string;
+    storageArea?: Storage;
+}
+
 interface IDBObjectStoreParameters {
     keyPath?: string | string[];
     autoIncrement?: boolean;
@@ -12633,6 +12644,14 @@ declare var HTMLTemplateElement: {
     new(): HTMLTemplateElement;
 }
 
+interface HTMLPictureElement extends HTMLElement {
+}
+
+declare var HTMLPictureElement: {
+    prototype: HTMLPictureElement;
+    new(): HTMLPictureElement;
+}
+
 declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
 
 interface ErrorEventHandler {
@@ -12829,7 +12848,7 @@ declare function msCancelRequestAnimationFrame(handle: number): void;
 declare function msMatchMedia(mediaQuery: string): MediaQueryList;
 declare function msRequestAnimationFrame(callback: FrameRequestCallback): number;
 declare function msWriteProfilerMark(profilerMarkName: string): void;
-declare function open(url?: string, target?: string, features?: string, replace?: boolean): any;
+declare function open(url?: string, target?: string, features?: string, replace?: boolean): Window;
 declare function postMessage(message: any, targetOrigin: string, ports?: any): void;
 declare function print(): void;
 declare function prompt(message?: string, _default?: string): string;

src/lib/header.d.ts

@@ -0,0 +1 @@
+/// <reference no-default-lib="true"/>

src/lib/webworker.generated.d.ts

@@ -69,7 +69,7 @@ interface Console {
     select(element: any): void;
     time(timerName?: string): void;
     timeEnd(timerName?: string): void;
-    trace(): void;
+    trace(message?: any, ...optionalParams: any[]): void;
     warn(message?: any, ...optionalParams: any[]): void;
 }
 
@@ -309,7 +309,7 @@ interface IDBDatabase extends EventTarget {
     objectStoreNames: DOMStringList;
     onabort: (ev: Event) => any;
     onerror: (ev: Event) => any;
-    version: string;
+    version: number;
     close(): void;
     createObjectStore(name: string, optionalParameters?: IDBObjectStoreParameters): IDBObjectStore;
     deleteObjectStore(name: string): void;

src/server/editorServices.ts

@@ -1002,7 +1002,9 @@ namespace ts.server {
                     info.setFormatOptions(this.getFormatCodeOptions());
                     this.filenameToScriptInfo[fileName] = info;
                     if (!info.isOpen) {
-                        info.fileWatcher = this.host.watchFile(fileName, _ => { this.watchedFileChanged(fileName); });
+                        info.fileWatcher = this.host.watchFile(
+                            toPath(fileName, fileName, createGetCanonicalFileName(sys.useCaseSensitiveFileNames)),
+                            _ => { this.watchedFileChanged(fileName); });
                     }
                 }
             }
@@ -1215,7 +1217,9 @@ namespace ts.server {
                     }
                 }
                 project.finishGraph();
-                project.projectFileWatcher = this.host.watchFile(configFilename, _ => this.watchedProjectConfigFileChanged(project));
+                project.projectFileWatcher = this.host.watchFile(
+                    toPath(configFilename, configFilename, createGetCanonicalFileName(sys.useCaseSensitiveFileNames)),
+                    _ => this.watchedProjectConfigFileChanged(project));
                 this.log("Add recursive watcher for: " + ts.getDirectoryPath(configFilename));
                 project.directoryWatcher = this.host.watchDirectory(
                     ts.getDirectoryPath(configFilename),

src/services/navigationBar.ts

@@ -387,7 +387,7 @@ namespace ts.NavigationBar {
 
             function getModuleName(moduleDeclaration: ModuleDeclaration): string {
                 // We want to maintain quotation marks.
-                if (moduleDeclaration.name.kind === SyntaxKind.StringLiteral) {
+                if (isAmbientModule(moduleDeclaration)) {
                     return getTextOfNode(moduleDeclaration.name);
                 }
 

src/services/services.ts

@@ -811,6 +811,7 @@ namespace ts {
         public nameTable: Map<string>;
         public resolvedModules: Map<ResolvedModule>;
         public imports: LiteralExpression[];
+        public moduleAugmentations: LiteralExpression[];
         private namedDeclarations: Map<Declaration[]>;
 
         constructor(kind: SyntaxKind, pos: number, end: number) {
@@ -2018,13 +2019,6 @@ namespace ts {
         return createLanguageServiceSourceFile(sourceFile.fileName, scriptSnapshot, sourceFile.languageVersion, version, /*setNodeParents*/ true);
     }
 
-    export function createGetCanonicalFileName(useCaseSensitivefileNames: boolean): (fileName: string) => string {
-        return useCaseSensitivefileNames
-            ? ((fileName) => fileName)
-            : ((fileName) => fileName.toLowerCase());
-    }
-
-
     export function createDocumentRegistry(useCaseSensitiveFileNames?: boolean, currentDirectory = ""): DocumentRegistry {
         // Maps from compiler setting target (ES3, ES5, etc.) to all the cached documents we have
         // for those settings.
@@ -5517,10 +5511,8 @@ namespace ts {
                 };
             }
 
-            function isImportOrExportSpecifierImportSymbol(symbol: Symbol) {
-                return (symbol.flags & SymbolFlags.Alias) && forEach(symbol.declarations, declaration => {
-                    return declaration.kind === SyntaxKind.ImportSpecifier || declaration.kind === SyntaxKind.ExportSpecifier;
-                });
+            function isImportSpecifierSymbol(symbol: Symbol) {
+                return (symbol.flags & SymbolFlags.Alias) && !!getDeclarationOfKind(symbol, SyntaxKind.ImportSpecifier);
             }
 
             function getInternedName(symbol: Symbol, location: Node, declarations: Declaration[]): string {
@@ -5964,8 +5956,17 @@ namespace ts {
                 let result = [symbol];
 
                 // If the symbol is an alias, add what it alaises to the list
-                if (isImportOrExportSpecifierImportSymbol(symbol)) {
-                    result.push(typeChecker.getAliasedSymbol(symbol));
+                if (isImportSpecifierSymbol(symbol)) {
+                     result.push(typeChecker.getAliasedSymbol(symbol));
+                }
+
+                // For export specifiers, the exported name can be refering to a local symbol, e.g.:
+                //     import {a} from "mod";
+                //     export {a as somethingElse}
+                // We want the *local* declaration of 'a' as declared in the import,
+                // *not* as declared within "mod" (or farther)
+                if (location.parent.kind === SyntaxKind.ExportSpecifier) {
+                    result.push(typeChecker.getExportSpecifierLocalTargetSymbol(<ExportSpecifier>location.parent));
                 }
 
                 // If the location is in a context sensitive location (i.e. in an object literal) try
@@ -6011,15 +6012,43 @@ namespace ts {
 
                     // Add symbol of properties/methods of the same name in base classes and implemented interfaces definitions
                     if (rootSymbol.parent && rootSymbol.parent.flags & (SymbolFlags.Class | SymbolFlags.Interface)) {
-                        getPropertySymbolsFromBaseTypes(rootSymbol.parent, rootSymbol.getName(), result);
+                        getPropertySymbolsFromBaseTypes(rootSymbol.parent, rootSymbol.getName(), result, /*previousIterationSymbolsCache*/ {});
                     }
                 });
 
                 return result;
             }
 
-            function getPropertySymbolsFromBaseTypes(symbol: Symbol, propertyName: string, result: Symbol[]): void {
-                if (symbol && symbol.flags & (SymbolFlags.Class | SymbolFlags.Interface)) {
+            /**
+             * Find symbol of the given property-name and add the symbol to the given result array
+             * @param symbol a symbol to start searching for the given propertyName
+             * @param propertyName a name of property to serach for
+             * @param result an array of symbol of found property symbols
+             * @param previousIterationSymbolsCache a cache of symbol from previous iterations of calling this function to prevent infinite revisitng of the same symbol.
+             *                                The value of previousIterationSymbol is undefined when the function is first called.
+             */
+            function getPropertySymbolsFromBaseTypes(symbol: Symbol, propertyName: string, result: Symbol[],
+                previousIterationSymbolsCache: SymbolTable): void {
+                if (!symbol) {
+                    return;
+                }
+
+                // If the current symbol is the same as the previous-iteration symbol, we can just return the symbol that has already been visited
+                // This is particularly important for the following cases, so that we do not infinitely visit the same symbol.
+                // For example:
+                //      interface C extends C {
+                //          /*findRef*/propName: string;
+                //      }
+                // The first time getPropertySymbolsFromBaseTypes is called when finding-all-references at propName,
+                // the symbol argument will be the symbol of an interface "C" and previousIterationSymbol is undefined,
+                // the function will add any found symbol of the property-name, then its sub-routine will call
+                // getPropertySymbolsFromBaseTypes again to walk up any base types to prevent revisiting already
+                // visited symbol, interface "C", the sub-routine will pass the current symbol as previousIterationSymbol.
+                if (hasProperty(previousIterationSymbolsCache, symbol.name)) {
+                    return;
+                }
+
+                if (symbol.flags & (SymbolFlags.Class | SymbolFlags.Interface)) {
                     forEach(symbol.getDeclarations(), declaration => {
                         if (declaration.kind === SyntaxKind.ClassDeclaration) {
                             getPropertySymbolFromTypeReference(getClassExtendsHeritageClauseElement(<ClassDeclaration>declaration));
@@ -6042,7 +6071,8 @@ namespace ts {
                             }
 
                             // Visit the typeReference as well to see if it directly or indirectly use that property
-                            getPropertySymbolsFromBaseTypes(type.symbol, propertyName, result);
+                            previousIterationSymbolsCache[symbol.name] = symbol;
+                            getPropertySymbolsFromBaseTypes(type.symbol, propertyName, result, previousIterationSymbolsCache);
                         }
                     }
                 }
@@ -6055,13 +6085,24 @@ namespace ts {
 
                 // If the reference symbol is an alias, check if what it is aliasing is one of the search
                 // symbols.
-                if (isImportOrExportSpecifierImportSymbol(referenceSymbol)) {
+                if (isImportSpecifierSymbol(referenceSymbol)) {
                     const aliasedSymbol = typeChecker.getAliasedSymbol(referenceSymbol);
                     if (searchSymbols.indexOf(aliasedSymbol) >= 0) {
                         return aliasedSymbol;
                     }
                 }
 
+                // For export specifiers, it can be a local symbol, e.g. 
+                //     import {a} from "mod";
+                //     export {a as somethingElse}
+                // We want the local target of the export (i.e. the import symbol) and not the final target (i.e. "mod".a)
+                if (referenceLocation.parent.kind === SyntaxKind.ExportSpecifier) {
+                    const aliasedSymbol = typeChecker.getExportSpecifierLocalTargetSymbol(<ExportSpecifier>referenceLocation.parent);
+                    if (searchSymbols.indexOf(aliasedSymbol) >= 0) {
+                        return aliasedSymbol;
+                    }
+                }
+
                 // If the reference location is in an object literal, try to get the contextual type for the
                 // object literal, lookup the property symbol in the contextual type, and use this symbol to
                 // compare to our searchSymbol
@@ -6083,7 +6124,7 @@ namespace ts {
                     // see if any is in the list
                     if (rootSymbol.parent && rootSymbol.parent.flags & (SymbolFlags.Class | SymbolFlags.Interface)) {
                         const result: Symbol[] = [];
-                        getPropertySymbolsFromBaseTypes(rootSymbol.parent, rootSymbol.getName(), result);
+                        getPropertySymbolsFromBaseTypes(rootSymbol.parent, rootSymbol.getName(), result, /*previousIterationSymbolsCache*/ {});
                         return forEach(result, s => searchSymbols.indexOf(s) >= 0 ? s : undefined);
                     }
 
@@ -6256,7 +6297,7 @@ namespace ts {
                     return SemanticMeaning.Value | SemanticMeaning.Type;
 
                 case SyntaxKind.ModuleDeclaration:
-                    if ((<ModuleDeclaration>node).name.kind === SyntaxKind.StringLiteral) {
+                    if (isAmbientModule(<ModuleDeclaration>node)) {
                         return SemanticMeaning.Namespace | SemanticMeaning.Value;
                     }
                     else if (getModuleInstanceState(node) === ModuleInstanceState.Instantiated) {
@@ -6787,7 +6828,8 @@ namespace ts {
             function classifyDisabledMergeCode(text: string, start: number, end: number) {
                 // Classify the line that the ======= marker is on as a comment.  Then just lex
                 // all further tokens and add them to the result.
-                for (var i = start; i < end; i++) {
+                let i: number;
+                for (i = start; i < end; i++) {
                     if (isLineBreak(text.charCodeAt(i))) {
                         break;
                     }

tests/baselines/reference/YieldExpression11_es6.errors.txt

@@ -1,5 +1,5 @@
 tests/cases/conformance/es6/yieldExpressions/YieldExpression11_es6.ts(2,3): error TS1220: Generators are only available when targeting ECMAScript 6 or higher.
-tests/cases/conformance/es6/yieldExpressions/YieldExpression11_es6.ts(3,11): error TS2304: Cannot find name 'foo'.
+tests/cases/conformance/es6/yieldExpressions/YieldExpression11_es6.ts(3,11): error TS2663: Cannot find name 'foo'. Did you mean the instance member 'this.foo'?
 
 
 ==== tests/cases/conformance/es6/yieldExpressions/YieldExpression11_es6.ts (2 errors) ====
@@ -9,6 +9,6 @@ tests/cases/conformance/es6/yieldExpressions/YieldExpression11_es6.ts(3,11): err
 !!! error TS1220: Generators are only available when targeting ECMAScript 6 or higher.
         yield(foo);
               ~~~
-!!! error TS2304: Cannot find name 'foo'.
+!!! error TS2663: Cannot find name 'foo'. Did you mean the instance member 'this.foo'?
       }
     }

tests/baselines/reference/accessInstanceMemberFromStaticMethod01.errors.txt

@@ -0,0 +1,13 @@
+tests/cases/compiler/accessInstanceMemberFromStaticMethod01.ts(5,17): error TS2662: Cannot find name 'foo'. Did you mean the static member 'C.foo'?
+
+
+==== tests/cases/compiler/accessInstanceMemberFromStaticMethod01.ts (1 errors) ====
+    class C {
+        static foo: string;
+    
+        bar() {
+            let k = foo;
+                    ~~~
+!!! error TS2662: Cannot find name 'foo'. Did you mean the static member 'C.foo'?
+        }
+    }

tests/baselines/reference/accessInstanceMemberFromStaticMethod01.js

@@ -0,0 +1,18 @@
+//// [accessInstanceMemberFromStaticMethod01.ts]
+class C {
+    static foo: string;
+
+    bar() {
+        let k = foo;
+    }
+}
+
+//// [accessInstanceMemberFromStaticMethod01.js]
+var C = (function () {
+    function C() {
+    }
+    C.prototype.bar = function () {
+        var k = foo;
+    };
+    return C;
+}());

tests/baselines/reference/accessStaticMemberFromInstanceMethod01.errors.txt

@@ -0,0 +1,13 @@
+tests/cases/compiler/accessStaticMemberFromInstanceMethod01.ts(5,17): error TS2304: Cannot find name 'foo'.
+
+
+==== tests/cases/compiler/accessStaticMemberFromInstanceMethod01.ts (1 errors) ====
+    class C {
+        foo: string;
+    
+        static bar() {
+            let k = foo;
+                    ~~~
+!!! error TS2304: Cannot find name 'foo'.
+        }
+    }

tests/baselines/reference/accessStaticMemberFromInstanceMethod01.js

@@ -0,0 +1,18 @@
+//// [accessStaticMemberFromInstanceMethod01.ts]
+class C {
+    foo: string;
+
+    static bar() {
+        let k = foo;
+    }
+}
+
+//// [accessStaticMemberFromInstanceMethod01.js]
+var C = (function () {
+    function C() {
+    }
+    C.bar = function () {
+        var k = foo;
+    };
+    return C;
+}());

tests/baselines/reference/aliasAssignments.errors.txt

@@ -1,5 +1,4 @@
 tests/cases/compiler/aliasAssignments_1.ts(3,1): error TS2322: Type 'number' is not assignable to type 'typeof "tests/cases/compiler/aliasAssignments_moduleA"'.
-  Property 'someClass' is missing in type 'Number'.
 tests/cases/compiler/aliasAssignments_1.ts(5,1): error TS2322: Type 'typeof "tests/cases/compiler/aliasAssignments_moduleA"' is not assignable to type 'number'.
 
 
@@ -9,7 +8,6 @@ tests/cases/compiler/aliasAssignments_1.ts(5,1): error TS2322: Type 'typeof "tes
     x = 1; // Should be error
     ~
 !!! error TS2322: Type 'number' is not assignable to type 'typeof "tests/cases/compiler/aliasAssignments_moduleA"'.
-!!! error TS2322:   Property 'someClass' is missing in type 'Number'.
     var y = 1;
     y = moduleA; // should be error
     ~

tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.errors.txt

@@ -1,4 +1,4 @@
-tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts(5,16): error TS2435: Ambient modules cannot be nested in other modules or namespaces.
+tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts(5,16): error TS2664: Invalid module name in augmentation, module 'ext' cannot be found.
 tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts(10,22): error TS2307: Cannot find module 'ext'.
 
 
@@ -9,7 +9,7 @@ tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts(10,22): err
     
     declare module "ext" {
                    ~~~~~
-!!! error TS2435: Ambient modules cannot be nested in other modules or namespaces.
+!!! error TS2664: Invalid module name in augmentation, module 'ext' cannot be found.
         export class C { }
     }
     

tests/baselines/reference/ambientExternalModuleInsideNonAmbient.errors.txt

@@ -1,9 +1,12 @@
+tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbient.ts(2,5): error TS2668: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
 tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbient.ts(2,27): error TS2435: Ambient modules cannot be nested in other modules or namespaces.
 
 
-==== tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbient.ts (1 errors) ====
+==== tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbient.ts (2 errors) ====
     module M {
         export declare module "M" { }
+        ~~~~~~
+!!! error TS2668: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
                               ~~~
 !!! error TS2435: Ambient modules cannot be nested in other modules or namespaces.
     }

tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.errors.txt

@@ -1,7 +1,10 @@
-tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbientExternalModule.ts(1,23): error TS2435: Ambient modules cannot be nested in other modules or namespaces.
+tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbientExternalModule.ts(1,1): error TS2668: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
+tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbientExternalModule.ts(1,23): error TS2664: Invalid module name in augmentation, module 'M' cannot be found.
 
 
-==== tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbientExternalModule.ts (1 errors) ====
+==== tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbientExternalModule.ts (2 errors) ====
     export declare module "M" { }
+    ~~~~~~
+!!! error TS2668: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.
                           ~~~
-!!! error TS2435: Ambient modules cannot be nested in other modules or namespaces.
+!!! error TS2664: Invalid module name in augmentation, module 'M' cannot be found.

tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList.errors.txt

@@ -1,5 +1,4 @@
 tests/cases/compiler/argumentsBindsToFunctionScopeArgumentList.ts(3,5): error TS2322: Type 'number' is not assignable to type 'IArguments'.
-  Property 'length' is missing in type 'Number'.
 
 
 ==== tests/cases/compiler/argumentsBindsToFunctionScopeArgumentList.ts (1 errors) ====
@@ -8,5 +7,4 @@ tests/cases/compiler/argumentsBindsToFunctionScopeArgumentList.ts(3,5): error TS
         arguments = 10;  /// This shouldnt be of type number and result in error.
         ~~~~~~~~~
 !!! error TS2322: Type 'number' is not assignable to type 'IArguments'.
-!!! error TS2322:   Property 'length' is missing in type 'Number'.
     }

tests/baselines/reference/arrayAssignmentTest1.errors.txt

@@ -26,10 +26,13 @@ tests/cases/compiler/arrayAssignmentTest1.ts(70,1): error TS2322: Type 'C3[]' is
     Property 'C2M1' is missing in type 'C3'.
 tests/cases/compiler/arrayAssignmentTest1.ts(75,1): error TS2322: Type 'C2[]' is not assignable to type 'C3[]'.
   Type 'C2' is not assignable to type 'C3'.
+    Property 'CM3M1' is missing in type 'C2'.
 tests/cases/compiler/arrayAssignmentTest1.ts(76,1): error TS2322: Type 'C1[]' is not assignable to type 'C3[]'.
   Type 'C1' is not assignable to type 'C3'.
+    Property 'CM3M1' is missing in type 'C1'.
 tests/cases/compiler/arrayAssignmentTest1.ts(77,1): error TS2322: Type 'I1[]' is not assignable to type 'C3[]'.
   Type 'I1' is not assignable to type 'C3'.
+    Property 'CM3M1' is missing in type 'I1'.
 tests/cases/compiler/arrayAssignmentTest1.ts(79,1): error TS2322: Type '() => C1' is not assignable to type 'any[]'.
   Property 'push' is missing in type '() => C1'.
 tests/cases/compiler/arrayAssignmentTest1.ts(80,1): error TS2322: Type '{ one: number; }' is not assignable to type 'any[]'.
@@ -159,14 +162,17 @@ tests/cases/compiler/arrayAssignmentTest1.ts(85,1): error TS2322: Type 'I1' is n
     ~~~~~~
 !!! error TS2322: Type 'C2[]' is not assignable to type 'C3[]'.
 !!! error TS2322:   Type 'C2' is not assignable to type 'C3'.
+!!! error TS2322:     Property 'CM3M1' is missing in type 'C2'.
     arr_c3 = arr_c1_2; // should be an error - is
     ~~~~~~
 !!! error TS2322: Type 'C1[]' is not assignable to type 'C3[]'.
 !!! error TS2322:   Type 'C1' is not assignable to type 'C3'.
+!!! error TS2322:     Property 'CM3M1' is missing in type 'C1'.
     arr_c3 = arr_i1_2; // should be an error - is
     ~~~~~~
 !!! error TS2322: Type 'I1[]' is not assignable to type 'C3[]'.
 !!! error TS2322:   Type 'I1' is not assignable to type 'C3'.
+!!! error TS2322:     Property 'CM3M1' is missing in type 'I1'.
     
     arr_any = f1; // should be an error - is
     ~~~~~~~

tests/baselines/reference/arrayLiterals3.errors.txt

@@ -18,7 +18,6 @@ tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(34,5): error
       Types of parameters 'items' and 'items' are incompatible.
         Type 'number | string' is not assignable to type 'Number'.
           Type 'string' is not assignable to type 'Number'.
-            Property 'toFixed' is missing in type 'String'.
 
 
 ==== tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts (6 errors) ====
@@ -82,5 +81,4 @@ tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(34,5): error
 !!! error TS2322:       Types of parameters 'items' and 'items' are incompatible.
 !!! error TS2322:         Type 'number | string' is not assignable to type 'Number'.
 !!! error TS2322:           Type 'string' is not assignable to type 'Number'.
-!!! error TS2322:             Property 'toFixed' is missing in type 'String'.
     

tests/baselines/reference/arraySigChecking.errors.txt

@@ -4,7 +4,6 @@ tests/cases/compiler/arraySigChecking.ts(18,5): error TS2322: Type 'void[]' is n
 tests/cases/compiler/arraySigChecking.ts(22,1): error TS2322: Type 'number[][]' is not assignable to type 'number[][][]'.
   Type 'number[]' is not assignable to type 'number[][]'.
     Type 'number' is not assignable to type 'number[]'.
-      Property 'length' is missing in type 'Number'.
 
 
 ==== tests/cases/compiler/arraySigChecking.ts (3 errors) ====
@@ -39,7 +38,6 @@ tests/cases/compiler/arraySigChecking.ts(22,1): error TS2322: Type 'number[][]'
 !!! error TS2322: Type 'number[][]' is not assignable to type 'number[][][]'.
 !!! error TS2322:   Type 'number[]' is not assignable to type 'number[][]'.
 !!! error TS2322:     Type 'number' is not assignable to type 'number[]'.
-!!! error TS2322:       Property 'length' is missing in type 'Number'.
     
     function isEmpty(l: { length: number }) {
         return l.length === 0;

tests/baselines/reference/arrayTypeOfTypeOf.errors.txt

@@ -1,5 +1,4 @@
 tests/cases/conformance/types/specifyingTypes/typeLiterals/arrayTypeOfTypeOf.ts(6,5): error TS2322: Type 'number' is not assignable to type 'ArrayConstructor'.
-  Property 'isArray' is missing in type 'Number'.
 tests/cases/conformance/types/specifyingTypes/typeLiterals/arrayTypeOfTypeOf.ts(6,22): error TS1005: '=' expected.
 tests/cases/conformance/types/specifyingTypes/typeLiterals/arrayTypeOfTypeOf.ts(6,30): error TS1109: Expression expected.
 tests/cases/conformance/types/specifyingTypes/typeLiterals/arrayTypeOfTypeOf.ts(7,5): error TS2322: Type 'number' is not assignable to type 'ArrayConstructor'.
@@ -16,7 +15,6 @@ tests/cases/conformance/types/specifyingTypes/typeLiterals/arrayTypeOfTypeOf.ts(
     var xs3: typeof Array<number>;
         ~~~
 !!! error TS2322: Type 'number' is not assignable to type 'ArrayConstructor'.
-!!! error TS2322:   Property 'isArray' is missing in type 'Number'.
                          ~
 !!! error TS1005: '=' expected.
                                  ~

tests/baselines/reference/assignmentCompat1.errors.txt

@@ -3,9 +3,7 @@ tests/cases/compiler/assignmentCompat1.ts(4,1): error TS2322: Type '{ [index: st
 tests/cases/compiler/assignmentCompat1.ts(6,1): error TS2322: Type '{ [index: number]: any; }' is not assignable to type '{ one: number; }'.
   Property 'one' is missing in type '{ [index: number]: any; }'.
 tests/cases/compiler/assignmentCompat1.ts(8,1): error TS2322: Type 'string' is not assignable to type '{ [index: string]: any; }'.
-  Index signature is missing in type 'String'.
 tests/cases/compiler/assignmentCompat1.ts(10,1): error TS2322: Type 'boolean' is not assignable to type '{ [index: number]: any; }'.
-  Index signature is missing in type 'Boolean'.
 
 
 ==== tests/cases/compiler/assignmentCompat1.ts (4 errors) ====
@@ -25,11 +23,9 @@ tests/cases/compiler/assignmentCompat1.ts(10,1): error TS2322: Type 'boolean' is
     y = "foo"; // Error
     ~
 !!! error TS2322: Type 'string' is not assignable to type '{ [index: string]: any; }'.
-!!! error TS2322:   Index signature is missing in type 'String'.
     z = "foo"; // OK, string has numeric indexer
     z = false; // Error
     ~
 !!! error TS2322: Type 'boolean' is not assignable to type '{ [index: number]: any; }'.
-!!! error TS2322:   Index signature is missing in type 'Boolean'.
     
     

tests/baselines/reference/assignmentCompatWithCallSignatures4.errors.txt

@@ -8,6 +8,10 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures4.ts(53,9): error TS2322: Type '(x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived' is not assignable to type '<T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U'.
   Types of parameters 'y' and 'y' are incompatible.
     Type '(arg2: Base) => Derived' is not assignable to type '(arg2: { foo: number; }) => any'.
+      Types of parameters 'arg2' and 'arg2' are incompatible.
+        Type 'Base' is not assignable to type '{ foo: number; }'.
+          Types of property 'foo' are incompatible.
+            Type 'string' is not assignable to type 'number'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures4.ts (2 errors) ====
@@ -76,6 +80,10 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type '(x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived' is not assignable to type '<T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U'.
 !!! error TS2322:   Types of parameters 'y' and 'y' are incompatible.
 !!! error TS2322:     Type '(arg2: Base) => Derived' is not assignable to type '(arg2: { foo: number; }) => any'.
+!!! error TS2322:       Types of parameters 'arg2' and 'arg2' are incompatible.
+!!! error TS2322:         Type 'Base' is not assignable to type '{ foo: number; }'.
+!!! error TS2322:           Types of property 'foo' are incompatible.
+!!! error TS2322:             Type 'string' is not assignable to type 'number'.
     
             
             var b10: <T extends Derived>(...x: T[]) => T; 

tests/baselines/reference/assignmentCompatWithConstructSignatures4.errors.txt

@@ -8,6 +8,10 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures4.ts(53,9): error TS2322: Type 'new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived' is not assignable to type 'new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U'.
   Types of parameters 'y' and 'y' are incompatible.
     Type '(arg2: Base) => Derived' is not assignable to type '(arg2: { foo: number; }) => any'.
+      Types of parameters 'arg2' and 'arg2' are incompatible.
+        Type 'Base' is not assignable to type '{ foo: number; }'.
+          Types of property 'foo' are incompatible.
+            Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures4.ts(77,9): error TS2322: Type 'new <T>(x: (a: T) => T) => T[]' is not assignable to type '{ new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }'.
   Types of parameters 'x' and 'x' are incompatible.
     Type '(a: any) => any' is not assignable to type '{ new (a: number): number; new (a?: number): number; }'.
@@ -15,6 +19,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures4.ts(78,9): error TS2322: Type '{ new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }' is not assignable to type 'new <T>(x: (a: T) => T) => T[]'.
   Types of parameters 'x' and 'x' are incompatible.
     Type '{ new (a: number): number; new (a?: number): number; }' is not assignable to type '(a: any) => any'.
+      Type '{ new (a: number): number; new (a?: number): number; }' provides no match for the signature '(a: any): any'
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures4.ts(81,9): error TS2322: Type 'new <T>(x: (a: T) => T) => any[]' is not assignable to type '{ new (x: { new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }): any[]; new (x: { new <T extends Derived2>(a: T): T; new <T extends Base>(a: T): T; }): any[]; }'.
   Types of parameters 'x' and 'x' are incompatible.
     Type '(a: any) => any' is not assignable to type '{ new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }'.
@@ -22,6 +27,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures4.ts(82,9): error TS2322: Type '{ new (x: { new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }): any[]; new (x: { new <T extends Derived2>(a: T): T; new <T extends Base>(a: T): T; }): any[]; }' is not assignable to type 'new <T>(x: (a: T) => T) => any[]'.
   Types of parameters 'x' and 'x' are incompatible.
     Type '{ new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }' is not assignable to type '(a: any) => any'.
+      Type '{ new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }' provides no match for the signature '(a: any): any'
 
 
 ==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures4.ts (6 errors) ====
@@ -90,6 +96,10 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type 'new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived' is not assignable to type 'new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U'.
 !!! error TS2322:   Types of parameters 'y' and 'y' are incompatible.
 !!! error TS2322:     Type '(arg2: Base) => Derived' is not assignable to type '(arg2: { foo: number; }) => any'.
+!!! error TS2322:       Types of parameters 'arg2' and 'arg2' are incompatible.
+!!! error TS2322:         Type 'Base' is not assignable to type '{ foo: number; }'.
+!!! error TS2322:           Types of property 'foo' are incompatible.
+!!! error TS2322:             Type 'string' is not assignable to type 'number'.
     
             
             var b10: new <T extends Derived>(...x: T[]) => T; 
@@ -124,6 +134,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type '{ new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }' is not assignable to type 'new <T>(x: (a: T) => T) => T[]'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
 !!! error TS2322:     Type '{ new (a: number): number; new (a?: number): number; }' is not assignable to type '(a: any) => any'.
+!!! error TS2322:       Type '{ new (a: number): number; new (a?: number): number; }' provides no match for the signature '(a: any): any'
     
             var b17: new <T>(x: (a: T) => T) => any[];
             a17 = b17; // error
@@ -137,6 +148,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322: Type '{ new (x: { new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }): any[]; new (x: { new <T extends Derived2>(a: T): T; new <T extends Base>(a: T): T; }): any[]; }' is not assignable to type 'new <T>(x: (a: T) => T) => any[]'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
 !!! error TS2322:     Type '{ new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }' is not assignable to type '(a: any) => any'.
+!!! error TS2322:       Type '{ new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }' provides no match for the signature '(a: any): any'
         }
     
         module WithGenericSignaturesInBaseType {

tests/baselines/reference/assignmentCompatability16.errors.txt

@@ -1,7 +1,6 @@
 tests/cases/compiler/assignmentCompatability16.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '{ one: any[]; }'.
   Types of property 'one' are incompatible.
     Type 'number' is not assignable to type 'any[]'.
-      Property 'length' is missing in type 'Number'.
 
 
 ==== tests/cases/compiler/assignmentCompatability16.ts (1 errors) ====
@@ -17,5 +16,4 @@ tests/cases/compiler/assignmentCompatability16.ts(9,1): error TS2322: Type 'inte
     ~~~~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '{ one: any[]; }'.
 !!! error TS2322:   Types of property 'one' are incompatible.
-!!! error TS2322:     Type 'number' is not assignable to type 'any[]'.
-!!! error TS2322:       Property 'length' is missing in type 'Number'.
+!!! error TS2322:     Type 'number' is not assignable to type 'any[]'.

tests/baselines/reference/assignmentCompatability17.errors.txt

@@ -1,7 +1,6 @@
 tests/cases/compiler/assignmentCompatability17.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '{ two: any[]; }'.
   Types of property 'two' are incompatible.
     Type 'string' is not assignable to type 'any[]'.
-      Property 'push' is missing in type 'String'.
 
 
 ==== tests/cases/compiler/assignmentCompatability17.ts (1 errors) ====
@@ -17,5 +16,4 @@ tests/cases/compiler/assignmentCompatability17.ts(9,1): error TS2322: Type 'inte
     ~~~~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '{ two: any[]; }'.
 !!! error TS2322:   Types of property 'two' are incompatible.
-!!! error TS2322:     Type 'string' is not assignable to type 'any[]'.
-!!! error TS2322:       Property 'push' is missing in type 'String'.
+!!! error TS2322:     Type 'string' is not assignable to type 'any[]'.

tests/baselines/reference/assignmentCompatability18.errors.txt

@@ -1,7 +1,6 @@
 tests/cases/compiler/assignmentCompatability18.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '{ one: number[]; }'.
   Types of property 'one' are incompatible.
     Type 'number' is not assignable to type 'number[]'.
-      Property 'length' is missing in type 'Number'.
 
 
 ==== tests/cases/compiler/assignmentCompatability18.ts (1 errors) ====
@@ -17,5 +16,4 @@ tests/cases/compiler/assignmentCompatability18.ts(9,1): error TS2322: Type 'inte
     ~~~~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '{ one: number[]; }'.
 !!! error TS2322:   Types of property 'one' are incompatible.
-!!! error TS2322:     Type 'number' is not assignable to type 'number[]'.
-!!! error TS2322:       Property 'length' is missing in type 'Number'.
+!!! error TS2322:     Type 'number' is not assignable to type 'number[]'.

tests/baselines/reference/assignmentCompatability19.errors.txt

@@ -1,7 +1,6 @@
 tests/cases/compiler/assignmentCompatability19.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '{ two: number[]; }'.
   Types of property 'two' are incompatible.
     Type 'string' is not assignable to type 'number[]'.
-      Property 'push' is missing in type 'String'.
 
 
 ==== tests/cases/compiler/assignmentCompatability19.ts (1 errors) ====
@@ -17,5 +16,4 @@ tests/cases/compiler/assignmentCompatability19.ts(9,1): error TS2322: Type 'inte
     ~~~~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '{ two: number[]; }'.
 !!! error TS2322:   Types of property 'two' are incompatible.
-!!! error TS2322:     Type 'string' is not assignable to type 'number[]'.
-!!! error TS2322:       Property 'push' is missing in type 'String'.
+!!! error TS2322:     Type 'string' is not assignable to type 'number[]'.

tests/baselines/reference/assignmentCompatability20.errors.txt

@@ -1,7 +1,6 @@
 tests/cases/compiler/assignmentCompatability20.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '{ one: string[]; }'.
   Types of property 'one' are incompatible.
     Type 'number' is not assignable to type 'string[]'.
-      Property 'length' is missing in type 'Number'.
 
 
 ==== tests/cases/compiler/assignmentCompatability20.ts (1 errors) ====
@@ -17,5 +16,4 @@ tests/cases/compiler/assignmentCompatability20.ts(9,1): error TS2322: Type 'inte
     ~~~~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '{ one: string[]; }'.
 !!! error TS2322:   Types of property 'one' are incompatible.
-!!! error TS2322:     Type 'number' is not assignable to type 'string[]'.
-!!! error TS2322:       Property 'length' is missing in type 'Number'.
+!!! error TS2322:     Type 'number' is not assignable to type 'string[]'.

tests/baselines/reference/assignmentCompatability21.errors.txt

@@ -1,7 +1,6 @@
 tests/cases/compiler/assignmentCompatability21.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '{ two: string[]; }'.
   Types of property 'two' are incompatible.
     Type 'string' is not assignable to type 'string[]'.
-      Property 'push' is missing in type 'String'.
 
 
 ==== tests/cases/compiler/assignmentCompatability21.ts (1 errors) ====
@@ -17,5 +16,4 @@ tests/cases/compiler/assignmentCompatability21.ts(9,1): error TS2322: Type 'inte
     ~~~~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '{ two: string[]; }'.
 !!! error TS2322:   Types of property 'two' are incompatible.
-!!! error TS2322:     Type 'string' is not assignable to type 'string[]'.
-!!! error TS2322:       Property 'push' is missing in type 'String'.
+!!! error TS2322:     Type 'string' is not assignable to type 'string[]'.

tests/baselines/reference/assignmentCompatability22.errors.txt

@@ -1,7 +1,6 @@
 tests/cases/compiler/assignmentCompatability22.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '{ one: boolean[]; }'.
   Types of property 'one' are incompatible.
     Type 'number' is not assignable to type 'boolean[]'.
-      Property 'length' is missing in type 'Number'.
 
 
 ==== tests/cases/compiler/assignmentCompatability22.ts (1 errors) ====
@@ -17,5 +16,4 @@ tests/cases/compiler/assignmentCompatability22.ts(9,1): error TS2322: Type 'inte
     ~~~~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '{ one: boolean[]; }'.
 !!! error TS2322:   Types of property 'one' are incompatible.
-!!! error TS2322:     Type 'number' is not assignable to type 'boolean[]'.
-!!! error TS2322:       Property 'length' is missing in type 'Number'.
+!!! error TS2322:     Type 'number' is not assignable to type 'boolean[]'.

tests/baselines/reference/assignmentCompatability23.errors.txt

@@ -1,7 +1,6 @@
 tests/cases/compiler/assignmentCompatability23.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '{ two: boolean[]; }'.
   Types of property 'two' are incompatible.
     Type 'string' is not assignable to type 'boolean[]'.
-      Property 'push' is missing in type 'String'.
 
 
 ==== tests/cases/compiler/assignmentCompatability23.ts (1 errors) ====
@@ -17,5 +16,4 @@ tests/cases/compiler/assignmentCompatability23.ts(9,1): error TS2322: Type 'inte
     ~~~~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '{ two: boolean[]; }'.
 !!! error TS2322:   Types of property 'two' are incompatible.
-!!! error TS2322:     Type 'string' is not assignable to type 'boolean[]'.
-!!! error TS2322:       Property 'push' is missing in type 'String'.
+!!! error TS2322:     Type 'string' is not assignable to type 'boolean[]'.

tests/baselines/reference/assignmentCompatability29.errors.txt

@@ -1,7 +1,6 @@
 tests/cases/compiler/assignmentCompatability29.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '{ one: any[]; }'.
   Types of property 'one' are incompatible.
     Type 'number' is not assignable to type 'any[]'.
-      Property 'length' is missing in type 'Number'.
 
 
 ==== tests/cases/compiler/assignmentCompatability29.ts (1 errors) ====
@@ -17,5 +16,4 @@ tests/cases/compiler/assignmentCompatability29.ts(9,1): error TS2322: Type 'inte
     ~~~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '{ one: any[]; }'.
 !!! error TS2322:   Types of property 'one' are incompatible.
-!!! error TS2322:     Type 'number' is not assignable to type 'any[]'.
-!!! error TS2322:       Property 'length' is missing in type 'Number'.
+!!! error TS2322:     Type 'number' is not assignable to type 'any[]'.

tests/baselines/reference/assignmentCompatability30.errors.txt

@@ -1,7 +1,6 @@
 tests/cases/compiler/assignmentCompatability30.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '{ one: number[]; }'.
   Types of property 'one' are incompatible.
     Type 'number' is not assignable to type 'number[]'.
-      Property 'length' is missing in type 'Number'.
 
 
 ==== tests/cases/compiler/assignmentCompatability30.ts (1 errors) ====
@@ -17,5 +16,4 @@ tests/cases/compiler/assignmentCompatability30.ts(9,1): error TS2322: Type 'inte
     ~~~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '{ one: number[]; }'.
 !!! error TS2322:   Types of property 'one' are incompatible.
-!!! error TS2322:     Type 'number' is not assignable to type 'number[]'.
-!!! error TS2322:       Property 'length' is missing in type 'Number'.
+!!! error TS2322:     Type 'number' is not assignable to type 'number[]'.

tests/baselines/reference/assignmentCompatability31.errors.txt

@@ -1,7 +1,6 @@
 tests/cases/compiler/assignmentCompatability31.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '{ one: string[]; }'.
   Types of property 'one' are incompatible.
     Type 'number' is not assignable to type 'string[]'.
-      Property 'length' is missing in type 'Number'.
 
 
 ==== tests/cases/compiler/assignmentCompatability31.ts (1 errors) ====
@@ -17,5 +16,4 @@ tests/cases/compiler/assignmentCompatability31.ts(9,1): error TS2322: Type 'inte
     ~~~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '{ one: string[]; }'.
 !!! error TS2322:   Types of property 'one' are incompatible.
-!!! error TS2322:     Type 'number' is not assignable to type 'string[]'.
-!!! error TS2322:       Property 'length' is missing in type 'Number'.
+!!! error TS2322:     Type 'number' is not assignable to type 'string[]'.

tests/baselines/reference/assignmentCompatability32.errors.txt

@@ -1,7 +1,6 @@
 tests/cases/compiler/assignmentCompatability32.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '{ one: boolean[]; }'.
   Types of property 'one' are incompatible.
     Type 'number' is not assignable to type 'boolean[]'.
-      Property 'length' is missing in type 'Number'.
 
 
 ==== tests/cases/compiler/assignmentCompatability32.ts (1 errors) ====
@@ -17,5 +16,4 @@ tests/cases/compiler/assignmentCompatability32.ts(9,1): error TS2322: Type 'inte
     ~~~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '{ one: boolean[]; }'.
 !!! error TS2322:   Types of property 'one' are incompatible.
-!!! error TS2322:     Type 'number' is not assignable to type 'boolean[]'.
-!!! error TS2322:       Property 'length' is missing in type 'Number'.
+!!! error TS2322:     Type 'number' is not assignable to type 'boolean[]'.

tests/baselines/reference/assignmentCompatability_checking-apply-member-off-of-function-interface.errors.txt

@@ -1,9 +1,7 @@
 tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(10,1): error TS2322: Type 'string' is not assignable to type 'Applicable'.
-  Property 'apply' is missing in type 'String'.
 tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(11,1): error TS2322: Type 'string[]' is not assignable to type 'Applicable'.
   Property 'apply' is missing in type 'string[]'.
 tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(12,1): error TS2322: Type 'number' is not assignable to type 'Applicable'.
-  Property 'apply' is missing in type 'Number'.
 tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(13,1): error TS2322: Type '{}' is not assignable to type 'Applicable'.
   Property 'apply' is missing in type '{}'.
 tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-function-interface.ts(22,4): error TS2345: Argument of type 'string' is not assignable to parameter of type 'Applicable'.
@@ -26,7 +24,6 @@ tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-functi
     x = '';
     ~
 !!! error TS2322: Type 'string' is not assignable to type 'Applicable'.
-!!! error TS2322:   Property 'apply' is missing in type 'String'.
     x = [''];
     ~
 !!! error TS2322: Type 'string[]' is not assignable to type 'Applicable'.
@@ -34,7 +31,6 @@ tests/cases/compiler/assignmentCompatability_checking-apply-member-off-of-functi
     x = 4;
     ~
 !!! error TS2322: Type 'number' is not assignable to type 'Applicable'.
-!!! error TS2322:   Property 'apply' is missing in type 'Number'.
     x = {};
     ~
 !!! error TS2322: Type '{}' is not assignable to type 'Applicable'.

tests/baselines/reference/assignmentCompatability_checking-call-member-off-of-function-interface.errors.txt

@@ -1,9 +1,7 @@
 tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(10,1): error TS2322: Type 'string' is not assignable to type 'Callable'.
-  Property 'call' is missing in type 'String'.
 tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(11,1): error TS2322: Type 'string[]' is not assignable to type 'Callable'.
   Property 'call' is missing in type 'string[]'.
 tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(12,1): error TS2322: Type 'number' is not assignable to type 'Callable'.
-  Property 'call' is missing in type 'Number'.
 tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(13,1): error TS2322: Type '{}' is not assignable to type 'Callable'.
   Property 'call' is missing in type '{}'.
 tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-function-interface.ts(22,4): error TS2345: Argument of type 'string' is not assignable to parameter of type 'Callable'.
@@ -26,7 +24,6 @@ tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-functio
     x = '';
     ~
 !!! error TS2322: Type 'string' is not assignable to type 'Callable'.
-!!! error TS2322:   Property 'call' is missing in type 'String'.
     x = [''];
     ~
 !!! error TS2322: Type 'string[]' is not assignable to type 'Callable'.
@@ -34,7 +31,6 @@ tests/cases/compiler/assignmentCompatability_checking-call-member-off-of-functio
     x = 4;
     ~
 !!! error TS2322: Type 'number' is not assignable to type 'Callable'.
-!!! error TS2322:   Property 'call' is missing in type 'Number'.
     x = {};
     ~
 !!! error TS2322: Type '{}' is not assignable to type 'Callable'.

tests/baselines/reference/asyncAwaitIsolatedModules_es6.js

@@ -40,17 +40,12 @@ module M {
 }
 
 //// [asyncAwaitIsolatedModules_es6.js]
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promise, generator) {
-    return new Promise(function (resolve, reject) {
-        generator = generator.call(thisArg, _arguments);
-        function cast(value) { return value instanceof Promise && value.constructor === Promise ? value : new Promise(function (resolve) { resolve(value); }); }
-        function onfulfill(value) { try { step("next", value); } catch (e) { reject(e); } }
-        function onreject(value) { try { step("throw", value); } catch (e) { reject(e); } }
-        function step(verb, value) {
-            var result = generator[verb](value);
-            result.done ? resolve(result.value) : cast(result.value).then(onfulfill, onreject);
-        }
-        step("next", void 0);
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new P(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.call(thisArg, _arguments)).next());
     });
 };
 function f0() {

tests/baselines/reference/asyncAwait_es6.js

@@ -40,17 +40,12 @@ module M {
 }
 
 //// [asyncAwait_es6.js]
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promise, generator) {
-    return new Promise(function (resolve, reject) {
-        generator = generator.call(thisArg, _arguments);
-        function cast(value) { return value instanceof Promise && value.constructor === Promise ? value : new Promise(function (resolve) { resolve(value); }); }
-        function onfulfill(value) { try { step("next", value); } catch (e) { reject(e); } }
-        function onreject(value) { try { step("throw", value); } catch (e) { reject(e); } }
-        function step(verb, value) {
-            var result = generator[verb](value);
-            result.done ? resolve(result.value) : cast(result.value).then(onfulfill, onreject);
-        }
-        step("next", void 0);
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new P(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.call(thisArg, _arguments)).next());
     });
 };
 function f0() {

tests/baselines/reference/asyncImportedPromise_es6.js

@@ -16,17 +16,12 @@ class Task extends Promise {
 exports.Task = Task;
 //// [test.js]
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promise, generator) {
-    return new Promise(function (resolve, reject) {
-        generator = generator.call(thisArg, _arguments);
-        function cast(value) { return value instanceof Promise && value.constructor === Promise ? value : new Promise(function (resolve) { resolve(value); }); }
-        function onfulfill(value) { try { step("next", value); } catch (e) { reject(e); } }
-        function onreject(value) { try { step("throw", value); } catch (e) { reject(e); } }
-        function step(verb, value) {
-            var result = generator[verb](value);
-            result.done ? resolve(result.value) : cast(result.value).then(onfulfill, onreject);
-        }
-        step("next", void 0);
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new P(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.call(thisArg, _arguments)).next());
     });
 };
 var task_1 = require("./task");

tests/baselines/reference/asyncMultiFile.js

@@ -6,17 +6,12 @@ async function f() {}
 function g() { }
 
 //// [a.js]
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promise, generator) {
-    return new Promise(function (resolve, reject) {
-        generator = generator.call(thisArg, _arguments);
-        function cast(value) { return value instanceof Promise && value.constructor === Promise ? value : new Promise(function (resolve) { resolve(value); }); }
-        function onfulfill(value) { try { step("next", value); } catch (e) { reject(e); } }
-        function onreject(value) { try { step("throw", value); } catch (e) { reject(e); } }
-        function step(verb, value) {
-            var result = generator[verb](value);
-            result.done ? resolve(result.value) : cast(result.value).then(onfulfill, onreject);
-        }
-        step("next", void 0);
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new P(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.call(thisArg, _arguments)).next());
     });
 };
 function f() {

tests/baselines/reference/booleanAssignment.errors.txt

@@ -1,11 +1,5 @@
 tests/cases/compiler/booleanAssignment.ts(2,1): error TS2322: Type 'number' is not assignable to type 'Boolean'.
-  Types of property 'valueOf' are incompatible.
-    Type '() => number' is not assignable to type '() => boolean'.
-      Type 'number' is not assignable to type 'boolean'.
 tests/cases/compiler/booleanAssignment.ts(3,1): error TS2322: Type 'string' is not assignable to type 'Boolean'.
-  Types of property 'valueOf' are incompatible.
-    Type '() => string' is not assignable to type '() => boolean'.
-      Type 'string' is not assignable to type 'boolean'.
 tests/cases/compiler/booleanAssignment.ts(4,1): error TS2322: Type '{}' is not assignable to type 'Boolean'.
   Types of property 'valueOf' are incompatible.
     Type '() => Object' is not assignable to type '() => boolean'.
@@ -17,15 +11,9 @@ tests/cases/compiler/booleanAssignment.ts(4,1): error TS2322: Type '{}' is not a
     b = 1; // Error
     ~
 !!! error TS2322: Type 'number' is not assignable to type 'Boolean'.
-!!! error TS2322:   Types of property 'valueOf' are incompatible.
-!!! error TS2322:     Type '() => number' is not assignable to type '() => boolean'.
-!!! error TS2322:       Type 'number' is not assignable to type 'boolean'.
     b = "a"; // Error
     ~
 !!! error TS2322: Type 'string' is not assignable to type 'Boolean'.
-!!! error TS2322:   Types of property 'valueOf' are incompatible.
-!!! error TS2322:     Type '() => string' is not assignable to type '() => boolean'.
-!!! error TS2322:       Type 'string' is not assignable to type 'boolean'.
     b = {}; // Error
     ~
 !!! error TS2322: Type '{}' is not assignable to type 'Boolean'.

tests/baselines/reference/capturedLetConstInLoop11.js

@@ -0,0 +1,35 @@
+//// [capturedLetConstInLoop11.ts]
+for (;;) {
+    let x = 1;
+    () => x;
+}
+
+function foo() {
+    for (;;) {
+        const a = 0;
+        switch(a) {
+            case 0: return () => a;
+        }
+    }
+}
+
+//// [capturedLetConstInLoop11.js]
+var _loop_1 = function() {
+    var x = 1;
+    (function () { return x; });
+};
+for (;;) {
+    _loop_1();
+}
+function foo() {
+    var _loop_2 = function() {
+        var a = 0;
+        switch (a) {
+            case 0: return { value: function () { return a; } };
+        }
+    };
+    for (;;) {
+        var state_2 = _loop_2();
+        if (typeof state_2 === "object") return state_2.value
+    }
+}

tests/baselines/reference/capturedLetConstInLoop11.symbols

@@ -0,0 +1,24 @@
+=== tests/cases/compiler/capturedLetConstInLoop11.ts ===
+for (;;) {
+    let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop11.ts, 1, 7))
+
+    () => x;
+>x : Symbol(x, Decl(capturedLetConstInLoop11.ts, 1, 7))
+}
+
+function foo() {
+>foo : Symbol(foo, Decl(capturedLetConstInLoop11.ts, 3, 1))
+
+    for (;;) {
+        const a = 0;
+>a : Symbol(a, Decl(capturedLetConstInLoop11.ts, 7, 13))
+
+        switch(a) {
+>a : Symbol(a, Decl(capturedLetConstInLoop11.ts, 7, 13))
+
+            case 0: return () => a;
+>a : Symbol(a, Decl(capturedLetConstInLoop11.ts, 7, 13))
+        }
+    }
+}

tests/baselines/reference/capturedLetConstInLoop11.types

@@ -0,0 +1,29 @@
+=== tests/cases/compiler/capturedLetConstInLoop11.ts ===
+for (;;) {
+    let x = 1;
+>x : number
+>1 : number
+
+    () => x;
+>() => x : () => number
+>x : number
+}
+
+function foo() {
+>foo : () => () => number
+
+    for (;;) {
+        const a = 0;
+>a : number
+>0 : number
+
+        switch(a) {
+>a : number
+
+            case 0: return () => a;
+>0 : number
+>() => a : () => number
+>a : number
+        }
+    }
+}

tests/baselines/reference/capturedLetConstInLoop11_ES6.js

@@ -0,0 +1,28 @@
+//// [capturedLetConstInLoop11_ES6.ts]
+for (;;) {
+    let x = 1;
+    () => x;
+}
+
+function foo() {
+    for (;;) {
+        const a = 0;
+        switch(a) {
+            case 0: return () => a;
+        }
+    }
+}
+
+//// [capturedLetConstInLoop11_ES6.js]
+for (;;) {
+    let x = 1;
+    (() => x);
+}
+function foo() {
+    for (;;) {
+        const a = 0;
+        switch (a) {
+            case 0: return () => a;
+        }
+    }
+}

tests/baselines/reference/capturedLetConstInLoop11_ES6.symbols

@@ -0,0 +1,24 @@
+=== tests/cases/compiler/capturedLetConstInLoop11_ES6.ts ===
+for (;;) {
+    let x = 1;
+>x : Symbol(x, Decl(capturedLetConstInLoop11_ES6.ts, 1, 7))
+
+    () => x;
+>x : Symbol(x, Decl(capturedLetConstInLoop11_ES6.ts, 1, 7))
+}
+
+function foo() {
+>foo : Symbol(foo, Decl(capturedLetConstInLoop11_ES6.ts, 3, 1))
+
+    for (;;) {
+        const a = 0;
+>a : Symbol(a, Decl(capturedLetConstInLoop11_ES6.ts, 7, 13))
+
+        switch(a) {
+>a : Symbol(a, Decl(capturedLetConstInLoop11_ES6.ts, 7, 13))
+
+            case 0: return () => a;
+>a : Symbol(a, Decl(capturedLetConstInLoop11_ES6.ts, 7, 13))
+        }
+    }
+}

tests/baselines/reference/capturedLetConstInLoop11_ES6.types

@@ -0,0 +1,29 @@
+=== tests/cases/compiler/capturedLetConstInLoop11_ES6.ts ===
+for (;;) {
+    let x = 1;
+>x : number
+>1 : number
+
+    () => x;
+>() => x : () => number
+>x : number
+}
+
+function foo() {
+>foo : () => () => number
+
+    for (;;) {
+        const a = 0;
+>a : number
+>0 : number
+
+        switch(a) {
+>a : number
+
+            case 0: return () => a;
+>0 : number
+>() => a : () => number
+>a : number
+        }
+    }
+}

tests/baselines/reference/compoundAdditionAssignmentLHSCannotBeAssigned.errors.txt

@@ -2,7 +2,6 @@ tests/cases/conformance/expressions/assignmentOperator/compoundAdditionAssignmen
 tests/cases/conformance/expressions/assignmentOperator/compoundAdditionAssignmentLHSCannotBeAssigned.ts(8,1): error TS2322: Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/expressions/assignmentOperator/compoundAdditionAssignmentLHSCannotBeAssigned.ts(11,1): error TS2322: Type 'string' is not assignable to type 'E'.
 tests/cases/conformance/expressions/assignmentOperator/compoundAdditionAssignmentLHSCannotBeAssigned.ts(14,1): error TS2322: Type 'string' is not assignable to type '{ a: string; }'.
-  Property 'a' is missing in type 'String'.
 tests/cases/conformance/expressions/assignmentOperator/compoundAdditionAssignmentLHSCannotBeAssigned.ts(17,1): error TS2322: Type 'string' is not assignable to type 'void'.
 
 
@@ -29,7 +28,6 @@ tests/cases/conformance/expressions/assignmentOperator/compoundAdditionAssignmen
     x4 += '';
     ~~
 !!! error TS2322: Type 'string' is not assignable to type '{ a: string; }'.
-!!! error TS2322:   Property 'a' is missing in type 'String'.
     
     var x5: void;
     x5 += '';

tests/baselines/reference/constructorReturnsInvalidType.errors.txt

@@ -1,5 +1,4 @@
 tests/cases/compiler/constructorReturnsInvalidType.ts(3,16): error TS2322: Type 'number' is not assignable to type 'X'.
-  Property 'foo' is missing in type 'Number'.
 tests/cases/compiler/constructorReturnsInvalidType.ts(3,16): error TS2409: Return type of constructor signature must be assignable to the instance type of the class
 
 
@@ -9,7 +8,6 @@ tests/cases/compiler/constructorReturnsInvalidType.ts(3,16): error TS2409: Retur
             return 1;
                    ~
 !!! error TS2322: Type 'number' is not assignable to type 'X'.
-!!! error TS2322:   Property 'foo' is missing in type 'Number'.
                    ~
 !!! error TS2409: Return type of constructor signature must be assignable to the instance type of the class
         }

tests/baselines/reference/constructorWithAssignableReturnExpression.errors.txt

@@ -1,5 +1,4 @@
 tests/cases/conformance/classes/constructorDeclarations/constructorWithAssignableReturnExpression.ts(12,16): error TS2322: Type 'number' is not assignable to type 'D'.
-  Property 'x' is missing in type 'Number'.
 tests/cases/conformance/classes/constructorDeclarations/constructorWithAssignableReturnExpression.ts(12,16): error TS2409: Return type of constructor signature must be assignable to the instance type of the class
 tests/cases/conformance/classes/constructorDeclarations/constructorWithAssignableReturnExpression.ts(26,16): error TS2322: Type '{ x: number; }' is not assignable to type 'F<T>'.
   Types of property 'x' are incompatible.
@@ -22,7 +21,6 @@ tests/cases/conformance/classes/constructorDeclarations/constructorWithAssignabl
             return 1; // error
                    ~
 !!! error TS2322: Type 'number' is not assignable to type 'D'.
-!!! error TS2322:   Property 'x' is missing in type 'Number'.
                    ~
 !!! error TS2409: Return type of constructor signature must be assignable to the instance type of the class
         }

tests/baselines/reference/contextualTyping21.errors.txt

@@ -1,7 +1,6 @@
 tests/cases/compiler/contextualTyping21.ts(1,36): error TS2322: Type '({ id: number; } | number)[]' is not assignable to type '{ id: number; }[]'.
   Type '{ id: number; } | number' is not assignable to type '{ id: number; }'.
     Type 'number' is not assignable to type '{ id: number; }'.
-      Property 'id' is missing in type 'Number'.
 
 
 ==== tests/cases/compiler/contextualTyping21.ts (1 errors) ====
@@ -9,5 +8,4 @@ tests/cases/compiler/contextualTyping21.ts(1,36): error TS2322: Type '({ id: num
                                        ~~~
 !!! error TS2322: Type '({ id: number; } | number)[]' is not assignable to type '{ id: number; }[]'.
 !!! error TS2322:   Type '{ id: number; } | number' is not assignable to type '{ id: number; }'.
-!!! error TS2322:     Type 'number' is not assignable to type '{ id: number; }'.
-!!! error TS2322:       Property 'id' is missing in type 'Number'.
+!!! error TS2322:     Type 'number' is not assignable to type '{ id: number; }'.

tests/baselines/reference/contextualTyping33.errors.txt

@@ -1,6 +1,7 @@
 tests/cases/compiler/contextualTyping33.ts(1,66): error TS2345: Argument of type '((() => number) | (() => string))[]' is not assignable to parameter of type '{ (): number; (i: number): number; }[]'.
   Type '(() => number) | (() => string)' is not assignable to type '{ (): number; (i: number): number; }'.
     Type '() => string' is not assignable to type '{ (): number; (i: number): number; }'.
+      Type 'string' is not assignable to type 'number'.
 
 
 ==== tests/cases/compiler/contextualTyping33.ts (1 errors) ====
@@ -8,4 +9,5 @@ tests/cases/compiler/contextualTyping33.ts(1,66): error TS2345: Argument of type
                                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '((() => number) | (() => string))[]' is not assignable to parameter of type '{ (): number; (i: number): number; }[]'.
 !!! error TS2345:   Type '(() => number) | (() => string)' is not assignable to type '{ (): number; (i: number): number; }'.
-!!! error TS2345:     Type '() => string' is not assignable to type '{ (): number; (i: number): number; }'.
+!!! error TS2345:     Type '() => string' is not assignable to type '{ (): number; (i: number): number; }'.
+!!! error TS2345:       Type 'string' is not assignable to type 'number'.

tests/baselines/reference/contextualTypingOfArrayLiterals1.errors.txt

@@ -2,7 +2,6 @@ tests/cases/compiler/contextualTypingOfArrayLiterals1.ts(5,5): error TS2322: Typ
   Index signatures are incompatible.
     Type 'Date | number' is not assignable to type 'Date'.
       Type 'number' is not assignable to type 'Date'.
-        Property 'toDateString' is missing in type 'Number'.
 
 
 ==== tests/cases/compiler/contextualTypingOfArrayLiterals1.ts (1 errors) ====
@@ -16,7 +15,6 @@ tests/cases/compiler/contextualTypingOfArrayLiterals1.ts(5,5): error TS2322: Typ
 !!! error TS2322:   Index signatures are incompatible.
 !!! error TS2322:     Type 'Date | number' is not assignable to type 'Date'.
 !!! error TS2322:       Type 'number' is not assignable to type 'Date'.
-!!! error TS2322:         Property 'toDateString' is missing in type 'Number'.
     var r2 = x3[1]; 
     r2.getDate(); 
     

tests/baselines/reference/contextualTypingOfConditionalExpression2.errors.txt

@@ -2,7 +2,6 @@ tests/cases/compiler/contextualTypingOfConditionalExpression2.ts(11,5): error TS
   Type '(b: number) => void' is not assignable to type '(a: A) => void'.
     Types of parameters 'b' and 'a' are incompatible.
       Type 'number' is not assignable to type 'A'.
-        Property 'foo' is missing in type 'Number'.
 
 
 ==== tests/cases/compiler/contextualTypingOfConditionalExpression2.ts (1 errors) ====
@@ -22,5 +21,4 @@ tests/cases/compiler/contextualTypingOfConditionalExpression2.ts(11,5): error TS
 !!! error TS2322:   Type '(b: number) => void' is not assignable to type '(a: A) => void'.
 !!! error TS2322:     Types of parameters 'b' and 'a' are incompatible.
 !!! error TS2322:       Type 'number' is not assignable to type 'A'.
-!!! error TS2322:         Property 'foo' is missing in type 'Number'.
     

tests/baselines/reference/contextualTypingOfGenericFunctionTypedArguments1.errors.txt

@@ -1,6 +1,5 @@
 tests/cases/compiler/contextualTypingOfGenericFunctionTypedArguments1.ts(16,32): error TS2345: Argument of type '(x: number) => string' is not assignable to parameter of type '(x: number) => Date'.
   Type 'string' is not assignable to type 'Date'.
-    Property 'toDateString' is missing in type 'String'.
 tests/cases/compiler/contextualTypingOfGenericFunctionTypedArguments1.ts(17,32): error TS2345: Argument of type '(x: number) => string' is not assignable to parameter of type '(x: number) => Date'.
   Type 'string' is not assignable to type 'Date'.
 
@@ -25,7 +24,6 @@ tests/cases/compiler/contextualTypingOfGenericFunctionTypedArguments1.ts(17,32):
                                    ~
 !!! error TS2345: Argument of type '(x: number) => string' is not assignable to parameter of type '(x: number) => Date'.
 !!! error TS2345:   Type 'string' is not assignable to type 'Date'.
-!!! error TS2345:     Property 'toDateString' is missing in type 'String'.
     var r6 = _.forEach<number>(c2, (x) => { return x.toFixed() }); 
                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: number) => string' is not assignable to parameter of type '(x: number) => Date'.

tests/baselines/reference/declarationEmit_UnknownImport.errors.txt

@@ -0,0 +1,15 @@
+tests/cases/compiler/declarationEmit_UnknownImport.ts(2,1): error TS2304: Cannot find name 'SomeNonExistingName'.
+tests/cases/compiler/declarationEmit_UnknownImport.ts(2,14): error TS2503: Cannot find namespace 'SomeNonExistingName'.
+tests/cases/compiler/declarationEmit_UnknownImport.ts(2,14): error TS4000: Import declaration 'Foo' is using private name 'SomeNonExistingName'.
+
+
+==== tests/cases/compiler/declarationEmit_UnknownImport.ts (3 errors) ====
+    
+    import Foo = SomeNonExistingName
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2304: Cannot find name 'SomeNonExistingName'.
+                 ~~~~~~~~~~~~~~~~~~~
+!!! error TS2503: Cannot find namespace 'SomeNonExistingName'.
+                 ~~~~~~~~~~~~~~~~~~~
+!!! error TS4000: Import declaration 'Foo' is using private name 'SomeNonExistingName'.
+    export {Foo}

tests/baselines/reference/declarationEmit_UnknownImport.js

@@ -0,0 +1,7 @@
+//// [declarationEmit_UnknownImport.ts]
+
+import Foo = SomeNonExistingName
+export {Foo}
+
+//// [declarationEmit_UnknownImport.js]
+"use strict";

tests/baselines/reference/declarationEmit_UnknownImport2.errors.txt

@@ -0,0 +1,21 @@
+tests/cases/compiler/declarationEmit_UnknownImport2.ts(2,1): error TS2304: Cannot find name 'From'.
+tests/cases/compiler/declarationEmit_UnknownImport2.ts(2,12): error TS1005: '=' expected.
+tests/cases/compiler/declarationEmit_UnknownImport2.ts(2,12): error TS2503: Cannot find namespace 'From'.
+tests/cases/compiler/declarationEmit_UnknownImport2.ts(2,12): error TS4000: Import declaration 'Foo' is using private name 'From'.
+tests/cases/compiler/declarationEmit_UnknownImport2.ts(2,17): error TS1005: ';' expected.
+
+
+==== tests/cases/compiler/declarationEmit_UnknownImport2.ts (5 errors) ====
+    
+    import Foo From './Foo'; // Syntax error
+    ~~~~~~~~~~~~~~~
+!!! error TS2304: Cannot find name 'From'.
+               ~~~~
+!!! error TS1005: '=' expected.
+               ~~~~
+!!! error TS2503: Cannot find namespace 'From'.
+               ~~~~
+!!! error TS4000: Import declaration 'Foo' is using private name 'From'.
+                    ~~~~~~~
+!!! error TS1005: ';' expected.
+    export default Foo

tests/baselines/reference/declarationEmit_UnknownImport2.js

@@ -0,0 +1,8 @@
+//// [declarationEmit_UnknownImport2.ts]
+
+import Foo From './Foo'; // Syntax error
+export default Foo
+
+//// [declarationEmit_UnknownImport2.js]
+"use strict";
+'./Foo'; // Syntax error

tests/baselines/reference/destructuringArrayBindingPatternAndAssignment2.errors.txt

@@ -5,7 +5,6 @@ tests/cases/conformance/es6/destructuring/destructuringArrayBindingPatternAndAss
   Types of property '1' are incompatible.
     Type 'number' is not assignable to type 'boolean'.
 tests/cases/conformance/es6/destructuring/destructuringArrayBindingPatternAndAssignment2.ts(17,6): error TS2322: Type 'string' is not assignable to type 'Number'.
-  Property 'toFixed' is missing in type 'String'.
 tests/cases/conformance/es6/destructuring/destructuringArrayBindingPatternAndAssignment2.ts(22,5): error TS2322: Type 'number[]' is not assignable to type '[number, number]'.
   Property '0' is missing in type 'number[]'.
 tests/cases/conformance/es6/destructuring/destructuringArrayBindingPatternAndAssignment2.ts(23,5): error TS2322: Type 'number[]' is not assignable to type '[string, string]'.
@@ -43,7 +42,6 @@ tests/cases/conformance/es6/destructuring/destructuringArrayBindingPatternAndAss
     var [b3 = "string", b4, b5] = bar();  // Error
          ~~
 !!! error TS2322: Type 'string' is not assignable to type 'Number'.
-!!! error TS2322:   Property 'toFixed' is missing in type 'String'.
     
     // V is an array assignment pattern, S is the type Any or an array-like type (section 3.3.2), and, for each assignment element E in V,
     //      S is not a tuple- like type and the numeric index signature type of S is assignable to the target given in E.

tests/baselines/reference/destructuringParameterDeclaration2.errors.txt

@@ -8,7 +8,6 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(
       Type 'number | string[][] | string' is not assignable to type 'number | string[][]'.
         Type 'string' is not assignable to type 'number | string[][]'.
           Type 'string' is not assignable to type 'string[][]'.
-            Property 'push' is missing in type 'String'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(16,8): error TS2371: A parameter initializer is only allowed in a function or constructor implementation.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(16,16): error TS2371: A parameter initializer is only allowed in a function or constructor implementation.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(23,14): error TS2345: Argument of type '{ x: string; y: boolean; }' is not assignable to parameter of type '{ x: number; y: any; }'.
@@ -34,7 +33,6 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(39,4): error TS2345: Argument of type '[number, number, boolean, boolean]' is not assignable to parameter of type '[any, any, [[any]]]'.
   Types of property '2' are incompatible.
     Type 'boolean' is not assignable to type '[[any]]'.
-      Property '0' is missing in type 'Boolean'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(40,4): error TS2345: Argument of type '[number, number, [[string]]]' is not assignable to parameter of type '[any, any, [[number]]]'.
   Types of property '2' are incompatible.
     Type '[[string]]' is not assignable to type '[[number]]'.
@@ -78,7 +76,6 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(
 !!! error TS2345:       Type 'number | string[][] | string' is not assignable to type 'number | string[][]'.
 !!! error TS2345:         Type 'string' is not assignable to type 'number | string[][]'.
 !!! error TS2345:           Type 'string' is not assignable to type 'string[][]'.
-!!! error TS2345:             Property 'push' is missing in type 'String'.
     
     
     // If the declaration includes an initializer expression (which is permitted only
@@ -146,7 +143,6 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(
 !!! error TS2345: Argument of type '[number, number, boolean, boolean]' is not assignable to parameter of type '[any, any, [[any]]]'.
 !!! error TS2345:   Types of property '2' are incompatible.
 !!! error TS2345:     Type 'boolean' is not assignable to type '[[any]]'.
-!!! error TS2345:       Property '0' is missing in type 'Boolean'.
     c6([1, 2, [["string"]]]);  // Error, implied type is [any, any, [[number]]]  // Use initializer
        ~~~~~~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '[number, number, [[string]]]' is not assignable to parameter of type '[any, any, [[number]]]'.

tests/baselines/reference/destructuringParameterDeclaration4.errors.txt

@@ -6,7 +6,6 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(22,4): error TS2345: Argument of type '[number, number, string, boolean, boolean]' is not assignable to parameter of type '[any, any, [[any]]]'.
   Types of property '2' are incompatible.
     Type 'string' is not assignable to type '[[any]]'.
-      Property '0' is missing in type 'String'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(23,4): error TS2345: Argument of type '[number, number]' is not assignable to parameter of type '[any, any, [[any]]]'.
   Property '2' is missing in type '[number, number]'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(24,4): error TS2345: Argument of type '(number | string)[]' is not assignable to parameter of type 'number[]'.
@@ -53,7 +52,6 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(
 !!! error TS2345: Argument of type '[number, number, string, boolean, boolean]' is not assignable to parameter of type '[any, any, [[any]]]'.
 !!! error TS2345:   Types of property '2' are incompatible.
 !!! error TS2345:     Type 'string' is not assignable to type '[[any]]'.
-!!! error TS2345:       Property '0' is missing in type 'String'.
     a5([1, 2]);                              // Error, parameter type is [any, any, [[any]]]
        ~~~~~~
 !!! error TS2345: Argument of type '[number, number]' is not assignable to parameter of type '[any, any, [[any]]]'.

tests/baselines/reference/destructuringParameterDeclaration5.errors.txt

@@ -1,6 +1,7 @@
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts(47,4): error TS2345: Argument of type '{ y: Class; }' is not assignable to parameter of type '{ y: D; }'.
   Types of property 'y' are incompatible.
     Type 'Class' is not assignable to type 'D'.
+      Property 'foo' is missing in type 'Class'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts(48,4): error TS2345: Argument of type '{}' is not assignable to parameter of type '{ y: D; }'.
   Property 'y' is missing in type '{}'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts(49,4): error TS2345: Argument of type '{ y: number; }' is not assignable to parameter of type '{ y: D; }'.
@@ -63,6 +64,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration5.ts(
 !!! error TS2345: Argument of type '{ y: Class; }' is not assignable to parameter of type '{ y: D; }'.
 !!! error TS2345:   Types of property 'y' are incompatible.
 !!! error TS2345:     Type 'Class' is not assignable to type 'D'.
+!!! error TS2345:       Property 'foo' is missing in type 'Class'.
     d3({});
        ~~
 !!! error TS2345: Argument of type '{}' is not assignable to parameter of type '{ y: D; }'.

tests/baselines/reference/dontShowCompilerGeneratedMembers.errors.txt

@@ -1,5 +1,4 @@
 tests/cases/compiler/dontShowCompilerGeneratedMembers.ts(1,5): error TS2322: Type 'number' is not assignable to type '{ (): any; x: number; }'.
-  Property 'x' is missing in type 'Number'.
 tests/cases/compiler/dontShowCompilerGeneratedMembers.ts(3,6): error TS1139: Type parameter declaration expected.
 tests/cases/compiler/dontShowCompilerGeneratedMembers.ts(4,1): error TS1109: Expression expected.
 
@@ -8,7 +7,6 @@ tests/cases/compiler/dontShowCompilerGeneratedMembers.ts(4,1): error TS1109: Exp
     var f: {
         ~
 !!! error TS2322: Type 'number' is not assignable to type '{ (): any; x: number; }'.
-!!! error TS2322:   Property 'x' is missing in type 'Number'.
         x: number;
         <-
          ~

tests/baselines/reference/enumAssignability.errors.txt

@@ -3,23 +3,16 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssi
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignability.ts(29,9): error TS2322: Type 'E' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignability.ts(30,9): error TS2322: Type 'E' is not assignable to type 'boolean'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignability.ts(31,9): error TS2322: Type 'E' is not assignable to type 'Date'.
-  Property 'toDateString' is missing in type 'Number'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignability.ts(33,9): error TS2322: Type 'E' is not assignable to type 'void'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignability.ts(36,9): error TS2322: Type 'E' is not assignable to type '() => {}'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignability.ts(37,9): error TS2322: Type 'E' is not assignable to type 'Function'.
-  Property 'apply' is missing in type 'Number'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignability.ts(38,9): error TS2322: Type 'E' is not assignable to type '(x: number) => string'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignability.ts(39,5): error TS2322: Type 'E' is not assignable to type 'C'.
-  Property 'foo' is missing in type 'Number'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignability.ts(40,5): error TS2322: Type 'E' is not assignable to type 'I'.
-  Property 'foo' is missing in type 'Number'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignability.ts(41,9): error TS2322: Type 'E' is not assignable to type 'number[]'.
-  Property 'length' is missing in type 'Number'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignability.ts(42,9): error TS2322: Type 'E' is not assignable to type '{ foo: string; }'.
-  Property 'foo' is missing in type 'Number'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignability.ts(43,9): error TS2322: Type 'E' is not assignable to type '<T>(x: T) => T'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignability.ts(45,9): error TS2322: Type 'E' is not assignable to type 'String'.
-  Property 'charAt' is missing in type 'Number'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignability.ts(48,9): error TS2322: Type 'E' is not assignable to type 'T'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignability.ts(49,9): error TS2322: Type 'E' is not assignable to type 'U'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignability.ts(50,9): error TS2322: Type 'E' is not assignable to type 'V'.
@@ -69,7 +62,6 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssi
         var ee: Date = e;
             ~~
 !!! error TS2322: Type 'E' is not assignable to type 'Date'.
-!!! error TS2322:   Property 'toDateString' is missing in type 'Number'.
         var f: any = e; // ok
         var g: void = e;
             ~
@@ -82,26 +74,21 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssi
         var k: Function = e;
             ~
 !!! error TS2322: Type 'E' is not assignable to type 'Function'.
-!!! error TS2322:   Property 'apply' is missing in type 'Number'.
         var l: (x: number) => string = e;
             ~
 !!! error TS2322: Type 'E' is not assignable to type '(x: number) => string'.
         ac = e;
         ~~
 !!! error TS2322: Type 'E' is not assignable to type 'C'.
-!!! error TS2322:   Property 'foo' is missing in type 'Number'.
         ai = e;
         ~~
 !!! error TS2322: Type 'E' is not assignable to type 'I'.
-!!! error TS2322:   Property 'foo' is missing in type 'Number'.
         var m: number[] = e;
             ~
 !!! error TS2322: Type 'E' is not assignable to type 'number[]'.
-!!! error TS2322:   Property 'length' is missing in type 'Number'.
         var n: { foo: string } = e;
             ~
 !!! error TS2322: Type 'E' is not assignable to type '{ foo: string; }'.
-!!! error TS2322:   Property 'foo' is missing in type 'Number'.
         var o: <T>(x: T) => T = e;
             ~
 !!! error TS2322: Type 'E' is not assignable to type '<T>(x: T) => T'.
@@ -109,7 +96,6 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssi
         var q: String = e;
             ~
 !!! error TS2322: Type 'E' is not assignable to type 'String'.
-!!! error TS2322:   Property 'charAt' is missing in type 'Number'.
     
         function foo<T, U extends T, V extends Date, A extends Number, B extends E>(x: T, y: U, z: V) {
             x = e;

tests/baselines/reference/enumAssignmentCompat.errors.txt

@@ -1,9 +1,7 @@
 tests/cases/compiler/enumAssignmentCompat.ts(26,5): error TS2322: Type 'typeof W' is not assignable to type 'number'.
 tests/cases/compiler/enumAssignmentCompat.ts(28,5): error TS2322: Type 'W' is not assignable to type 'typeof W'.
-  Property 'D' is missing in type 'Number'.
 tests/cases/compiler/enumAssignmentCompat.ts(30,5): error TS2322: Type 'number' is not assignable to type 'typeof W'.
 tests/cases/compiler/enumAssignmentCompat.ts(32,5): error TS2322: Type 'W' is not assignable to type 'WStatic'.
-  Property 'a' is missing in type 'Number'.
 tests/cases/compiler/enumAssignmentCompat.ts(33,5): error TS2322: Type 'number' is not assignable to type 'WStatic'.
 
 
@@ -40,7 +38,6 @@ tests/cases/compiler/enumAssignmentCompat.ts(33,5): error TS2322: Type 'number'
     var b: typeof W = W.a; // error
         ~
 !!! error TS2322: Type 'W' is not assignable to type 'typeof W'.
-!!! error TS2322:   Property 'D' is missing in type 'Number'.
     var c: typeof W.a = W.a;
     var d: typeof W = 3; // error
         ~
@@ -49,7 +46,6 @@ tests/cases/compiler/enumAssignmentCompat.ts(33,5): error TS2322: Type 'number'
     var f: WStatic = W.a; // error
         ~
 !!! error TS2322: Type 'W' is not assignable to type 'WStatic'.
-!!! error TS2322:   Property 'a' is missing in type 'Number'.
     var g: WStatic = 5; // error
         ~
 !!! error TS2322: Type 'number' is not assignable to type 'WStatic'.

tests/baselines/reference/enumAssignmentCompat2.errors.txt

@@ -1,9 +1,7 @@
 tests/cases/compiler/enumAssignmentCompat2.ts(25,5): error TS2322: Type 'typeof W' is not assignable to type 'number'.
 tests/cases/compiler/enumAssignmentCompat2.ts(27,5): error TS2322: Type 'W' is not assignable to type 'typeof W'.
-  Property 'a' is missing in type 'Number'.
 tests/cases/compiler/enumAssignmentCompat2.ts(29,5): error TS2322: Type 'number' is not assignable to type 'typeof W'.
 tests/cases/compiler/enumAssignmentCompat2.ts(31,5): error TS2322: Type 'W' is not assignable to type 'WStatic'.
-  Property 'a' is missing in type 'Number'.
 tests/cases/compiler/enumAssignmentCompat2.ts(32,5): error TS2322: Type 'number' is not assignable to type 'WStatic'.
 
 
@@ -39,7 +37,6 @@ tests/cases/compiler/enumAssignmentCompat2.ts(32,5): error TS2322: Type 'number'
     var b: typeof W = W.a; // error
         ~
 !!! error TS2322: Type 'W' is not assignable to type 'typeof W'.
-!!! error TS2322:   Property 'a' is missing in type 'Number'.
     var c: typeof W.a = W.a;
     var d: typeof W = 3; // error
         ~
@@ -48,7 +45,6 @@ tests/cases/compiler/enumAssignmentCompat2.ts(32,5): error TS2322: Type 'number'
     var f: WStatic = W.a; // error
         ~
 !!! error TS2322: Type 'W' is not assignable to type 'WStatic'.
-!!! error TS2322:   Property 'a' is missing in type 'Number'.
     var g: WStatic = 5; // error
         ~
 !!! error TS2322: Type 'number' is not assignable to type 'WStatic'.

tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt

@@ -1,7 +1,6 @@
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(34,5): error TS2322: Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(35,5): error TS2322: Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(36,5): error TS2322: Type 'number' is not assignable to type 'Date'.
-  Property 'toDateString' is missing in type 'Number'.
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(38,5): error TS2322: Type 'number' is not assignable to type 'void'.
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(40,5): error TS2322: Type 'D<{}>' is not assignable to type 'I'.
   Property 'id' is missing in type 'D<{}>'.
@@ -76,7 +75,6 @@ tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAnd
     var aDate: Date = 9.9;
         ~~~~~
 !!! error TS2322: Type 'number' is not assignable to type 'Date'.
-!!! error TS2322:   Property 'toDateString' is missing in type 'Number'.
     
     var aVoid: void = 9.9;
         ~~~~~

tests/baselines/reference/exportAssignmentConstrainedGenericType.errors.txt

@@ -1,5 +1,4 @@
 tests/cases/conformance/externalModules/foo_1.ts(2,17): error TS2345: Argument of type 'boolean' is not assignable to parameter of type '{ a: string; b: number; }'.
-  Property 'a' is missing in type 'Boolean'.
 
 
 ==== tests/cases/conformance/externalModules/foo_1.ts (1 errors) ====
@@ -7,7 +6,6 @@ tests/cases/conformance/externalModules/foo_1.ts(2,17): error TS2345: Argument o
     var x = new foo(true); // Should error
                     ~~~~
 !!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type '{ a: string; b: number; }'.
-!!! error TS2345:   Property 'a' is missing in type 'Boolean'.
     var y = new foo({a: "test", b: 42}); // Should be OK
     var z: number = y.test.b;
 ==== tests/cases/conformance/externalModules/foo_0.ts (0 errors) ====

tests/baselines/reference/functionCall7.errors.txt

@@ -1,6 +1,5 @@
 tests/cases/compiler/functionCall7.ts(5,1): error TS2346: Supplied parameters do not match any signature of call target.
 tests/cases/compiler/functionCall7.ts(6,5): error TS2345: Argument of type 'number' is not assignable to parameter of type 'c1'.
-  Property 'a' is missing in type 'Number'.
 tests/cases/compiler/functionCall7.ts(7,1): error TS2346: Supplied parameters do not match any signature of call target.
 
 
@@ -15,7 +14,6 @@ tests/cases/compiler/functionCall7.ts(7,1): error TS2346: Supplied parameters do
     foo(4);
         ~
 !!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'c1'.
-!!! error TS2345:   Property 'a' is missing in type 'Number'.
     foo();
     ~~~~~
 !!! error TS2346: Supplied parameters do not match any signature of call target.

tests/baselines/reference/functionConstraintSatisfaction2.errors.txt

@@ -1,5 +1,4 @@
 tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction2.ts(5,5): error TS2345: Argument of type 'number' is not assignable to parameter of type 'Function'.
-  Property 'apply' is missing in type 'Number'.
 tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction2.ts(6,1): error TS2346: Supplied parameters do not match any signature of call target.
 tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction2.ts(7,1): error TS2346: Supplied parameters do not match any signature of call target.
 tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction2.ts(23,14): error TS2345: Argument of type 'Function' is not assignable to parameter of type '(x: string) => string'.
@@ -20,9 +19,11 @@ tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstrain
   Type 'F2' provides no match for the signature '(x: string): string'
 tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction2.ts(37,10): error TS2345: Argument of type 'T' is not assignable to parameter of type '(x: string) => string'.
   Type '() => void' is not assignable to type '(x: string) => string'.
+    Type 'void' is not assignable to type 'string'.
 tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction2.ts(38,10): error TS2345: Argument of type 'U' is not assignable to parameter of type '(x: string) => string'.
   Type 'T' is not assignable to type '(x: string) => string'.
     Type '() => void' is not assignable to type '(x: string) => string'.
+      Type 'void' is not assignable to type 'string'.
 
 
 ==== tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction2.ts (13 errors) ====
@@ -33,7 +34,6 @@ tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstrain
     foo(1);
         ~
 !!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'Function'.
-!!! error TS2345:   Property 'apply' is missing in type 'Number'.
     foo(() => { }, 1);
     ~~~~~~~~~~~~~~~~~
 !!! error TS2346: Supplied parameters do not match any signature of call target.
@@ -97,10 +97,12 @@ tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstrain
              ~
 !!! error TS2345: Argument of type 'T' is not assignable to parameter of type '(x: string) => string'.
 !!! error TS2345:   Type '() => void' is not assignable to type '(x: string) => string'.
+!!! error TS2345:     Type 'void' is not assignable to type 'string'.
         foo2(y);
              ~
 !!! error TS2345: Argument of type 'U' is not assignable to parameter of type '(x: string) => string'.
 !!! error TS2345:   Type 'T' is not assignable to type '(x: string) => string'.
 !!! error TS2345:     Type '() => void' is not assignable to type '(x: string) => string'.
+!!! error TS2345:       Type 'void' is not assignable to type 'string'.
     }
     

tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.errors.txt

@@ -1,5 +1,4 @@
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference2.ts(11,26): error TS2345: Argument of type 'number' is not assignable to parameter of type 'Date'.
-  Property 'toDateString' is missing in type 'Number'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference2.ts (1 errors) ====
@@ -16,5 +15,4 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithCon
     var r4 = foo<Date, Date>(1); // error
                              ~
 !!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'Date'.
-!!! error TS2345:   Property 'toDateString' is missing in type 'Number'.
     var r5 = foo<Date, Date>(new Date()); // no error

tests/baselines/reference/genericCombinators2.errors.txt

@@ -1,6 +1,5 @@
 tests/cases/compiler/genericCombinators2.ts(15,43): error TS2345: Argument of type '(x: number, y: string) => string' is not assignable to parameter of type '(x: number, y: string) => Date'.
   Type 'string' is not assignable to type 'Date'.
-    Property 'toDateString' is missing in type 'String'.
 tests/cases/compiler/genericCombinators2.ts(16,43): error TS2345: Argument of type '(x: number, y: string) => string' is not assignable to parameter of type '(x: number, y: string) => Date'.
   Type 'string' is not assignable to type 'Date'.
 
@@ -24,7 +23,6 @@ tests/cases/compiler/genericCombinators2.ts(16,43): error TS2345: Argument of ty
                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: number, y: string) => string' is not assignable to parameter of type '(x: number, y: string) => Date'.
 !!! error TS2345:   Type 'string' is not assignable to type 'Date'.
-!!! error TS2345:     Property 'toDateString' is missing in type 'String'.
     var r5b = _.map<number, string, Date>(c2, rf1);
                                               ~~~
 !!! error TS2345: Argument of type '(x: number, y: string) => string' is not assignable to parameter of type '(x: number, y: string) => Date'.

tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.errors.txt

@@ -1,7 +1,6 @@
 tests/cases/compiler/genericDerivedTypeWithSpecializedBase2.ts(11,1): error TS2322: Type 'B<number>' is not assignable to type 'A<{ length: number; foo: number; }>'.
   Types of property 'x' are incompatible.
     Type 'string' is not assignable to type '{ length: number; foo: number; }'.
-      Property 'foo' is missing in type 'String'.
 
 
 ==== tests/cases/compiler/genericDerivedTypeWithSpecializedBase2.ts (1 errors) ====
@@ -20,5 +19,4 @@ tests/cases/compiler/genericDerivedTypeWithSpecializedBase2.ts(11,1): error TS23
 !!! error TS2322: Type 'B<number>' is not assignable to type 'A<{ length: number; foo: number; }>'.
 !!! error TS2322:   Types of property 'x' are incompatible.
 !!! error TS2322:     Type 'string' is not assignable to type '{ length: number; foo: number; }'.
-!!! error TS2322:       Property 'foo' is missing in type 'String'.
     

tests/baselines/reference/genericRestArgs.errors.txt

@@ -4,7 +4,6 @@ tests/cases/compiler/genericRestArgs.ts(5,34): error TS2345: Argument of type 's
 tests/cases/compiler/genericRestArgs.ts(10,12): error TS2453: The type argument for type parameter 'T' cannot be inferred from the usage. Consider specifying the type arguments explicitly.
   Type argument candidate 'number' is not a valid type argument because it is not a supertype of candidate 'string'.
 tests/cases/compiler/genericRestArgs.ts(12,30): error TS2345: Argument of type 'number' is not assignable to parameter of type 'any[]'.
-  Property 'length' is missing in type 'Number'.
 
 
 ==== tests/cases/compiler/genericRestArgs.ts (4 errors) ====
@@ -29,5 +28,4 @@ tests/cases/compiler/genericRestArgs.ts(12,30): error TS2345: Argument of type '
     var a2Gb = makeArrayG<any>(1, "");
     var a2Gc = makeArrayG<any[]>(1, ""); // error
                                  ~
-!!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'any[]'.
-!!! error TS2345:   Property 'length' is missing in type 'Number'.
+!!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'any[]'.

tests/baselines/reference/globalIsContextualKeyword.js

@@ -0,0 +1,34 @@
+//// [globalIsContextualKeyword.ts]
+function a() {
+    let global = 1;
+}
+function b() {
+    class global {}
+}
+
+namespace global {
+}
+
+function foo(global: number) {
+}
+
+let obj = {
+    global: "123"
+}
+
+//// [globalIsContextualKeyword.js]
+function a() {
+    var global = 1;
+}
+function b() {
+    var global = (function () {
+        function global() {
+        }
+        return global;
+    }());
+}
+function foo(global) {
+}
+var obj = {
+    global: "123"
+};

tests/baselines/reference/globalIsContextualKeyword.symbols

@@ -0,0 +1,29 @@
+=== tests/cases/compiler/globalIsContextualKeyword.ts ===
+function a() {
+>a : Symbol(a, Decl(globalIsContextualKeyword.ts, 0, 0))
+
+    let global = 1;
+>global : Symbol(global, Decl(globalIsContextualKeyword.ts, 1, 7))
+}
+function b() {
+>b : Symbol(b, Decl(globalIsContextualKeyword.ts, 2, 1))
+
+    class global {}
+>global : Symbol(global, Decl(globalIsContextualKeyword.ts, 3, 14))
+}
+
+namespace global {
+>global : Symbol(global, Decl(globalIsContextualKeyword.ts, 5, 1))
+}
+
+function foo(global: number) {
+>foo : Symbol(foo, Decl(globalIsContextualKeyword.ts, 8, 1))
+>global : Symbol(global, Decl(globalIsContextualKeyword.ts, 10, 13))
+}
+
+let obj = {
+>obj : Symbol(obj, Decl(globalIsContextualKeyword.ts, 13, 3))
+
+    global: "123"
+>global : Symbol(global, Decl(globalIsContextualKeyword.ts, 13, 11))
+}

tests/baselines/reference/globalIsContextualKeyword.types

@@ -0,0 +1,32 @@
+=== tests/cases/compiler/globalIsContextualKeyword.ts ===
+function a() {
+>a : () => void
+
+    let global = 1;
+>global : number
+>1 : number
+}
+function b() {
+>b : () => void
+
+    class global {}
+>global : global
+}
+
+namespace global {
+>global : any
+}
+
+function foo(global: number) {
+>foo : (global: number) => void
+>global : number
+}
+
+let obj = {
+>obj : { global: string; }
+>{    global: "123"} : { global: string; }
+
+    global: "123"
+>global : string
+>"123" : string
+}

tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.errors.txt

@@ -1,6 +1,6 @@
 tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts(1,20): error TS2307: Cannot find module 'externalModule'.
-tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts(2,16): error TS2435: Ambient modules cannot be nested in other modules or namespaces.
+tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts(2,16): error TS2664: Invalid module name in augmentation, module 'm1' cannot be found.
 tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts(3,26): error TS2307: Cannot find module 'externalModule'.
 
 
@@ -12,7 +12,7 @@ tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts(3,26): er
 !!! error TS2307: Cannot find module 'externalModule'.
     declare module "m1" {
                    ~~~~
-!!! error TS2435: Ambient modules cannot be nested in other modules or namespaces.
+!!! error TS2664: Invalid module name in augmentation, module 'm1' cannot be found.
         import im2 = require("externalModule");
                              ~~~~~~~~~~~~~~~~
 !!! error TS2307: Cannot find module 'externalModule'.

tests/baselines/reference/initializerReferencingConstructorParameters.errors.txt

@@ -1,9 +1,9 @@
 tests/cases/conformance/classes/propertyMemberDeclarations/initializerReferencingConstructorParameters.ts(4,9): error TS2304: Cannot find name 'x'.
 tests/cases/conformance/classes/propertyMemberDeclarations/initializerReferencingConstructorParameters.ts(5,15): error TS2304: Cannot find name 'x'.
-tests/cases/conformance/classes/propertyMemberDeclarations/initializerReferencingConstructorParameters.ts(10,9): error TS2304: Cannot find name 'x'.
+tests/cases/conformance/classes/propertyMemberDeclarations/initializerReferencingConstructorParameters.ts(10,9): error TS2663: Cannot find name 'x'. Did you mean the instance member 'this.x'?
 tests/cases/conformance/classes/propertyMemberDeclarations/initializerReferencingConstructorParameters.ts(11,15): error TS2304: Cannot find name 'x'.
 tests/cases/conformance/classes/propertyMemberDeclarations/initializerReferencingConstructorParameters.ts(17,15): error TS1003: Identifier expected.
-tests/cases/conformance/classes/propertyMemberDeclarations/initializerReferencingConstructorParameters.ts(23,9): error TS2304: Cannot find name 'x'.
+tests/cases/conformance/classes/propertyMemberDeclarations/initializerReferencingConstructorParameters.ts(23,9): error TS2663: Cannot find name 'x'. Did you mean the instance member 'this.x'?
 
 
 ==== tests/cases/conformance/classes/propertyMemberDeclarations/initializerReferencingConstructorParameters.ts (6 errors) ====
@@ -22,7 +22,7 @@ tests/cases/conformance/classes/propertyMemberDeclarations/initializerReferencin
     class D {
         a = x; // error
             ~
-!!! error TS2304: Cannot find name 'x'.
+!!! error TS2663: Cannot find name 'x'. Did you mean the instance member 'this.x'?
         b: typeof x; // error
                   ~
 !!! error TS2304: Cannot find name 'x'.
@@ -41,6 +41,6 @@ tests/cases/conformance/classes/propertyMemberDeclarations/initializerReferencin
         a = this.x; // ok
         b = x; // error
             ~
-!!! error TS2304: Cannot find name 'x'.
+!!! error TS2663: Cannot find name 'x'. Did you mean the instance member 'this.x'?
         constructor(public x: T) { }
     }

tests/baselines/reference/instanceSubtypeCheck2.errors.txt

@@ -1,7 +1,6 @@
 tests/cases/compiler/instanceSubtypeCheck2.ts(5,7): error TS2415: Class 'C2<T>' incorrectly extends base class 'C1<T>'.
   Types of property 'x' are incompatible.
     Type 'string' is not assignable to type 'C2<T>'.
-      Property 'x' is missing in type 'String'.
 
 
 ==== tests/cases/compiler/instanceSubtypeCheck2.ts (1 errors) ====
@@ -14,6 +13,5 @@ tests/cases/compiler/instanceSubtypeCheck2.ts(5,7): error TS2415: Class 'C2<T>'
 !!! error TS2415: Class 'C2<T>' incorrectly extends base class 'C1<T>'.
 !!! error TS2415:   Types of property 'x' are incompatible.
 !!! error TS2415:     Type 'string' is not assignable to type 'C2<T>'.
-!!! error TS2415:       Property 'x' is missing in type 'String'.
         x: string
     }